@abtnode/core 1.6.15 → 1.6.16

package/lib/blocklet/manager/disk.js

@@ -12,7 +12,7 @@ const LRU = require('lru-cache');
 
 const { isValid: isValidDid } = require('@arcblock/did');
 const { verifyPresentation } = require('@arcblock/vc');
-const { toBase58 } = require('@ocap/util');
+const { toBase58, isHex } = require('@ocap/util');
 const { fromSecretKey } = require('@ocap/wallet');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
@@ -189,9 +189,9 @@ class BlockletManager extends BaseBlockletManager {
       }
     }
 
-    meta.isFree = isFree;
+    const blocklet = await states.blocklet.getBlocklet(meta.did);
 
-    return meta;
+    return { meta, isFree, isInstalled: !!blocklet };
   }
 
   async installBlockletFromVc({ vcPresentation, challenge }, context) {
@@ -549,6 +549,14 @@ class BlockletManager extends BaseBlockletManager {
         }
       }
 
+      if (x.key === 'BLOCKLET_PASSPORT_COLOR') {
+        if (x.value && x.value !== 'auto') {
+          if (x.value.length !== 7 || !isHex(x.value.slice(-6))) {
+            throw new Error('BLOCKLET_PASSPORT_COLOR must be a hex encoded color, eg. #ffeeaa');
+          }
+        }
+      }
+
       blocklet.configObj[x.key] = x.value;
     }
 
@@ -558,7 +566,6 @@ class BlockletManager extends BaseBlockletManager {
       hooks: Object.assign(blocklet.meta.hooks || {}, blocklet.meta.scripts || {}),
       exitOnError: true,
       env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments), ...blocklet.configObj },
-      notification: states.notification,
       did,
       context,
       progress: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT,

package/lib/event.js

@@ -182,7 +182,7 @@ module.exports = ({
       .catch((error) => logger.error('refresh blocklets failed on initialize the registry', { error }));
 
     // We need update router on some fields change
-    const fields = ['enableWelcomePage', 'webWalletUrl'];
+    const fields = ['enableWelcomePage', 'webWalletUrl', 'registerUrl'];
     const shouldUpdateRouter = fields.some((x) => nodeInfo[x] !== oldInfo[x]);
     if (shouldUpdateRouter) {
       handleRouting(nodeInfo).catch((err) => {

package/lib/index.js

@@ -50,6 +50,7 @@ const { toStatus, fromStatus, ensureDataDirs, getQueueConcurrencyByMem } = requi
  *   version
  *   runtimeConfig: {}
  *   autoUpgrade
+ *   registerUrl
  *   webWalletUrl
  */
 function ABTNode(options) {

package/lib/router/helper.js

@@ -244,6 +244,9 @@ const ensureLatestNodeInfo = async (sites = [], { withDefaultCors = true } = {})
       site.domain = DOMAIN_FOR_IP_SITE_REGEXP;
 
       if (withDefaultCors) {
+        // Allow CORS from "Install on ABT Node"
+        addCorsToSite(site, info.registerUrl);
+
         // Allow CORS from "Web Wallet"
         addCorsToSite(site, info.webWalletUrl);
       }
@@ -434,7 +437,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
     const https = get(info, 'routing.https', true);
     const dashboardDomain = get(info, 'routing.dashboardDomain', '');
-    const certDownloadAddress = get(info, 'routing.dashboardCertDownloadAddress', '');
+    const certDownloadAddress =
+      process.env.ABT_NODE_DASHBOARD_CERT_DOWN_URL || get(info, 'routing.dashboardCertDownloadAddress', '');
     if (!https || !dashboardDomain || !certDownloadAddress) {
       return;
     }
@@ -508,9 +512,9 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       return { status: 'existed' };
     }
 
-    logger.debug('downloading certificate', { url: downloadUrl, dashboardDomain });
+    logger.debug('downloading dashboard ip-domain certificate', { url: downloadUrl, dashboardDomain });
     await updateDashboardCertificate({ checkExpire: false });
-    logger.debug('downloading certificate', { url: downloadUrl, dashboardDomain });
+    logger.debug('downloaded dashboard ip-domain certificate', { url: downloadUrl, dashboardDomain });
     return { status: 'downloaded' };
   };
 

package/lib/states/blocklet.js

@@ -4,6 +4,7 @@
 /* eslint-disable no-underscore-dangle */
 const omit = require('lodash/omit');
 const uniq = require('lodash/uniq');
+const cloneDeep = require('lodash/cloneDeep');
 const detectPort = require('detect-port');
 const Lock = require('@abtnode/util/lib/lock');
 const security = require('@abtnode/util/lib/security');
@@ -119,7 +120,7 @@ class BlockletState extends BaseState {
             }
 
             this.emit('remove', doc);
-            return resolve(doc);
+            return resolve(formatBlocklet(doc, 'onRead', this.options.dek));
           });
         })
     );
