fix: Timing out sACN according to E1.31 specs

schw4rzlicht · Jun 14, 2020 · ffdaf65 · ffdaf65
1 parent c14bdba
commit ffdaf65
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/src/lib/permissions/SACNPermission.ts b/src/lib/permissions/SACNPermission.ts
@@ -42,7 +42,7 @@ export default class SACNPermission extends EventEmitter implements PermissionIn
 
             if (sacn) {
                 let universe = this.universes[sacn.universe];
-                if (universe && universe.data[sacn.channel - 1] < 255) {
+                if (universe && (universe.status !== UniverseStatus.Valid || universe.data[sacn.channel - 1] < 255)) {
                     permissionCollector.denyPermission("sacn",
                         `@${runtimeInformation.userName}, ${runtimeInformation.config.sacn.lockMessage}`);
                 }
@@ -77,13 +77,15 @@ export default class SACNPermission extends EventEmitter implements PermissionIn
 
                 this.sACNReceiver.on("packet", (packet: Packet) => {
 
-                    if (this.universes[packet.universe]) {
+                    let universe = this.universes[packet.universe];
+
+                    if (universe) {
                         let data = new Array(512).fill(0);
                         packet.slotsData.forEach((value, channel) => {
                             data[channel] = value;
                         });
 
-                        this.universes[packet.universe].data = data;
+                        universe.data = data;
                     }
                 });
 
@@ -121,15 +123,15 @@ export default class SACNPermission extends EventEmitter implements PermissionIn
             }
 
             if (lastValidTime <= universe.lastReceived &&
-                (universe.status == UniverseStatus.NeverReceived || universe.status == UniverseStatus.Expired)) {
+                (universe.watchdogStatus == UniverseStatus.NeverReceived || universe.watchdogStatus == UniverseStatus.Expired)) {
 
                 receiving.push(universe.universe);
-                universe.status = UniverseStatus.Valid;
+                universe.watchdogStatus = UniverseStatus.Valid;
             }
 
             if (lastValidTime > universe.lastReceived && universe.status == UniverseStatus.Valid) {
                 lost.push(universe.universe);
-                universe.status = UniverseStatus.Expired;
+                universe.watchdogStatus = UniverseStatus.Expired;
             }
         }
 

diff --git a/src/lib/permissions/SACNUniverse.ts b/src/lib/permissions/SACNUniverse.ts
@@ -9,13 +9,14 @@ export class SACNUniverse {
     readonly universe: number;
     private _data: Array<number>;
     private _lastReceived: number;
-    status: UniverseStatus;
+    private _watchdogStatus: UniverseStatus;
+    private _status: UniverseStatus;
 
     constructor(universe: number) {
         this.universe = universe;
         this._data = new Array<number>(512).fill(0);
         this._lastReceived = 0;
-        this.status = UniverseStatus.NeverReceived;
+        this.watchdogStatus = UniverseStatus.NeverReceived;
     }
 
     get data(): Array<number> {
@@ -25,9 +26,23 @@ export class SACNUniverse {
     set data(value: Array<number>) {
         this._data = value;
         this._lastReceived = new Date().getTime();
+        this._status = UniverseStatus.Valid;
     }
 
     get lastReceived(): number {
         return this._lastReceived;
     }
+
+    get watchdogStatus(): UniverseStatus {
+        return this._watchdogStatus;
+    }
+
+    set watchdogStatus(value: UniverseStatus) {
+        this._watchdogStatus = value;
+        this._status = value;
+    }
+
+    get status(): UniverseStatus {
+        return this._status;
+    }
 }
diff --git a/src/resources/config.schema.json b/src/resources/config.schema.json
@@ -104,15 +104,15 @@
         },
         "timeout": {
           "description": "Time until sACN is considered lost.",
-          "type": "integer",
-          "minimum": 1,
-          "default": 1
+          "type": "number",
+          "minimum": 0.5,
+          "default": 2.5
         }
       },
       "additionalProperties": false,
       "default": {
         "lockMessage": "{command} is currently locked! Please wait!",
-        "timeout": 1
+        "timeout": 2.5
       }
     },
     "commands": {