@abtnode/util 1.16.6-beta-1fde60e3 → 1.16.6-beta-7cbab489

package/lib/did-document.js

@@ -116,13 +116,9 @@ const updateBlockletDocument = async ({
   return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet });
 };
 
-const disableBlockletDNS = async ({ appPid, wallet, didRegistryUrl }) =>
-  updateWithRetry({ id: appPid, services: [], didRegistryUrl, wallet });
-
 module.exports = {
   updateServerDocument,
   updateBlockletDocument,
-  disableBlockletDNS,
   getDID,
   getServerServices,
   getBlockletServices,

package/lib/get-pm2-process-info.js

@@ -0,0 +1,22 @@
+const pm2 = require('./async-pm2');
+const CustomError = require('./custom-error');
+
+const noop = () => {};
+
+const getPm2ProcessInfo = (processId, { printError = noop, throwOnNotExist = true } = {}) =>
+  new Promise((resolve, reject) => {
+    pm2.describe(processId, async (err, [info]) => {
+      if (err) {
+        printError('Failed to get blocklet status from pm2', { error: err });
+        return reject(err);
+      }
+
+      if (!info && throwOnNotExist) {
+        return reject(new CustomError('BLOCKLET_PROCESS_404', 'Blocklet process info is not available'));
+      }
+
+      return resolve(info);
+    });
+  });
+
+module.exports = getPm2ProcessInfo;

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

@@ -0,0 +1,34 @@
+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;

package/lib/url-evaluation/index.js

@@ -81,6 +81,7 @@ const evaluateURLs = async (urls, options = {}) => {
 };
 
 module.exports = {
+  isIpEcho,
   evaluateURL,
   evaluateURLs,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-1fde60e3",
+  "version": "1.16.6-beta-7cbab489",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-1fde60e3",
-    "@abtnode/logger": "1.16.6-beta-1fde60e3",
-    "@blocklet/constant": "1.16.6-beta-1fde60e3",
+    "@abtnode/constant": "1.16.6-beta-7cbab489",
+    "@abtnode/logger": "1.16.6-beta-7cbab489",
+    "@blocklet/constant": "1.16.6-beta-7cbab489",
     "@ocap/client": "1.18.75",
     "@ocap/mcrypto": "1.18.75",
     "@ocap/util": "1.18.75",
@@ -34,6 +34,7 @@
     "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
     "find-up": "^5.0.0",
+    "fkill": "^7.2.1",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "get-folder-size": "^2.0.1",
@@ -70,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "be8d8eab7d210910e24dae3b389f2c70aa414a13"
+  "gitHead": "36b58c0651762472ac34ad880965c47510eb9768"
 }