@scrypted/server 0.7.19 → 0.7.21

package/bin/scrypted-serve

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-const { spawn } = require('child_process');
 const path = require('path');
 const mainPath = path.join(__dirname, '../dist/scrypted-main.js');
-spawn('node', ['--expose-gc', mainPath], { stdio: 'inherit' });
+require(mainPath);

package/dist/scrypted-main-exports.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const v8_1 = __importDefault(require("v8"));
+const vm_1 = __importDefault(require("vm"));
+const process_1 = __importDefault(require("process"));
+const semver_1 = __importDefault(require("semver"));
+const rpc_1 = require("./rpc");
+const plugin_error_1 = require("./plugin/plugin-error");
+function start(mainFilename) {
+    if (!global.gc) {
+        v8_1.default.setFlagsFromString('--expose_gc');
+        global.gc = vm_1.default.runInNewContext("gc");
+    }
+    if (!semver_1.default.gte(process_1.default.version, '16.0.0')) {
+        throw new Error('"node" version out of date. Please update node to v16 or higher.');
+    }
+    // Node 17 changes the dns resolution order to return the record order.
+    // This causes issues with clients that are on "IPv6" networks that are
+    // actually busted and fail to connect to npm's IPv6 address.
+    // The workaround is to favor IPv4.
+    process_1.default.env['NODE_OPTIONS'] = '--dns-result-order=ipv4first';
+    (0, rpc_1.startPeriodicGarbageCollection)();
+    if (process_1.default.argv[2] === 'child' || process_1.default.argv[2] === 'child-thread') {
+        // plugins should never crash. this handler will be removed, and then readded
+        // after the plugin source map is retrieved.
+        process_1.default.on('uncaughtException', e => {
+            console.error('uncaughtException', e);
+        });
+        process_1.default.on('unhandledRejection', e => {
+            console.error('unhandledRejection', e);
+        });
+        const start = require('./scrypted-plugin-main').default;
+        start(mainFilename);
+    }
+    else {
+        // unhandled rejections are allowed if they are from a rpc/plugin call.
+        process_1.default.on('unhandledRejection', error => {
+            if (error?.constructor !== rpc_1.RPCResultError && error?.constructor !== plugin_error_1.PluginError) {
+                console.error('wtf', error);
+                throw error;
+            }
+            console.warn('unhandled rejection of RPC Result', error);
+        });
+        const start = require('./scrypted-server-main').default;
+        start(mainFilename);
+    }
+}
+exports.default = start;
+//# sourceMappingURL=scrypted-main-exports.js.map

package/dist/scrypted-main-exports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scrypted-main-exports.js","sourceRoot":"","sources":["../src/scrypted-main-exports.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,sDAA8B;AAC9B,oDAA4B;AAC5B,+BAAuE;AACvE,wDAAoD;AAEpD,SAAS,KAAK,CAAC,YAAoB;IAC/B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;QACZ,YAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QACpC,MAAM,CAAC,EAAE,GAAG,YAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;KACxC;IAED,IAAI,CAAC,gBAAM,CAAC,GAAG,CAAC,iBAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;KACtF;IAED,uEAAuE;IACvE,uEAAuE;IACvE,6DAA6D;IAC7D,mCAAmC;IACnC,iBAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,8BAA8B,CAAC;IAE7D,IAAA,oCAA8B,GAAE,CAAC;IAEjC,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE;QACnE,6EAA6E;QAC7E,4CAA4C;QAC5C,iBAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE;YAChC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,iBAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE;YACjC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,CAAC,YAAY,CAAC,CAAC;KACvB;SACI;QACD,uEAAuE;QACvE,iBAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE;YACrC,IAAI,KAAK,EAAE,WAAW,KAAK,oBAAc,IAAI,KAAK,EAAE,WAAW,KAAK,0BAAW,EAAE;gBAC7E,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC5B,MAAM,KAAK,CAAC;aACf;YACD,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,CAAC,YAAY,CAAC,CAAC;KACvB;AACL,CAAC;AAED,kBAAe,KAAK,CAAC"}

package/dist/scrypted-main.js

