@abtnode/util 1.16.13-beta-0656f92f → 1.16.13-beta-2eb54cbc

package/lib/dayjs.js

@@ -0,0 +1,18 @@
+const dayjs = require('dayjs');
+
+require('dayjs/locale/en');
+require('dayjs/locale/zh');
+
+const relativeTime = require('dayjs/plugin/relativeTime');
+const localizedFormat = require('dayjs/plugin/localizedFormat');
+const duration = require('dayjs/plugin/duration');
+const utc = require('dayjs/plugin/utc');
+const timezone = require('dayjs/plugin/timezone'); // dependent on utc plugin
+
+dayjs.extend(relativeTime);
+dayjs.extend(localizedFormat);
+dayjs.extend(duration);
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
+module.exports = dayjs;

package/lib/log.js

@@ -2,7 +2,6 @@
 const path = require('path');
 const createArchive = require('archiver');
 const fs = require('fs-extra');
-const dayjs = require('dayjs');
 const glob = require('fast-glob');
 const isEqual = require('lodash/isEqual');
 const { Tail } = require('tail');
@@ -10,6 +9,8 @@ const readLastLines = require('read-last-lines');
 const { BLOCKLET_MODES } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')(require('../package.json').name);
 
+const dayjs = require('./dayjs');
+
 class StreamLog {
   constructor() {
     this._files = null; // Object { <level>: <filePath> }

package/lib/port.js

@@ -0,0 +1,126 @@
+const net = require('net');
+const killProcess = require('fkill');
+const getPm2ProcessInfo = require('./get-pm2-process-info');
+
+const noop = () => {};
+
+const killProcessOccupiedPorts = async ({ pm2ProcessId, ports = {}, printError = noop } = {}) => {
+  if (!pm2ProcessId) {
+    throw new Error('pm2ProcessId is required');
+  }
+
+  const info = await getPm2ProcessInfo(pm2ProcessId, { throwOnNotExist: false });
+  await Promise.all(
+    Object.entries(ports).map(async ([envName, configPort]) => {
+      if (!configPort) {
+        return;
+      }
+
+      const pm2ProcessPort = (info?.pm2_env?.env || {})[envName];
+      const pm2ProcessExist = pm2ProcessPort === configPort;
+
+      if (pm2ProcessExist) {
+        return;
+      }
+
+      try {
+        await killProcess(`:${configPort}`, { silent: true, force: true });
+      } catch (error) {
+        printError('Failed to kill process', { error });
+      }
+    })
+  );
+};
+
+const isPortTaken = (port) =>
+  new Promise((resolve, reject) => {
+    const tester = net
+      .createServer()
+      .once('error', (err) => {
+        if (err.code !== 'EADDRINUSE') {
+          reject(err);
+          return;
+        }
+        resolve(true);
+      })
+      .once('listening', () => {
+        tester.once('close', () => resolve(false)).close();
+      })
+      .listen(port);
+  });
+
+/**
+ * @param {{
+ *  [key: string]: number;
+ * }} ports
+ * @param {{
+ *  blackList?: number[];
+ *  range?: [number, number];
+ * }} options
+ * @returns {
+ *  Promise<{
+ *   [key: string]: number;
+ *  }>
+ * }
+ */
+const refreshPorts = async (ports, { blackList = [], range = [10000, 65535] } = {}) => {
+  const res = {};
+  const blackListPorts = [...Object.values(ports), ...blackList];
+
+  for (const key of Object.keys(ports)) {
+    let found = false;
+    while (!found) {
+      const port = Math.floor(Math.random() * [range[1] - range[0]]) + range[0];
+
+      if (!blackListPorts.includes(port)) {
+        // eslint-disable-next-line no-await-in-loop
+        const isTaken = await isPortTaken(port);
+        if (!isTaken) {
+          res[key] = port;
+          blackListPorts.push(port);
+          found = true;
+        }
+      }
+    }
+  }
+
+  return res;
+};
+
+const isPortsOccupiedByOtherProcess = async ({ pm2ProcessId, ports = {} } = {}) => {
+  if (!pm2ProcessId) {
+    throw new Error('pm2ProcessId is required');
+  }
+
+  const info = await getPm2ProcessInfo(pm2ProcessId, { throwOnNotExist: false });
+
+  let occupied = false;
+  await Promise.all(
+    Object.entries(ports).map(async ([envName, configPort]) => {
+      if (!configPort) {
+        return;
+      }
+
+      const pm2ProcessPort = (info?.pm2_env?.env || {})[envName];
+      const pm2ProcessExist = pm2ProcessPort === configPort;
+
+      if (pm2ProcessExist) {
+        return;
+      }
+
+      const isYes = await isPortTaken(configPort);
+      if (isYes) {
+        occupied = isYes;
+      }
+    })
+  );
+
+  return occupied;
+};
+
+module.exports = {
+  isPortsOccupiedByOtherProcess,
+  killProcessOccupiedPorts,
+  isPortTaken,
+  refreshPorts,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-0656f92f",
+  "version": "1.16.13-beta-2eb54cbc",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.13-beta-0656f92f",
-    "@abtnode/logger": "1.16.13-beta-0656f92f",
-    "@blocklet/constant": "1.16.13-beta-0656f92f",
+    "@abtnode/constant": "1.16.13-beta-2eb54cbc",
+    "@abtnode/logger": "1.16.13-beta-2eb54cbc",
+    "@blocklet/constant": "1.16.13-beta-2eb54cbc",
     "@ocap/client": "1.18.84",
     "@ocap/mcrypto": "1.18.84",
     "@ocap/util": "1.18.84",
@@ -32,7 +32,7 @@
     "cookie": "^0.5.0",
     "cookie-parser": "^1.4.6",
     "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.8",
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
     "find-up": "^5.0.0",
@@ -74,5 +74,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "07996e8ec6fd2141ee3e93dd699ed7fd434bc0ad"
+  "gitHead": "7adf96c2eb31762d8eb14b8121fce9865d6a458c"
 }

package/lib/kill-process-occupied-ports.js

@@ -1,34 +0,0 @@
-const killProcess = require('fkill');
-const getPm2ProcessInfo = require('./get-pm2-process-info');
-
-const noop = () => {};
-
-const killProcessOccupiedPorts = async ({ pm2ProcessId, ports = {}, printError = noop } = {}) => {
-  if (!pm2ProcessId) {
-    throw new Error('pm2ProcessId is required');
-  }
-
-  const info = await getPm2ProcessInfo(pm2ProcessId, { throwOnNotExist: false });
-  await Promise.all(
-    Object.entries(ports).map(async ([envName, configPort]) => {
-      if (!configPort) {
-        return;
-      }
-
-      const pm2ProcessPort = (info?.pm2_env?.env || {})[envName];
-      const pm2ProcessExist = pm2ProcessPort === configPort;
-
-      if (pm2ProcessExist) {
-        return;
-      }
-
-      try {
-        await killProcess(`:${configPort}`, { silent: true, force: true });
-      } catch (error) {
-        printError('Failed to kill process', { error });
-      }
-    })
-  );
-};
-
-module.exports = killProcessOccupiedPorts;