@scrypted/server 0.7.93 → 0.7.95

package/dist/services/users.js.map

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

package/dist/sleep.d.ts

@@ -0,0 +1 @@
+export declare function sleep(ms: number): Promise<void>;

package/dist/sleep.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = void 0;
+async function sleep(ms) {
+    await new Promise(resolve => setTimeout(resolve, ms));
+}
+exports.sleep = sleep;
+//# sourceMappingURL=sleep.js.map

package/dist/sleep.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAC,EAAU;IAClC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,sBAEC"}

package/dist/state.d.ts

@@ -0,0 +1,39 @@
+/// <reference types="lodash" />
+import { EventDetails, EventListenerOptions, EventListenerRegister, ScryptedInterface, SystemDeviceState } from "@scrypted/types";
+import { PluginDevice } from "./db-types";
+import { EventRegistry } from "./event-registry";
+import { ScryptedRuntime } from "./runtime";
+export declare class ScryptedStateManager extends EventRegistry {
+    scrypted: ScryptedRuntime;
+    upserts: Set<string>;
+    upsertThrottle: import("lodash").DebouncedFunc<() => void>;
+    constructor(scrypted: ScryptedRuntime);
+    getImplementerId(pluginDevice: PluginDevice, eventInterface: ScryptedInterface | string): Promise<string>;
+    notifyInterfaceEventFromMixin(pluginDevice: PluginDevice, eventInterface: ScryptedInterface | string, value: any, mixinId: string): Promise<void>;
+    setPluginDeviceStateFromMixin(pluginDevice: PluginDevice, property: string, value: any, eventInterface: ScryptedInterface, mixinId: string): Promise<boolean>;
+    setPluginDeviceState(device: PluginDevice, property: string, value: any, eventInterface?: ScryptedInterface): boolean;
+    updateDescriptor(device: PluginDevice): void;
+    removeDevice(id: string): void;
+    notifyInterfaceEvent(device: PluginDevice, eventInterface: ScryptedInterface | string, value: any, mixinId?: string): void;
+    setState(id: string, property: string, value: any): boolean;
+    getSystemState(): {
+        [id: string]: {
+            [property: string]: SystemDeviceState;
+        };
+    };
+    listenDevice(id: string, options: string | EventListenerOptions, callback: (eventDetails: EventDetails, eventData: any) => void): EventListenerRegister;
+    refreshThrottles: {
+        [id: string]: RefreshThrottle;
+    };
+    getOrCreateRefreshThrottle(id: string, refreshInterface: string, userInitiated: boolean): RefreshThrottle;
+    refresh(id: string, refreshInterface: string, userInitiated: boolean): Promise<void>;
+}
+interface RefreshThrottle {
+    promise: Promise<void>;
+    refreshInterface: string;
+    userInitiated: boolean;
+    tailRefresh: boolean;
+}
+export declare function setState(pluginDevice: PluginDevice, property: string, value: any): boolean;
+export declare function getState(pluginDevice: PluginDevice, property: string): any;
+export {};

package/dist/state.js

