@abtnode/core 1.5.17 → 1.5.21

package/lib/api/node.js

@@ -6,7 +6,6 @@ const isDocker = require('@abtnode/util/lib/is-docker');
 const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
-const { NODE_PACKAGE_NAME, NODE_COMMAND_NAME } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -96,7 +95,7 @@ class NodeAPI {
 
     if (entity.autoUpgrade) {
       try {
-        canPackageReadWrite(NODE_COMMAND_NAME, NODE_PACKAGE_NAME);
+        canPackageReadWrite(process.env.ABT_NODE_BINARY_NAME, process.env.ABT_NODE_PACKAGE_NAME);
       } catch (err) {
         throw new Error(`Auto upgrade is not supported for this node due to: ${err.message}`);
       }

package/lib/api/team.js

@@ -86,6 +86,7 @@ class TeamAPI extends EventEmitter {
           'passports',
           'firstLoginAt',
           'lastLoginAt',
+          'remark',
         ])
       // eslint-disable-next-line function-paren-newline
     );
@@ -296,7 +297,7 @@ class TeamAPI extends EventEmitter {
       throw new Error(`The invitation does not exist: ${inviteId}`);
     }
 
-    const { role, expireDate } = await state.read(inviteId);
+    const { role, expireDate, remark } = await state.read(inviteId);
 
     if (Date.now() > expireDate) {
       logger.error('Invite id has expired', { inviteId, expireAt: new Date(expireDate) });
@@ -315,6 +316,7 @@ class TeamAPI extends EventEmitter {
 
     return {
       role,
+      remark,
     };
   }
 

package/lib/migrations/1.5.20-registry.js

@@ -0,0 +1,15 @@
+module.exports = async ({ states, printInfo }) => {
+  printInfo('Try to rename Blocklet Registry to Blocklet Store in db...');
+
+  const info = await states.node.read();
+  (info.blockletRegistryList || []).forEach((item) => {
+    if (!item) {
+      return;
+    }
+    item.name = (item.name || '').replace('Registry', 'Store');
+    item.description = (item.description || '').replace('registry', 'store');
+    item.url = (item.url || '').replace('registry.arcblock.io', 'store.blocklet.dev');
+  });
+
+  await states.node.updateNodeInfo(info);
+};

package/lib/util/blocklet.js

@@ -852,7 +852,7 @@ const fixAndVerifyBlockletMeta = (meta, did) => {
   try {
     const result = verifyMultiSig(sanitized);
     if (!result) {
-      throw new Error('invalid signature from developer or registry');
+      throw new Error('invalid signature from developer or store');
     }
   } catch (err) {
     throw new Error(`Invalid blocklet meta: ${err.message}`);

package/lib/util/default-node-config.js

@@ -1,16 +1,9 @@
-const {
-  NODE_REGISTER_URL,
-  BLOCKLET_STORE_URL,
-  BLOCKLET_STORE_URL_DEV,
-  WEB_WALLET_URL,
-  NODE_PACKAGE_NAME,
-  NODE_COMMAND_NAME,
-} = require('@abtnode/constant');
+const { NODE_REGISTER_URL, BLOCKLET_STORE_URL, BLOCKLET_STORE_URL_DEV, WEB_WALLET_URL } = require('@abtnode/constant');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 
 const getDefaultAutoUpgrade = () => {
   try {
-    return canPackageReadWrite(NODE_COMMAND_NAME, NODE_PACKAGE_NAME);
+    return canPackageReadWrite(process.env.ABT_NODE_BINARY_NAME, process.env.ABT_NODE_PACKAGE_NAME);
   } catch (err) {
     return false;
   }

package/lib/util/upgrade.js

@@ -2,7 +2,7 @@
 const axon = require('axon');
 const semver = require('semver');
 const sleep = require('@abtnode/util/lib/sleep');
-const { NODE_PACKAGE_NAME, NODE_MODES, NODE_UPGRADE_PROGRESS } = require('@abtnode/constant');
+const { NODE_MODES, NODE_UPGRADE_PROGRESS } = require('@abtnode/constant');
 const listNpmPackageVersion = require('@abtnode/util/lib/list-npm-package-version');
 const Lock = require('@abtnode/util/lib/lock');
 const logger = require('@abtnode/logger')('@abtnode/core:upgrade');
@@ -31,7 +31,12 @@ const checkNewVersion = async (params, context) => {
       return '';
     }
 
-    const versions = await listNpmPackageVersion(NODE_PACKAGE_NAME);
+    if (!process.env.ABT_NODE_PACKAGE_NAME) {
+      logger.error('ABT_NODE_PACKAGE_NAME name was not found in environment');
+      return '';
+    }
+
+    const versions = await listNpmPackageVersion(process.env.ABT_NODE_PACKAGE_NAME);
     if (Array.isArray(versions) && versions.length) {
       const latestVersion = versions[0].version;
       if (semver.gt(latestVersion, info.version)) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.17",
+  "version": "1.5.21",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,26 +19,26 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.5.17",
-    "@abtnode/cron": "1.5.17",
-    "@abtnode/logger": "1.5.17",
-    "@abtnode/queue": "1.5.17",
-    "@abtnode/rbac": "1.5.17",
-    "@abtnode/router-provider": "1.5.17",
-    "@abtnode/static-server": "1.5.17",
-    "@abtnode/timemachine": "1.5.17",
-    "@abtnode/util": "1.5.17",
-    "@arcblock/did": "^1.13.61",
-    "@arcblock/event-hub": "1.13.61",
+    "@abtnode/constant": "1.5.21",
+    "@abtnode/cron": "1.5.21",
+    "@abtnode/logger": "1.5.21",
+    "@abtnode/queue": "1.5.21",
+    "@abtnode/rbac": "1.5.21",
+    "@abtnode/router-provider": "1.5.21",
+    "@abtnode/static-server": "1.5.21",
+    "@abtnode/timemachine": "1.5.21",
+    "@abtnode/util": "1.5.21",
+    "@arcblock/did": "^1.13.65",
+    "@arcblock/event-hub": "1.13.65",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.61",
-    "@blocklet/meta": "1.5.17",
+    "@arcblock/vc": "^1.13.65",
+    "@blocklet/meta": "1.5.21",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.61",
-    "@ocap/util": "^1.13.61",
-    "@ocap/wallet": "^1.13.61",
+    "@ocap/mcrypto": "^1.13.65",
+    "@ocap/util": "^1.13.65",
+    "@ocap/wallet": "^1.13.65",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -73,5 +73,5 @@
     "express": "^4.17.1",
     "jest": "^27.3.1"
   },
-  "gitHead": "d4190f30661adf4bef268440d26f270c0c21305d"
+  "gitHead": "db219f519704e8c7ebe60f8448ec6c447ac4e059"
 }