mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Compare commits
2 Commits
use-rfdc
...
multiplaye
| Author | SHA1 | Date | |
|---|---|---|---|
|
595933d046 | ||
|
|
789426f80e |
@@ -73,7 +73,6 @@
|
||||
"passport-http-bearer": "1.0.1",
|
||||
"passport-oauth2-client-password": "0.1.2",
|
||||
"raw-body": "2.5.2",
|
||||
"rfdc": "^1.3.1",
|
||||
"semver": "7.5.4",
|
||||
"tar": "6.2.1",
|
||||
"tough-cookie": "4.1.3",
|
||||
|
||||
@@ -643,7 +643,6 @@
|
||||
"errors": {
|
||||
"catalogLoadFailed": "<p>Failed to load node catalogue.</p><p>Check the browser console for more information</p>",
|
||||
"installFailed": "<p>Failed to install: __module__</p><p>__message__</p><p>Check the log for more information</p>",
|
||||
"installTimeout": "<p>Install continuing the background.</p><p>Nodes will appear in palette when complete. Check the log for more information.</p>",
|
||||
"removeFailed": "<p>Failed to remove: __module__</p><p>__message__</p><p>Check the log for more information</p>",
|
||||
"updateFailed": "<p>Failed to update: __module__</p><p>__message__</p><p>Check the log for more information</p>",
|
||||
"enableFailed": "<p>Failed to enable: __module__</p><p>__message__</p><p>Check the log for more information</p>",
|
||||
@@ -658,9 +657,6 @@
|
||||
"body": "<p>Removing '__module__'</p><p>Removing the node will uninstall it from Node-RED. The node may continue to use resources until Node-RED is restarted.</p>",
|
||||
"title": "Remove nodes"
|
||||
},
|
||||
"removePlugin": {
|
||||
"body": "<p>Removed plugin __module__. Please reload the editor to clear left-overs.</p>"
|
||||
},
|
||||
"update": {
|
||||
"body": "<p>Updating '__module__'</p><p>Updating the node will require a restart of Node-RED to complete the update. This must be done manually.</p>",
|
||||
"title": "Update nodes"
|
||||
@@ -672,8 +668,7 @@
|
||||
"review": "Open node information",
|
||||
"install": "Install",
|
||||
"remove": "Remove",
|
||||
"update": "Update",
|
||||
"understood": "Understood"
|
||||
"update": "Update"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -614,8 +614,6 @@
|
||||
},
|
||||
"nodeCount": "__label__ 個のノード",
|
||||
"nodeCount_plural": "__label__ 個のノード",
|
||||
"pluginCount": "__count__ 個のプラグイン",
|
||||
"pluginCount_plural": "__count__ 個のプラグイン",
|
||||
"moduleCount": "__count__ 個のモジュール",
|
||||
"moduleCount_plural": "__count__ 個のモジュール",
|
||||
"inuse": "使用中",
|
||||
@@ -643,7 +641,6 @@
|
||||
"errors": {
|
||||
"catalogLoadFailed": "<p>ノードのカタログの読み込みに失敗しました。</p><p>詳細はブラウザのコンソールを確認してください。</p>",
|
||||
"installFailed": "<p>追加処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
|
||||
"installTimeout": "<p>バックグラウンドでインストールが継続されます。</p><p>完了した時にノードが表示されます。詳細はログを確認してください。</p>",
|
||||
"removeFailed": "<p>削除処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
|
||||
"updateFailed": "<p>更新処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
|
||||
"enableFailed": "<p>有効化処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
|
||||
@@ -658,9 +655,6 @@
|
||||
"body": "<p>__module__ を削除します。</p><p>Node-REDからノードを削除します。ノードはNode-REDが再起動されるまで、リソースを使い続ける可能性があります。</p>",
|
||||
"title": "ノードを削除"
|
||||
},
|
||||
"removePlugin": {
|
||||
"body": "<p>プラグイン __module__ を削除しました。ブラウザを再読み込みして残った表示を消してください。</p>"
|
||||
},
|
||||
"update": {
|
||||
"body": "<p>__module__ を更新します。</p><p>更新を完了するには手動でNode-REDを再起動する必要があります。</p>",
|
||||
"title": "ノードの更新"
|
||||
@@ -672,8 +666,7 @@
|
||||
"review": "ノードの情報を参照",
|
||||
"install": "追加",
|
||||
"remove": "削除",
|
||||
"update": "更新",
|
||||
"understood": "了解"
|
||||
"update": "更新"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,114 +1,92 @@
|
||||
RED.multiplayer = (function () {
|
||||
|
||||
// sessionId - used to identify sessions across websocket reconnects
|
||||
let sessionId
|
||||
// activeSessionId - used to identify sessions across websocket reconnects
|
||||
let activeSessionId
|
||||
|
||||
let headerWidget
|
||||
// Map of session id to { session:'', user:{}, location:{}}
|
||||
let connections = {}
|
||||
// Map of username to { user:{}, connections:[] }
|
||||
let sessions = {}
|
||||
// Map of username to { user:{}, sessions:[] }
|
||||
let users = {}
|
||||
|
||||
function addUserConnection (connection) {
|
||||
if (connections[connection.session]) {
|
||||
function addUserSession (session) {
|
||||
if (sessions[session.session]) {
|
||||
// This is an existing connection that has been authenticated
|
||||
const existingConnection = connections[connection.session]
|
||||
if (existingConnection.user.username !== connection.user.username) {
|
||||
removeUserButton(users[existingConnection.user.username])
|
||||
const existingSession = sessions[session.session]
|
||||
if (existingSession.user.username !== session.user.username) {
|
||||
removeUserHeaderButton(users[existingSession.user.username])
|
||||
}
|
||||
}
|
||||
connections[connection.session] = connection
|
||||
const user = users[connection.user.username] = users[connection.user.username] || {
|
||||
user: connection.user,
|
||||
connections: []
|
||||
sessions[session.session] = session
|
||||
const user = users[session.user.username] = users[session.user.username] || {
|
||||
user: session.user,
|
||||
sessions: []
|
||||
}
|
||||
connection.location = connection.location || {}
|
||||
user.connections.push(connection)
|
||||
if (session.user.profileColor === undefined) {
|
||||
session.user.profileColor = (1 + Math.floor(Math.random() * 5))
|
||||
}
|
||||
session.location = session.location || {}
|
||||
user.sessions.push(session)
|
||||
|
||||
if (connection.user.username === RED.settings.user?.username ||
|
||||
connection.session === sessionId
|
||||
) {
|
||||
// This is the current user - do not add a extra button for them
|
||||
if (session.session === activeSessionId) {
|
||||
// This is the current user session - do not add a extra button for them
|
||||
} else {
|
||||
if (user.connections.length === 1) {
|
||||
if (user.sessions.length === 1) {
|
||||
if (user.button) {
|
||||
clearTimeout(user.inactiveTimeout)
|
||||
clearTimeout(user.removeTimeout)
|
||||
user.button.removeClass('inactive')
|
||||
} else {
|
||||
addUserButton(user)
|
||||
addUserHeaderButton(user)
|
||||
}
|
||||
}
|
||||
sessions[session.session].location = session.location
|
||||
updateUserLocation(session.session)
|
||||
}
|
||||
}
|
||||
|
||||
function removeUserConnection (session, isDisconnected) {
|
||||
const connection = connections[session]
|
||||
delete connections[session]
|
||||
const user = users[connection.user.username]
|
||||
const i = user.connections.indexOf(connection)
|
||||
user.connections.splice(i, 1)
|
||||
function removeUserSession (sessionId, isDisconnected) {
|
||||
removeUserLocation(sessionId)
|
||||
const session = sessions[sessionId]
|
||||
delete sessions[sessionId]
|
||||
const user = users[session.user.username]
|
||||
const i = user.sessions.indexOf(session)
|
||||
user.sessions.splice(i, 1)
|
||||
if (isDisconnected) {
|
||||
removeUserButton(user)
|
||||
removeUserHeaderButton(user)
|
||||
} else {
|
||||
if (user.connections.length === 0) {
|
||||
if (user.sessions.length === 0) {
|
||||
// Give the user 5s to reconnect before marking inactive
|
||||
user.inactiveTimeout = setTimeout(() => {
|
||||
user.button.addClass('inactive')
|
||||
// Give the user further 20 seconds to reconnect before removing them
|
||||
// from the user toolbar entirely
|
||||
user.removeTimeout = setTimeout(() => {
|
||||
removeUserButton(user)
|
||||
removeUserHeaderButton(user)
|
||||
}, 20000)
|
||||
}, 5000)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function addUserButton (user) {
|
||||
user.button = $('<li class="red-ui-multiplayer-user"><button type="button" class="red-ui-multiplayer-user-icon" href="#"></button></li>')
|
||||
function addUserHeaderButton (user) {
|
||||
user.button = $('<li class="red-ui-multiplayer-user"><button type="button" class="red-ui-multiplayer-user-icon"></button></li>')
|
||||
.attr('data-username', user.user.username)
|
||||
.prependTo("#red-ui-multiplayer-user-list");
|
||||
var button = user.button.find("button")
|
||||
RED.popover.tooltip(button, user.user.username)
|
||||
button.on('click', function () {
|
||||
RED.popover.create({
|
||||
target:button,
|
||||
trigger: 'modal',
|
||||
interactive: true,
|
||||
width: "250px",
|
||||
direction: 'bottom',
|
||||
content: () => {
|
||||
const content = $('<div>')
|
||||
$('<div style="text-align: center">').text(user.user.username).appendTo(content)
|
||||
|
||||
const location = user.connections[0].location
|
||||
if (location.workspace) {
|
||||
const ws = RED.nodes.workspace(location.workspace) || RED.nodes.subflow(location.workspace)
|
||||
if (ws) {
|
||||
$('<div>').text(`${ws.type}: ${ws.label||ws.name||ws.id}`).appendTo(content)
|
||||
} else {
|
||||
$('<div>').text(`tab: unknown`).appendTo(content)
|
||||
}
|
||||
}
|
||||
if (location.node) {
|
||||
const node = RED.nodes.node(location.node)
|
||||
if (node) {
|
||||
$('<div>').text(`node: ${node.id}`).appendTo(content)
|
||||
} else {
|
||||
$('<div>').text(`node: unknown`).appendTo(content)
|
||||
}
|
||||
}
|
||||
return content
|
||||
},
|
||||
}).open()
|
||||
const location = user.sessions[0].location
|
||||
revealUser(location)
|
||||
})
|
||||
if (!user.user.image) {
|
||||
$('<i class="fa fa-user"></i>').appendTo(button);
|
||||
} else {
|
||||
$('<span class="user-profile"></span>').css({
|
||||
backgroundImage: "url("+user.user.image+")",
|
||||
}).appendTo(button);
|
||||
}
|
||||
|
||||
const userProfile = RED.user.generateUserIcon(user.user)
|
||||
userProfile.appendTo(button)
|
||||
}
|
||||
|
||||
function removeUserHeaderButton (user) {
|
||||
user.button.remove()
|
||||
delete user.button
|
||||
}
|
||||
|
||||
function getLocation () {
|
||||
@@ -124,7 +102,7 @@ RED.multiplayer = (function () {
|
||||
}
|
||||
return location
|
||||
}
|
||||
function updateLocation () {
|
||||
function publishLocation () {
|
||||
const location = getLocation()
|
||||
if (location.workspace !== 0) {
|
||||
log('send', 'multiplayer/location', location)
|
||||
@@ -132,31 +110,314 @@ RED.multiplayer = (function () {
|
||||
}
|
||||
}
|
||||
|
||||
function removeUserButton (user) {
|
||||
user.button.remove()
|
||||
delete user.button
|
||||
function revealUser(location, skipWorkspace) {
|
||||
if (location.node) {
|
||||
// Need to check if this is a known node, so we can fall back to revealing
|
||||
// the workspace instead
|
||||
const node = RED.nodes.node(location.node)
|
||||
if (node) {
|
||||
RED.view.reveal(location.node)
|
||||
} else if (!skipWorkspace && location.workspace) {
|
||||
RED.view.reveal(location.workspace)
|
||||
}
|
||||
} else if (!skipWorkspace && location.workspace) {
|
||||
RED.view.reveal(location.workspace)
|
||||
}
|
||||
}
|
||||
|
||||
function updateUserLocation (data) {
|
||||
connections[data.session].location = data
|
||||
delete data.session
|
||||
const workspaceTrays = {}
|
||||
function getWorkspaceTray(workspaceId) {
|
||||
// console.log('get tray for',workspaceId)
|
||||
if (!workspaceTrays[workspaceId]) {
|
||||
const tray = $('<div class="red-ui-multiplayer-users-tray"></div>')
|
||||
const users = []
|
||||
const userIcons = {}
|
||||
|
||||
const userCountIcon = $(`<div class="red-ui-multiplayer-user-location"><span class="red-ui-user-profile red-ui-multiplayer-user-count"><span></span></span></div>`)
|
||||
const userCountSpan = userCountIcon.find('span span')
|
||||
userCountIcon.hide()
|
||||
userCountSpan.text('')
|
||||
userCountIcon.appendTo(tray)
|
||||
const userCountTooltip = RED.popover.tooltip(userCountIcon, function () {
|
||||
const content = $('<div>')
|
||||
users.forEach(sessionId => {
|
||||
$('<div>').append($('<a href="#">').text(sessions[sessionId].user.username).on('click', function (evt) {
|
||||
evt.preventDefault()
|
||||
revealUser(sessions[sessionId].location, true)
|
||||
userCountTooltip.close()
|
||||
})).appendTo(content)
|
||||
})
|
||||
return content
|
||||
},
|
||||
null,
|
||||
true
|
||||
)
|
||||
|
||||
const updateUserCount = function () {
|
||||
const maxShown = 2
|
||||
const children = tray.children()
|
||||
children.each(function (index, element) {
|
||||
const i = users.length - index
|
||||
if (i > maxShown) {
|
||||
$(this).hide()
|
||||
} else if (i >= 0) {
|
||||
$(this).show()
|
||||
}
|
||||
})
|
||||
if (users.length < maxShown + 1) {
|
||||
userCountIcon.hide()
|
||||
} else {
|
||||
userCountSpan.text('+'+(users.length - maxShown))
|
||||
userCountIcon.show()
|
||||
}
|
||||
}
|
||||
workspaceTrays[workspaceId] = {
|
||||
attached: false,
|
||||
tray,
|
||||
users,
|
||||
userIcons,
|
||||
addUser: function (sessionId) {
|
||||
if (users.indexOf(sessionId) === -1) {
|
||||
// console.log(`addUser ws:${workspaceId} session:${sessionId}`)
|
||||
users.push(sessionId)
|
||||
const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
|
||||
const userLocationIcon = $(`<div class="red-ui-multiplayer-user-location" id="${userLocationId}"></div>`)
|
||||
RED.user.generateUserIcon(sessions[sessionId].user).appendTo(userLocationIcon)
|
||||
userLocationIcon.prependTo(tray)
|
||||
RED.popover.tooltip(userLocationIcon, sessions[sessionId].user.username)
|
||||
userIcons[sessionId] = userLocationIcon
|
||||
updateUserCount()
|
||||
}
|
||||
},
|
||||
removeUser: function (sessionId) {
|
||||
// console.log(`removeUser ws:${workspaceId} session:${sessionId}`)
|
||||
const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
|
||||
const index = users.indexOf(sessionId)
|
||||
if (index > -1) {
|
||||
users.splice(index, 1)
|
||||
userIcons[sessionId].remove()
|
||||
delete userIcons[sessionId]
|
||||
}
|
||||
updateUserCount()
|
||||
},
|
||||
updateUserCount
|
||||
}
|
||||
}
|
||||
const trayDef = workspaceTrays[workspaceId]
|
||||
if (!trayDef.attached) {
|
||||
const workspaceTab = $(`#red-ui-tab-${workspaceId}`)
|
||||
if (workspaceTab.length > 0) {
|
||||
trayDef.attached = true
|
||||
trayDef.tray.appendTo(workspaceTab)
|
||||
trayDef.users.forEach(sessionId => {
|
||||
trayDef.userIcons[sessionId].on('click', function (evt) {
|
||||
revealUser(sessions[sessionId].location, true)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
return workspaceTrays[workspaceId]
|
||||
}
|
||||
function attachWorkspaceTrays () {
|
||||
let viewTouched = false
|
||||
for (let sessionId of Object.keys(sessions)) {
|
||||
const location = sessions[sessionId].location
|
||||
if (location) {
|
||||
if (location.workspace) {
|
||||
getWorkspaceTray(location.workspace).updateUserCount()
|
||||
}
|
||||
if (location.node) {
|
||||
addUserToNode(sessionId, location.node)
|
||||
viewTouched = true
|
||||
}
|
||||
}
|
||||
}
|
||||
if (viewTouched) {
|
||||
RED.view.redraw()
|
||||
}
|
||||
}
|
||||
|
||||
function addUserToNode(sessionId, nodeId) {
|
||||
const node = RED.nodes.node(nodeId)
|
||||
if (node) {
|
||||
if (!node._multiplayer) {
|
||||
node._multiplayer = {
|
||||
users: [sessionId]
|
||||
}
|
||||
node._multiplayer_refresh = true
|
||||
} else {
|
||||
if (node._multiplayer.users.indexOf(sessionId) === -1) {
|
||||
node._multiplayer.users.push(sessionId)
|
||||
node._multiplayer_refresh = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
function removeUserFromNode(sessionId, nodeId) {
|
||||
const node = RED.nodes.node(nodeId)
|
||||
if (node && node._multiplayer) {
|
||||
const i = node._multiplayer.users.indexOf(sessionId)
|
||||
if (i > -1) {
|
||||
node._multiplayer.users.splice(i, 1)
|
||||
}
|
||||
if (node._multiplayer.users.length === 0) {
|
||||
delete node._multiplayer
|
||||
} else {
|
||||
node._multiplayer_refresh = true
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function removeUserLocation (sessionId) {
|
||||
updateUserLocation(sessionId, {})
|
||||
}
|
||||
function updateUserLocation (sessionId, location) {
|
||||
let viewTouched = false
|
||||
const oldLocation = sessions[sessionId].location
|
||||
if (location) {
|
||||
if (oldLocation.workspace !== location.workspace) {
|
||||
// console.log('removing', sessionId, oldLocation.workspace)
|
||||
workspaceTrays[oldLocation.workspace]?.removeUser(sessionId)
|
||||
}
|
||||
if (oldLocation.node !== location.node) {
|
||||
removeUserFromNode(sessionId, oldLocation.node)
|
||||
viewTouched = true
|
||||
}
|
||||
sessions[sessionId].location = location
|
||||
} else {
|
||||
location = sessions[sessionId].location
|
||||
}
|
||||
// console.log(`updateUserLocation sessionId:${sessionId} oldWS:${oldLocation?.workspace} newWS:${location.workspace}`)
|
||||
if (location.workspace) {
|
||||
getWorkspaceTray(location.workspace).addUser(sessionId)
|
||||
}
|
||||
if (location.node) {
|
||||
addUserToNode(sessionId, location.node)
|
||||
viewTouched = true
|
||||
}
|
||||
if (viewTouched) {
|
||||
RED.view.redraw()
|
||||
}
|
||||
}
|
||||
|
||||
// function refreshUserLocations () {
|
||||
// for (const session of Object.keys(sessions)) {
|
||||
// if (session !== activeSessionId) {
|
||||
// updateUserLocation(session)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
return {
|
||||
init: function () {
|
||||
|
||||
|
||||
sessionId = RED.settings.getLocal('multiplayer:sessionId')
|
||||
if (!sessionId) {
|
||||
sessionId = RED.nodes.id()
|
||||
RED.settings.setLocal('multiplayer:sessionId', sessionId)
|
||||
function createAnnotationUser(user) {
|
||||
|
||||
const group = document.createElementNS("http://www.w3.org/2000/svg","g");
|
||||
const badge = document.createElementNS("http://www.w3.org/2000/svg","circle");
|
||||
const radius = 20
|
||||
badge.setAttribute("cx",radius/2);
|
||||
badge.setAttribute("cy",radius/2);
|
||||
badge.setAttribute("r",radius/2);
|
||||
badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
|
||||
group.appendChild(badge)
|
||||
if (user && user.profileColor !== undefined) {
|
||||
badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
|
||||
}
|
||||
if (user && user.image) {
|
||||
const image = document.createElementNS("http://www.w3.org/2000/svg","image");
|
||||
image.setAttribute("width", radius)
|
||||
image.setAttribute("height", radius)
|
||||
image.setAttribute("href", user.image)
|
||||
image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
|
||||
group.appendChild(image)
|
||||
} else if (user && user.anonymous) {
|
||||
const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
|
||||
anonIconHead.setAttribute("cx", radius/2)
|
||||
anonIconHead.setAttribute("cy", radius/2 - 2)
|
||||
anonIconHead.setAttribute("r", 2.4)
|
||||
anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
|
||||
group.appendChild(anonIconHead)
|
||||
const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
|
||||
anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
|
||||
// anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
|
||||
anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5 2.5 5.5 0 4.5 z`);
|
||||
group.appendChild(anonIconBody)
|
||||
} else {
|
||||
const labelText = user.username ? user.username.substring(0,2) : user
|
||||
const label = document.createElementNS("http://www.w3.org/2000/svg","text");
|
||||
if (user.username) {
|
||||
label.setAttribute("class","red-ui-multiplayer-annotation-label");
|
||||
label.textContent = user.username.substring(0,2)
|
||||
} else {
|
||||
label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
|
||||
label.textContent = user
|
||||
}
|
||||
label.setAttribute("text-anchor", "middle")
|
||||
label.setAttribute("x",radius/2);
|
||||
label.setAttribute("y",radius/2 + 3);
|
||||
group.appendChild(label)
|
||||
}
|
||||
const border = document.createElementNS("http://www.w3.org/2000/svg","circle");
|
||||
border.setAttribute("cx",radius/2);
|
||||
border.setAttribute("cy",radius/2);
|
||||
border.setAttribute("r",radius/2);
|
||||
border.setAttribute("class", "red-ui-multiplayer-annotation-border")
|
||||
group.appendChild(border)
|
||||
|
||||
|
||||
|
||||
return group
|
||||
}
|
||||
|
||||
RED.view.annotations.register("red-ui-multiplayer",{
|
||||
type: 'badge',
|
||||
align: 'left',
|
||||
class: "red-ui-multiplayer-annotation",
|
||||
show: "_multiplayer",
|
||||
refresh: "_multiplayer_refresh",
|
||||
element: function(node) {
|
||||
const containerGroup = document.createElementNS("http://www.w3.org/2000/svg","g");
|
||||
containerGroup.setAttribute("transform","translate(0,-4)")
|
||||
if (node._multiplayer) {
|
||||
let y = 0
|
||||
for (let i = Math.min(1, node._multiplayer.users.length - 1); i >= 0; i--) {
|
||||
const user = sessions[node._multiplayer.users[i]].user
|
||||
const group = createAnnotationUser(user)
|
||||
group.setAttribute("transform","translate("+y+",0)")
|
||||
y += 15
|
||||
containerGroup.appendChild(group)
|
||||
}
|
||||
if (node._multiplayer.users.length > 2) {
|
||||
const group = createAnnotationUser('+'+(node._multiplayer.users.length - 2))
|
||||
group.setAttribute("transform","translate("+y+",0)")
|
||||
y += 12
|
||||
containerGroup.appendChild(group)
|
||||
}
|
||||
|
||||
}
|
||||
return containerGroup;
|
||||
},
|
||||
tooltip: node => { return node._multiplayer.users.map(u => sessions[u].user.username).join('\n') }
|
||||
});
|
||||
|
||||
|
||||
// activeSessionId = RED.settings.getLocal('multiplayer:sessionId')
|
||||
// if (!activeSessionId) {
|
||||
activeSessionId = RED.nodes.id()
|
||||
// RED.settings.setLocal('multiplayer:sessionId', activeSessionId)
|
||||
// log('Session ID (new)', activeSessionId)
|
||||
// } else {
|
||||
log('Session ID', activeSessionId)
|
||||
// }
|
||||
|
||||
headerWidget = $('<li><ul id="red-ui-multiplayer-user-list"></ul></li>').prependTo('.red-ui-header-toolbar')
|
||||
|
||||
RED.comms.on('connect', () => {
|
||||
const location = getLocation()
|
||||
const connectInfo = {
|
||||
session: sessionId
|
||||
session: activeSessionId
|
||||
}
|
||||
if (location.workspace !== 0) {
|
||||
connectInfo.location = location
|
||||
@@ -168,40 +429,52 @@ RED.multiplayer = (function () {
|
||||
if (topic === 'multiplayer/init') {
|
||||
// We have just reconnected, runtime has sent state to
|
||||
// initialise the world
|
||||
connections = {}
|
||||
sessions = {}
|
||||
users = {}
|
||||
$('#red-ui-multiplayer-user-list').empty()
|
||||
|
||||
msg.forEach(connection => {
|
||||
addUserConnection(connection)
|
||||
msg.sessions.forEach(session => {
|
||||
addUserSession(session)
|
||||
})
|
||||
} else if (topic === 'multiplayer/connection-added') {
|
||||
addUserConnection(msg)
|
||||
addUserSession(msg)
|
||||
} else if (topic === 'multiplayer/connection-removed') {
|
||||
removeUserConnection(msg.session, msg.disconnected)
|
||||
removeUserSession(msg.session, msg.disconnected)
|
||||
} else if (topic === 'multiplayer/location') {
|
||||
updateUserLocation(msg)
|
||||
const session = msg.session
|
||||
delete msg.session
|
||||
updateUserLocation(session, msg)
|
||||
}
|
||||
})
|
||||
|
||||
RED.events.on('workspace:change', (event) => {
|
||||
updateLocation()
|
||||
getWorkspaceTray(event.workspace)
|
||||
publishLocation()
|
||||
})
|
||||
RED.events.on('editor:open', () => {
|
||||
updateLocation()
|
||||
publishLocation()
|
||||
})
|
||||
RED.events.on('editor:close', () => {
|
||||
updateLocation()
|
||||
publishLocation()
|
||||
})
|
||||
RED.events.on('editor:change', () => {
|
||||
updateLocation()
|
||||
publishLocation()
|
||||
})
|
||||
RED.events.on('login', () => {
|
||||
updateLocation()
|
||||
publishLocation()
|
||||
})
|
||||
RED.events.on('flows:loaded', () => {
|
||||
attachWorkspaceTrays()
|
||||
})
|
||||
RED.events.on('workspace:close', (event) => {
|
||||
// A subflow tab has been closed. Need to mark its tray as detached
|
||||
if (workspaceTrays[event.workspace]) {
|
||||
workspaceTrays[event.workspace].attached = false
|
||||
}
|
||||
})
|
||||
RED.events.on('logout', () => {
|
||||
const disconnectInfo = {
|
||||
session: sessionId
|
||||
session: activeSessionId
|
||||
}
|
||||
RED.comms.send('multiplayer/disconnect', disconnectInfo)
|
||||
RED.settings.removeLocal('multiplayer:sessionId')
|
||||
|
||||
@@ -298,6 +298,7 @@ var RED = (function() {
|
||||
RED.workspaces.show(workspaces[0]);
|
||||
}
|
||||
}
|
||||
RED.events.emit('flows:loaded')
|
||||
} catch(err) {
|
||||
console.warn(err);
|
||||
RED.notify(
|
||||
|
||||
@@ -445,9 +445,12 @@ RED.popover = (function() {
|
||||
|
||||
return {
|
||||
create: createPopover,
|
||||
tooltip: function(target,content, action) {
|
||||
tooltip: function(target,content, action, interactive) {
|
||||
var label = function() {
|
||||
var label = content;
|
||||
if (typeof content === 'function') {
|
||||
label = content()
|
||||
}
|
||||
if (action) {
|
||||
var shortcut = RED.keyboard.getShortcut(action);
|
||||
if (shortcut && shortcut.key) {
|
||||
@@ -463,6 +466,7 @@ RED.popover = (function() {
|
||||
size: "small",
|
||||
direction: "bottom",
|
||||
content: label,
|
||||
interactive,
|
||||
delay: { show: 750, hide: 50 }
|
||||
});
|
||||
popover.setContent = function(newContent) {
|
||||
|
||||
@@ -112,16 +112,23 @@ RED.deploy = (function() {
|
||||
RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
|
||||
}
|
||||
|
||||
|
||||
window.addEventListener('beforeunload', function (event) {
|
||||
if (RED.nodes.dirty()) {
|
||||
event.preventDefault();
|
||||
event.stopImmediatePropagation()
|
||||
event.returnValue = RED._("deploy.confirm.undeployedChanges");
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
RED.events.on('workspace:dirty',function(state) {
|
||||
if (state.dirty) {
|
||||
window.onbeforeunload = function() {
|
||||
return RED._("deploy.confirm.undeployedChanges");
|
||||
}
|
||||
// window.onbeforeunload = function() {
|
||||
// return
|
||||
// }
|
||||
$("#red-ui-header-button-deploy").removeClass("disabled");
|
||||
} else {
|
||||
window.onbeforeunload = null;
|
||||
// window.onbeforeunload = null;
|
||||
$("#red-ui-header-button-deploy").addClass("disabled");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -133,7 +133,7 @@ RED.palette.editor = (function() {
|
||||
}).done(function(data,textStatus,xhr) {
|
||||
callback();
|
||||
}).fail(function(xhr,textStatus,err) {
|
||||
callback(xhr,textStatus,err);
|
||||
callback(xhr);
|
||||
});
|
||||
}
|
||||
function removeNodeModule(id,callback) {
|
||||
@@ -1346,13 +1346,13 @@ RED.palette.editor = (function() {
|
||||
});
|
||||
|
||||
if (!found_onremove) {
|
||||
let removeNotify = RED.notify(RED._("palette.editor.confirm.removePlugin.body",{module:entry.name}),{
|
||||
let removeNotify = RED.notify("Removed plugin " + entry.name + ". Please reload the editor to clear left-overs.",{
|
||||
modal: true,
|
||||
fixed: true,
|
||||
type: 'warning',
|
||||
buttons: [
|
||||
{
|
||||
text: RED._("palette.editor.confirm.button.understood"),
|
||||
text: "Understood",
|
||||
class:"primary",
|
||||
click: function(e) {
|
||||
removeNotify.close();
|
||||
@@ -1405,28 +1405,9 @@ RED.palette.editor = (function() {
|
||||
RED.actions.invoke("core:show-event-log");
|
||||
});
|
||||
RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
|
||||
installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr, textStatus,err) {
|
||||
installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr) {
|
||||
spinner.remove();
|
||||
if (err && xhr.status === 504) {
|
||||
var notification = RED.notify(RED._("palette.editor.errors.installTimeout"), {
|
||||
modal: true,
|
||||
fixed: true,
|
||||
buttons: [
|
||||
{
|
||||
text: RED._("common.label.close"),
|
||||
click: function() {
|
||||
notification.close();
|
||||
}
|
||||
},{
|
||||
text: RED._("eventLog.view"),
|
||||
click: function() {
|
||||
notification.close();
|
||||
RED.actions.invoke("core:show-event-log");
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
} else if (xhr) {
|
||||
if (xhr) {
|
||||
if (xhr.responseJSON) {
|
||||
var notification = RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}),{
|
||||
type: 'error',
|
||||
|
||||
@@ -1363,7 +1363,7 @@ RED.subflow = (function() {
|
||||
break;
|
||||
case "conf-types":
|
||||
item.value = input.val()
|
||||
item.type = "conf-type"
|
||||
item.type = data.parent.value;
|
||||
}
|
||||
if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) {
|
||||
env.push(item);
|
||||
|
||||
@@ -9,14 +9,27 @@ RED.view.annotations = (function() {
|
||||
addAnnotation(evt.node.__pendingAnnotation__,evt);
|
||||
delete evt.node.__pendingAnnotation__;
|
||||
}
|
||||
var badgeDX = 0;
|
||||
var controlDX = 0;
|
||||
for (var i=0,l=evt.el.__annotations__.length;i<l;i++) {
|
||||
var annotation = evt.el.__annotations__[i];
|
||||
let badgeRDX = 0;
|
||||
let badgeLDX = 0;
|
||||
|
||||
for (let i=0,l=evt.el.__annotations__.length;i<l;i++) {
|
||||
const annotation = evt.el.__annotations__[i];
|
||||
if (annotations.hasOwnProperty(annotation.id)) {
|
||||
var opts = annotations[annotation.id];
|
||||
var showAnnotation = true;
|
||||
var isBadge = opts.type === 'badge';
|
||||
const opts = annotations[annotation.id];
|
||||
let showAnnotation = true;
|
||||
const isBadge = opts.type === 'badge';
|
||||
if (opts.refresh !== undefined) {
|
||||
let refreshAnnotation = false
|
||||
if (typeof opts.refresh === "string") {
|
||||
refreshAnnotation = !!evt.node[opts.refresh]
|
||||
delete evt.node[opts.refresh]
|
||||
} else if (typeof opts.refresh === "function") {
|
||||
refreshAnnotation = opts.refresh(evnt.node)
|
||||
}
|
||||
if (refreshAnnotation) {
|
||||
refreshAnnotationElement(annotation.id, annotation.node, annotation.element)
|
||||
}
|
||||
}
|
||||
if (opts.show !== undefined) {
|
||||
if (typeof opts.show === "string") {
|
||||
showAnnotation = !!evt.node[opts.show]
|
||||
@@ -29,17 +42,24 @@ RED.view.annotations = (function() {
|
||||
}
|
||||
if (isBadge) {
|
||||
if (showAnnotation) {
|
||||
var rect = annotation.element.getBoundingClientRect();
|
||||
badgeDX += rect.width;
|
||||
annotation.element.setAttribute("transform", "translate("+(evt.node.w-3-badgeDX)+", -8)");
|
||||
badgeDX += 4;
|
||||
}
|
||||
} else {
|
||||
if (showAnnotation) {
|
||||
var rect = annotation.element.getBoundingClientRect();
|
||||
annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
|
||||
controlDX += rect.width + 4;
|
||||
const rect = annotation.element.getBoundingClientRect();
|
||||
let annotationX
|
||||
if (!opts.align || opts.align === 'right') {
|
||||
annotationX = evt.node.w - 3 - badgeRDX - rect.width
|
||||
badgeRDX += rect.width + 4;
|
||||
|
||||
} else if (opts.align === 'left') {
|
||||
annotationX = 3 + badgeLDX
|
||||
badgeLDX += rect.width + 4;
|
||||
}
|
||||
annotation.element.setAttribute("transform", "translate("+annotationX+", -8)");
|
||||
}
|
||||
// } else {
|
||||
// if (showAnnotation) {
|
||||
// var rect = annotation.element.getBoundingClientRect();
|
||||
// annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
|
||||
// controlDX += rect.width + 4;
|
||||
// }
|
||||
}
|
||||
} else {
|
||||
annotation.element.parentNode.removeChild(annotation.element);
|
||||
@@ -95,15 +115,25 @@ RED.view.annotations = (function() {
|
||||
annotationGroup.setAttribute("class",opts.class || "");
|
||||
evt.el.__annotations__.push({
|
||||
id:id,
|
||||
node: evt.node,
|
||||
element: annotationGroup
|
||||
});
|
||||
var annotation = opts.element(evt.node);
|
||||
refreshAnnotationElement(id, evt.node, annotationGroup)
|
||||
evt.el.appendChild(annotationGroup);
|
||||
}
|
||||
|
||||
function refreshAnnotationElement(id, node, annotationGroup) {
|
||||
const opts = annotations[id];
|
||||
const annotation = opts.element(node);
|
||||
if (opts.tooltip) {
|
||||
annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation,evt.node,opts.tooltip));
|
||||
annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation, node, opts.tooltip));
|
||||
annotation.addEventListener("mouseleave", annotationMouseLeave);
|
||||
}
|
||||
if (annotationGroup.hasChildNodes()) {
|
||||
annotationGroup.removeChild(annotationGroup.firstChild)
|
||||
}
|
||||
annotationGroup.appendChild(annotation);
|
||||
evt.el.appendChild(annotationGroup);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -401,6 +401,7 @@ RED.workspaces = (function() {
|
||||
if (tab.type === "tab") {
|
||||
workspaceTabCount--;
|
||||
} else {
|
||||
RED.events.emit("workspace:close",{workspace: tab.id})
|
||||
hideStack.push(tab.id);
|
||||
}
|
||||
RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
|
||||
|
||||
@@ -212,6 +212,8 @@ RED.user = (function() {
|
||||
|
||||
function updateUserMenu() {
|
||||
$("#red-ui-header-button-user-submenu li").remove();
|
||||
const userMenu = $("#red-ui-header-button-user")
|
||||
userMenu.empty()
|
||||
if (RED.settings.user.anonymous) {
|
||||
RED.menu.addItem("red-ui-header-button-user",{
|
||||
id:"usermenu-item-login",
|
||||
@@ -226,7 +228,6 @@ RED.user = (function() {
|
||||
});
|
||||
}
|
||||
});
|
||||
$('<i class="fa fa-user"></i>').appendTo("#red-ui-header-button-user");
|
||||
} else {
|
||||
RED.menu.addItem("red-ui-header-button-user",{
|
||||
id:"usermenu-item-username",
|
||||
@@ -239,17 +240,9 @@ RED.user = (function() {
|
||||
RED.user.logout();
|
||||
}
|
||||
});
|
||||
const userMenu = $("#red-ui-header-button-user")
|
||||
userMenu.empty()
|
||||
if (RED.settings.user.image) {
|
||||
$('<span class="user-profile"></span>').css({
|
||||
backgroundImage: "url("+RED.settings.user.image+")",
|
||||
}).appendTo(userMenu);
|
||||
} else {
|
||||
$('<i class="fa fa-user"></i>').appendTo(userMenu);
|
||||
}
|
||||
}
|
||||
|
||||
const userIcon = generateUserIcon(RED.settings.user)
|
||||
userIcon.appendTo(userMenu);
|
||||
}
|
||||
|
||||
function init() {
|
||||
@@ -320,12 +313,30 @@ RED.user = (function() {
|
||||
return false;
|
||||
}
|
||||
|
||||
function generateUserIcon(user) {
|
||||
const userIcon = $('<span class="red-ui-user-profile"></span>')
|
||||
if (user.image) {
|
||||
userIcon.addClass('has_profile_image')
|
||||
userIcon.css({
|
||||
backgroundImage: "url("+user.image+")",
|
||||
})
|
||||
} else if (user.anonymous) {
|
||||
$('<i class="fa fa-user"></i>').appendTo(userIcon);
|
||||
} else {
|
||||
$('<span>').text(user.username.substring(0,2)).appendTo(userIcon);
|
||||
}
|
||||
if (user.profileColor !== undefined) {
|
||||
userIcon.addClass('red-ui-user-profile-color-' + user.profileColor)
|
||||
}
|
||||
return userIcon
|
||||
}
|
||||
|
||||
return {
|
||||
init: init,
|
||||
login: login,
|
||||
logout: logout,
|
||||
hasPermission: hasPermission
|
||||
hasPermission: hasPermission,
|
||||
generateUserIcon
|
||||
}
|
||||
|
||||
})();
|
||||
|
||||
@@ -314,6 +314,16 @@ $spinner-color: #999;
|
||||
|
||||
$tab-icon-color: #dedede;
|
||||
|
||||
// Anonymous User Colors
|
||||
|
||||
$user-profile-colors: (
|
||||
1: #822e81,
|
||||
2: #955e42,
|
||||
3: #9c914f,
|
||||
4: #748e54,
|
||||
5: #06bcc1
|
||||
);
|
||||
|
||||
// Deprecated
|
||||
$text-color-green: $text-color-success;
|
||||
$info-text-code-color: $text-color-code;
|
||||
|
||||
@@ -274,18 +274,44 @@
|
||||
#usermenu-item-username > .red-ui-menu-label {
|
||||
color: var(--red-ui-header-menu-heading-color);
|
||||
}
|
||||
}
|
||||
|
||||
.user-profile {
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
display: inline-block;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
vertical-align: middle;
|
||||
|
||||
.red-ui-user-profile {
|
||||
background-color: var(--red-ui-header-background);
|
||||
border: 2px solid var(--red-ui-header-menu-color);
|
||||
border-radius: 30px;
|
||||
overflow: hidden;
|
||||
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
vertical-align: middle;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
font-size: 20px;
|
||||
|
||||
&.red-ui-user-profile-color-1 {
|
||||
background-color: var(--red-ui-user-profile-colors-1);
|
||||
}
|
||||
&.red-ui-user-profile-color-2 {
|
||||
background-color: var(--red-ui-user-profile-colors-2);
|
||||
}
|
||||
&.red-ui-user-profile-color-3 {
|
||||
background-color: var(--red-ui-user-profile-colors-3);
|
||||
}
|
||||
&.red-ui-user-profile-color-4 {
|
||||
background-color: var(--red-ui-user-profile-colors-4);
|
||||
}
|
||||
&.red-ui-user-profile-color-5 {
|
||||
background-color: var(--red-ui-user-profile-colors-5);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@media only screen and (max-width: 450px) {
|
||||
span.red-ui-header-logo > span {
|
||||
display: none;
|
||||
|
||||
@@ -5,23 +5,18 @@
|
||||
li {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
width: 30px;
|
||||
margin: 0 2px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.red-ui-multiplayer-user-icon {
|
||||
background: var(--red-ui-header-background);
|
||||
border: 2px solid var(--red-ui-header-menu-color);
|
||||
border-radius: 30px;
|
||||
background: none;
|
||||
border: none;
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
text-decoration: none;
|
||||
color: var(--red-ui-header-menu-color);
|
||||
@@ -36,13 +31,86 @@
|
||||
.red-ui-multiplayer-user.inactive & {
|
||||
opacity: 0.5;
|
||||
}
|
||||
.user-profile {
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
.red-ui-user-profile {
|
||||
width: 20px;
|
||||
border-radius: 20px;
|
||||
height: 20px;
|
||||
font-size: 12px
|
||||
}
|
||||
}
|
||||
.red-ui-multiplayer-users-tray {
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
right: 20px;
|
||||
line-height: normal;
|
||||
cursor: pointer;
|
||||
// &:hover {
|
||||
// .red-ui-multiplayer-user-location {
|
||||
// margin-left: 1px;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
$multiplayer-user-icon-background: var(--red-ui-primary-background);
|
||||
$multiplayer-user-icon-border: var(--red-ui-view-background);
|
||||
$multiplayer-user-icon-text-color: var(--red-ui-header-menu-color);
|
||||
$multiplayer-user-icon-count-text-color: var(--red-ui-primary-color);
|
||||
$multiplayer-user-icon-shadow: 0px 0px 4px var(--red-ui-shadow);
|
||||
.red-ui-multiplayer-user-location {
|
||||
display: inline-block;
|
||||
margin-left: -6px;
|
||||
transition: margin-left 0.2s;
|
||||
.red-ui-user-profile {
|
||||
border: 1px solid $multiplayer-user-icon-border;
|
||||
color: $multiplayer-user-icon-text-color;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
border-radius: 18px;
|
||||
font-size: 10px;
|
||||
font-weight: normal;
|
||||
box-shadow: $multiplayer-user-icon-shadow;
|
||||
&.red-ui-multiplayer-user-count {
|
||||
color: $multiplayer-user-icon-count-text-color;
|
||||
background-color: $multiplayer-user-icon-background;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.red-ui-multiplayer-annotation {
|
||||
.red-ui-multiplayer-annotation-background {
|
||||
filter: drop-shadow($multiplayer-user-icon-shadow);
|
||||
fill: $multiplayer-user-icon-background;
|
||||
&.red-ui-user-profile-color-1 {
|
||||
fill: var(--red-ui-user-profile-colors-1);
|
||||
}
|
||||
&.red-ui-user-profile-color-2 {
|
||||
fill: var(--red-ui-user-profile-colors-2);
|
||||
}
|
||||
&.red-ui-user-profile-color-3 {
|
||||
fill: var(--red-ui-user-profile-colors-3);
|
||||
}
|
||||
&.red-ui-user-profile-color-4 {
|
||||
fill: var(--red-ui-user-profile-colors-4);
|
||||
}
|
||||
&.red-ui-user-profile-color-5 {
|
||||
fill: var(--red-ui-user-profile-colors-5);
|
||||
}
|
||||
}
|
||||
.red-ui-multiplayer-annotation-border {
|
||||
stroke: $multiplayer-user-icon-border;
|
||||
stroke-width: 1px;
|
||||
fill: none;
|
||||
}
|
||||
.red-ui-multiplayer-annotation-anon-label {
|
||||
fill: $multiplayer-user-icon-text-color;
|
||||
stroke: none;
|
||||
}
|
||||
text {
|
||||
user-select: none;
|
||||
fill: $multiplayer-user-icon-text-color;
|
||||
stroke: none;
|
||||
font-size: 10px;
|
||||
&.red-ui-multiplayer-user-count {
|
||||
fill: $multiplayer-user-icon-count-text-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -299,4 +299,7 @@
|
||||
|
||||
--red-ui-tab-icon-color: #{$tab-icon-color};
|
||||
|
||||
@each $current-color in 1 2 3 4 5 {
|
||||
--red-ui-user-profile-colors-#{"" + $current-color}: #{map-get($user-profile-colors, $current-color)};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,7 @@ export default {
|
||||
},
|
||||
{
|
||||
title: {
|
||||
"en-US": "Multiplayer Mode",
|
||||
"ja": "複数ユーザ同時利用モード"
|
||||
"en-US": "Multiplayer Mode"
|
||||
},
|
||||
image: 'images/nr4-multiplayer.png',
|
||||
description: {
|
||||
@@ -25,58 +24,46 @@ export default {
|
||||
to work with when you have multiple people editing flows at the same time.</p>
|
||||
<p>When this feature is enabled, you will now see who else has the editor open and some
|
||||
basic information on where they are in the editor.</p>
|
||||
<p>Check the release post for details on how to enable this feature in your settings file.</p>`,
|
||||
"ja": `<p>本リリースには、複数ユーザが同時にフローを編集する時に、Node-REDをより使いやすくするのための最初の微修正が入っています。</p>
|
||||
<p>本機能を有効にすると、誰がエディタを開いているか、その人がエディタ上のどこにいるかの基本的な情報が表示されます。</p>
|
||||
<p>設定ファイルで本機能を有効化する方法の詳細は、リリースの投稿を確認してください。</p>`
|
||||
<p>Check the release post for details on how to enable this feature in your settings file.</p>`
|
||||
}
|
||||
},
|
||||
{
|
||||
title: {
|
||||
"en-US": "Better Configuration Node UX",
|
||||
"ja": "設定ノードのUXが向上"
|
||||
"en-US": "Better Configuration Node UX"
|
||||
},
|
||||
image: 'images/nr4-config-select.png',
|
||||
description: {
|
||||
"en-US": `<p>The Configuration node selection UI has had a small update to have a dedicated 'add' button
|
||||
next to the select box.</p>
|
||||
<p>It's a small change, but should make it easier to work with your config nodes.</p>`,
|
||||
"ja": `<p>設定ノードを選択するUIが修正され、選択ボックスの隣に専用の「追加」ボタンが追加されました。</p>
|
||||
<p>微修正ですが設定ノードの操作が容易になります。</p>`
|
||||
<p>It's a small change, but should make it easier to work with your config nodes.</p>`
|
||||
}
|
||||
},
|
||||
{
|
||||
title: {
|
||||
"en-US": "Remembering palette state",
|
||||
"ja": "パレットの状態を維持"
|
||||
"en-US": "Remembering palette state"
|
||||
},
|
||||
description: {
|
||||
"en-US": `<p>The palette now remembers what categories you have hidden between reloads - as well as any
|
||||
filter you have applied.</p>`,
|
||||
"ja": `<p>パレット上で非表示にしたカテゴリや適用したフィルタが、リロードしても記憶されるようになりました。</p>`
|
||||
filter you have applied.</p>`
|
||||
}
|
||||
},
|
||||
{
|
||||
title: {
|
||||
"en-US": "Plugins shown in the Palette Manager",
|
||||
"ja": "パレット管理にプラグインを表示"
|
||||
"en-US": "Plugins shown in the Palette Manager"
|
||||
},
|
||||
image: 'images/nr4-plugins.png',
|
||||
description: {
|
||||
"en-US": `<p>The palette manager now shows any plugin modules you have installed, such as
|
||||
<code>node-red-debugger</code>. Previously they would only be shown if the plugins include
|
||||
nodes for the palette.</p>`,
|
||||
"ja": `<p>パレットの管理に <code>node-red-debugger</code> の様なインストールしたプラグインが表示されます。以前はプラグインにパレット向けのノードが含まれている時のみ表示されていました。</p>`
|
||||
<code>node-red-debugger</code>. Previously they would only be shown if they plugin include
|
||||
nodes for the palette.</p>`
|
||||
}
|
||||
},
|
||||
{
|
||||
title: {
|
||||
"en-US": "That's it for Beta 2!",
|
||||
"ja": "ベータ2については以上です!"
|
||||
"en-US": "That's if for Beta 2!"
|
||||
},
|
||||
description: {
|
||||
"en-US": `<p>Keep clicking through to see what was added in Beta 1</p>`,
|
||||
"ja": `<p>クリックを続けてベータ1で追加された内容を確認してください。</p>`
|
||||
"en-US": `<p>Keep clicking through to see what was added in Beta 1</p>`
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -88,7 +88,7 @@ function generateSubflowConfig(subflow) {
|
||||
this.credentials['has_' + prop.name] = (this.credentials[prop.name] !== "");
|
||||
} else {
|
||||
switch(prop.type) {
|
||||
case "str": case "conf-type": this[prop.name] = prop.value||""; break;
|
||||
case "str": this[prop.name] = prop.value||""; break;
|
||||
case "bool": this[prop.name] = (typeof prop.value === 'boolean')?prop.value:prop.value === "true" ; break;
|
||||
case "num": this[prop.name] = (typeof prop.value === 'number')?prop.value:Number(prop.value); break;
|
||||
default:
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
**/
|
||||
|
||||
const clone = require("clone");
|
||||
const jsonClone = require("rfdc")();
|
||||
const Flow = require('./Flow').Flow;
|
||||
const context = require('../nodes/context');
|
||||
const util = require("util");
|
||||
@@ -109,7 +108,7 @@ class Subflow extends Flow {
|
||||
}
|
||||
}
|
||||
|
||||
subflowInternalFlowConfig.subflows = jsonClone(subflowDef.subflows || {});
|
||||
subflowInternalFlowConfig.subflows = clone(subflowDef.subflows || {});
|
||||
|
||||
remapSubflowNodes(subflowInternalFlowConfig.configs,node_map);
|
||||
remapSubflowNodes(subflowInternalFlowConfig.nodes,node_map);
|
||||
@@ -221,7 +220,7 @@ class Subflow extends Flow {
|
||||
}
|
||||
if (this.subflowDef.in) {
|
||||
subflowInstanceConfig.wires = this.subflowDef.in.map(function(n) { return n.wires.map(function(w) { return self.node_map[w.id].id;})})
|
||||
subflowInstanceConfig._originalWires = jsonClone(subflowInstanceConfig.wires);
|
||||
subflowInstanceConfig._originalWires = clone(subflowInstanceConfig.wires);
|
||||
}
|
||||
|
||||
this.node = new Node(subflowInstanceConfig);
|
||||
@@ -245,14 +244,14 @@ class Subflow extends Flow {
|
||||
if (self.subflowDef.out) {
|
||||
var node,wires,i,j;
|
||||
// Restore the original wiring to the internal nodes
|
||||
subflowInstanceConfig.wires = jsonClone(subflowInstanceConfig._originalWires);
|
||||
subflowInstanceConfig.wires = clone(subflowInstanceConfig._originalWires);
|
||||
for (i=0;i<self.subflowDef.out.length;i++) {
|
||||
wires = self.subflowDef.out[i].wires;
|
||||
for (j=0;j<wires.length;j++) {
|
||||
if (wires[j].id != self.subflowDef.id) {
|
||||
node = self.node_map[wires[j].id];
|
||||
if (node && node._originalWires) {
|
||||
node.wires = jsonClone(node._originalWires);
|
||||
node.wires = clone(node._originalWires);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -301,7 +300,7 @@ class Subflow extends Flow {
|
||||
var node = self.node_map[wires[j].id];
|
||||
if (node) {
|
||||
if (!node._originalWires) {
|
||||
node._originalWires = jsonClone(node.wires);
|
||||
node._originalWires = clone(node.wires);
|
||||
}
|
||||
node.wires[wires[j].port] = (node.wires[wires[j].port]||[]).concat(this.subflowInstance.wires[i]);
|
||||
} else {
|
||||
@@ -324,7 +323,7 @@ class Subflow extends Flow {
|
||||
var node = self.node_map[wires[j].id];
|
||||
if (node) {
|
||||
if (!node._originalWires) {
|
||||
node._originalWires = jsonClone(node.wires);
|
||||
node._originalWires = clone(node.wires);
|
||||
}
|
||||
node.wires[wires[j].port] = (node.wires[wires[j].port]||[]);
|
||||
node.wires[wires[j].port].push(subflowStatusId);
|
||||
@@ -464,7 +463,7 @@ class Subflow extends Flow {
|
||||
* @return {[type]} [description]
|
||||
*/
|
||||
function createNodeInSubflow(subflowInstanceId, def) {
|
||||
let node = jsonClone(def);
|
||||
let node = clone(def);
|
||||
let nid = `${subflowInstanceId}-${node.id}` //redUtil.generateId();
|
||||
// console.log("Create Node In subflow",node._alias, "--->",nid, "(",node.type,")")
|
||||
// node_map[node.id] = node;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
**/
|
||||
|
||||
const jsonClone = require("rfdc")();
|
||||
var clone = require("clone");
|
||||
|
||||
var Flow = require('./Flow');
|
||||
|
||||
@@ -140,16 +140,16 @@ function setFlows(_config,_credentials,type,muteLog,forceStart,user) {
|
||||
if (type === "load") {
|
||||
isLoad = true;
|
||||
configSavePromise = loadFlows().then(function(_config) {
|
||||
config = jsonClone(_config.flows);
|
||||
newFlowConfig = flowUtil.parseConfig(jsonClone(config));
|
||||
config = clone(_config.flows);
|
||||
newFlowConfig = flowUtil.parseConfig(clone(config));
|
||||
type = "full";
|
||||
return _config.rev;
|
||||
});
|
||||
} else {
|
||||
// Clone the provided config so it can be manipulated
|
||||
config = jsonClone(_config);
|
||||
config = clone(_config);
|
||||
// Parse the configuration
|
||||
newFlowConfig = flowUtil.parseConfig(jsonClone(config));
|
||||
newFlowConfig = flowUtil.parseConfig(clone(config));
|
||||
// Generate a diff to identify what has changed
|
||||
diff = flowUtil.diffConfigs(activeFlowConfig,newFlowConfig);
|
||||
|
||||
@@ -609,7 +609,7 @@ async function addFlow(flow, user) {
|
||||
nodes.push(node);
|
||||
}
|
||||
}
|
||||
var newConfig = jsonClone(activeConfig.flows);
|
||||
var newConfig = clone(activeConfig.flows);
|
||||
newConfig = newConfig.concat(nodes);
|
||||
|
||||
return setFlows(newConfig, null, 'flows', true, null, user).then(function() {
|
||||
@@ -650,7 +650,7 @@ function getFlow(id) {
|
||||
var nodeIds = Object.keys(flow.nodes);
|
||||
if (nodeIds.length > 0) {
|
||||
result.nodes = nodeIds.map(function(nodeId) {
|
||||
var node = jsonClone(flow.nodes[nodeId]);
|
||||
var node = clone(flow.nodes[nodeId]);
|
||||
if (node.type === 'link out') {
|
||||
delete node.wires;
|
||||
}
|
||||
@@ -662,7 +662,7 @@ function getFlow(id) {
|
||||
if (flow.configs) {
|
||||
var configIds = Object.keys(flow.configs);
|
||||
result.configs = configIds.map(function(configId) {
|
||||
const node = jsonClone(flow.configs[configId]);
|
||||
const node = clone(flow.configs[configId]);
|
||||
delete node.credentials;
|
||||
return node
|
||||
|
||||
@@ -674,17 +674,17 @@ function getFlow(id) {
|
||||
if (flow.subflows) {
|
||||
var subflowIds = Object.keys(flow.subflows);
|
||||
result.subflows = subflowIds.map(function(subflowId) {
|
||||
var subflow = jsonClone(flow.subflows[subflowId]);
|
||||
var subflow = clone(flow.subflows[subflowId]);
|
||||
var nodeIds = Object.keys(subflow.nodes);
|
||||
subflow.nodes = nodeIds.map(function(id) {
|
||||
const node = jsonClone(subflow.nodes[id])
|
||||
const node = clone(subflow.nodes[id])
|
||||
delete node.credentials
|
||||
return node
|
||||
});
|
||||
if (subflow.configs) {
|
||||
var configIds = Object.keys(subflow.configs);
|
||||
subflow.configs = configIds.map(function(id) {
|
||||
const node = jsonClone(subflow.configs[id])
|
||||
const node = clone(subflow.configs[id])
|
||||
delete node.credentials
|
||||
return node
|
||||
})
|
||||
@@ -709,7 +709,7 @@ async function updateFlow(id,newFlow, user) {
|
||||
}
|
||||
label = activeFlowConfig.flows[id].label;
|
||||
}
|
||||
var newConfig = jsonClone(activeConfig.flows);
|
||||
var newConfig = clone(activeConfig.flows);
|
||||
var nodes;
|
||||
|
||||
if (id === 'global') {
|
||||
@@ -779,7 +779,7 @@ async function removeFlow(id, user) {
|
||||
throw e;
|
||||
}
|
||||
|
||||
var newConfig = jsonClone(activeConfig.flows);
|
||||
var newConfig = clone(activeConfig.flows);
|
||||
newConfig = newConfig.filter(function(node) {
|
||||
return node.z !== id && node.id !== id;
|
||||
});
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
**/
|
||||
const jsonClone = require("rfdc")();
|
||||
const clone = require("clone");
|
||||
const redUtil = require("@node-red/util").util;
|
||||
const Log = require("@node-red/util").log;
|
||||
const typeRegistry = require("@node-red/registry");
|
||||
@@ -68,7 +68,7 @@ function mapEnvVarProperties(obj,prop,flow,config) {
|
||||
if (obj[prop][0] === "$" && (EnvVarPropertyRE_old.test(v) || EnvVarPropertyRE.test(v)) ) {
|
||||
const envVar = v.substring(2,v.length-1);
|
||||
const r = redUtil.getSetting(config, envVar, flow);
|
||||
if (r !== undefined) {
|
||||
if (r !== undefined && r !== '') {
|
||||
obj[prop] = r
|
||||
}
|
||||
}
|
||||
@@ -175,7 +175,7 @@ async function createNode(flow,config) {
|
||||
try {
|
||||
var nodeTypeConstructor = typeRegistry.get(type);
|
||||
if (typeof nodeTypeConstructor === "function") {
|
||||
var conf = jsonClone(config);
|
||||
var conf = clone(config);
|
||||
delete conf.credentials;
|
||||
try {
|
||||
Object.defineProperty(conf,'_module', {value: typeRegistry.getNodeInfo(type), enumerable: false, writable: true })
|
||||
@@ -202,8 +202,8 @@ async function createNode(flow,config) {
|
||||
var subflowInstanceConfig = subflowConfig.subflows[nodeTypeConstructor.subflow.id];
|
||||
delete subflowConfig.subflows[nodeTypeConstructor.subflow.id];
|
||||
subflowInstanceConfig.subflows = subflowConfig.subflows;
|
||||
var instanceConfig = jsonClone(config);
|
||||
instanceConfig.env = jsonClone(nodeTypeConstructor.subflow.env);
|
||||
var instanceConfig = clone(config);
|
||||
instanceConfig.env = clone(nodeTypeConstructor.subflow.env);
|
||||
|
||||
instanceConfig.env = nodeTypeConstructor.subflow.env.map(nodeProp => {
|
||||
var nodePropType;
|
||||
@@ -256,7 +256,7 @@ function parseConfig(config) {
|
||||
flow.missingTypes = [];
|
||||
|
||||
config.forEach(function (n) {
|
||||
flow.allNodes[n.id] = jsonClone(n);
|
||||
flow.allNodes[n.id] = clone(n);
|
||||
if (n.type === 'tab') {
|
||||
flow.flows[n.id] = n;
|
||||
flow.flows[n.id].subflows = {};
|
||||
|
||||
@@ -69,7 +69,7 @@ module.exports = {
|
||||
// Send init info to new connection
|
||||
const initPacket = {
|
||||
topic: "multiplayer/init",
|
||||
data: getSessionsList(),
|
||||
data: { sessions: getSessionsList() },
|
||||
session: opts.session
|
||||
}
|
||||
// console.log('<<', initPacket)
|
||||
|
||||
@@ -14,8 +14,9 @@
|
||||
* limitations under the License.
|
||||
**/
|
||||
|
||||
|
||||
const jsonClone = require("rfdc")();
|
||||
var path = require("path");
|
||||
var fs = require("fs");
|
||||
var clone = require("clone");
|
||||
var util = require("util");
|
||||
|
||||
var registry = require("@node-red/registry");
|
||||
@@ -97,7 +98,7 @@ function createNode(node,def) {
|
||||
}
|
||||
var creds = credentials.get(id);
|
||||
if (creds) {
|
||||
creds = jsonClone(creds);
|
||||
creds = clone(creds);
|
||||
//console.log("Attaching credentials to ",node.id);
|
||||
// allow $(foo) syntax to substitute env variables for credentials also...
|
||||
for (var p in creds) {
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
"removing-modules": "設定からモジュールを削除します",
|
||||
"added-types": "追加したノード:",
|
||||
"removed-types": "削除したノード:",
|
||||
"removed-plugins": "削除したプラグイン:",
|
||||
"install": {
|
||||
"invalid": "不正なモジュール名",
|
||||
"installing": "モジュール __name__, バージョン: __version__ をインストールします",
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
"clone": "2.1.2",
|
||||
"express": "4.19.2",
|
||||
"fs-extra": "11.1.1",
|
||||
"json-stringify-safe": "5.0.1",
|
||||
"rfdc": "^1.3.1"
|
||||
"json-stringify-safe": "5.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user