@scrypted/server 0.7.63 → 0.7.64

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.63",
+  "version": "0.7.64",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
-    "@scrypted/types": "^0.2.79",
+    "@scrypted/types": "^0.2.80",
     "adm-zip": "^0.5.10",
     "axios": "^0.21.4",
     "body-parser": "^1.20.2",

package/src/plugin/system.ts

@@ -1,4 +1,4 @@
-import { EventListener, EventListenerOptions, EventListenerRegister, Logger, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptor, ScryptedInterfaceDescriptors, ScryptedInterfaceProperty, SystemDeviceState, SystemManager } from "@scrypted/types";
+import { EventListener, EventListenerOptions, EventListenerRegister, Logger, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptor, ScryptedInterfaceDescriptors, ScryptedInterfaceProperty, ScryptedNativeId, SystemDeviceState, SystemManager } from "@scrypted/types";
 import { EventRegistry } from "../event-registry";
 import { PrimitiveProxyHandler, RpcPeer } from '../rpc';
 // import type { PluginComponent } from "../services/plugin";
@@ -175,8 +175,24 @@ export class SystemManagerImpl implements SystemManager {
         return this.state;
     }
 
-    getDeviceById(id: string): any {
-        if (!this.state[id])
+    getDeviceById(idOrPluginId: string, nativeId?: ScryptedNativeId): any {
+        let id: string;
+        if (this.state[idOrPluginId]) {
+            id = idOrPluginId;
+        }
+        else {
+            for (const check of Object.keys(this.state)) {
+                const state = this.state[check];
+                if (state[ScryptedInterfaceProperty.pluginId] === idOrPluginId) {
+                    // null and undefined should match here.
+                    if (nativeId == state[ScryptedInterfaceProperty.nativeId]) {
+                        id = check;
+                        break;
+                    }
+                }
+            }
+        }
+        if (!id)
             return;
         let proxy = this.deviceProxies[id];
         if (!proxy)