remoterigs-raspberrypi 0.1.8 → 0.1.10

package/package.json

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

package/src/common/signalr.js

@@ -76,6 +76,7 @@ export default class SignalR {
     }
     static ScheduleReconnect() {
         if (SignalR.intentionalStop) {
+            1;
             return;
         }
         if (SignalR.reconnectTimer != null) {
@@ -100,10 +101,10 @@ export default class SignalR {
         if (SignalR.hubConnection) {
             SignalR.hubConnection.stop()
                 .then(() => {
-                Debug.Log(LogSettingType.SignalR, undefined, SignalR.GetName(), 'hub connection stopped');
+                Debug.LogAlways(SignalR.GetName(), 'hub connection stopped', false);
             })
                 .catch((err) => {
-                Debug.Error(SignalR.GetName(), err);
+                Debug.LogAlways(SignalR.GetName(), "StopConnection err: '" + err + "'", false);
             });
         }
     }
@@ -132,7 +133,7 @@ export default class SignalR {
             });
         }
         else {
-            Debug.Error(SignalR.GetName(), "sign in canceled: no hub connection");
+            Debug.LogAlways(SignalR.GetName(), "sign in canceled: no hub connection", false);
         }
     }
     static UpdateStatus(pStatusModel) {
@@ -151,7 +152,7 @@ export default class SignalR {
             });
         }
         else {
-            Debug.Error(SignalR.GetName(), "outgoing UpdateStatus: no hub connection");
+            Debug.LogAlways(SignalR.GetName(), "outgoing UpdateStatus: no hub connection", false);
         }
     }
     static SendWebRTCMessage(message) {
@@ -166,7 +167,7 @@ export default class SignalR {
             });
         }
         else {
-            Debug.Error(SignalR.GetName(), "SendWebRTCMessage: no hub connection");
+            Debug.LogAlways(SignalR.GetName(), "SendWebRTCMessage: no hub connection", false);
         }
     }
     static AddHighScorePoints(message) {
@@ -181,7 +182,7 @@ export default class SignalR {
             });
         }
         else {
-            Debug.Error(SignalR.GetName(), "outgoing AddHighScorePoints: no hub connection");
+            Debug.LogAlways(SignalR.GetName(), "outgoing AddHighScorePoints: no hub connection", false);
         }
     }
 }

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 {
@@ -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)
@@ -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;
     }
 }

package/src/src/common/code.js

@@ -1,62 +0,0 @@
-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

@@ -1,75 +0,0 @@
-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) {
-        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

@@ -1,189 +0,0 @@
-import * as signalR from '@microsoft/signalr';
-import Server from './../server.js';
-import Debug from './debug.js';
-import Rig from '../rig.js';
-import { exec } from "child_process";
-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! (received command)", 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.LogAlways(SignalR.GetName(), "failed to establish hub connection: " + err, false);
-            SignalR.ScheduleReconnect();
-        });
-    }
-    static ScheduleReconnect() {
-        if (SignalR.intentionalStop) {
-            1;
-            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(), "sign in to server failed! GUID: " + uniquecode, true);
-                }
-                else {
-                    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);
-                    Server.rig = new Rig(rigClientViewModel);
-                    Server.rig.CreateComponents();
-                    Server.rig.Init();
-                    Server.rig.SendCurrent();
-                }
-            })
-                .catch((err) => {
-                Debug.Error(SignalR.GetName(), err);
-            });
-        }
-        else {
-            Debug.Error(SignalR.GetName(), "sign in canceled: 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