@blocklet/cli 1.8.61 → 1.8.63-beta-c51e554d

package/bin/blocklet.js

@@ -1,9 +1,3 @@
 #!/usr/bin/env node
 
-const { name } = require('../package.json');
-
-process.env.ABT_NODE_MAX_CLUSTER_SIZE = Math.min(Math.max(Number(process.env.ABT_NODE_MAX_CLUSTER_SIZE) || 32, 1), 32);
-
-process.env.ABT_NODE_PACKAGE_NAME = name;
-
-require('@abtnode/cli/bin/blocklet');
+require('../lib/run')();

package/lib/constant.js

@@ -0,0 +1,5 @@
+const packageJson = require('../package.json');
+
+module.exports = {
+  name: packageJson.name,
+};

package/lib/run.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => void;
+export = _default;

package/lib/run.js

@@ -0,0 +1,72 @@
+"use strict";
+/* eslint-disable global-require */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const constant_1 = require("@abtnode/cli/lib/constant");
+// !!! PM_HOME must be set before everything
+process.env.PM2_HOME = constant_1.PM2_HOME;
+process.env.ABT_NODE_HOME = constant_1.ABT_NODE_HOME;
+process.env.ABT_NODE_MAX_CLUSTER_SIZE = constant_1.ABT_NODE_MAX_CLUSTER_SIZE;
+const cross_spawn_1 = __importDefault(require("cross-spawn"));
+const get_cli_binary_name_1 = __importDefault(require("@abtnode/cli/lib/util/get-cli-binary-name"));
+const exit_when_server_stopped_1 = __importDefault(require("@abtnode/cli/lib/util/exit-when-server-stopped"));
+const print_error_1 = __importDefault(require("@abtnode/cli/lib/util/print-error"));
+const constant_2 = require("./constant");
+const keepAliveParams = ['--keep-alive', '-k'];
+const parseArgv = () => {
+    const binaryName = (0, get_cli_binary_name_1.default)();
+    const isServer = process.argv[2] === 'server';
+    const isStart = process.argv[3] === 'start';
+    const keepAlive = keepAliveParams.some((x) => process.argv.includes(x));
+    return { binaryName, isServer, isStart, keepAlive };
+};
+module.exports = () => {
+    process.env.ABT_NODE_PACKAGE_NAME = constant_2.name;
+    const { binaryName, isServer, isStart, keepAlive } = parseArgv();
+    if (isServer && isStart && keepAlive) {
+        const argv = process.argv.slice(4).filter((x) => !keepAliveParams.includes(x));
+        const { error, status } = cross_spawn_1.default.sync(binaryName, ['server', 'start', ...argv], {
+            timeout: 3 * 60 * 1000,
+            detached: false,
+            shell: false,
+            stdio: 'inherit',
+        });
+        if (error) {
+            (0, print_error_1.default)(error.message);
+            process.exit(error.errno || -1);
+            return; // just for test
+        }
+        if (status !== 0) {
+            process.exit(status);
+            return; // just for test
+        }
+        (0, exit_when_server_stopped_1.default)();
+    }
+    else {
+        Promise.resolve().then(() => __importStar(require('@abtnode/cli/bin/blocklet')));
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.8.61",
+  "version": "1.8.63-beta-c51e554d",
   "description": "Command line tools to manage Blocklet and Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "main": "bin/blocklet.js",
@@ -12,10 +12,15 @@
   },
   "scripts": {
     "lint": "eslint bin",
-    "lint:fix": "eslint bin --fix"
+    "lint:fix": "eslint bin --fix",
+    "test": "node tools/jest.js",
+    "coverage": "npm run test -- --coverage",
+    "clean": "rm -fr lib",
+    "build": "npm run clean && tsc && cp src/constant.js lib"
   },
   "files": [
-    "bin"
+    "bin",
+    "lib"
   ],
   "author": {
     "name": "wangshijun",
@@ -31,15 +36,26 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cli": "1.8.61",
+    "@abtnode/cli": "1.8.63-beta-c51e554d",
     "colors": "1.4.0",
+    "cross-spawn": "^7.0.3",
     "shelljs": "^0.8.5"
   },
+  "devDependencies": {
+    "@types/jest": "^29.2.2",
+    "@types/joi": "^17.2.3",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
+    "jest": "^29.3.0",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4"
+  },
   "resolutions": {
     "colors": "1.4.0"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "f68ac14c2074400d392e2171d328f12dbd2e64cb"
+  "gitHead": "9913ed7968dfab63d6549201a5a98f9819fcfac6"
 }