remoterigs-raspberrypi 0.1.9 → 0.1.10

package/package.json

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

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;
     }
 }