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

package/lib/blocklet/manager/disk.js

@@ -5,7 +5,6 @@ const path = require('path');
 const flat = require('flat');
 const get = require('lodash/get');
 const omit = require('lodash/omit');
-const uniq = require('lodash/uniq');
 const merge = require('lodash/merge');
 const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
@@ -1010,7 +1009,7 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('configs list is not an array');
     }
 
-    const tmpDids = Array.isArray(did) ? uniq(did) : [did];
+    const tmpDids = Array.isArray(did) ? did : [did];
     const [rootDid, ...childDids] = tmpDids;
     const rootMetaDid = await states.blocklet.getBlockletMetaDid(rootDid);
     const dids = [rootMetaDid, ...childDids];
@@ -1993,7 +1992,7 @@ class BlockletManager extends BaseBlockletManager {
         });
       }
 
-      if (blocklet.controller && process.env.NODE_ENV !== 'test') {
+      if (blocklet?.controller?.nftId && process.env.NODE_ENV !== 'test') {
         const nodeInfo = await states.node.read();
         await consumeServerlessNFT({ nftId: blocklet.controller.nftId, nodeInfo, blocklet });
         this.emit(BlockletEvents.nftConsumed, { blocklet, context });
@@ -2273,19 +2272,6 @@ class BlockletManager extends BaseBlockletManager {
     fs.removeSync(cacheDir);
     await this._cleanBlockletData({ blocklet, keepData, keepLogsDir, keepConfigs });
 
-    if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
-      const nodeInfo = await states.node.read();
-      const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-      didDocument
-        .disableBlockletDNS({ appPid: blocklet.appPid, wallet, didRegistryUrl: nodeInfo.didRegistry })
-        .then(() => {
-          logger.info(`disabled blocklet ${blocklet.appPid} dns`);
-        })
-        .catch((err) => {
-          logger.error(`disable blocklet ${blocklet.appPid} dns failed`, { error: err });
-        });
-    }
-
     const result = await states.blocklet.deleteBlocklet(did);
     logger.info('blocklet removed successfully', { did });
 

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -67,7 +67,15 @@ const installApplicationFromBackup = async ({
   const { meta } = blockletState;
   const { did, name: appName } = meta;
 
-  const extra = omit(fs.readJSONSync(path.join(dir, 'blocklet-extras.json')), ['_id', 'createdAt', 'updatedAt']);
+  const extra = omit(fs.readJSONSync(path.join(dir, 'blocklet-extras.json')), [
+    '_id',
+    'createdAt',
+    'updatedAt',
+    'controller.nftId',
+    'controller.nftOwner',
+    'controller.chainHost',
+    'controller.appMaxCount',
+  ]);
 
   if (blockletState.meta.did !== extra.did) {
     throw new Error(

package/lib/blocklet/manager/helper/install-application-from-dev.js

@@ -1,5 +1,4 @@
 const { BlockletStatus, BLOCKLET_MODES, fromBlockletStatus, BlockletSource } = require('@blocklet/constant');
-const toDid = require('@blocklet/meta/lib/did');
 
 const logger = require('@abtnode/logger')('@abtnode/core:install-app-dev');
 const { ensureMeta, updateBlockletFallbackLogo, ensureAppLogo } = require('../../../util/blocklet');
@@ -13,10 +12,7 @@ const { ensureMeta, updateBlockletFallbackLogo, ensureAppLogo } = require('../..
  * @returns
  */
 const installApplicationFromDev = async ({ folder, meta, states, manager } = {}) => {
-  const { version } = meta;
-
-  const name = `${meta.name}-dev`;
-  const did = toDid(name);
+  const { version, name, did } = meta;
 
   const exist = await states.blocklet.getBlocklet(did);
   if (exist) {

package/lib/states/blocklet-extras.js

@@ -5,7 +5,6 @@ const logger = require('@abtnode/logger')('state-blocklet-extras');
 const { EXPIRED_BLOCKLET_DATA_RETENTION_DAYS } = require('@abtnode/constant');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
-const uniq = require('lodash/uniq');
 const dayjs = require('dayjs');
 
 const BaseState = require('./base');
@@ -129,7 +128,7 @@ class BlockletExtrasState extends BaseState {
   generateGetFn(extra) {
     return async (dids, path, defaultValue) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, afterGet = noop('data') } = extra;
@@ -152,7 +151,7 @@ class BlockletExtrasState extends BaseState {
   generateSetFn(extra) {
     return async (dids, data) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { dek } = this.config;
       const { name, beforeSet = noop('cur') } = extra;
@@ -192,7 +191,7 @@ class BlockletExtrasState extends BaseState {
   generateDelFn(extra) {
     return async (dids) => {
       // eslint-disable-next-line no-param-reassign
-      dids = uniq([].concat(dids));
+      dids = [].concat(dids);
       const [rootDid, ...childDids] = dids;
       const { name } = extra;
       const item = await this.findOne({ did: rootDid });

package/lib/util/blocklet.js

@@ -28,6 +28,8 @@ const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
+const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
+const killProcessOccupiedPorts = require('@abtnode/util/lib/kill-process-occupied-ports');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { formatEnv } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
@@ -526,6 +528,14 @@ const startBlockletProcess = async (
       // run hook
       await preStart(b, { env });
 
+      // kill process if port is occupied
+      try {
+        const { ports } = b;
+        await killProcessOccupiedPorts({ ports, pm2ProcessId: processId, printError: logger.error.bind(logger) });
+      } catch (error) {
+        logger.error('Failed to killProcessOccupiedPorts', { error });
+      }
+
       // start process
       const maxMemoryRestart = get(nodeInfo, 'runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB);
 
@@ -720,21 +730,8 @@ const getProcessState = async (processId) => {
   return statusMap[info.pm2_env.status];
 };
 
-const getProcessInfo = (processId) =>
-  new Promise((resolve, reject) => {
-    pm2.describe(processId, async (err, [info]) => {
-      if (err) {
-        logger.error('Failed to get blocklet status from pm2', { error: err });
-        return reject(err);
-      }
-
-      if (!info) {
-        return reject(new CustomError('BLOCKLET_PROCESS_404', 'Blocklet process info is not available'));
-      }
-
-      return resolve(info);
-    });
-  });
+const getProcessInfo = (processId, { throwOnNotExist = true } = {}) =>
+  getPm2ProcessInfo(processId, { printError: logger.error.bind(logger), throwOnNotExist });
 
 const deleteProcess = (processId) =>
   new Promise((resolve, reject) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-1fde60e3",
+  "version": "1.16.6-beta-7cbab489",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-1fde60e3",
-    "@abtnode/certificate-manager": "1.16.6-beta-1fde60e3",
-    "@abtnode/constant": "1.16.6-beta-1fde60e3",
-    "@abtnode/cron": "1.16.6-beta-1fde60e3",
-    "@abtnode/db": "1.16.6-beta-1fde60e3",
-    "@abtnode/logger": "1.16.6-beta-1fde60e3",
-    "@abtnode/queue": "1.16.6-beta-1fde60e3",
-    "@abtnode/rbac": "1.16.6-beta-1fde60e3",
-    "@abtnode/router-provider": "1.16.6-beta-1fde60e3",
-    "@abtnode/static-server": "1.16.6-beta-1fde60e3",
-    "@abtnode/timemachine": "1.16.6-beta-1fde60e3",
-    "@abtnode/util": "1.16.6-beta-1fde60e3",
+    "@abtnode/auth": "1.16.6-beta-7cbab489",
+    "@abtnode/certificate-manager": "1.16.6-beta-7cbab489",
+    "@abtnode/constant": "1.16.6-beta-7cbab489",
+    "@abtnode/cron": "1.16.6-beta-7cbab489",
+    "@abtnode/db": "1.16.6-beta-7cbab489",
+    "@abtnode/logger": "1.16.6-beta-7cbab489",
+    "@abtnode/queue": "1.16.6-beta-7cbab489",
+    "@abtnode/rbac": "1.16.6-beta-7cbab489",
+    "@abtnode/router-provider": "1.16.6-beta-7cbab489",
+    "@abtnode/static-server": "1.16.6-beta-7cbab489",
+    "@abtnode/timemachine": "1.16.6-beta-7cbab489",
+    "@abtnode/util": "1.16.6-beta-7cbab489",
     "@arcblock/did": "1.18.75",
     "@arcblock/did-auth": "1.18.75",
     "@arcblock/did-ext": "^1.18.75",
@@ -40,9 +40,9 @@
     "@arcblock/jwt": "^1.18.75",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.75",
-    "@blocklet/constant": "1.16.6-beta-1fde60e3",
-    "@blocklet/meta": "1.16.6-beta-1fde60e3",
-    "@blocklet/sdk": "1.16.6-beta-1fde60e3",
+    "@blocklet/constant": "1.16.6-beta-7cbab489",
+    "@blocklet/meta": "1.16.6-beta-7cbab489",
+    "@blocklet/sdk": "1.16.6-beta-7cbab489",
     "@did-space/client": "^0.2.83",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.75",
@@ -94,5 +94,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "be8d8eab7d210910e24dae3b389f2c70aa414a13"
+  "gitHead": "36b58c0651762472ac34ad880965c47510eb9768"
 }