@scrypted/server 0.0.80 → 0.0.84

package/src/scrypted-main.ts

@@ -4,9 +4,8 @@ import http from 'http';
 import https from 'https';
 import express from 'express';
 import bodyParser from 'body-parser';
-import cluster from 'cluster';
 import net from 'net';
-import { startPluginClusterWorker as startPluginRemoteClusterWorker } from './plugin/plugin-host';
+import { startPluginRemote } from './plugin/plugin-host';
 import { ScryptedRuntime } from './runtime';
 import level from './level';
 import { Plugin, ScryptedUser, Settings } from './db-types';
@@ -46,11 +45,8 @@ function listenServerPort(env: string, port: number, server: any) {
     })
 }
 
-if (!cluster.isMaster) {
-    startPluginRemoteClusterWorker();
-}
-else if (process.argv[2] === 'child') {
-    startPluginRemoteClusterWorker();
+if (process.argv[2] === 'child') {
+    startPluginRemote();
 }
 else {
     installSourceMapSupport({
@@ -77,15 +73,14 @@ else {
             try {
                 const target = await doconnect();
                 socket.pipe(target).pipe(socket);
-                socket.on('error', () => {
+                const destroy = () => {
                     socket.destroy();
                     target.destroy();
-                });
-                target.on('error', e => {
-                    console.error('debugger target error', e);
-                    socket.destroy();
-                    target.destroy();
-                });
+                }
+                socket.on('error', destroy);
+                target.on('error', destroy);
+                socket.on('close', destroy);
+                target.on('close', destroy);
                 return;
             }
             catch (e) {
@@ -151,14 +146,22 @@ else {
 
         const keys = certSetting.value;
 
-        const secure = https.createServer({ key: keys.serviceKey, cert: keys.certificate }, app);
+        const httpsServerOptions = process.env.SCRYPTED_HTTPS_OPTIONS_FILE
+            ? JSON.parse(fs.readFileSync(process.env.SCRYPTED_HTTPS_OPTIONS_FILE).toString())
+            : {};
+
+        const mergedHttpsServerOptions = Object.assign({
+            key: keys.serviceKey,
+            cert: keys.certificate
+        }, httpsServerOptions);
+        const secure = https.createServer(mergedHttpsServerOptions, app);
         listenServerPort('SCRYPTED_SECURE_PORT', SCRYPTED_SECURE_PORT, secure);
         const insecure = http.createServer(app);
         listenServerPort('SCRYPTED_INSECURE_PORT', SCRYPTED_INSECURE_PORT, insecure);
 
         // 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) {
@@ -228,7 +231,7 @@ else {
                 return;
             }
             next();
-        })
+        });
 
         console.log('#######################################################');
         console.log(`Scrypted Server (Local)   : https://localhost:${SCRYPTED_SECURE_PORT}/`);
@@ -246,6 +249,10 @@ 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 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('#######################################################');
         const scrypted = new ScryptedRuntime(db, insecure, secure, app);
         await scrypted.start();

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);
     }
 }

package/src/state.ts