@@ -0,0 +1,247 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getState = exports.setState = exports.ScryptedStateManager = void 0;
+const types_1 = require("@scrypted/types");
+const throttle_1 = __importDefault(require("lodash/throttle"));
+const event_registry_1 = require("./event-registry");
+const descriptor_1 = require("./plugin/descriptor");
+const plugin_device_1 = require("./plugin/plugin-device");
+const sleep_1 = require("./sleep");
+class ScryptedStateManager extends event_registry_1.EventRegistry {
+    scrypted;
+    upserts = new Set();
+    upsertThrottle = (0, throttle_1.default)(() => {
+        const ids = [...this.upserts.values()];
+        this.upserts.clear();
+        for (const id of ids) {
+            try {
+                const pluginDevice = this.scrypted.findPluginDeviceById(id);
+                // may have been deleted
+                if (pluginDevice)
+                    this.scrypted.datastore.upsert(pluginDevice);
+            }
+            catch (e) {
+                console.error('save state error', e);
+            }
+        }
+    }, 30000, {
+        leading: false,
+        trailing: true,
+    });
+    constructor(scrypted) {
+        super();
+        this.scrypted = scrypted;
+    }
+    async getImplementerId(pluginDevice, eventInterface) {
+        if (!eventInterface)
+            throw new Error(`ScryptedInterface is required`);
+        const device = this.scrypted.getDevice(pluginDevice._id);
+        if (!device)
+            throw new Error(`device ${pluginDevice._id} not found?`);
+        const implementerId = await device[plugin_device_1.QueryInterfaceSymbol](eventInterface);
+        return implementerId;
+    }
+    async notifyInterfaceEventFromMixin(pluginDevice, eventInterface, value, mixinId) {
+        // TODO: figure out how to clean this up this hack. For now,
+        // Settings interface is allowed to bubble from mixin devices..
+        // TODO: mixin masking of property-less events is disabled due to ObjectDetector.
+        // Running opencv and tensorflow-lite masks one or the other object events.
+        // Need to think this through more.
+        if (false && eventInterface !== types_1.ScryptedInterface.Settings) {
+            const implementerId = await this.getImplementerId(pluginDevice, eventInterface);
+            if (implementerId !== mixinId) {
+                const event = (0, event_registry_1.getMixinEventName)({
+                    event: eventInterface,
+                    mixinId,
+                });
+                this.notifyEventDetails(pluginDevice._id, {
+                    eventId: undefined,
+                    eventInterface,
+                    eventTime: Date.now(),
+                    mixinId,
+                }, value, event);
+                return;
+            }
+        }
+        this.notify(pluginDevice?._id, Date.now(), eventInterface, undefined, value);
+    }
+    async setPluginDeviceStateFromMixin(pluginDevice, property, value, eventInterface, mixinId) {
+        // TODO: crashing here. send descriptor from python too.
+        eventInterface = eventInterface || descriptor_1.propertyInterfaces[property];
+        const implementerId = await this.getImplementerId(pluginDevice, eventInterface);
+        if (implementerId !== mixinId) {
+            const event = (0, event_registry_1.getMixinEventName)({
+                event: eventInterface,
+                mixinId,
+            });
+            this.scrypted.getDeviceLogger(pluginDevice).log('i', `${property}: ${value} (mixin)`);
+            this.notifyEventDetails(pluginDevice._id, {
+                eventId: undefined,
+                eventInterface,
+                eventTime: Date.now(),
+                mixinId,
+                property,
+            }, value, event);
+            return false;
+        }
+        return this.setPluginDeviceState(pluginDevice, property, value, eventInterface);
+    }
+    setPluginDeviceState(device, property, value, eventInterface) {
+        eventInterface = eventInterface || descriptor_1.propertyInterfaces[property];
+        if (!eventInterface)
+            throw new Error(`eventInterface must be provided`);
+        const changed = setState(device, property, value);
+        if (eventInterface !== types_1.ScryptedInterface.ScryptedDevice) {
+            if (this.notify(device?._id, Date.now(), eventInterface, property, value, { changed }) && device) {
+                this.scrypted.getDeviceLogger(device).log('i', `${property}: ${value}`);
+            }
+        }
+        this.upserts.add(device._id);
+        this.upsertThrottle();
+        return changed;
+    }
+    updateDescriptor(device) {
+        this.notify(device._id, undefined, types_1.ScryptedInterface.ScryptedDevice, undefined, device.state, { changed: true });
+    }
+    removeDevice(id) {
+        this.notify(undefined, undefined, types_1.ScryptedInterface.ScryptedDevice, types_1.ScryptedInterfaceProperty.id, id, { changed: true });
+    }
+    notifyInterfaceEvent(device, eventInterface, value, mixinId) {
+        this.notify(device?._id, Date.now(), eventInterface, undefined, value, {
+            changed: true,
+            mixinId,
+        });
+    }
+    setState(id, property, value) {
+        const device = this.scrypted.pluginDevices[id];
+        if (!device)
+            throw new Error(`device not found for id ${id}`);
+        return this.setPluginDeviceState(device, property, value);
+    }
+    getSystemState() {
+        const systemState = {};
+        for (const pluginDevice of Object.values(this.scrypted.pluginDevices)) {
+            systemState[pluginDevice._id] = pluginDevice.state;
+        }
+        return systemState;
+    }
+    listenDevice(id, options, callback) {
+        let { denoise, event, watch } = (options || {});
+        if (!event && typeof options === 'string')
+            event = options;
+        if (!event)
+            event = undefined;
+        let polling = true;
+        const device = this.scrypted.getDevice(id);
+        if (device.interfaces.includes(types_1.ScryptedInterface.Refresh)) {
+            (async () => {
+                while (polling && !watch) {
+                    // listen is not user initiated. an explicit refresh call would be.
+                    try {
+                        await this.refresh(id, event, false);
+                    }
+                    catch (e) {
+                        console.error('refresh ended by exception', e);
+                        break;
+                    }
+                }
+            })();
+        }
+        let lastData = undefined;
+        let cb = (eventDetails, eventData) => {
+            if (denoise && lastData === eventData)
+                return;
+            callback?.(eventDetails, eventData);
+        };
+        const wrappedRegister = super.listenDevice(id, options, cb);
+        return new event_registry_1.EventListenerRegisterImpl(() => {
+            wrappedRegister.removeListener();
+            cb = undefined;
+            callback = undefined;
+            polling = false;
+        });
+    }
+    refreshThrottles = {};
+    getOrCreateRefreshThrottle(id, refreshInterface, userInitiated) {
+        let throttle = this.refreshThrottles[id];
+        if (throttle) {
+            if (userInitiated)
+                throttle.userInitiated = true;
+            if (throttle.refreshInterface !== refreshInterface)
+                throttle.refreshInterface = undefined;
+            throttle.tailRefresh = true;
+            return throttle;
+        }
+        const device = this.scrypted.getDevice(id);
+        const logger = this.scrypted.getDeviceLogger(this.scrypted.findPluginDeviceById(id));
+        if (!device.interfaces.includes(types_1.ScryptedInterface.Refresh))
+            throw new Error('device does not implement refresh');
+        // further refreshes will block
+        const ret = this.refreshThrottles[id] = {
+            promise: (async () => {
+                let timeout = 30000;
+                try {
+                    timeout = await device.getRefreshFrequency() * 1000;
+                }
+                catch (e) {
+                }
+                await (0, sleep_1.sleep)(timeout);
+                try {
+                    const rt = this.refreshThrottles[id];
+                    if (!rt.tailRefresh)
+                        return;
+                    await device[plugin_device_1.RefreshSymbol](rt.refreshInterface, rt.userInitiated);
+                }
+                catch (e) {
+                    logger.log('e', 'Refresh failed');
+                    logger.log('e', e.toString());
+                }
+                finally {
+                    delete this.refreshThrottles[id];
+                }
+            })(),
+            userInitiated,
+            refreshInterface,
+            tailRefresh: false,
+        };
+        // initial refresh does not block
+        const promise = device[plugin_device_1.RefreshSymbol](ret.refreshInterface, ret.userInitiated);
+        return {
+            promise,
+            refreshInterface,
+            userInitiated,
+            tailRefresh: false,
+        };
+    }
+    async refresh(id, refreshInterface, userInitiated) {
+        const throttle = this.getOrCreateRefreshThrottle(id, refreshInterface, userInitiated);
+        return throttle.promise;
+    }
+}
+exports.ScryptedStateManager = ScryptedStateManager;
+function isSameValue(value1, value2) {
+    return value1 === value2 || JSON.stringify(value1) === JSON.stringify(value2);
+}
+function setState(pluginDevice, property, value) {
+    // device may have been deleted.
+    if (!pluginDevice.state)
+        return;
+    if (!pluginDevice.state[property])
+        pluginDevice.state[property] = {};
+    const state = pluginDevice.state[property];
+    const changed = !isSameValue(value, state.value);
+    state.value = value;
+    return changed;
+}
+exports.setState = setState;
+function getState(pluginDevice, property) {
+    const ret = pluginDevice.state?.[property]?.value;
+    if (typeof ret === 'object')
+        return JSON.parse(JSON.stringify(ret));
+    return ret;
+}
+exports.getState = getState;
+//# sourceMappingURL=state.js.map

