remoterigs-raspberrypi 0.1.9 → 0.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "remoterigs-raspberrypi",
   "type": "module",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "main": "./index.js",
   "files": [
     "index.js",

package/src/common/signalr.js

@@ -9,12 +9,15 @@ export default class SignalR {
     static { this.reconnectTimer = null; }
     static { this.lastUniqueCode = null; }
     static { this.intentionalStop = false; }
+    static { this.signInRetryTimer = null; }
+    static { this.signInAttempts = 0; }
     static GetName() {
         return "SignalR";
     }
     static StartConnection(uniquecode) {
         SignalR.lastUniqueCode = uniquecode;
         SignalR.intentionalStop = false;
+        SignalR.CancelSignInRetry();
         Debug.LogAlways(SignalR.GetName(), "initiating hub connection... url: '" + Server.signalr + "'", false);
         SignalR.hubConnection = new signalR.HubConnectionBuilder()
             .withUrl(Server.signalr)
@@ -33,7 +36,7 @@ export default class SignalR {
                 if (Server.rig.rig.id !== webRTCMessage.rigId) {
                     Debug.Error(SignalR.GetName(), "incoming web-rtc-message error Server.rig.rig.id (" + Server.rig.rig.id + ") !== message.rigId (" + webRTCMessage.rigId + ")");
                 }
-                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "incoming web-rtc-message rigId:" + webRTCMessage.rigId + " componentId:" + webRTCMessage.componentId + " userName: " + webRTCMessage.userName + " rigOwnerUsername: " + webRTCMessage.rigOwnerUsername);
+                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "incoming web-rtc-message rigId:" + webRTCMessage.rigId + " componentId:" + webRTCMessage.componentId + " userId: " + webRTCMessage.userId + " rigOwnerUserId: " + webRTCMessage.rigOwnerUserId);
                 Server.rig.PutWebRTCMessage(webRTCMessage);
             }
             else {
@@ -61,6 +64,8 @@ export default class SignalR {
         });
         SignalR.hubConnection.onclose((error) => {
             Debug.LogAlways(SignalR.GetName(), "hub connection closed" + (error ? (": " + error) : ""), true);
+            // a new connection signs in itself (StartConnection)
+            SignalR.CancelSignInRetry();
             SignalR.ScheduleReconnect();
         });
         SignalR.hubConnection
@@ -76,7 +81,6 @@ export default class SignalR {
     }
     static ScheduleReconnect() {
         if (SignalR.intentionalStop) {
-            1;
             return;
         }
         if (SignalR.reconnectTimer != null) {
@@ -91,9 +95,35 @@ export default class SignalR {
             }
         }, 30000);
     }
+    /// The server refuses a sign in while another connection is still signed in as this rig. After a network drop
+    /// that is our own old connection: the server only drops it after the SignalR timeout (30s). The server also
+    /// refuses (with the same empty answer) when there are too many sign in attempts from this IP address.
+    /// So keep trying: after 5s, 10s, 20s and then every 30s.
+    static ScheduleSignInRetry(uniquecode) {
+        if (SignalR.intentionalStop || SignalR.signInRetryTimer != null) {
+            return;
+        }
+        SignalR.signInAttempts++;
+        const delay = Math.min(5000 * Math.pow(2, SignalR.signInAttempts - 1), 30000);
+        Debug.LogAlways(SignalR.GetName(), "retrying sign in in " + (delay / 1000) + "s (attempt " + SignalR.signInAttempts + ")...", true);
+        SignalR.signInRetryTimer = setTimeout(() => {
+            SignalR.signInRetryTimer = null;
+            if (!SignalR.intentionalStop) {
+                SignalR.SignIn(uniquecode);
+            }
+        }, delay);
+    }
+    static CancelSignInRetry() {
+        if (SignalR.signInRetryTimer != null) {
+            clearTimeout(SignalR.signInRetryTimer);
+            SignalR.signInRetryTimer = null;
+        }
+        SignalR.signInAttempts = 0;
+    }
     static StopConnection() {
         Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "stopping hub connection...");
         SignalR.intentionalStop = true;