@@ -236,7 +236,7 @@ export function setState(pluginDevice: PluginDevice, property: string, value: an
 }
 
 export function getState(pluginDevice: PluginDevice, property: string): any {
-    const ret = pluginDevice.state[property]?.value;
+    const ret = pluginDevice.state?.[property]?.value;
     if (typeof ret === 'object')
         return JSON.parse(JSON.stringify(ret));
     return ret;

package/test/test-cert.json

@@ -0,0 +1,4 @@
+{
+    "key": "-----BEGIN RSA PRIVATE KEY-----\r\nMIIEowIBAAKCAQEA3bLZP9mrM22Oq2dmCR1hMWbUueNvemaV4AebCysht9HkJbbI\r\nxISgqJPP3BGirGe/M1D8USv4/cYSeiWEh7cEnSzz5JWlzCxRAAHWQIUups66qaIe\r\nfTb0Lb5rfdWkX3pWiEVhKN39AJsOk+dHLoJG4/SxPKG74Fg3sqkbCjmyZm/MEfDM\r\nRLKyFbt3yQvktFQ4324ycMgX2FL1oq3UFBRcku6oGPbgQ3AMas8UGw5HrKp+Nk8c\r\n2Hd5+V/0pO0CmqlhEnMjBiBHIequzOI74dMjWvPVtBi0ULHRLsGzLy+es9VOzOTi\r\nMbHhdqpsdSGh0swOPQmgnzLmR2SrRY3TbvG/1QIDAQABAoIBAD1UhsklHDlj6337\r\nYrzOxd52xg6Onn5L9tY9BGU4j2FczTKpuCy1TASWr3//2PK82KYHl2WVNpJtwxrL\r\nWjh5JuucTfREedNbxySrXWwH6/n1Yqoe0TRuiWpGLVJoUcqf+2RDXTeDAcSzIHtG\r\nFekF3TqerJFLZMARZ4cjRPm1MGcprnn03fNB8deLAw2Fhf/VSdgjB+KZkAFQLrS2\r\n+k48wp8G9k8fDnj/83Y6Bn4FpZidbPVKryOjvwjuukFfqTus1ag7MVAy/VbzGSPp\r\nfDbQFv6bbS+7YQ4/ycYjLmP73AAxu4h7ggGybpTaAQK2H2pMKHHQB3DOyTFf80Yi\r\n/aujghkCgYEA9X/IV20lQMkU+te8KEQTYpr1XTwAsM4P/gMTgdRvLzZb5SbqYl0f\r\nw6svAqYk6k5H/NdYxJjour9QDYma7sjxi2UIqhh0Hk400kHfQxlry1bZIfykN01+\r\ntoxozu/MuFHOf2Z3e9m3gJbGLlMY94diocha/ARE7cLruiKkzAXSFF8CgYEA5y5z\r\nPRC2deGxCqVWIA1AjyNG7nyS841oYroYy8dMJqvvV9s9TA3t1NGfJ4MHpNd3LvSA\r\nLjGQ6XcJZANRP/ftMLzobm55G3Ed3rQJRIUEgTy/r5PARlDglcOELULUANfvNHhC\r\nuLRDAk6rtQsknxr8Q4HrmLRCEihV+JczasevOEsCgYA5LLRc4Bd/+hS/wsSYYBpf\r\nqZUhTJsgki0ZTGAbqXzncvJ98M0/cU63hEOji0wnoWmUkhajWrVA4NNlA7ooiHXw\r\nr+wPqThJ4o7ctOipON9o8OYKy0r3cj3jh9nU7/Yuqya7dwK2vmLFONgY69Nxun8X\r\nDJFcBiaDdRTvOahFt8lQYwKBgQCkfLJV0pxgR5MWRgl/iK5Uqf8AFPbh/80z4cFe\r\nzJDsOw1y73UvtgFwmS2qiVpY+U29xQ2m0HGRC7dMx+d5okfLk721RTk6Q0PDf0nQ\r\nzOwloDmrDW+TGFyTcqeLJK9/YiS6qo6eqPO8ookdqa4G3sZ6qegdoLQaA0UYOUzG\r\nPwn2/QKBgHTkiOppR6t8JT2nGivHeiEEXCrITcb3FEz7b91yEkm4ckTp3VSjlooK\r\nKVudR/l9ijSVJUnSHqekpC9hLMUxGgMEAyYusxKRzKR+j18+Tuay1ioXNawOi64u\r\nkcq/SGTcOpy73sFzy5Pwco3U598e0ziSuJH8qupVMVevDrjmvUJ5\r\n-----END RSA PRIVATE KEY-----\r\n",
+    "cert": "-----BEGIN CERTIFICATE-----\r\nMIIDVTCCAj2gAwIBAgIUAeTS/IIWmg/8SChxN/eo4Hs09oQwDQYJKoZIhvcNAQEF\r\nBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTIxMTExODA1Mzg0NFoXDTIyMTEx\r\nODA1Mzg0NFowFDESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF\r\nAAOCAQ8AMIIBCgKCAQEA3bLZP9mrM22Oq2dmCR1hMWbUueNvemaV4AebCysht9Hk\r\nJbbIxISgqJPP3BGirGe/M1D8USv4/cYSeiWEh7cEnSzz5JWlzCxRAAHWQIUups66\r\nqaIefTb0Lb5rfdWkX3pWiEVhKN39AJsOk+dHLoJG4/SxPKG74Fg3sqkbCjmyZm/M\r\nEfDMRLKyFbt3yQvktFQ4324ycMgX2FL1oq3UFBRcku6oGPbgQ3AMas8UGw5HrKp+\r\nNk8c2Hd5+V/0pO0CmqlhEnMjBiBHIequzOI74dMjWvPVtBi0ULHRLsGzLy+es9VO\r\nzOTiMbHhdqpsdSGh0swOPQmgnzLmR2SrRY3TbvG/1QIDAQABo4GeMIGbMAwGA1Ud\r\nEwQFMAMBAf8wCwYDVR0PBAQDAgL0MDsGA1UdJQQ0MDIGCCsGAQUFBwMBBggrBgEF\r\nBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCDARBglghkgBhvhCAQEE\r\nBAMCAPcwDwYDVR0RBAgwBocEfwAAATAdBgNVHQ4EFgQUewo1zH7zyultnwaBZ56o\r\nulrWGk0wDQYJKoZIhvcNAQEFBQADggEBAHxdemfNw/mPV8S5ZcZhVlnUzW4oQYX8\r\nAGh35Kqj6GOjguakrdHeIaKWG+ymFptHQkWQgcb65tt7TnWXWNQxaHdxvX4OAQVg\r\nlbWYVEQTJlAJSRr10X6DgEmyU8kNV7saLAmQVdiOxGevcBVVcwiik/IRM3+pyAHj\r\n3zNgMC56sAMzT+F+IkXfEkTHwP5SrBcrGZz0BsU/2JzoAGxuubEW0KI+M9XaUOcD\r\nUaHhEFqjCymLy0kiRIMqcFZYm2y7ZnkKd4N69vDl3jdXuh6GaH/StCZPuq+Kisvp\r\n4Vcj3HZad1qIta8Oy/732G6AZ7t8y+IKFS00e87GpIASE4OFM30fZF4=\r\n-----END CERTIFICATE-----\r\n"
+}