@@ -3,47 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const v8_1 = __importDefault(require("v8"));
-const vm_1 = __importDefault(require("vm"));
-const process_1 = __importDefault(require("process"));
-const semver_1 = __importDefault(require("semver"));
-const rpc_1 = require("./rpc");
-const plugin_error_1 = require("./plugin/plugin-error");
-if (!global.gc) {
-    v8_1.default.setFlagsFromString('--expose_gc');
-    global.gc = vm_1.default.runInNewContext("gc");
-}
-if (!semver_1.default.gte(process_1.default.version, '16.0.0')) {
-    throw new Error('"node" version out of date. Please update node to v16 or higher.');
-}
-// Node 17 changes the dns resolution order to return the record order.
-// This causes issues with clients that are on "IPv6" networks that are
-// actually busted and fail to connect to npm's IPv6 address.
-// The workaround is to favor IPv4.
-process_1.default.env['NODE_OPTIONS'] = '--dns-result-order=ipv4first';
-(0, rpc_1.startPeriodicGarbageCollection)();
-if (process_1.default.argv[2] === 'child' || process_1.default.argv[2] === 'child-thread') {
-    // plugins should never crash. this handler will be removed, and then readded
-    // after the plugin source map is retrieved.
-    process_1.default.on('uncaughtException', e => {
-        console.error('uncaughtException', e);
-    });
-    process_1.default.on('unhandledRejection', e => {
-        console.error('unhandledRejection', e);
-    });
-    const start = require('./scrypted-plugin-main').default;
-    start(__filename);
-}
-else {
-    // unhandled rejections are allowed if they are from a rpc/plugin call.
-    process_1.default.on('unhandledRejection', error => {
-        if (error?.constructor !== rpc_1.RPCResultError && error?.constructor !== plugin_error_1.PluginError) {
-            console.error('wtf', error);
-            throw error;
-        }
-        console.warn('unhandled rejection of RPC Result', error);
-    });
-    const start = require('./scrypted-server-main').default;
-    start(__filename);
-}
+const scrypted_main_exports_1 = __importDefault(require("./scrypted-main-exports"));
+(0, scrypted_main_exports_1.default)(__filename);
 //# sourceMappingURL=scrypted-main.js.map

package/dist/scrypted-main.js.map

