@scrypted/server 0.0.104 → 0.0.108

package/dist/plugin/plugin-lazy-remote.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LazyRemote = void 0;
+/**
+ * This remote is necessary as the host needs to create a remote synchronously
+ * in the constructor and immediately begin queueing commands.
+ * Warning: do not await in any of these methods unless necessary, otherwise
+ * execution order of state reporting may fail.
+ */
+class LazyRemote {
+    remotePromise;
+    remoteReadyPromise;
+    remote;
+    constructor(remotePromise, remoteReadyPromise) {
+        this.remotePromise = remotePromise;
+        this.remoteReadyPromise = remoteReadyPromise;
+        this.remoteReadyPromise = (async () => {
+            this.remote = await remoteReadyPromise;
+            return this.remote;
+        })();
+    }
+    async loadZip(packageJson, zipData, options) {
+        if (!this.remote)
+            await this.remoteReadyPromise;
+        return this.remote.loadZip(packageJson, zipData, options);
+    }
+    async setSystemState(state) {
+        if (!this.remote)
+            await this.remoteReadyPromise;
+        return this.remote.setSystemState(state);
+    }
+    async setNativeId(nativeId, id, storage) {
+        if (!this.remote)
+            await this.remoteReadyPromise;
+        return this.remote.setNativeId(nativeId, id, storage);
+    }
+    async updateDeviceState(id, state) {
+        try {
+            if (!this.remote)
+                await this.remoteReadyPromise;
+        }
+        catch (e) {
+            return;
+        }
+        return this.remote.updateDeviceState(id, state);
+    }
+    async notify(id, eventTime, eventInterface, property, propertyState, changed) {
+        try {
+            if (!this.remote)
+                await this.remoteReadyPromise;
+        }
+        catch (e) {
+            return;
+        }
+        return this.remote.notify(id, eventTime, eventInterface, property, propertyState, changed);
+    }
+    async ioEvent(id, event, message) {
+        if (!this.remote)
+            await this.remoteReadyPromise;
+        return this.remote.ioEvent(id, event, message);
+    }
+    async createDeviceState(id, setState) {
+        if (!this.remote)
+            await this.remoteReadyPromise;
+        return this.remote.createDeviceState(id, setState);
+    }
+    async getServicePort(name, ...args) {
+        const remote = await this.remotePromise;
+        return remote.getServicePort(name, ...args);
+    }
+}
+exports.LazyRemote = LazyRemote;
+//# sourceMappingURL=plugin-lazy-remote.js.map

package/dist/plugin/plugin-lazy-remote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-lazy-remote.js","sourceRoot":"","sources":["../../src/plugin/plugin-lazy-remote.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACF,MAAa,UAAU;IAGD;IAA6C;IAFhE,MAAM,CAAe;IAErB,YAAmB,aAAoC,EAAS,kBAAyC;QAAtF,kBAAa,GAAb,aAAa,CAAuB;QAAS,uBAAkB,GAAlB,kBAAkB,CAAuB;QACrG,IAAI,CAAC,kBAAkB,GAAG,CAAC,KAAK,IAAI,EAAE;YAClC,IAAI,CAAC,MAAM,GAAG,MAAM,kBAAkB,CAAC;YACvC,OAAO,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAgB,EAAE,OAAe,EAAE,OAAoC;QACjF,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,KAAoE;QACrF,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,QAA0B,EAAE,EAAU,EAAE,OAAgC;QACtF,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,EAAU,EAAE,KAAiD;QACjF,IAAI;YACA,IAAI,CAAC,IAAI,CAAC,MAAM;gBACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;SACrC;QACD,OAAO,CAAC,EAAE;YACN,OAAO;SACV;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,SAAiB,EAAE,cAAsB,EAAE,QAAgB,EAAE,aAAgC,EAAE,OAAiB;QACrI,IAAI;YACA,IAAI,CAAC,IAAI,CAAC,MAAM;gBACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;SACrC;QACD,OAAO,CAAC,EAAE;YACN,OAAO;SACV;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAC/F,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,KAAa,EAAE,OAAa;QAClD,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,EAAU,EAAE,QAAyD;QACzF,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,GAAG,IAAW;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;QACxC,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;IAChD,CAAC;CACJ;AA5DA,gCA4DA"}

package/dist/plugin/plugin-remote-websocket.js

