remoterigs-raspberrypi 0.1.2 → 0.1.3

package/package.json

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

package/src/common/signalr.js

@@ -33,7 +33,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 + " userName: " + webRTCMessage.userName + " rigOwnerUsername: " + webRTCMessage.rigOwnerUsername);
                 Server.rig.PutWebRTCMessage(webRTCMessage);
             }
             else {
@@ -157,10 +157,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 + " userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
             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 + " userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
             })
                 .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 userName: " + message.userName + " 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 userName: " + message.userName + " messageType: " + message.messageType);
         }
     }
     async StartWebRTCStreamer() {
@@ -189,7 +189,7 @@ export default class WebRTCStreamerWrapper {
             webrtcMessage.rigId = message.rigId;
             webrtcMessage.webRTCConnectionType = message.webRTCConnectionType;
             webrtcMessage.sessionId = message.sessionId;
-            webrtcMessage.username = message.username;
+            webrtcMessage.userName = message.userName;
             webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
             webrtcMessage.messageType = 'getIceServersResponse';
             webrtcMessage.message = JSON.stringify(response.data);
@@ -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.userName = message.userName;
                 webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
                 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.userName, message.rigOwnerUsername, message.webRTCConnectionType);
             }
             else {
                 this.Error("devicePath is empty");
@@ -324,7 +324,7 @@ export default class WebRTCStreamerWrapper {
                 webrtcMessage.rigId = message.rigId;
                 webrtcMessage.webRTCConnectionType = message.webRTCConnectionType;
                 webrtcMessage.sessionId = message.sessionId;
-                webrtcMessage.username = message.username;
+                webrtcMessage.userName = message.userName;
                 webrtcMessage.rigOwnerUsername = message.rigOwnerUsername;
                 webrtcMessage.messageType = 'receiveOffer';
                 //webrtcMessage.message = JSON.stringify(response.data);
@@ -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.userName, message.rigOwnerUsername, 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, userName, rigOwnerUsername, webRTCConnectionType) {
         // Stop eventuele bestaande polling voor deze peer
         this.StopIceCandidatePolling(peerId);
         // Initialiseer candidate tracking voor deze peer
@@ -401,7 +401,7 @@ export default class WebRTCStreamerWrapper {
                             webrtcMessage.rigId = rigId;
                             webrtcMessage.sessionId = peerId;
                             webrtcMessage.webRTCConnectionType = webRTCConnectionType;
-                            webrtcMessage.username = username;
+                            webrtcMessage.userName = userName;
                             webrtcMessage.rigOwnerUsername = rigOwnerUsername;
                             webrtcMessage.messageType = 'onReceiveCandidate';
                             webrtcMessage.message = JSON.stringify(candidate);

package/src/component/component.js

@@ -193,7 +193,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 userName: " + message.userName + " rigOwnerUsername: " + message.rigOwnerUsername);
             if (this.streamer != null) {
                 this.streamer.PutWebRTCMessage(message);
             }

package/src/models/models.js

@@ -224,7 +224,7 @@ export class WebRTCMessage {
             this.componentId = _data["componentId"];
             this.webRTCConnectionType = _data["webRTCConnectionType"];
             this.sessionId = _data["sessionId"];
-            this.username = _data["username"];
+            this.userName = _data["userName"];
             this.messageType = _data["messageType"];
             this.message = _data["message"];
         }
@@ -242,7 +242,7 @@ export class WebRTCMessage {
         data["componentId"] = this.componentId;
         data["webRTCConnectionType"] = this.webRTCConnectionType;
         data["sessionId"] = this.sessionId;
-        data["username"] = this.username;
+        data["userName"] = this.userName;
         data["messageType"] = this.messageType;
         data["message"] = this.message;
         return data;

package/src/src/common/code.js

@@ -0,0 +1,62 @@
+import vm from "vm";
+import SignalR from "./signalr.js";
+export default class Code {
+    static GetComponentContext(component) {
+        return {
+            SetCallback: component.SetCallback,
+            SetStatus: component.SetStatus,
+            SetStatusState: component.SetStatusState,
+            GetStatus: component.GetStatus,
+            GetStatusState: component.GetStatusState,
+            GetName: component.GetName,
+            GetStorageName: component.GetStorageName,
+            GetChild: component.GetChild,
+            Log: component.Log,
+            LogAlways: component.LogAlways,
+            Error: component.Error,
+            GetProperty: component.GetProperty,
+            GetPropertyNumber: component.GetPropertyNumber,
+            SetTimeOut: component.SetTimeOut,
+            ResetTimeOut: component.ResetTimeOut,
+            IsEventInput: component.IsEventInput,
+            child: component.child,
+            property: component.property,
+            input: component.input,
+            component: component.component,
+            pin: component.pin,
+            status: component.status,
+            boolean: component.boolean,
+            number: component.number,
+            string: component.string,
+            timeout: component.timeout,
+            streamer: component.streamer,
+            callback: component.callback
+        };
+    }
+    /* (code: string, sandboxVars: SandboxVars): any {*/
+    /**
+    * Voert dynamische code uit in een veilige VM-sandbox.
+    * Geeft nette foutmeldingen met regelnummers.
+    *
+    * @param code - De code die moet worden uitgevoerd.
+    * @param contextVars - Variabelen die zichtbaar moeten zijn in de sandbox.
+    */
+    static runSandboxed(code, contextVars = {}) {
+        const sandbox = {
+            SignalR: SignalR,
+            console,
+            ...contextVars,
+        };
+        const context = vm.createContext(sandbox);
+        try {
+            return vm.runInContext(code, context, {
+                filename: "dynamic.js",
+                displayErrors: true,
+            });
+        }
+        catch (err) {
+            throw err; // laat native stacktrace intact
+        }
+    }
+}
+//# sourceMappingURL=code.js.map

package/src/src/common/debug.js

@@ -0,0 +1,77 @@
+import { LogModel, LogSettingType, StatusModel, StatusType } from '../models/models.js';
+import Server from "../server.js";
+import SignalR from "./signalr.js";
+export default class Debug {
+    // Timings
+    static { this.watchdogtimer = 1000; }
+    static { this.pwmdelay = 100; }
+    static { this.pwmstart = 120; }
+    static { this.pwm_frequency = 800; }
+    static { this.pwm_dutycycle_max = 1000000; }
+    static { this.time_to_full_speed_ms = 10000; }
+    static { this.commandtimer = 500; }
+    static SetErrorCallback(callback_param) {
+        Debug.error_callback = callback_param;
+    }
+    static Log(pVehicleSettingType, id, name, message) {
+        if (Debug.GetLogSetting(pVehicleSettingType, id)) {
+            Debug.LogAlways(name, message, true);
+        }
+    }
+    static LogAlways(name, message, signalr) {
+        var date = new Date();
+        if (signalr) {
+            var logModel = new LogModel();
+            logModel.dateTime = date;
+            logModel.name = name;
+            logModel.message = message;
+            Debug.SendLogModel(logModel);
+        }
+        console.log(date.toLocaleTimeString() + " / " + name + " / " + message);
+    }
+    static Error(name, message) {
+        var date = new Date();
+        var logModel = new LogModel();
+        logModel.dateTime = date;
+        logModel.name = name;
+        logModel.message = message;
+        Debug.SendLogModel(logModel);
+        console.error(date.toLocaleTimeString() + " / " + name + " / " + message);
+        Debug.error_callback();
+    }
+    static SendLogModel(logModel) {
+        if (Server.rig != null) {
+            var tStatusModel = new StatusModel();
+            tStatusModel.type = StatusType.RigLog;
+            tStatusModel.value = logModel;
+            SignalR.UpdateStatus(tStatusModel);
+        }
+    }
+    static GetLogSetting(pLogSettingType, id) {
+        if (Server.rig != null) {
+            for (var i = 0; i < Server.rig.rig.logSettings.length; i++) {
+                if (Server.rig.rig.logSettings[i].logSettingType == pLogSettingType &&
+                    Server.rig.rig.logSettings[i].parameter1 == id) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    static GetStringValue(logSettingType) {
+        switch (logSettingType) {
+            case LogSettingType.BLESensor:
+                return "BLESensor";
+            case LogSettingType.Commands:
+                return "Commands";
+            case LogSettingType.KeyEvents:
+                return "KeyEvents";
+            case LogSettingType.SignalR:
+                return "SignalR";
+            case LogSettingType.Component:
+                return "Component";
+        }
+        return "";
+    }
+}
+//# sourceMappingURL=debug.js.map

package/src/src/common/signalr.js

@@ -0,0 +1,189 @@
+import { exec } from "child_process";
+import * as signalR from '@microsoft/signalr';
+import Server from './../server.js';
+import Debug from './debug.js';
+import Rig from '../rig.js';
+import { LogSettingType, CommandType, StatusType } from '../models/models.js';
+export default class SignalR {
+    static { this.hubConnection = null; }
+    static { this.reconnectTimer = null; }
+    static { this.lastUniqueCode = null; }
+    static { this.intentionalStop = false; }
+    static GetName() {
+        return "SignalR";
+    }
+    static StartConnection(uniquecode) {
+        SignalR.lastUniqueCode = uniquecode;
+        SignalR.intentionalStop = false;
+        Debug.LogAlways(SignalR.GetName(), "initiating hub connection... url: '" + Server.signalr + "'", false);
+        SignalR.hubConnection = new signalR.HubConnectionBuilder()
+            .withUrl(Server.signalr)
+            .withAutomaticReconnect()
+            .build();
+        SignalR.hubConnection.on('keyevent', (keyEventClientModel) => {
+            if (Server.rig != null) {
+                Server.rig.ProcessKeyEvent(keyEventClientModel);
+            }
+            else {
+                Debug.LogAlways(SignalR.GetName(), "no rig to process keyevent", true);
+            }
+        });
+        SignalR.hubConnection.on("web-rtc-message", async (webRTCMessage) => {
+            if (Server.rig != null) {
+                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);
+                Server.rig.PutWebRTCMessage(webRTCMessage);
+            }
+            else {
+                Debug.LogAlways(SignalR.GetName(), "no rig to process webrtc message", true);
+            }
+        });
+        SignalR.hubConnection.on("send-command", async (commandMessage) => {
+            Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "incoming message: " + JSON.stringify(commandMessage));
+            switch (commandMessage.type) {
+                case CommandType.RigReloadRigModel:
+                    SignalR.SignIn(uniquecode);
+                    break;
+                case CommandType.RigShutdown:
+                    Debug.LogAlways("Raspberry Pi", "SHUTTING DOWN!", true);
+                    exec("shutdown now");
+                    break;
+            }
+        });
+        SignalR.hubConnection.onreconnecting((error) => {
+            Debug.LogAlways(SignalR.GetName(), "hub connection lost, attempting to reconnect..." + (error ? (" reason: " + error) : ""), true);
+        });
+        SignalR.hubConnection.onreconnected(() => {
+            Debug.LogAlways(SignalR.GetName(), "hub connection reconnected, re-signing in...", true);
+            SignalR.SignIn(uniquecode);
+        });
+        SignalR.hubConnection.onclose((error) => {
+            Debug.LogAlways(SignalR.GetName(), "hub connection closed" + (error ? (": " + error) : ""), true);
+            SignalR.ScheduleReconnect();
+        });
+        SignalR.hubConnection
+            .start()
+            .then(() => {
+            Debug.LogAlways(SignalR.GetName(), 'hub connection established', false);
+            SignalR.SignIn(uniquecode);
+        })
+            .catch((err) => {
+            Debug.Error(SignalR.GetName(), err);
+            SignalR.ScheduleReconnect();
+        });
+    }
+    static ScheduleReconnect() {
+        if (SignalR.intentionalStop) {
+            return;
+        }
+        if (SignalR.reconnectTimer != null) {
+            return;
+        }
+        Debug.LogAlways(SignalR.GetName(), "scheduling reconnect attempt in 30s...", true);
+        SignalR.reconnectTimer = setTimeout(() => {
+            SignalR.reconnectTimer = null;
+            if (SignalR.lastUniqueCode != null && !SignalR.intentionalStop) {
+                Debug.LogAlways(SignalR.GetName(), "attempting reconnect now...", true);
+                SignalR.StartConnection(SignalR.lastUniqueCode);
+            }
+        }, 30000);
+    }
+    static StopConnection() {
+        Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "stopping hub connection...");
+        SignalR.intentionalStop = true;
+        if (SignalR.reconnectTimer != null) {
+            clearTimeout(SignalR.reconnectTimer);
+            SignalR.reconnectTimer = null;
+        }
+        if (SignalR.hubConnection) {
+            SignalR.hubConnection.stop()
+                .then(() => {
+                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), 'hub connection stopped');
+            })
+                .catch((err) => {
+                Debug.Error(SignalR.GetName(), err);
+            });
+        }
+    }
+    static IsConnected() {
+        return SignalR.hubConnection != null && SignalR.hubConnection.state === signalR.HubConnectionState.Connected;
+    }
+    static SignIn(uniquecode) {
+        if (SignalR.hubConnection != null && SignalR.IsConnected()) {
+            SignalR.hubConnection.invoke('SignIn', uniquecode)
+                .then((rigClientViewModel) => {
+                if (rigClientViewModel.rigModelViewModel == undefined) {
+                    Debug.LogAlways(SignalR.GetName(), "SignIn failed!! GUID: " + uniquecode, true);
+                }
+                else {
+                    Debug.LogAlways(SignalR.GetName(), "SignIn successful", true);
+                    Server.rig = new Rig(rigClientViewModel);
+                    Server.rig.CreateComponents();
+                    Debug.LogAlways(SignalR.GetName(), "Rig components loaded", true);
+                    Server.rig.Init();
+                    Debug.LogAlways(SignalR.GetName(), "Rig 'Init' functions executed", true);
+                    Server.rig.SendCurrent();
+                    Debug.LogAlways(SignalR.GetName(), "Rig current status send", true);
+                }
+            })
+                .catch((err) => {
+                Debug.Error(SignalR.GetName(), err);
+            });
+        }
+        else {
+            Debug.Error(SignalR.GetName(), "outgoing SignIn: no hub connection");
+        }
+    }
+    static UpdateStatus(pStatusModel) {
+        if (SignalR.hubConnection != null && SignalR.IsConnected()) {
+            if (pStatusModel.type != StatusType.RigLog) {
+                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing UpdateStatus type: " + pStatusModel.type);
+            }
+            SignalR.hubConnection.invoke('UpdateStatus', pStatusModel)
+                .then(() => {
+                if (pStatusModel.type != StatusType.RigLog) {
+                    Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing UpdateStatus type: " + pStatusModel.type);
+                }
+            })
+                .catch((err) => {
+                Debug.Error(SignalR.GetName(), "outgoing UpdateStatus error: " + err);
+            });
+        }
+        else {
+            Debug.Error(SignalR.GetName(), "outgoing UpdateStatus: no hub connection");
+        }
+    }
+    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);
+            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);
+            })
+                .catch((err) => {
+                Debug.Error(SignalR.GetName(), "outgoing SendWebRTCMessage error: " + err);
+            });
+        }
+        else {
+            Debug.Error(SignalR.GetName(), "SendWebRTCMessage: no hub connection");
+        }
+    }
+    static AddHighScorePoints(message) {
+        if (SignalR.hubConnection != null && SignalR.IsConnected()) {
+            Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing AddHighScorePoints: " + JSON.stringify(message));
+            SignalR.hubConnection.invoke("AddHighScorePoints", message)
+                .then(() => {
+                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), "outgoing AddHighScorePoints success: " + JSON.stringify(message));
+            })
+                .catch((err) => {
+                Debug.Error(SignalR.GetName(), "outgoing AddHighScorePoints error: " + err);
+            });
+        }
+        else {
+            Debug.Error(SignalR.GetName(), "outgoing AddHighScorePoints: no hub connection");
+        }
+    }
+}
+//# sourceMappingURL=signalr.js.map