@abtnode/core 1.16.8-next-199ae4cb → 1.16.8-next-bcc85536

package/lib/migrations/1.16.6-chain-info.js

@@ -71,7 +71,7 @@ module.exports = async ({ states, printInfo }) => {
     }
 
     if (shouldUpdate) {
-      await states.blockletExtras.update({ _id: extra._id }, { $set: { configs: appConfigs } });
+      await states.blockletExtras.update({ did: extra.did }, { $set: { configs: appConfigs } });
       printInfo(`Blocklet in blocklet_extra.db updated: ${extra.did}`);
     }
   }

package/lib/processes/updater.js

@@ -51,17 +51,25 @@ const getInstaller = () => {
 const getBinaryDir = () => {
   const installer = getInstaller();
   if (installer === 'pnpm') {
-    const { stdout: binaryDir } = shell.exec('pnpm bin -g', { silent: true });
-    return binaryDir.trim();
+    const { stdout: binaryDir, code } = shell.exec('pnpm bin -g', { silent: true });
+    if (code === 0) {
+      return binaryDir.trim();
+    }
   }
 
   if (installer === 'yarn') {
-    const { stdout: binaryDir } = shell.exec(`yarn global bin ${BINARY_NAME}`, { silent: true });
-    return binaryDir.trim();
+    const { stdout: binaryDir, code } = shell.exec(`yarn global bin ${BINARY_NAME}`, { silent: true });
+    if (code === 0) {
+      return binaryDir.trim();
+    }
+  }
+
+  const { stdout: binaryDir, code } = shell.exec('npm root -g', { silent: true });
+  if (code === 0) {
+    return path.join(binaryDir.trim(), '../../bin');
   }
 
-  const { stdout: binaryDir } = shell.exec(`npm bin -g ${BINARY_NAME}`, { silent: true });
-  return binaryDir.trim();
+  return '';
 };
 
 const installBlockletServer = async (version) => {
@@ -125,7 +133,7 @@ const restartBlockletServer = async (dataDir) => {
   return dataDir;
 };
 
-// Start the server
+// Start the updater
 const sock = axon.socket('rep');
 const port = Number(process.env.ABT_NODE_UPDATER_PORT);
 sock.bind(port, '127.0.0.1');

package/lib/states/access-key.js

@@ -1,7 +1,7 @@
 const get = require('lodash/get');
 const { fromRandom } = require('@ocap/wallet');
 const { toBase58 } = require('@ocap/util');
-const logger = require('@abtnode/logger')('@abtnode/core:access-key');
+const logger = require('@abtnode/logger')('@abtnode/core:states:access-key');
 const BaseState = require('./base');
 
 const validateRemark = (remark) => {

package/lib/states/base.js

@@ -1,5 +1,5 @@
 const { BaseState } = require('@abtnode/models');
-const logger = require('@abtnode/logger')('@abtnode/core:states');
+const logger = require('@abtnode/logger')('@abtnode/core:states:base');
 
 const { isCLI } = require('../util');
 

package/lib/states/blocklet-extras.js

@@ -1,7 +1,7 @@
 /* eslint-disable function-paren-newline */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable consistent-return */
-const logger = require('@abtnode/logger')('state-blocklet-extras');
+const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet-extras');
 const { EXPIRED_BLOCKLET_DATA_RETENTION_DAYS } = require('@abtnode/constant');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');

package/lib/states/blocklet.js

@@ -19,7 +19,7 @@ const {
 const { BlockletStatus, BlockletSource, BLOCKLET_MODES, BLOCKLET_DEFAULT_PORT_NAME } = require('@blocklet/constant');
 const { APP_STRUCT_VERSION } = require('@abtnode/constant');
 
-const logger = require('@abtnode/logger')('state-blocklet');
+const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet');
 
 const BaseState = require('./base');
 const { checkDuplicateComponents, ensureMeta } = require('../util/blocklet');

package/lib/states/index.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { createSequelize, createStateFactory, getServerModels, setupModels } = require('@abtnode/models');
+const logger = require('@abtnode/logger')('@abtnode/core:states');
 
 const NodeState = require('./node');
 const BlockletState = require('./blocklet');
@@ -22,7 +23,7 @@ const init = (dataDirs, config = {}) => {
   const dbPath = getDbFilePath(path.join(dataDirs.core, 'server.db'));
   const sequelize = createSequelize(dbPath);
   setupModels(models, sequelize);
-  console.info(`Init server states in ${dbPath}`); // eslint-disable-line
+  logger.info(`Init server states in ${dbPath}`);
 
   const notificationState = new NotificationState(models.Notification, config);
   const nodeState = new NodeState(models.Server, config, dataDirs, notificationState);

package/lib/states/node.js

@@ -5,7 +5,7 @@ const isEmpty = require('lodash/isEmpty');
 const security = require('@abtnode/util/lib/security');
 const { isFromPublicKey } = require('@arcblock/did');
 const { NODE_MODES, DISK_ALERT_THRESHOLD_PERCENT, EVENTS, SERVER_STATUS } = require('@abtnode/constant');
-// const logger = require('@abtnode/logger')('@abtnode/core:node');
+// const logger = require('@abtnode/logger')('@abtnode/core:states:node');
 
 const BaseState = require('./base');
 const { validateOwner } = require('../util');

package/lib/util/rpc.js

@@ -42,6 +42,7 @@ const startRpcServer = async () => {
     env: {
       PATH: process.env.PATH,
       PM2_HOME: process.env.PM2_HOME,
+      NODE_ENV: 'production',
       ABT_NODE_UPDATER_PORT: process.env.ABT_NODE_UPDATER_PORT,
       ABT_NODE_PACKAGE_NAME: process.env.ABT_NODE_PACKAGE_NAME,
       ABT_NODE_BINARY_NAME: process.env.ABT_NODE_BINARY_NAME,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-next-199ae4cb",
+  "version": "1.16.8-next-bcc85536",
   "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.8-next-199ae4cb",
-    "@abtnode/certificate-manager": "1.16.8-next-199ae4cb",
-    "@abtnode/constant": "1.16.8-next-199ae4cb",
-    "@abtnode/cron": "1.16.8-next-199ae4cb",
-    "@abtnode/logger": "1.16.8-next-199ae4cb",
-    "@abtnode/models": "1.16.8-next-199ae4cb",
-    "@abtnode/queue": "1.16.8-next-199ae4cb",
-    "@abtnode/rbac": "1.16.8-next-199ae4cb",
-    "@abtnode/router-provider": "1.16.8-next-199ae4cb",
-    "@abtnode/static-server": "1.16.8-next-199ae4cb",
-    "@abtnode/timemachine": "1.16.8-next-199ae4cb",
-    "@abtnode/util": "1.16.8-next-199ae4cb",
+    "@abtnode/auth": "1.16.8-next-bcc85536",
+    "@abtnode/certificate-manager": "1.16.8-next-bcc85536",
+    "@abtnode/constant": "1.16.8-next-bcc85536",
+    "@abtnode/cron": "1.16.8-next-bcc85536",
+    "@abtnode/logger": "1.16.8-next-bcc85536",
+    "@abtnode/models": "1.16.8-next-bcc85536",
+    "@abtnode/queue": "1.16.8-next-bcc85536",
+    "@abtnode/rbac": "1.16.8-next-bcc85536",
+    "@abtnode/router-provider": "1.16.8-next-bcc85536",
+    "@abtnode/static-server": "1.16.8-next-bcc85536",
+    "@abtnode/timemachine": "1.16.8-next-bcc85536",
+    "@abtnode/util": "1.16.8-next-bcc85536",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.8-next-199ae4cb",
-    "@blocklet/meta": "1.16.8-next-199ae4cb",
-    "@blocklet/sdk": "1.16.8-next-199ae4cb",
+    "@blocklet/constant": "1.16.8-next-bcc85536",
+    "@blocklet/meta": "1.16.8-next-bcc85536",
+    "@blocklet/sdk": "1.16.8-next-bcc85536",
     "@did-space/client": "^0.2.91",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a3c52c2929d25254f33a08eca0261fbf4dbc7b4c"
+  "gitHead": "27f3858f8138d08c68420a78f3cd4c9437e10170"
 }