+        SignalR.CancelSignInRetry();
         if (SignalR.reconnectTimer != null) {
             clearTimeout(SignalR.reconnectTimer);
             SignalR.reconnectTimer = null;
@@ -116,9 +146,12 @@ export default class SignalR {
             SignalR.hubConnection.invoke('SignIn', uniquecode)
                 .then((rigClientViewModel) => {
                 if (rigClientViewModel.rigModelViewModel == undefined) {
+                    // unknown code, the rig is still signed in on another (old) connection, or too many attempts
                     Debug.LogAlways(SignalR.GetName(), "sign in to server failed! GUID: " + uniquecode, true);
+                    SignalR.ScheduleSignInRetry(uniquecode);
                 }
                 else {
+                    SignalR.CancelSignInRetry();
                     Debug.LogAlways(SignalR.GetName(), "sign in to server successful", true);
                     Debug.LogAlways(SignalR.GetName(), "rig #" + rigClientViewModel.id + " '" + rigClientViewModel.name + "'", true);
                     Debug.LogAlways(SignalR.GetName(), "rig model #" + rigClientViewModel.rigModelViewModel.id + " '" + rigClientViewModel.rigModelViewModel.name + "'", true);
@@ -157,10 +190,10 @@ export default class SignalR {
     }
     static SendWebRTCMessage(message) {
         if (SignalR.hubConnection != null && SignalR.IsConnected()) {
-            Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing SendWebRTCMessage rigId: " + message.rigId + " componentId:" + message.componentId + " userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
+            Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing SendWebRTCMessage rigId: " + message.rigId + " componentId:" + message.componentId + " userId: " + message.userId + " rigOwnerUserId: " + message.rigOwnerUserId);
             SignalR.hubConnection.invoke("SendWebRTCMessage", message)
                 .then(() => {
-                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing SendWebRTCMessage success rigId: " + message.rigId + " componentId:" + message.componentId + " userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
+                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing SendWebRTCMessage success rigId: " + message.rigId + " componentId:" + message.componentId + " userId: " + message.userId + " rigOwnerUserId: " + message.rigOwnerUserId);
             })
                 .catch((err) => {
                 Debug.Error(SignalR.GetName(), "outgoing SendWebRTCMessage error: " + err);

package/src/common/webrtc-streamer-wrapper.js

@@ -47,7 +47,7 @@ export default class WebRTCStreamerWrapper {
     }
     async PutWebRTCMessage(message) {
         if (this.streamerStarted) {
-            this.Log("PutWebRTCMessage userName: " + message.userName + " messageType: " + message.messageType);
+            this.Log("PutWebRTCMessage userId: " + message.userId + " messageType: " + message.messageType);
             if (message.messageType == "getIceServers") {
                 await this.GetIceServers(message);
             }
@@ -88,7 +88,7 @@ export default class WebRTCStreamerWrapper {
             }
         }
         else {
-            this.Log("IGNORED! PutWebRTCMessage userName: " + message.userName + " messageType: " + message.messageType);
+            this.Log("IGNORED! PutWebRTCMessage userId: " + message.userId + " messageType: " + message.messageType);
         }
     }
     async StartWebRTCStreamer() {
@@ -189,8 +189,8 @@ export default class WebRTCStreamerWrapper {
             webrtcMessage.rigId = message.rigId;
             webrtcMessage.webRTCConnectionType = message.webRTCConnectionType;
             webrtcMessage.sessionId = message.sessionId;
-            webrtcMessage.userName = message.userName;
-            webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
+            webrtcMessage.userId = message.userId;
+            webrtcMessage.rigOwnerUserId = message.rigOwnerUserId;
             webrtcMessage.messageType = 'getIceServersResponse';
             webrtcMessage.message = JSON.stringify(response.data);
             SignalR.SendWebRTCMessage(webrtcMessage);
@@ -249,13 +249,13 @@ export default class WebRTCStreamerWrapper {
                 webrtcMessage.rigId = message.rigId;
                 webrtcMessage.sessionId = message.sessionId;
                 webrtcMessage.webRTCConnectionType = message.webRTCConnectionType;
-                webrtcMessage.userName = message.userName;
-                webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
+                webrtcMessage.userId = message.userId;
+                webrtcMessage.rigOwnerUserId = message.rigOwnerUserId;
                 webrtcMessage.messageType = 'onReceiveCall';
                 webrtcMessage.message = JSON.stringify(response.data);
                 SignalR.SendWebRTCMessage(webrtcMessage);
                 // Start polling voor ICE candidates van de server
-                this.StartIceCandidatePolling(message.sessionId, message.rigId, message.userName, message.rigOwnerUsername, message.webRTCConnectionType);
+                this.StartIceCandidatePolling(message.sessionId, message.rigId, message.userId, message.rigOwnerUserId, message.webRTCConnectionType);
             }
             else {
                 this.Error("devicePath is empty");
@@ -324,8 +324,8 @@ export default class WebRTCStreamerWrapper {
                 webrtcMessage.rigId = message.rigId;
                 webrtcMessage.webRTCConnectionType = message.webRTCConnectionType;
                 webrtcMessage.sessionId = message.sessionId;
-                webrtcMessage.userName = message.userName;
-                webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
+                webrtcMessage.userId = message.userId;
+                webrtcMessage.rigOwnerUserId = message.rigOwnerUserId;
                 webrtcMessage.messageType = 'receiveOffer';
                 //webrtcMessage.message = JSON.stringify(response.data);
                 webrtcMessage.message = JSON.stringify({ ...response.data, sdp });
@@ -355,7 +355,7 @@ export default class WebRTCStreamerWrapper {
             const response = await this.streamerClient.post(setAnswerUrl, tJSON);
             this.Log("SetAnswer Response status: " + response.status);
             this.Log("SetAnswer Response data:\\r\\n" + JSON.stringify(response.data?.sdp));
-            this.StartIceCandidatePolling(message.sessionId, message.rigId, message.userName, message.rigOwnerUsername, message.webRTCConnectionType);
+            this.StartIceCandidatePolling(message.sessionId, message.rigId, message.userId, message.rigOwnerUserId, message.webRTCConnectionType);
         }
         catch (err) {
             if (err.response) {
@@ -365,7 +365,7 @@ export default class WebRTCStreamerWrapper {
             this.Error("SetAnswer Call error: " + err.message);
         }
     }
-    StartIceCandidatePolling(peerId, rigId, userName, rigOwnerUsername, webRTCConnectionType) {
+    StartIceCandidatePolling(peerId, rigId, userId, rigOwnerUserId, webRTCConnectionType) {
         // Stop eventuele bestaande polling voor deze peer
         this.StopIceCandidatePolling(peerId);
         // Initialiseer candidate tracking voor deze peer
@@ -401,8 +401,8 @@ export default class WebRTCStreamerWrapper {
                             webrtcMessage.rigId = rigId;
                             webrtcMessage.sessionId = peerId;
                             webrtcMessage.webRTCConnectionType = webRTCConnectionType;
-                            webrtcMessage.userName = userName;
-                            webrtcMessage.rigOwnerUsername = rigOwnerUsername;
+                            webrtcMessage.userId = userId;
+                            webrtcMessage.rigOwnerUserId = rigOwnerUserId;
                             webrtcMessage.messageType = 'onReceiveCandidate';
                             webrtcMessage.message = JSON.stringify(candidate);
                             SignalR.SendWebRTCMessage(webrtcMessage);

package/src/component/component.js

@@ -61,6 +61,7 @@ export default class Component {
             }
             this.Log("status: '" + this.component.status[i].name.toLowerCase() + "'");
         }
+        this.LoadStoredStatuses();
         for (var i = 0; i < this.component.codeBlocks.length; i++) {
             if (this.component.codeBlocks[i].type == CodeBlockType.Function) {
                 try {
@@ -193,7 +194,7 @@ export default class Component {
     }
     PutWebRTCMessage(message) {
         if (this.component.id == message.componentId) {
-            this.Log("PutWebRTCMessage userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
+            this.Log("PutWebRTCMessage userId: " + message.userId + " rigOwnerUserId: " + message.rigOwnerUserId);
             if (this.streamer != null) {
                 this.streamer.PutWebRTCMessage(message);
             }
@@ -232,6 +233,29 @@ export default class Component {
             }
         }
     }
+    LoadStoredStatuses() {
+        var componentStatuses = this.rig.rig.componentStatuses;
+        if (componentStatuses == undefined) {
+            return;
+        }
+        for (const key in this.status) {
+            var status = this.status[key];
+            if (!status.IsStored()) {
+                continue;
+            }
+            for (var i = 0; i < componentStatuses.length; i++) {
+                var stored = componentStatuses[i].value;
+                if (stored != undefined &&
+                    stored.componentId == this.component.id &&
+                    stored.statusId == status.GetStatusId() &&
+                    stored.value != undefined && stored.value != null) {
+                    status.LoadStoredValue(stored.value);
+                    this.Log("stored status loaded: '" + key + "' = " + stored.value + (stored.valueStr ? " (" + stored.valueStr + ")" : ""));
+                    break;
+                }
+            }
+        }
+    }
     SetCallback(callback) {
         this.callback = callback;
     }
@@ -262,7 +286,7 @@ export default class Component {
     }
     GetStatusState(status) {
         if (this.status.hasOwnProperty(status.toLowerCase())) {
-            this.status[status.toLowerCase()].GetValueStr();
+            return this.status[status.toLowerCase()].GetValueStr();
         }
         return "";
     }

package/src/component/status/status.js

@@ -13,6 +13,19 @@ export default class Status {
             this.SendUpdateStatus(value);
         }
     }
+    /**
+     * Restore the last value stored on the server (only for statuses with 'store' enabled).
+     * Does not send an update; SendCurrent() will report it to the server.
+     */
+    LoadStoredValue(value) {
+        this.last_value = value;
+    }
+    IsStored() {
+        return this.status.store == true;
+    }
+    GetStatusId() {
+        return this.status.id;
+    }
     SendCurrent() {
         if (this.last_value != null) {
             this.SendUpdateStatus(this.last_value);

package/src/models/models.js

@@ -29,6 +29,7 @@ export class ComponentStatusViewModel {
             this.componentId = _data["componentId"];
             this.name = _data["name"];
             this.type = _data["type"];
+            this.store = _data["store"];
             if (Array.isArray(_data["states"])) {
                 this.states = [];
                 for (let item of _data["states"])
@@ -48,6 +49,7 @@ export class ComponentStatusViewModel {
         data["componentId"] = this.componentId;
         data["name"] = this.name;
         data["type"] = this.type;
+        data["store"] = this.store;
         if (Array.isArray(this.states)) {
             data["states"] = [];
             for (let item of this.states)
@@ -219,12 +221,12 @@ export class WebRTCMessage {
     }
     init(_data) {
         if (_data) {
-            this.rigOwnerUsername = _data["rigOwnerUsername"];
+            this.rigOwnerUserId = _data["rigOwnerUserId"];
             this.rigId = _data["rigId"];
             this.componentId = _data["componentId"];
             this.webRTCConnectionType = _data["webRTCConnectionType"];
             this.sessionId = _data["sessionId"];
-            this.userName = _data["userName"];
+            this.userId = _data["userId"];
             this.messageType = _data["messageType"];
             this.message = _data["message"];
         }
@@ -237,12 +239,12 @@ export class WebRTCMessage {
     }
     toJSON(data) {
         data = typeof data === 'object' ? data : {};
-        data["rigOwnerUsername"] = this.rigOwnerUsername;
+        data["rigOwnerUserId"] = this.rigOwnerUserId;
         data["rigId"] = this.rigId;
         data["componentId"] = this.componentId;
         data["webRTCConnectionType"] = this.webRTCConnectionType;
         data["sessionId"] = this.sessionId;
-        data["userName"] = this.userName;
+        data["userId"] = this.userId;
         data["messageType"] = this.messageType;
         data["message"] = this.message;
         return data;
@@ -308,6 +310,7 @@ export class RigClientViewModel {
         if (!data) {
             this.rigModelViewModel = new RigModelViewModel();
             this.logSettings = [];
+            this.componentStatuses = [];
         }
     }
     init(_data) {
@@ -323,6 +326,11 @@ export class RigClientViewModel {
                 for (let item of _data["logSettings"])
                     this.logSettings.push(LogSettingViewModel.fromJS(item));
             }
+            if (Array.isArray(_data["componentStatuses"])) {
+                this.componentStatuses = [];
+                for (let item of _data["componentStatuses"])
+                    this.componentStatuses.push(StatusModel.fromJS(item));
+            }
         }
     }
     static fromJS(data) {
@@ -344,6 +352,11 @@ export class RigClientViewModel {
             for (let item of this.logSettings)
                 data["logSettings"].push(item ? item.toJSON() : undefined);
         }
+        if (Array.isArray(this.componentStatuses)) {
+            data["componentStatuses"] = [];
+            for (let item of this.componentStatuses)
+                data["componentStatuses"].push(item ? item.toJSON() : undefined);
+        }
         return data;
     }
 }