@scrypted/server 0.0.83 → 0.0.87

package/src/scrypted-main.ts

@@ -63,43 +63,19 @@ else {
         })
     }
 
-    const debuggers = new Map<number, net.Socket[]>();
     const debugServer = net.createServer(async (socket) => {
         if (!workerInspectPort) {
             socket.destroy();
             return;
         }
 
-        const entry = debuggers.get(workerInspectPort);
-        if (!entry) {
-            debuggers.set(workerInspectPort, [socket]);
-        }
-        else {
-            entry.push(socket);
-        }
-
         for (let i = 0; i < 10; i++) {
             try {
                 const target = await doconnect();
                 socket.pipe(target).pipe(socket);
                 const destroy = () => {
-                    socket.end();
                     socket.destroy();
-                    target.end();
                     target.destroy();
-
-                    if (!entry) {
-                        const sockets = debuggers.get(workerInspectPort);
-                        if (!debuggers.delete(workerInspectPort))
-                            return;
-                        setTimeout(() => {
-                            if (debuggers.has(workerInspectPort))
-                                return;
-                            for (const s of sockets) {
-                                s.destroy();
-                            }
-                        }, 500)
-                    }
                 }
                 socket.on('error', destroy);
                 target.on('error', destroy);
@@ -185,7 +161,7 @@ else {
 
         // legacy secure port 9443 is now in use by portainer.
         let shownLegacyPortAlert = false
-        const legacySecure = https.createServer({ key: keys.serviceKey, cert: keys.certificate }, (req, res) => {
+        const legacySecure = https.createServer(mergedHttpsServerOptions, (req, res) => {
             if (!shownLegacyPortAlert) {
                 const core = scrypted.findPluginDevice('@scrypted/core');
                 if (core) {
@@ -273,8 +249,8 @@ else {
         console.log('Ports can be changed with environment variables.')
         console.log('https: $SCRYPTED_SECURE_PORT')
         console.log('http : $SCRYPTED_INSECURE_PORT')
-        console.log('Certificate can be by providing tls.createSecureContext options')
-        console.log('JSON file in the SCRYPTED_HTTPS_OPTIONS_FILE environment variable:');
+        console.log('Certificate can be modified via tls.createSecureContext options in')
+        console.log('JSON file located at SCRYPTED_HTTPS_OPTIONS_FILE environment variable:');
         console.log('export SCRYPTED_HTTPS_OPTIONS_FILE=/path/to/options.json');
         console.log('https://nodejs.org/api/tls.html#tlscreatesecurecontextoptions')
         console.log('#######################################################');
@@ -370,15 +346,22 @@ else {
             }
 
             const waitDebug = new Promise<void>((resolve, reject) => {
-                setTimeout(() => reject(new Error('timed out waiting for debug session')), 10000);
+                setTimeout(() => reject(new Error('timed out waiting for debug session')), 30000);
                 debugServer.on('connection', resolve);
             });
 
             workerInspectPort = Math.round(Math.random() * 10000) + 30000;
-            const pluginHost = await scrypted.installPlugin(plugin, {
-                waitDebug,
-                inspectPort: workerInspectPort,
-            });
+            try {
+                await scrypted.installPlugin(plugin, {
+                    waitDebug,
+                    inspectPort: workerInspectPort,
+                });
+            }
+            catch (e) {
+                res.status(500);
+                res.send(e.toString());
+                return
+            }
 
             res.send({
                 workerInspectPort,

package/src/services/plugin.ts

@@ -119,6 +119,14 @@ export class PluginComponent {
     }
 
     async getRemoteServicePort(pluginId: string, name: string): Promise<number> {
+        if (name === 'console') {
+            const consoleServer = await this.scrypted.plugins[pluginId].consoleServer;
+            return consoleServer.readPort;
+        }
+        if (name === 'console-writer') {
+            const consoleServer = await this.scrypted.plugins[pluginId].consoleServer;
+            return consoleServer.writePort;
+        }
         return this.scrypted.plugins[pluginId].remote.getServicePort(name);
     }
 }