@@ -47,59 +47,65 @@ function createWebSocketClass(__websocketConnect) {
         _url;
         _protocols;
         readyState;
-        send;
         _ws;
         constructor(url, protocols) {
             super();
             this._url = url;
             this._protocols = protocols;
             this.readyState = 0;
-            __websocketConnect(url, protocols, (e, ws, send) => {
-                // connect
-                if (e != null) {
+            __websocketConnect(url, protocols, {
+                connect: (e, ws) => {
+                    // connect
+                    if (e != null) {
+                        this.dispatchEvent({
+                            type: 'error',
+                            message: e.toString(),
+                        });
+                        return;
+                    }
+                    this._ws = ws;
+                    this.readyState = 1;
+                    this.dispatchEvent({
+                        type: 'open',
+                    });
+                },
+                end: () => {
+                    // end
+                    this.readyState = 3;
+                    this.dispatchEvent({
+                        type: 'close',
+                        reason: 'closed',
+                    });
+                },
+                error: (e) => {
+                    // error
+                    this.readyState = 3;
                     this.dispatchEvent({
                         type: 'error',
                         message: e.toString(),
                     });
-                    return;
+                },
+                data: (data) => {
+                    // data
+                    this.dispatchEvent({
+                        type: 'message',
+                        data: data,
+                        source: this,
+                    });
                 }
-                this._ws = ws;
-                this.send = send;
-                this.readyState = 1;
-                this.dispatchEvent({
-                    type: 'open',
-                });
-            }, () => {
-                // end
-                this.readyState = 3;
-                this.dispatchEvent({
-                    type: 'close',
-                    reason: 'closed',
-                });
-            }, (e) => {
-                // error
-                this.readyState = 3;
-                this.dispatchEvent({
-                    type: 'error',
-                    message: e.toString(),
-                });
-            }, (data) => {
-                // data
-                this.dispatchEvent({
-                    type: 'message',
-                    data: data,
-                    source: this,
-                });
             });
         }
+        send(message) {
+            this._ws.send(message);
+        }
         get url() {
             return this._url;
         }
         get extensions() {
             return "";
         }
-        close() {
-            this._ws.close();
+        close(reason) {
+            this._ws.close(reason);
         }
     }
     defineEventAttribute(WebSocket.prototype, "close");

package/dist/plugin/plugin-remote-websocket.js.map

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

package/dist/plugin/plugin-remote.js

@@ -72,8 +72,9 @@ class EndpointManagerImpl {
         return id;
     }
     async getUrlSafeIp() {
+        // ipv6 addresses have colons and need to be bracketed for url safety
         const ip = await this.api.getComponent('SCRYPTED_IP_ADDRESS');
-        return ip.includes(':') ? `[${ip}]` : ip;
+        return ip?.includes(':') ? `[${ip}]` : ip;
     }
     async getAuthenticatedPath(nativeId) {
         return `/endpoint/${this.getEndpoint(nativeId)}/`;
@@ -248,7 +249,7 @@ class StorageImpl {
         this.api.setStorage(this.nativeId, this.storage);
     }
 }
-async function setupPluginRemote(peer, api, pluginId) {
+async function setupPluginRemote(peer, api, pluginId, getSystemState) {
     try {
         // the host/remote connection can be from server to plugin (node to node),
         // core plugin to web (node to browser).
@@ -256,7 +257,29 @@ async function setupPluginRemote(peer, api, pluginId) {
         // but in plugin-host, mark Buffer as transport safe.
         peer.addSerializer(Buffer, 'Buffer', new buffer_serializer_1.BufferSerializer());
         const getRemote = await peer.getParam('getRemote');
-        return await getRemote(api, pluginId);
+        const remote = await getRemote(api, pluginId);
+        await remote.setSystemState(getSystemState());
+        api.listen((id, eventDetails, eventData) => {
+            // ScryptedDevice events will be handled specially and repropagated by the remote.
+            if (eventDetails.eventInterface === types_1.ScryptedInterface.ScryptedDevice) {
+                if (eventDetails.property === types_1.ScryptedInterfaceProperty.id) {
+                    // a change on the id property means device was deleted
+                    remote.updateDeviceState(eventData, undefined);
+                }
+                else {
+                    // a change on anything else is a descriptor update
+                    remote.updateDeviceState(id, getSystemState()[id]);
+                }
+                return;
+            }
+            if (eventDetails.property) {
+                remote.notify(id, eventDetails.eventTime, eventDetails.eventInterface, eventDetails.property, getSystemState()[id]?.[eventDetails.property], eventDetails.changed);
+            }
+            else {
+                remote.notify(id, eventDetails.eventTime, eventDetails.eventInterface, eventDetails.property, eventData, eventDetails.changed);
+            }
+        });
+        return remote;
     }
     catch (e) {
         throw new rpc_1.RPCResultError(peer, 'error while retrieving PluginRemote', e);
@@ -273,8 +296,9 @@ function attachPluginRemote(peer, options) {
         const systemManager = new system_1.SystemManagerImpl();
         const deviceManager = new DeviceManagerImpl(systemManager, getDeviceConsole, getMixinConsole);
         const endpointManager = new EndpointManagerImpl();
-        const ioSockets = {};
         const mediaManager = await api.getMediaManager() || await createMediaManager(systemManager);
+        peer.params['mediaManager'] = mediaManager;
+        const ioSockets = {};
         systemManager.api = api;
         deviceManager.api = api;
         const log = deviceManager.getDeviceLogger(undefined);
@@ -338,11 +362,11 @@ function attachPluginRemote(peer, options) {
             async updateDeviceState(id, state) {
                 if (!state) {
                     delete systemManager.state[id];
-                    systemManager.events.notify(id, Date.now(), types_1.ScryptedInterface.ScryptedDevice, types_1.ScryptedInterfaceProperty.id, id, true);
+                    systemManager.events.notify(undefined, undefined, types_1.ScryptedInterface.ScryptedDevice, types_1.ScryptedInterfaceProperty.id, id, true);
                 }
                 else {
                     systemManager.state[id] = state;
-                    systemManager.events.notify(id, Date.now(), types_1.ScryptedInterface.ScryptedDevice, undefined, undefined, true);
+                    systemManager.events.notify(id, undefined, types_1.ScryptedInterface.ScryptedDevice, undefined, state, true);
                 }
             },
             async notify(id, eventTime, eventInterface, property, value, changed) {
@@ -382,28 +406,14 @@ function attachPluginRemote(peer, options) {
                     volume.mkdirpSync(path_1.default.dirname(name));
                     volume.writeFileSync(name, entry.getData());
                 }
-                function websocketConnect(url, protocols, connect, end, error, data) {
-                    if (url.startsWith('io://')) {
-                        const id = url.substring('io://'.length);
-                        ioSockets[id] = {
-                            data,
-                            error,
-                            end
-                        };
-                        connect(undefined, {
-                            close: () => api.ioClose(id),
-                        }, (message) => api.ioSend(id, message));
-                    }
-                    else if (url.startsWith('ws://')) {
-                        const id = url.substring('ws://'.length);
-                        ioSockets[id] = {
-                            data,
-                            error,
-                            end
-                        };
-                        connect(undefined, {
+                function websocketConnect(url, protocols, callbacks) {
+                    if (url.startsWith('io://') || url.startsWith('ws://')) {
+                        const id = url.substring('xx://'.length);
+                        ioSockets[id] = callbacks;
+                        callbacks.connect(undefined, {
                             close: () => api.ioClose(id),
-                        }, (message) => api.ioSend(id, message));
+                            send: (message) => api.ioSend(id, message),
+                        });
                     }
                     else {
                         throw new Error('unsupported websocket');

package/dist/plugin/plugin-remote.js.map

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

package/dist/runtime.js

@@ -10,7 +10,6 @@ const plugin_device_1 = require("./plugin/plugin-device");
 const db_types_1 = require("./db-types");
 const state_1 = require("./state");
 const http_interfaces_1 = require("./http-interfaces");
-const body_parser_1 = __importDefault(require("body-parser"));
 const logger_1 = require("./logger");
 const infer_defaults_1 = require("./infer-defaults");
 const url_1 = require("url");
@@ -30,15 +29,15 @@ const engine_io_1 = __importDefault(require("engine.io"));
 const node_pty_1 = require("node-pty");
 const rimraf_1 = __importDefault(require("rimraf"));
 const plugin_volume_1 = require("./plugin/plugin-volume");
+const plugin_http_1 = require("./plugin/plugin-http");
 const MIN_SCRYPTED_CORE_VERSION = 'v0.0.146';
 const PLUGIN_DEVICE_STATE_VERSION = 2;
-class ScryptedRuntime {
+class ScryptedRuntime extends plugin_http_1.PluginHttp {
     datastore;
     plugins = {};
     pluginDevices = {};
     devices = {};
     stateManager = new state_1.ScryptedStateManager(this);
-    app;
     logger = new logger_1.Logger(this, '', 'Scrypted');
     devicesLogger = this.logger.getLogger('device', 'Devices');
     wss = new ws_1.Server({ noServer: true });
@@ -47,23 +46,10 @@ class ScryptedRuntime {
         pingTimeout: 120000,
     });
     constructor(datastore, insecure, secure, app) {
+        super(app);
         this.datastore = datastore;
         this.app = app;
         app.disable('x-powered-by');
-        app.all(['/endpoint/@:owner/:pkg/public/engine.io/*', '/endpoint/:pkg/public/engine.io/*'], (req, res) => {
-            this.endpointHandler(req, res, true, true, this.handleEngineIOEndpoint.bind(this));
-        });
-        app.all(['/endpoint/@:owner/:pkg/engine.io/*', '/endpoint/@:owner/:pkg/engine.io/*'], (req, res) => {
-            this.endpointHandler(req, res, false, true, this.handleEngineIOEndpoint.bind(this));
-        });
-        // stringify all http endpoints
-        app.all(['/endpoint/@:owner/:pkg/public', '/endpoint/@:owner/:pkg/public/*', '/endpoint/:pkg', '/endpoint/:pkg/*'], body_parser_1.default.text());
-        app.all(['/endpoint/@:owner/:pkg/public', '/endpoint/@:owner/:pkg/public/*', '/endpoint/:pkg/public', '/endpoint/:pkg/public/*'], (req, res) => {
-            this.endpointHandler(req, res, true, false, this.handleRequestEndpoint.bind(this));
-        });
-        app.all(['/endpoint/@:owner/:pkg', '/endpoint/@:owner/:pkg/*', '/endpoint/:pkg', '/endpoint/:pkg/*'], (req, res) => {
-            this.endpointHandler(req, res, false, false, this.handleRequestEndpoint.bind(this));
-        });
         app.get('/web/oauth/callback', (req, res) => {
             this.oauthCallback(req, res);
         });
@@ -213,96 +199,49 @@ class ScryptedRuntime {
         else
             this.shellio.handleRequest(req, res);
     }
-    async endpointHandler(req, res, isPublicEndpoint, isEngineIOEndpoint, handler) {
-        const isUpgrade = req.headers.connection?.toLowerCase() === 'upgrade';
-        const end = (code, message) => {
-            if (isUpgrade) {
-                const socket = res.socket;
-                socket.write(`HTTP/1.1 ${code} ${message}\r\n` +
-                    '\r\n');
-                socket.destroy();
-            }
-            else {
-                res.status(code);
-                res.send(message);
-            }
-        };
-        if (!isPublicEndpoint && !res.locals.username) {
-            end(401, 'Not Authorized');
-            return;
-        }
-        const { owner, pkg } = req.params;
-        let endpoint = pkg;
-        if (owner)
-            endpoint = `@${owner}/${endpoint}`;
-        const { pluginHost, pluginDevice } = await this.getPluginForEndpoint(endpoint);
+    async getEndpointPluginData(endpoint, isUpgrade, isEngineIOEndpoint) {
+        const ret = await this.getPluginForEndpoint(endpoint);
+        const { pluginDevice } = ret;
         // check if upgrade requests can be handled. must be websocket.
         if (isUpgrade) {
-            if (req.headers.upgrade?.toLowerCase() !== 'websocket' || !pluginDevice?.state.interfaces.value.includes(types_1.ScryptedInterface.EngineIOHandler)) {
-                end(404, 'Not Found');
+            if (!pluginDevice?.state.interfaces.value.includes(types_1.ScryptedInterface.EngineIOHandler)) {
                 return;
             }
         }
         else {
             if (!isEngineIOEndpoint && !pluginDevice?.state.interfaces.value.includes(types_1.ScryptedInterface.HttpRequestHandler)) {
-                end(404, 'Not Found');
                 return;
             }
         }
-        let rootPath = `/endpoint/${endpoint}`;
-        if (isPublicEndpoint)
-            rootPath += '/public';
-        const body = req.body && typeof req.body !== 'string' ? JSON.stringify(req.body) : req.body;
-        const httpRequest = {
-            body,
-            headers: req.headers,
-            method: req.method,
-            rootPath,
-            url: req.url,
-            isPublicEndpoint,
-            username: res.locals.username,
-        };
-        if (isEngineIOEndpoint && !isUpgrade && isPublicEndpoint) {
-            res.header("Access-Control-Allow-Origin", '*');
-        }
-        if (!isEngineIOEndpoint && isUpgrade) {
-            this.wss.handleUpgrade(req, req.socket, req.upgradeHead, async (ws) => {
-                try {
-                    const handler = this.getDevice(pluginDevice._id);
-                    const id = 'ws-' + this.wsAtomic++;
-                    const pluginHost = this.plugins[endpoint] ?? this.getPluginHostForDeviceId(endpoint);
-                    if (!pluginHost) {
-                        ws.close();
-                        return;
-                    }
-                    pluginHost.ws[id] = ws;
-                    ws.on('message', async (message) => {
-                        try {
-                            pluginHost.remote.ioEvent(id, 'message', message);
-                        }
-                        catch (e) {
-                            ws.close();
-                        }
-                    });
-                    ws.on('close', async (reason) => {
-                        try {
-                            pluginHost.remote.ioEvent(id, 'close');
-                        }
-                        catch (e) {
-                        }
-                        delete pluginHost.ws[id];
-                    });
-                    await handler.onConnection(httpRequest, `ws://${id}`);
-                }
-                catch (e) {
-                    console.error('websocket plugin error', e);
-                    ws.close();
-                }
-            });
-        }
-        else {
-            handler(req, res, httpRequest, pluginHost, pluginDevice);
+        return ret;
+    }
+    async handleWebSocket(endpoint, httpRequest, ws, pluginData) {
+        const { pluginDevice } = pluginData;
+        const handler = this.getDevice(pluginDevice._id);
+        const id = 'ws-' + this.wsAtomic++;
+        const pluginHost = this.plugins[endpoint] ?? this.getPluginHostForDeviceId(endpoint);
+        if (!pluginHost) {
+            ws.close();
+            return;
         }
+        pluginHost.ws[id] = ws;
+        ws.on('message', async (message) => {
+            try {
+                pluginHost.remote.ioEvent(id, 'message', message);
+            }
+            catch (e) {
+                ws.close();
+            }
+        });
+        ws.on('close', async (reason) => {
+            try {
+                pluginHost.remote.ioEvent(id, 'close');
+            }
+            catch (e) {
+            }
+            delete pluginHost.ws[id];
+        });
+        await handler.onConnection(httpRequest, `ws://${id}`);
     }
     async getComponent(componentId) {
         switch (componentId) {
@@ -324,7 +263,8 @@ class ScryptedRuntime {
                 return new alerts_1.Alerts(this);
         }
     }
-    async handleEngineIOEndpoint(req, res, endpointRequest, pluginHost, pluginDevice) {
+    async handleEngineIOEndpoint(req, res, endpointRequest, pluginData) {
+        const { pluginHost, pluginDevice } = pluginData;
         req.scrypted = {
             endpointRequest,
             pluginDevice,
@@ -334,21 +274,15 @@ class ScryptedRuntime {
         else
             pluginHost.io.handleRequest(req, res);
     }
-    async handleRequestEndpoint(req, res, endpointRequest, pluginHost, pluginDevice) {
-        try {
-            const handler = this.getDevice(pluginDevice._id);
-            if (handler.interfaces.includes(types_1.ScryptedInterface.EngineIOHandler) && req.headers.connection === 'upgrade' && req.headers.upgrade?.toLowerCase() === 'websocket') {
-                this.wss.handleUpgrade(req, req.socket, null, ws => {
-                    console.log(ws);
-                });
-            }
-            handler.onRequest(endpointRequest, (0, http_interfaces_1.createResponseInterface)(res, pluginHost));
-        }
-        catch (e) {
-            res.status(500);
-            res.send(e.toString());
-            console.error(e);
+    async handleRequestEndpoint(req, res, endpointRequest, pluginData) {
+        const { pluginHost, pluginDevice } = pluginData;
+        const handler = this.getDevice(pluginDevice._id);
+        if (handler.interfaces.includes(types_1.ScryptedInterface.EngineIOHandler) && req.headers.connection === 'upgrade' && req.headers.upgrade?.toLowerCase() === 'websocket') {
+            this.wss.handleUpgrade(req, req.socket, null, ws => {
+                console.log(ws);
+            });
         }
+        handler.onRequest(endpointRequest, (0, http_interfaces_1.createResponseInterface)(res, pluginHost.zip));
     }
     killPlugin(plugin) {
         const existing = this.plugins[plugin._id];