npm - @scrypted/server - Versions diffs - 0.0.97 → 0.0.101 - Mend

@scrypted/server 0.0.97 → 0.0.101

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of @scrypted/server might be problematic. Click here for more details.

Files changed (20) hide show

package/dist/event-registry.js +2 -1
package/dist/event-registry.js.map +1 -1
package/dist/plugin/plugin-device.js +103 -67
package/dist/plugin/plugin-device.js.map +1 -1
package/dist/plugin/plugin-host-api.js +30 -9
package/dist/plugin/plugin-host-api.js.map +1 -1
package/dist/plugin/plugin-host.js +2 -14
package/dist/plugin/plugin-host.js.map +1 -1
package/dist/runtime.js +40 -2
package/dist/runtime.js.map +1 -1
package/dist/services/plugin.js +4 -2
package/dist/services/plugin.js.map +1 -1
package/package.json +2 -2
package/python/plugin-remote.py +3 -1
package/src/event-registry.ts +3 -1
package/src/plugin/plugin-device.ts +117 -74
package/src/plugin/plugin-host-api.ts +31 -9
package/src/plugin/plugin-host.ts +2 -12
package/src/runtime.ts +49 -3
package/src/services/plugin.ts +4 -2

package/dist/runtime.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}

package/dist/services/plugin.js CHANGED Viewed