@@ -1 +1 @@
-{"version":3,"file":"scrypted-main.js","sourceRoot":"","sources":["../src/scrypted-main.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,sDAA8B;AAC9B,oDAA4B;AAC5B,+BAAuE;AACvE,wDAAoD;AAEpD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;IACZ,YAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;IACpC,MAAM,CAAC,EAAE,GAAG,YAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;CACxC;AAED,IAAI,CAAC,gBAAM,CAAC,GAAG,CAAC,iBAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;IACxC,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;CACtF;AAED,uEAAuE;AACvE,uEAAuE;AACvE,6DAA6D;AAC7D,mCAAmC;AACnC,iBAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,8BAA8B,CAAC;AAE7D,IAAA,oCAA8B,GAAE,CAAC;AAEjC,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE;IACnE,6EAA6E;IAC7E,4CAA4C;IAC5C,iBAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE;QAChC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,iBAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE;QACjC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC;IACxD,KAAK,CAAC,UAAU,CAAC,CAAC;CACrB;KACI;IACD,uEAAuE;IACvE,iBAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE;QACrC,IAAI,KAAK,EAAE,WAAW,KAAK,oBAAc,IAAI,KAAK,EAAE,WAAW,KAAK,0BAAW,EAAE;YAC7E,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC5B,MAAM,KAAK,CAAC;SACf;QACD,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,CAAC;IACxD,KAAK,CAAC,UAAU,CAAC,CAAC;CACrB"}
+{"version":3,"file":"scrypted-main.js","sourceRoot":"","sources":["../src/scrypted-main.ts"],"names":[],"mappings":";;;;;AAAA,oFAA4C;AAE5C,IAAA,+BAAK,EAAC,UAAU,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.7.19",
+  "version": "0.7.21",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
@@ -60,7 +60,7 @@
   "bin": {
     "scrypted-serve": "bin/scrypted-serve"
   },
-  "main": "dist/scrypted-main.js",
+  "main": "dist/scrypted-main-exports.js",
   "scripts": {
     "preserve": "npm run build",
     "serve": "node --expose-gc dist/scrypted-main.js",

package/src/scrypted-main-exports.ts

@@ -0,0 +1,54 @@
+import v8 from 'v8';
+import vm from 'vm';
+import process from 'process';
+import semver from 'semver';
+import { RPCResultError, startPeriodicGarbageCollection } from './rpc';
+import { PluginError } from './plugin/plugin-error';
+
+function start(mainFilename: string) {
+    if (!global.gc) {
+        v8.setFlagsFromString('--expose_gc')
+        global.gc = vm.runInNewContext("gc");
+    }
+
+    if (!semver.gte(process.version, '16.0.0')) {
+        throw new Error('"node" version out of date. Please update node to v16 or higher.')
+    }
+
+    // Node 17 changes the dns resolution order to return the record order.
+    // This causes issues with clients that are on "IPv6" networks that are
+    // actually busted and fail to connect to npm's IPv6 address.
+    // The workaround is to favor IPv4.
+    process.env['NODE_OPTIONS'] = '--dns-result-order=ipv4first';
+
+    startPeriodicGarbageCollection();
+
+    if (process.argv[2] === 'child' || process.argv[2] === 'child-thread') {
+        // plugins should never crash. this handler will be removed, and then readded
+        // after the plugin source map is retrieved.
+        process.on('uncaughtException', e => {
+            console.error('uncaughtException', e);
+        });
+        process.on('unhandledRejection', e => {
+            console.error('unhandledRejection', e);
+        });
+
+        const start = require('./scrypted-plugin-main').default;
+        start(mainFilename);
+    }
+    else {
+        // unhandled rejections are allowed if they are from a rpc/plugin call.
+        process.on('unhandledRejection', error => {
+            if (error?.constructor !== RPCResultError && error?.constructor !== PluginError) {
+                console.error('wtf', error);
+                throw error;
+            }
+            console.warn('unhandled rejection of RPC Result', error);
+        });
+
+        const start = require('./scrypted-server-main').default;
+        start(mainFilename);
+    }
+}
+
+export default start;

package/src/scrypted-main.ts

@@ -1,50 +1,3 @@
-import v8 from 'v8';
-import vm from 'vm';
-import process from 'process';
-import semver from 'semver';
-import { RPCResultError, startPeriodicGarbageCollection } from './rpc';
-import { PluginError } from './plugin/plugin-error';
+import start from './scrypted-main-exports';
 
-if (!global.gc) {
-    v8.setFlagsFromString('--expose_gc')
-    global.gc = vm.runInNewContext("gc");
-}
-
-if (!semver.gte(process.version, '16.0.0')) {
-    throw new Error('"node" version out of date. Please update node to v16 or higher.')
-}
-
-// Node 17 changes the dns resolution order to return the record order.
-// This causes issues with clients that are on "IPv6" networks that are
-// actually busted and fail to connect to npm's IPv6 address.
-// The workaround is to favor IPv4.
-process.env['NODE_OPTIONS'] = '--dns-result-order=ipv4first';
-
-startPeriodicGarbageCollection();
-
-if (process.argv[2] === 'child' || process.argv[2] === 'child-thread') {
-    // plugins should never crash. this handler will be removed, and then readded
-    // after the plugin source map is retrieved.
-    process.on('uncaughtException', e => {
-        console.error('uncaughtException', e);
-    });
-    process.on('unhandledRejection', e => {
-        console.error('unhandledRejection', e);
-    });
-
-    const start = require('./scrypted-plugin-main').default;
-    start(__filename);
-}
-else {
-    // unhandled rejections are allowed if they are from a rpc/plugin call.
-    process.on('unhandledRejection', error => {
-        if (error?.constructor !== RPCResultError && error?.constructor !== PluginError) {
-            console.error('wtf', error);
-            throw error;
-        }
-        console.warn('unhandled rejection of RPC Result', error);
-    });
-
-    const start = require('./scrypted-server-main').default;
-    start(__filename);
-}
+start(__filename);