@scrypted/server 0.1.16 → 0.2.5

package/src/plugin/system.ts

@@ -51,7 +51,7 @@ class DeviceProxyHandler implements PrimitiveProxyHandler<any>, ScryptedDevice {
         if (handled)
             return handled;
 
-        const interfaces = new Set<string>(this.systemManager.state[this.id].interfaces.value);
+        const interfaces = new Set<string>(this.systemManager.state[this.id].interfaces?.value || []);
         const prop = p.toString();
         const isValidProperty = this.systemManager.propertyInterfaces?.[prop] || propertyInterfaces[prop];
 

package/src/rpc.ts

@@ -321,7 +321,8 @@ export class RpcPeer {
         const params = Object.assign({}, this.params, coercedParams);
         let compile: CompileFunction;
         try {
-            compile = require('vm').compileFunction;;
+            // prevent bundlers from trying to include non-existent vm module.
+            compile = module[`require`]('vm').compileFunction;
         }
         catch (e) {
             compile = compileFunction;

package/src/runtime.ts

@@ -8,7 +8,6 @@ import http, { ServerResponse } from 'http';
 import https from 'https';
 import { spawn as ptySpawn } from 'node-pty-prebuilt-multiarch';
 import path from 'path';
-import qs from "query-string";
 import rimraf from 'rimraf';
 import semver from 'semver';
 import { PassThrough } from 'stream';
@@ -184,12 +183,10 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
 
             const url = new URL(callback_url as string);
             if (url.search) {
-                const search = qs.parse(url.search);
-                const state = search.state as string;
+                const state = url.searchParams.get('state');
                 if (state) {
                     const { s, d, r } = JSON.parse(state);
-                    search.state = s;
-                    url.search = '?' + qs.stringify(search);
+                    url.searchParams.set('state', s);
                     const oauthClient: ScryptedDevice & OauthClient = this.getDevice(d);
                     await oauthClient.onOauthCallback(url.toString()).catch();
                     res.redirect(r);
@@ -197,12 +194,12 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
                 }
             }
             if (url.hash) {
-                const hash = qs.parse(url.hash);
-                const state = hash.state as string;
+                const hash = new URLSearchParams(url.hash.substring(1));
+                const state = hash.get('state');
                 if (state) {
                     const { s, d, r } = JSON.parse(state);
-                    hash.state = s;
-                    url.hash = '#' + qs.stringify(hash);
+                    hash.set('state', s);
+                    url.hash = '#' + hash.toString();
                     const oauthClient: ScryptedDevice & OauthClient = this.getDevice(d);
                     await oauthClient.onOauthCallback(url.toString());
                     res.redirect(r);
@@ -700,12 +697,10 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
         // JSON stringify over rpc turns undefined into null.
         if (device.nativeId === null)
             device.nativeId = undefined;
-        let newDevice = false;
         let pluginDevice = this.findPluginDevice(pluginId, device.nativeId);
         if (!pluginDevice) {
             pluginDevice = new PluginDevice(this.datastore.nextId().toString());
             pluginDevice.stateVersion = PLUGIN_DEVICE_STATE_VERSION;
-            newDevice = true;
         }
         this.pluginDevices[pluginDevice._id] = pluginDevice;
         pluginDevice.pluginId = pluginId;
@@ -754,11 +749,6 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
 
         const ret = this.notifyPluginDeviceDescriptorChanged(pluginDevice);
 
-        if (newDevice) {
-            const logger = this.getDeviceLogger(pluginDevice);
-            logger.log('a', 'New Device Added.');
-        }
-
         return {
             pluginDevicePromise: ret,
             interfacesChanged,

package/src/scrypted-server-main.ts

@@ -12,7 +12,6 @@ import { getHostAddresses, SCRYPTED_DEBUG_PORT, SCRYPTED_INSECURE_PORT, SCRYPTED
 import crypto from 'crypto';
 import cookieParser from 'cookie-parser';
 import axios from 'axios';
-import qs from 'query-string';
 import { RPCResultError } from './rpc';
 import fs from 'fs';
 import mkdirp from 'mkdirp';
@@ -318,8 +317,8 @@ async function start() {
 
     app.get('/web/component/script/search', async (req, res) => {
         try {
-            const query = qs.stringify({
-                text: req.query.text,
+            const query = new URLSearchParams({
+                text: req.query.text.toString(),
             })
             const response = await axios(`https://registry.npmjs.org/-/v1/search?${query}`);
             res.send(response.data);
@@ -405,7 +404,12 @@ async function start() {
 
     app.get('/logout', (req, res) => {
         res.clearCookie(getLoginUserToken(req.secure));
-        res.send({});
+        if (req.headers['accept']?.startsWith('application/json')) {
+            res.send({});
+        }
+        else {
+            res.redirect('/endpoint/@scrypted/core/public/');
+        }
     });
 
     let hasLogin = await db.getCount(ScryptedUser) > 0;

package/src/services/plugin.ts

@@ -45,6 +45,7 @@ export class PluginComponent {
     async setMixins(id: string, mixins: string[]) {
         const pluginDevice = this.scrypted.findPluginDeviceById(id);
         this.scrypted.stateManager.setPluginDeviceState(pluginDevice, ScryptedInterfaceProperty.mixins, [...new Set(mixins)] || []);
+        this.scrypted.stateManager.updateDescriptor(pluginDevice);
         await this.scrypted.datastore.upsert(pluginDevice);
         // device may not exist, so force creation.
         this.scrypted.rebuildPluginDeviceMixinTable(id);

package/src/state.ts

@@ -46,7 +46,7 @@ export class ScryptedStateManager extends EventRegistry {
         if (!eventInterface)
             throw new Error(`${property} is not a valid property`);
 
-        const changed = setState(device, property, value);
+        const changed = setState(device, property, value) && eventInterface !== ScryptedInterface.ScryptedDevice;
 
         const eventTime = device?.state?.[property]?.lastEventTime;
 
@@ -116,7 +116,7 @@ export class ScryptedStateManager extends EventRegistry {
         let cb = (eventDetails: EventDetails, eventData: any) => {
             if (denoise && lastData === eventData)
                 return;
-            callback(eventDetails, eventData);
+            callback?.(eventDetails, eventData);
         };
 
         const wrappedRegister = super.listenDevice(id, options, cb);
@@ -124,6 +124,7 @@ export class ScryptedStateManager extends EventRegistry {
         return new EventListenerRegisterImpl(() => {
             wrappedRegister.removeListener();
             cb = undefined;
+            callback = undefined;
             polling = false;
         });
     }