package/dist/state.js.map

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

package/dist/threading.d.ts

@@ -0,0 +1,3 @@
+export declare function newThread<T>(thread: () => Promise<T>): Promise<T>;
+export declare function newThread<V, T>(params: V, thread: (params: V) => Promise<T>): Promise<T>;
+export declare function newThread<M, V, T>(modules: M, params: V, thread: (params: M & V) => Promise<T>): Promise<T>;

package/dist/threading.js

@@ -0,0 +1,93 @@
+"use strict";
+// WARNING: threading.ts does not work because RpcPeer transpilation does not include readonly static properties in the class definition
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newThread = void 0;
+const worker_threads_1 = __importDefault(require("worker_threads"));
+const rpc_1 = require("./rpc");
+const v8_1 = __importDefault(require("v8"));
+async function newThread(...args) {
+    let params = {};
+    let modules = {};
+    let thread;
+    if (args[2]) {
+        modules = args[0];
+        params = args[1];
+        thread = args[2];
+    }
+    else if (args[1]) {
+        params = args[0];
+        thread = args[1];
+    }
+    else {
+        thread = args[0];
+    }
+    const m = (customRequire, RpcPeer) => {
+        if (customRequire) {
+            const g = global;
+            g[customRequire] = g.require;
+        }
+        const thread_v8 = global.require('v8');
+        const thread_worker_threads = global.require('worker_threads');
+        const thread_vm = global.require('vm');
+        const mainPeer = new RpcPeer('thread', 'main', (message, reject) => {
+            try {
+                thread_worker_threads.parentPort.postMessage(thread_v8.serialize(message));
+            }
+            catch (e) {
+                reject?.(e);
+            }
+        });
+        mainPeer.transportSafeArgumentTypes.add(Buffer.name);
+        mainPeer.transportSafeArgumentTypes.add(Uint8Array.name);
+        thread_worker_threads.parentPort.on('message', (message) => mainPeer.handleMessage(thread_v8.deserialize(message)));
+        mainPeer.params.eval = async (script, moduleNames, paramNames, ...paramValues) => {
+            const f = thread_vm.compileFunction(`return (${script})`, paramNames, {
+                filename: 'script.js',
+            });
+            const params = {};
+            for (const module of moduleNames) {
+                params[module] = global.require(module);
+            }
+            for (let i = 0; i < paramNames.length; i++) {
+                params[paramNames[i]] = paramValues[i];
+            }
+            const c = await f(...paramValues);
+            return await c(params);
+        };
+    };
+    const rpcSource = (0, rpc_1.getEvalSource)();
+    let customRequire = params.customRequire || '';
+    const workerSource = `
+    const {RpcPeer} = ${rpcSource};
+
+    (${m})("${customRequire}", RpcPeer)`;
+    const worker = new worker_threads_1.default.Worker(workerSource, {
+        eval: true,
+    });
+    const threadPeer = new rpc_1.RpcPeer('main', 'thread', (message, reject) => {
+        try {
+            worker.postMessage(v8_1.default.serialize(message));
+        }
+        catch (e) {
+            reject?.(e);
+        }
+    });
+    threadPeer.transportSafeArgumentTypes.add(Buffer.name);
+    threadPeer.transportSafeArgumentTypes.add(Uint8Array.name);
+    worker.on('message', (message) => threadPeer.handleMessage(v8_1.default.deserialize(message)));
+    const e = await threadPeer.getParam('eval');
+    const moduleNames = Object.keys(modules);
+    const paramNames = Object.keys(params);
+    const paramValues = Object.values(params);
+    try {
+        return await e(thread.toString(), moduleNames, paramNames, ...paramValues);
+    }
+    finally {
+        worker.terminate();
+    }
+}
+exports.newThread = newThread;
+//# sourceMappingURL=threading.js.map