@@ -196,7 +197,7 @@ class BlockletState extends BaseState {
           }
 
           try {
-            const formatted = formatBlocklet(updates, 'onUpdate', this.options.dek);
+            const formatted = formatBlocklet(cloneDeep(updates), 'onUpdate', this.options.dek);
             const newDoc = await this.updateById(doc._id, { $set: formatted });
             resolve(newDoc);
           } catch (err) {
@@ -247,8 +248,10 @@ class BlockletState extends BaseState {
               },
             });
             lock.release();
-            this.emit('upgrade', newDoc);
-            resolve(newDoc);
+
+            const formatted = formatBlocklet(newDoc, 'onRead', this.options.dek);
+            this.emit('upgrade', formatted);
+            resolve(formatted);
           } catch (err) {
             lock.release();
             reject(err);
@@ -392,11 +395,12 @@ class BlockletState extends BaseState {
     if (typeof status === 'undefined') {
       throw new Error('Unsupported blocklet status');
     }
-    const record = await this.getBlocklet(did);
-    // when status change update record
-    if (record.status === status) {
-      return record;
+
+    const doc = await this.getBlocklet(did);
+    if (doc.status === status) {
+      return formatBlocklet(doc, 'onRead', this.options.dek);
     }
+
     const updates = { status, startedAt: undefined, stoppedAt: undefined };
     if (status === BlockletStatus.running) {
       updates.startedAt = new Date();
@@ -408,10 +412,8 @@ class BlockletState extends BaseState {
       updates.stoppedAt = new Date();
     }
 
-    const res = await this.update(record._id, {
-      $set: updates,
-    });
-    return res;
+    await this.update(doc._id, { $set: updates });
+    return formatBlocklet({ ...doc, ...updates }, 'onRead', this.options.dek);
   }
 
   getChildrenFromMetas(childrenMeta) {

package/lib/util/blocklet.js

@@ -41,6 +41,7 @@ const { forEachBlocklet } = require('@blocklet/meta/lib/util');
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
 
 const isRequirementsSatisfied = require('./requirement');
+const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { getServices } = require('./service');
 const {
   isBeforeInstalled,
@@ -247,12 +248,16 @@ const getRootSystemEnvironments = (blocklet, nodeInfo) => {
   const appName = title || name || result.name;
   const appDescription = description || result.description;
 
+  // FIXME: we should use https here when possible, eg, when did-gateway is available
+  const appUrl = `http://${getDidDomainForBlocklet({ appId, didDomain: nodeInfo.didDomain })}`;
+
   return {
     BLOCKLET_DID: did,
     BLOCKLET_APP_SK: appSk,
     BLOCKLET_APP_ID: appId,
     BLOCKLET_APP_NAME: appName,
     BLOCKLET_APP_DESCRIPTION: appDescription,
+    BLOCKLET_APP_URL: appUrl,
   };
 };
 

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

@@ -35,7 +35,7 @@ const defaultNodeConfigs = {
       },
     ],
   },
-  registerUrl: { getDefaultValue: () => NODE_REGISTER_URL }, // removed in 1.5.1
+  registerUrl: { getDefaultValue: () => NODE_REGISTER_URL },
   webWalletUrl: { getDefaultValue: () => WEB_WALLET_URL },
 };
 

package/lib/validators/node.js

@@ -9,14 +9,23 @@ const nodeInfoSchema = Joi.object({
   description: Joi.string()
     .required()
     .messages({ zh: { 'string.empty': '描述不能为空' }, en: { 'string.empty': 'Description cannot be empty' } }),
+  registerUrl: Joi.string()
+    .uri({ scheme: [/https?/] })
+    .label('register url')
+    .allow('')
+    .optional()
+    .messages({
+      zh: { 'string.uriCustomScheme': '应用启动器必须是合法的 URL' },
+      en: { 'string.uriCustomScheme': 'Blocklet Launcher must be a valid URL' },
+    }),
   webWalletUrl: Joi.string()
     .uri({ scheme: [/https?/] })
     .label('web wallet url')
     .allow('')
     .optional()
     .messages({
-      zh: { 'string.uriCustomScheme': 'Web DID Wallet 必须是合法的 URL' },
-      en: { 'string.uriCustomScheme': 'Web DID Wallet must be a valid URL' },
+      zh: { 'string.uriCustomScheme': 'Web Wallet 必须是合法的 URL' },
+      en: { 'string.uriCustomScheme': 'Web Wallet must be a valid URL' },
     }),
   autoUpgrade: Joi.boolean(),
   enableWelcomePage: Joi.boolean(),
@@ -31,16 +40,6 @@ const nodeInfoSchema = Joi.object({
         'number.max': 'Disk usage alert threshold cannot be higher than 99%',
       },
     }),
-  // removed in 1.5.1
-  registerUrl: Joi.string()
-    .uri({ scheme: [/https?/] })
-    .label('register url')
-    .allow('')
-    .optional()
-    .messages({
-      zh: { 'string.uriCustomScheme': '注册地址必须是合法的 URL' },
-      en: { 'string.uriCustomScheme': 'Registry URL must be a valid URL' },
-    }),
 }).options({ stripUnknown: true });
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.15",
-    "@abtnode/constant": "1.6.15",
-    "@abtnode/cron": "1.6.15",
-    "@abtnode/db": "1.6.15",
-    "@abtnode/logger": "1.6.15",
-    "@abtnode/queue": "1.6.15",
-    "@abtnode/rbac": "1.6.15",
-    "@abtnode/router-provider": "1.6.15",
-    "@abtnode/static-server": "1.6.15",
-    "@abtnode/timemachine": "1.6.15",
-    "@abtnode/util": "1.6.15",
-    "@arcblock/did": "^1.13.84",
-    "@arcblock/event-hub": "1.13.84",
+    "@abtnode/certificate-manager": "1.6.16",
+    "@abtnode/constant": "1.6.16",
+    "@abtnode/cron": "1.6.16",
+    "@abtnode/db": "1.6.16",
+    "@abtnode/logger": "1.6.16",
+    "@abtnode/queue": "1.6.16",
+    "@abtnode/rbac": "1.6.16",
+    "@abtnode/router-provider": "1.6.16",
+    "@abtnode/static-server": "1.6.16",
+    "@abtnode/timemachine": "1.6.16",
+    "@abtnode/util": "1.6.16",
+    "@arcblock/did": "^1.14.3",
+    "@arcblock/event-hub": "1.14.3",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.13.84",
-    "@blocklet/meta": "1.6.15",
+    "@arcblock/vc": "^1.14.3",
+    "@blocklet/meta": "1.6.16",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.13.84",
-    "@ocap/util": "^1.13.84",
-    "@ocap/wallet": "^1.13.84",
+    "@ocap/mcrypto": "^1.14.3",
+    "@ocap/util": "^1.14.3",
+    "@ocap/wallet": "^1.14.3",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.21.4",
     "axon": "^2.0.3",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "1b7b07da04387b1daa838b251a9388355009142d"
+  "gitHead": "69b08db16aeb75ce23b0e6bb5b9fa396adba2d4b"
 }