@scrypted/server 0.0.26 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "",
   "bin": {
     "scrypted-server": "dist/bin/scrypted-server.js"
@@ -63,13 +63,11 @@
     "@types/ws": "^7.4.7"
   },
   "scripts": {
-    "pregit-serve": "npm run build",
-    "git-serve": "node --expose-gc dist/git-serve.js",
     "preserve": "npm run build",
     "serve": "node --expose-gc dist/scrypted-main.js",
     "serve-no-build": "node --expose-gc dist/scrypted-main.js",
     "ts-serve": "ts-node --expose-gc src/scrypted-main.ts",
-    "prebuild": "tsc --build --clean && tsc -p ../sdk --outDir dist/sdk",
+    "prebuild": "rimraf dist && tsc -p ../sdk --outDir dist/sdk",
     "build": "tsc --outDir dist",
     "build-opencv": "cd node_modules/@koush/opencv4nodejs && npm run build",
     "postbuild": "node test/check-build-output.js",

package/dist/git-serve.js

@@ -1,60 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = __importDefault(require("child_process"));
-const events_1 = require("events");
-const fs_1 = __importDefault(require("fs"));
-const rimraf_1 = __importDefault(require("rimraf"));
-const path_1 = __importDefault(require("path"));
-async function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-const EXIT_FILE = '.exit';
-const UPDATE_FILE = '.update';
-async function runCommand(command, ...args) {
-    const cp = child_process_1.default.spawn(command, args, {
-        stdio: 'inherit'
-    });
-    await (0, events_1.once)(cp, 'exit');
-}
-async function runCommandEatError(command, ...args) {
-    try {
-        await runCommand(command, ...args);
-    }
-    catch (e) {
-        console.warn(command, args, 'command exited with error, ignoring', e);
-    }
-}
-async function main() {
-    process.chdir(path_1.default.join(__dirname, '..'));
-    console.log('cwd', process.cwd());
-    process.env.SCRYPTED_GIT_SERVE = 'true';
-    while (true) {
-        rimraf_1.default.sync(EXIT_FILE);
-        rimraf_1.default.sync(UPDATE_FILE);
-        try {
-            console.log('starting scrypted main...');
-            await runCommand('npm', 'run', 'serve-no-build');
-        }
-        catch (e) {
-            console.error('scrypted server exited with error', e);
-        }
-        if (fs_1.default.existsSync(EXIT_FILE)) {
-            console.log(`${EXIT_FILE} found. exiting.`);
-            process.exit();
-        }
-        if (fs_1.default.existsSync(UPDATE_FILE)) {
-            console.log(`${UPDATE_FILE} found. pulling and rebuilding.`);
-            await runCommandEatError('git', 'reset', '--hard');
-            await runCommandEatError('git', 'pull');
-            await runCommandEatError('npm', 'install');
-            await runCommandEatError('npm', 'run', 'build');
-        }
-        console.log(`${EXIT_FILE} not found. restarting momentarily.`);
-        await sleep(10000);
-    }
-}
-main();
-//# sourceMappingURL=git-serve.js.map

package/dist/git-serve.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"git-serve.js","sourceRoot":"","sources":["../src/git-serve.ts"],"names":[],"mappings":";;;;;AAAA,kEAA0C;AAC1C,mCAA8B;AAC9B,4CAAoB;AACpB,oDAA4B;AAC5B,gDAAwB;AAExB,KAAK,UAAU,KAAK,CAAC,EAAU;IAC3B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,CAAC;AAC1B,MAAM,WAAW,GAAG,SAAS,CAAC;AAE9B,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,GAAG,IAAc;IACxD,MAAM,EAAE,GAAG,uBAAa,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;QAC1C,KAAK,EAAE,SAAS;KACnB,CAAC,CAAC;IACH,MAAM,IAAA,aAAI,EAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAAe,EAAE,GAAG,IAAc;IAChE,IAAI;QACA,MAAM,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;KACtC;IACD,OAAO,CAAC,EAAE;QACN,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,qCAAqC,EAAE,CAAC,CAAC,CAAA;KACxE;AACL,CAAC;AAED,KAAK,UAAU,IAAI;IACf,OAAO,CAAC,KAAK,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC;IAExC,OAAO,IAAI,EAAE;QACT,gBAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,gBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzB,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACzC,MAAM,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAA;SACnD;QACD,OAAO,CAAC,EAAE;YACN,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;SACzD;QAED,IAAI,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,kBAAkB,CAAC,CAAC;YAC5C,OAAO,CAAC,IAAI,EAAE,CAAC;SAClB;QAED,IAAI,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,WAAW,iCAAiC,CAAC,CAAC;YAC7D,MAAM,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnD,MAAM,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,kBAAkB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC3C,MAAM,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACnD;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,qCAAqC,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;KACtB;AACL,CAAC;AAED,IAAI,EAAE,CAAC"}

package/src/git-serve.ts

@@ -1,65 +0,0 @@
-import child_process from 'child_process';
-import { once } from 'events';
-import fs from 'fs';
-import rimraf from 'rimraf';
-import path from 'path';
-
-async function sleep(ms: number) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-const EXIT_FILE = '.exit';
-const UPDATE_FILE = '.update';
-
-async function runCommand(command: string, ...args: string[]) {
-    const cp = child_process.spawn(command, args, {
-        stdio: 'inherit'
-    });
-    await once(cp, 'exit');
-}
-
-async function runCommandEatError(command: string, ...args: string[]) {
-    try {
-        await runCommand(command, ...args);
-    }
-    catch (e) {
-        console.warn(command, args, 'command exited with error, ignoring', e)
-    }
-}
-
-async function main() {
-    process.chdir(path.join(__dirname, '..'));
-    console.log('cwd', process.cwd());
-    process.env.SCRYPTED_GIT_SERVE = 'true';
-
-    while (true) {
-        rimraf.sync(EXIT_FILE);
-        rimraf.sync(UPDATE_FILE);
-
-        try {
-            console.log('starting scrypted main...');
-            await runCommand('npm', 'run', 'serve-no-build')
-        }
-        catch (e) {
-            console.error('scrypted server exited with error', e);
-        }
-
-        if (fs.existsSync(EXIT_FILE)) {
-            console.log(`${EXIT_FILE} found. exiting.`);
-            process.exit();
-        }
-
-        if (fs.existsSync(UPDATE_FILE)) {
-            console.log(`${UPDATE_FILE} found. pulling and rebuilding.`);
-            await runCommandEatError('git', 'reset', '--hard');
-            await runCommandEatError('git', 'pull');
-            await runCommandEatError('npm', 'install');
-            await runCommandEatError('npm', 'run', 'build');
-        }
-
-        console.log(`${EXIT_FILE} not found. restarting momentarily.`);
-        await sleep(10000);
-    }
-}
-
-main();