package/dist/threading.js.map

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

package/dist/usertoken.d.ts

@@ -0,0 +1,11 @@
+export declare const ONE_DAY_MILLISECONDS = 86400000;
+export declare const ONE_YEAR_MILLISECONDS: number;
+export declare class UserToken {
+    username: string;
+    aclId: string;
+    timestamp: number;
+    duration: number;
+    constructor(username: string, aclId: string, timestamp?: number, duration?: number);
+    static validateToken(token: string): UserToken;
+    toString(): string;
+}

package/dist/usertoken.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserToken = exports.ONE_YEAR_MILLISECONDS = exports.ONE_DAY_MILLISECONDS = void 0;
+exports.ONE_DAY_MILLISECONDS = 86400000;
+exports.ONE_YEAR_MILLISECONDS = exports.ONE_DAY_MILLISECONDS * 365;
+class UserToken {
+    username;
+    aclId;
+    timestamp;
+    duration;
+    constructor(username, aclId, timestamp = Date.now(), duration = exports.ONE_DAY_MILLISECONDS) {
+        this.username = username;
+        this.aclId = aclId;
+        this.timestamp = timestamp;
+        this.duration = duration;
+    }
+    static validateToken(token) {
+        if (!token)
+            throw new Error('Token not found.');
+        let json;
+        try {
+            json = JSON.parse(token);
+        }
+        catch (e) {
+            throw new Error('Token malformed, unparseable.');
+        }
+        let { u, a, t, d } = json;
+        u = u?.toString();
+        t = parseInt(t?.toString());
+        d = parseInt(d?.toString());
+        a = a?.toString();
+        if (!u || !t || !d)
+            throw new Error('Token malformed, missing properties.');
+        if (d > exports.ONE_YEAR_MILLISECONDS)
+            throw new Error('Token duration too long.');
+        if (t > Date.now())
+            throw new Error('Token from the future.');
+        if (t + d < Date.now())
+            throw new Error('Token expired.');
+        return new UserToken(u, a, t, d);
+    }
+    toString() {
+        return JSON.stringify({
+            u: this.username,
+            a: this.aclId,
+            t: this.timestamp,
+            d: this.duration,
+        });
+    }
+}
+exports.UserToken = UserToken;
+//# sourceMappingURL=usertoken.js.map