@@ -32,8 +32,10 @@ class PluginComponent {
         const pluginDevice = this.scrypted.findPluginDeviceById(id);
         this.scrypted.stateManager.setPluginDeviceState(pluginDevice, types_1.ScryptedInterfaceProperty.mixins, [...new Set(mixins)] || []);
         await this.scrypted.datastore.upsert(pluginDevice);
-        const device = this.scrypted.invalidatePluginDeviceMixins(id);
-        await device?.handler.ensureProxy();
+        // device may not exist, so force creation.
+        this.scrypted.rebuildPluginDeviceMixinTable(id);
+        this.scrypted.getDevice(id);
+        await this.scrypted.devices[id]?.handler?.ensureProxy();
     }
     async getMixins(id) {
         console.warn('legacy use of getMixins, use the mixins property');

package/dist/services/plugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/services/plugin.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAkF;AAElF,0CAAqC;AACrC,oCAAoC;AACpC,kDAA0B;AAC1B,oDAA4B;AAE5B,MAAa,eAAe;IACxB,QAAQ,CAAkB;IAC1B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,EAAU;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC;IAC5D,CAAC;IACD,UAAU,CAAC,EAAU;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;IACjE,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,OAAkC;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC5D,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC;QAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpF,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACxF,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,MAAgB;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,EAAE,iCAAyB,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5H,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACnD,~~MAAM~~,~~MAAM~~,~~GAAG~~,IAAI,CAAC,QAAQ,CAAC,~~4BAA4B~~,CAAC,EAAE,CAAC,CAAC;~~QAC9D~~,MAAM,~~MAAM~~,~~EAAE~~,OAAO,CAAC,WAAW,EAAE,CAAC;~~IACxC~~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~~AA5HD~~,~~0CA4HC~~"}
1	+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/services/plugin.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,9 +1,9 @@
 {
   "name": "@scrypted/server",
-  "version": "0.0.97",
+  "version": "0.0.101",
   "description": "",
   "dependencies": {
-    "@scrypted/sdk": "^0.0.128",
+    "@scrypted/sdk": "^0.0.129",
     "adm-zip": "^0.5.3",
     "axios": "^0.21.1",
     "body-parser": "^1.19.0",

package/python/plugin-remote.py CHANGED Viewed

@@ -34,7 +34,9 @@ class SystemManager(scrypted_python.scrypted_sdk.SystemManager):
         super().__init__()
         self.api = api
         self.systemState = systemState
+    async def getComponent(self, id: str) -> Any:
+        return await self.api.getComponent(id)
 class DeviceState(scrypted_python.scrypted_sdk.DeviceState):
     def __init__(self, id: str, nativeId: str, systemManager: SystemManager, deviceManager: scrypted_python.scrypted_sdk.DeviceManager) -> None:

package/src/event-registry.ts CHANGED Viewed

@@ -8,6 +8,8 @@ export class EventListenerRegisterImpl implements EventListenerRegister {
     }
 }
+const allowedEventInterfaces = new Set<string>([ScryptedInterface.ScryptedDevice, 'Logger'])
 export class EventRegistry {
     systemListeners = new Set<(id: string, eventDetails: EventDetails, eventData: object) => void>();
     listeners: { [token: string]: Set<(eventDetails: EventDetails, eventData: object) => void> } = {};
@@ -57,7 +59,7 @@ export class EventRegistry {
         // system listeners only get state changes.
         // there are many potentially noisy stateless events, like
         // object detection and settings changes.
-        if (property || eventInterface === ScryptedInterface.ScryptedDevice) {
+        if (property || allowedEventInterfaces.has(eventInterface)) {
             for (const event of this.systemListeners) {
                 event(id, eventDetails, value);
             }

package/src/plugin/plugin-device.ts CHANGED Viewed

@@ -18,8 +18,12 @@ interface MixinTableEntry {
     allInterfaces: string[];
     proxy: any;
     error?: Error;
+    passthrough: boolean;
 }
+export const RefreshSymbol = Symbol('ScryptedDeviceRefresh');
+export const QueryInterfaceSymbol = Symbol("ScryptedPluginDeviceQueryInterface");
 export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevice {
     scrypted: ScryptedRuntime;
     id: string;
@@ -31,7 +35,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
     }
     invalidateEntry(mixinEntry: MixinTable) {
-        if (!mixinEntry.mixinProviderId)
+        if (!mixinEntry?.mixinProviderId)
             return;
         (async () => {
             const mixinProvider = this.scrypted.getDevice(mixinEntry.mixinProviderId) as ScryptedDevice & MixinProvider;
@@ -49,7 +53,10 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         }
     }
-    invalidateMixinTable() {
+    /**
+     * Rebuild the mixin table with any currently missing mixins.
+     */
+    rebuildMixinTable() {
         if (!this.mixinTable)
             return this.invalidate();
@@ -88,6 +95,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
                 break;
             this.mixinTable.shift();
             this.invalidateEntry(entry);
+            console.log('invalidating mixin', this.id, entry.mixinProviderId);
         }
         this.ensureProxy(lastValidMixinId);
@@ -99,14 +107,13 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         if (!pluginDevice)
             throw new PluginError(`device ${this.id} does not exist`);
-        let previousEntry: Promise<MixinTableEntry>;
         if (!lastValidMixinId) {
             if (this.mixinTable)
                 return Promise.resolve(pluginDevice);
             this.mixinTable = [];
-            previousEntry = (async () => {
+            const entry = (async () => {
                 let proxy;
                 try {
                     if (!pluginDevice.nativeId) {
@@ -128,6 +135,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
                 const interfaces: ScryptedInterface[] = getState(pluginDevice, ScryptedInterfaceProperty.providedInterfaces) || [];
                 return {
+                    passthrough: false,
                     proxy,
                     interfaces: new Set<string>(interfaces),
                     allInterfaces: interfaces,
@@ -136,7 +144,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
             this.mixinTable.unshift({
                 mixinProviderId: undefined,
-                entry: previousEntry,
+                entry,
             });
         }
         else {
@@ -145,11 +153,8 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
             const prevTable = this.mixinTable.find(table => table.mixinProviderId === lastValidMixinId);
             if (!prevTable)
                 throw new PluginError('mixin table partial invalidation was called with invalid lastValidMixinId');
-            previousEntry = prevTable.entry;
         }
-        const type = getDisplayType(pluginDevice);
         for (const mixinId of getState(pluginDevice, ScryptedInterfaceProperty.mixins) || []) {
             if (lastValidMixinId) {
                 if (mixinId === lastValidMixinId)
@@ -158,65 +163,11 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
             }
             const wrappedMixinTable = this.mixinTable.slice();
+            const entry = this.rebuildEntry(pluginDevice, mixinId, Promise.resolve(wrappedMixinTable));
             this.mixinTable.unshift({
                 mixinProviderId: mixinId,
-                entry: (async () => {
-                    let { allInterfaces } = await previousEntry;
-                    try {
-                        const mixinProvider = this.scrypted.getDevice(mixinId) as ScryptedDevice & MixinProvider;
-                        const interfaces = await mixinProvider?.canMixin(type, allInterfaces) as any as ScryptedInterface[];
-                        if (!interfaces) {
-                            // this is not an error
-                            // do not advertise interfaces so it is skipped during
-                            // vtable lookup.
-                            console.log(`mixin provider ${mixinId} can no longer mixin ${this.id}`);
-                            const mixins: string[] = getState(pluginDevice, ScryptedInterfaceProperty.mixins) || [];
-                            this.scrypted.stateManager.setPluginDeviceState(pluginDevice, ScryptedInterfaceProperty.mixins, mixins.filter(mid => mid !== mixinId))
-                            this.scrypted.datastore.upsert(pluginDevice);
-                            return {
-                                allInterfaces,
-                                interfaces: new Set<string>(),
-                                proxy: undefined as any,
-                            };
-                        }
-                        allInterfaces = allInterfaces.slice();
-                        allInterfaces.push(...interfaces);
-                        const combinedInterfaces = [...new Set(allInterfaces)];
-                        const wrappedHandler = new PluginDeviceProxyHandler(this.scrypted, this.id);
-                        wrappedHandler.mixinTable = wrappedMixinTable;
-                        const wrappedProxy = new Proxy(wrappedHandler, wrappedHandler);
-                        const host = this.scrypted.getPluginHostForDeviceId(mixinId);
-                        const deviceState = await host.remote.createDeviceState(this.id,
-                            async (property, value) => this.scrypted.stateManager.setPluginDeviceState(pluginDevice, property, value));
-                        const mixinProxy = await mixinProvider.getMixin(wrappedProxy, allInterfaces as ScryptedInterface[], deviceState);
-                        if (!mixinProxy)
-                            throw new PluginError(`mixin provider ${mixinId} did not return mixin for ${this.id}`);
-                        return {
-                            interfaces: new Set<string>(interfaces),
-                            allInterfaces: combinedInterfaces,
-                            proxy: mixinProxy,
-                        };
-                    }
-                    catch (e) {
-                        // on any error, do not advertise interfaces
-                        // on this mixin, so as to prevent total failure?
-                        // this has been the behavior for a while,
-                        // but maybe interfaces implemented by that mixin
-                        // should rethrow the error caught here in applyMixin.
-                        console.warn(e);
-                        return {
-                            allInterfaces,
-                            interfaces: new Set<string>(),
-                            error: e,
-                            proxy: undefined as any,
-                        };
-                    }
-                })(),
+                entry,
             });
         }
@@ -226,6 +177,81 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         });
     }
+    async rebuildEntry(pluginDevice: PluginDevice, mixinId: string, wrappedMixinTablePromise: Promise<MixinTable[]>): Promise<MixinTableEntry> {
+        const wrappedMixinTable = await wrappedMixinTablePromise;
+        const previousEntry = wrappedMixinTable[0].entry;
+        const type = getDisplayType(pluginDevice);
+        let { allInterfaces } = await previousEntry;
+        try {
+            const mixinProvider = this.scrypted.getDevice(mixinId) as ScryptedDevice & MixinProvider;
+            const interfaces = mixinProvider?.interfaces?.includes(ScryptedInterface.MixinProvider) && await mixinProvider?.canMixin(type, allInterfaces) as any as ScryptedInterface[];
+            if (!interfaces) {
+                // this is not an error
+                // do not advertise interfaces so it is skipped during
+                // vtable lookup.
+                console.log(`mixin provider ${mixinId} can no longer mixin ${this.id}`);
+                const mixins: string[] = getState(pluginDevice, ScryptedInterfaceProperty.mixins) || [];
+                this.scrypted.stateManager.setPluginDeviceState(pluginDevice, ScryptedInterfaceProperty.mixins, mixins.filter(mid => mid !== mixinId))
+                this.scrypted.datastore.upsert(pluginDevice);
+                return {
+                    passthrough: true,
+                    allInterfaces,
+                    interfaces: new Set<string>(),
+                    proxy: undefined as any,
+                };
+            }
+            const previousInterfaces = allInterfaces;
+            allInterfaces = previousInterfaces.slice();
+            allInterfaces.push(...interfaces);
+            const combinedInterfaces = [...new Set(allInterfaces)];
+            const wrappedHandler = new PluginDeviceProxyHandler(this.scrypted, this.id);
+            wrappedHandler.mixinTable = wrappedMixinTable;
+            const wrappedProxy = new Proxy(wrappedHandler, wrappedHandler);
+            const implementer = await (mixinProvider as any)[QueryInterfaceSymbol](ScryptedInterface.MixinProvider);
+            const host = this.scrypted.getPluginHostForDeviceId(implementer);
+            // todo: remove this and pass the setter directly.
+            const deviceState = await host.remote.createDeviceState(this.id,
+                async (property, value) => this.scrypted.stateManager.setPluginDeviceState(pluginDevice, property, value));
+            const mixinProxy = await mixinProvider.getMixin(wrappedProxy, allInterfaces as ScryptedInterface[], deviceState);
+            if (!mixinProxy)
+                throw new PluginError(`mixin provider ${mixinId} did not return mixin for ${this.id}`);
+            // mixin is a passthrough of no interfaces changed, and the proxy is the same
+            // a mixin can be a passthrough even if it implements an interface (like Settings),
+            // so long as the wrapped proxy also implements that interface.
+            // techically it is a passthrough if the proxies are the same instance, but
+            // better to be explicit here about interface differences.
+            const passthrough = wrappedProxy === mixinProxy && previousInterfaces.length === combinedInterfaces.length;
+            return {
+                passthrough,
+                interfaces: new Set<string>(interfaces),
+                allInterfaces: combinedInterfaces,
+                proxy: mixinProxy,
+            };
+        }
+        catch (e) {
+            // on any error, do not advertise interfaces
+            // on this mixin, so as to prevent total failure?
+            // this has been the behavior for a while,
+            // but maybe interfaces implemented by that mixin
+            // should rethrow the error caught here in applyMixin.
+            console.warn(e);
+            return {
+                passthrough: false,
+                allInterfaces,
+                interfaces: new Set<string>(),
+                error: e,
+                proxy: undefined as any,
+            };
+        }
+    }
     get(target: any, p: PropertyKey, receiver: any): any {
         if (p === 'constructor')
             return;
@@ -241,7 +267,7 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         if (allInterfaceProperties.includes(prop))
             return getState(pluginDevice, prop);
-        if (p === RefreshSymbol)
+        if (p === RefreshSymbol || p === QueryInterfaceSymbol)
             return new Proxy(() => p, this);
         if (!isValidInterfaceMethod(pluginDevice.state.interfaces.value, prop))
@@ -287,17 +313,26 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         if (!iface)
             throw new PluginError(`unknown method ${method}`);
+        const found = await this.findMixin(iface);
+        if (found) {
+            const { mixin, entry } = found;
+            const { proxy } = entry;
+            if (!proxy)
+                throw new PluginError(`device is unavailable ${this.id} (mixin ${mixin.mixinProviderId})`);
+            return proxy[method](...argArray);
+        }
+        throw new PluginError(`${method} not implemented`)
+    }
+    async findMixin(iface: string) {
         for (const mixin of this.mixinTable) {
-            const { interfaces, proxy } = await mixin.entry;
-            // this could be null?
+            const entry = await mixin.entry;
+            const { interfaces } = entry;
             if (interfaces.has(iface)) {
-                if (!proxy)
-                    throw new PluginError(`device is unavailable ${this.id} (mixin ${mixin.mixinProviderId})`);
-                return proxy[method](...argArray);
+                return { mixin, entry };
             }
         }
-        throw new PluginError(`${method} not implemented`)
     }
     async apply(target: any, thisArg: any, argArray?: any): Promise<any> {
@@ -308,6 +343,16 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         if (method === RefreshSymbol)
             return this.applyMixin('refresh', argArray);
+        if (method === QueryInterfaceSymbol) {
+            const iface = argArray[0];
+            const found = await this.findMixin(iface);
+            if (found?.entry.interfaces.has(iface)) {
+                return found.mixin.mixinProviderId || this.id;
+            }
+            throw new PluginError(`${iface} not implemented`)
+        }
         if (!isValidInterfaceMethod(pluginDevice.state.interfaces.value, method))
             throw new PluginError(`device ${this.id} does not support method ${method}`);
@@ -326,5 +371,3 @@ export class PluginDeviceProxyHandler implements ProxyHandler<any>, ScryptedDevi
         return this.applyMixin(method, argArray);
     }
 }
-export const RefreshSymbol = Symbol('ScryptedDeviceRefresh');

package/src/plugin/plugin-host-api.ts CHANGED Viewed

@@ -41,16 +41,38 @@ export class PluginHostAPI extends PluginAPIManagedListeners implements PluginAP
         this.pluginId = plugin._id;
     }
-    async onMixinEvent(id: string, nativeId: ScryptedNativeId, eventInterface: any, eventData?: any) {
+    // do we care about mixin validation here?
+    // maybe to prevent/notify errant dangling events?
+    async onMixinEvent(id: string, nativeIdOrMixinDevice: ScryptedNativeId|any, eventInterface: any, eventData?: any) {
+        // nativeId code path has been deprecated in favor of mixin object 12/10/2021
         const device = this.scrypted.findPluginDeviceById(id);
-        const mixinProvider = this.scrypted.findPluginDevice(this.pluginId, nativeId);
-        const mixins: string[] = getState(device, ScryptedInterfaceProperty.mixins) || [];
-        if (!mixins.includes(mixinProvider._id))
-            throw new Error(`${mixinProvider._id} is not a mixin provider for ${id}`);
-        const tableEntry = this.scrypted.devices[device._id].handler.mixinTable.find(entry => entry.mixinProviderId === mixinProvider._id);
-        const { interfaces } = await tableEntry.entry;
-        if (!interfaces.has(eventInterface))
-            throw new Error(`${mixinProvider._id} does not mixin ${eventInterface} for ${id}`);
+        if (!nativeIdOrMixinDevice || typeof nativeIdOrMixinDevice === 'string') {
+            // todo: deprecate this code path
+            const mixinProvider = this.scrypted.findPluginDevice(this.pluginId, nativeIdOrMixinDevice);
+            const mixins: string[] = getState(device, ScryptedInterfaceProperty.mixins) || [];
+            if (!mixins.includes(mixinProvider._id))
+                throw new Error(`${mixinProvider._id} is not a mixin provider for ${id}`);
+            this.scrypted.findPluginDevice(this.pluginId, nativeIdOrMixinDevice);
+            const tableEntry = this.scrypted.devices[device._id].handler.mixinTable.find(entry => entry.mixinProviderId === mixinProvider._id);
+            const { interfaces } = await tableEntry.entry;
+            if (!interfaces.has(eventInterface))
+                throw new Error(`${mixinProvider._id} does not mixin ${eventInterface} for ${id}`);
+        }
+        else {
+            let found = false;
+            for (const mixin of this.scrypted.devices[device._id].handler.mixinTable) {
+                const { proxy } = await mixin.entry;
+                if (proxy === nativeIdOrMixinDevice) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                const mixinProvider = this.scrypted.findPluginDevice(this.pluginId, nativeIdOrMixinDevice);
+                throw new Error(`${mixinProvider._id} does not mixin ${eventInterface} for ${id}`);
+            }
+        }
         this.scrypted.stateManager.notifyInterfaceEvent(device, eventInterface, eventData);
     }

package/src/plugin/plugin-host.ts CHANGED Viewed

@@ -60,18 +60,8 @@ export class PluginHost {
         }
         this.ws = {};
-        for (const device of Object.values(this.scrypted.devices)) {
-            const pluginDevice = this.scrypted.pluginDevices[device.handler.id];
-            if (!pluginDevice) {
-                console.warn('PluginDevice missing?', device.handler.id);
-                continue;
-            }
-            for (const mixin of getState(pluginDevice, ScryptedInterfaceProperty.mixins) || []) {
-                if (this.scrypted.findPluginDeviceById(mixin)?.pluginId === this.pluginId) {
-                    device.handler.invalidate();
-                }
-            }
-        }
+        const deviceIds = new Set<string>(Object.values(this.scrypted.pluginDevices).filter(d => d.pluginId === this.pluginId).map(d => d._id));
+        this.scrypted.invalidateMixins(deviceIds);
         this.consoleServer?.then(server => {
             server.readServer.close();

package/src/runtime.ts CHANGED Viewed

@@ -27,7 +27,7 @@ import { ServiceControl } from './services/service-control';
 import { Alerts } from './services/alerts';
 import { Info } from './services/info';
 import io from 'engine.io';
-import {spawn as ptySpawn} from 'node-pty';
+import { spawn as ptySpawn } from 'node-pty';
 import rimraf from 'rimraf';
 import { getPluginVolume } from './plugin/plugin-volume';
@@ -427,14 +427,60 @@ export class ScryptedRuntime {
     }
     // should this be async?
-    invalidatePluginDeviceMixins(id: string) {
+    rebuildPluginDeviceMixinTable(id: string) {
         const proxyPair = this.devices[id];
         if (!proxyPair)
             return;
-        proxyPair.handler.invalidateMixinTable();
+        proxyPair.handler.rebuildMixinTable();
         return proxyPair;
     }
+    invalidateMixins(ids: Set<string>) {
+        const ret = new Set<string>();
+        const remaining = [...ids];
+        // first pass:
+        // for every id, find anything it is acting as a mixin, and clear out the entry.
+        while (remaining.length) {
+            const id = remaining.pop();
+            for (const device of Object.values(this.devices)) {
+                const foundIndex = device.handler?.mixinTable?.findIndex(mt => mt.mixinProviderId === id);
+                if (foundIndex === -1 || foundIndex === undefined)
+                    continue;
+                const did = device.handler.id;
+                if (!ret.has(did)) {
+                    // add this to the list of mixin providers that need to be rebuilt
+                    ret.add(did);
+                    remaining.push(did);
+                }
+                // if it is the last entry, that means it is the device itself.
+                // can this happen? i don't think it is possible. mixin provider id would be undefined.
+                if (foundIndex === device.handler.mixinTable.length - 1) {
+                    console.warn('attempt to invalidate mixin on actual device?');
+                    continue;
+                }
+                const removed = device.handler.mixinTable.splice(0, foundIndex + 1);
+                for (const entry of removed) {
+                    console.log('invalidating mixin', device.handler.id, entry.mixinProviderId);
+                    device.handler.invalidateEntry(entry);
+                }
+            }
+        }
+        // second pass:
+        // rebuild the mixin tables.
+        for (const id of ret) {
+            const device = this.devices[id];
+            device.handler.rebuildMixinTable();
+        }
+        return ret;
+    }
     async installNpm(pkg: string, version?: string): Promise<PluginHost> {
         const registry = (await axios(`https://registry.npmjs.org/${pkg}`)).data;
         if (!version) {