package/dist/usertoken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usertoken.js","sourceRoot":"","sources":["../src/usertoken.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,qBAAqB,GAAG,4BAAoB,GAAG,GAAG,CAAC;AAEhE,MAAa,SAAS;IACC;IAAyB;IAAsB;IAA+B;IAAjG,YAAmB,QAAgB,EAAS,KAAa,EAAS,YAAY,IAAI,CAAC,GAAG,EAAE,EAAS,WAAW,4BAAoB;QAA7G,aAAQ,GAAR,QAAQ,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAQ;QAAS,cAAS,GAAT,SAAS,CAAa;QAAS,aAAQ,GAAR,QAAQ,CAAuB;IAChI,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,KAAa;QAC9B,IAAI,CAAC,KAAK;YACN,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAExC,IAAI,IAKH,CAAC;QACF,IAAI;YACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC5B;QACD,OAAO,CAAC,EAAE;YACN,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SACpD;QACD,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QAC1B,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC;QAClB,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5B,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5B,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,6BAAqB;YACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,OAAO,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,CAAC,EAAE,IAAI,CAAC,QAAQ;YAChB,CAAC,EAAE,IAAI,CAAC,KAAK;YACb,CAAC,EAAE,IAAI,CAAC,SAAS;YACjB,CAAC,EAAE,IAAI,CAAC,QAAQ;SACnB,CAAC,CAAA;IACN,CAAC;CACJ;AA5CD,8BA4CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.93",
+  "version": "0.7.95",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
@@ -72,7 +72,7 @@
     "beta": "npm publish --tag beta",
     "postbeta": "npm version patch && git add package.json && npm run build && git commit -m postbeta",
     "release": "npm publish",
-    "prepublish": "npm run build",
+    "prepublishOnly": "npm run build",
     "postrelease": "git tag v$npm_package_version && git push origin v$npm_package_version && npm version patch && git add package.json && git commit -m postrelease",
     "docker": "scripts/github-workflow-publish-docker.sh"
   },

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

@@ -147,7 +147,9 @@ export class PluginHostAPI extends PluginAPIManagedListeners implements PluginAP
     }
 
     async onDeviceDiscovered(device: Device) {
-        return this.pluginHost.upsertDevice(device);
+        const id = await this.pluginHost.upsertDevice(device);
+        this.scrypted.getDevice(id)?.probe().catch(() => { });
+        return id;
     }
 
     async onDeviceRemoved(nativeId: string) {