@abtnode/core 1.7.27 → 1.8.2

package/lib/api/node.js

@@ -7,6 +7,7 @@ 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 { toDelegateAddress } = require('@arcblock/did-util');
+const { STORE_DETAIL_PAGE_PATH_PREFIX } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -40,7 +41,19 @@ class NodeAPI {
   // eslint-disable-next-line no-unused-vars
   async addRegistry({ url }, context) {
     logger.info('add registry', { url });
-    const sanitized = sanitizeUrl(url);
+
+    const urlObj = new URL(url);
+    let newUrl = urlObj.origin;
+
+    // if the pathname is store blocklet list or blocklet detail
+    if (urlObj.pathname?.includes(STORE_DETAIL_PAGE_PATH_PREFIX)) {
+      const lastIndex = urlObj.pathname.lastIndexOf(STORE_DETAIL_PAGE_PATH_PREFIX);
+      const pathnamePrefix = urlObj.pathname.substring(0, lastIndex);
+      newUrl = `${newUrl}${pathnamePrefix || ''}`;
+    }
+
+    const sanitized = sanitizeUrl(newUrl);
+
     const info = await this.state.read();
     const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
     if (exist) {

package/lib/blocklet/manager/disk.js

@@ -22,6 +22,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
 const downloadFile = require('@abtnode/util/lib/download-file');
 const Lock = require('@abtnode/util/lib/lock');
 const { getVcFromPresentation } = require('@abtnode/util/lib/vc');
+const handleInstanceInStore = require('@abtnode/util/lib/public-to-store');
 const { VC_TYPE_BLOCKLET_PURCHASE } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -216,6 +217,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {{
    *  url: string;
    *  sync: boolean = false;
+   *  downloadToken: string;
    * }} params
    * @param {{
    *  [key: string]: any
@@ -223,9 +225,22 @@ class BlockletManager extends BaseBlockletManager {
    * @return {*}
    * @memberof BlockletManager
    */
-  async install(params, context) {
+  async install(params, context = {}) {
     logger.debug('install blocklet', { params, context });
 
+    if (params.downloadToken) {
+      const info = await states.node.read();
+
+      context.headers = Object.assign(context?.headers || {}, {
+        'x-server-did': info.did,
+        'x-download-token': params.downloadToken,
+        'x-server-publick-key': info.pk,
+        'x-server-signature': sign(info.did, info.sk, {
+          exp: (Date.now() + 5 * 60 * 1000) / 1000,
+        }),
+      });
+    }
+
     const source = getSourceFromInstallParams(params);
     if (typeof context.startImmediately === 'undefined') {
       context.startImmediately = !!params.startImmediately;
@@ -319,10 +334,12 @@ class BlockletManager extends BaseBlockletManager {
       }
     }
 
+    const { inStore, registryUrl } = await parseSourceUrl(url);
+
     const blocklet = await states.blocklet.getBlocklet(meta.did);
     const isRunning = blocklet ? blocklet.status === BlockletStatus.running : false;
 
-    return { meta, isFree, isInstalled: !!blocklet, isRunning };
+    return { meta, isFree, isInstalled: !!blocklet, isRunning, inStore, registryUrl };
   }
 
   async installBlockletFromVc({ vcPresentation, challenge }, context) {
@@ -423,7 +440,7 @@ class BlockletManager extends BaseBlockletManager {
 
       await this.deleteProcess({ did });
       const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error);
-      this.emit(BlockletEvents.startFailed, res);
+      this.emit(BlockletEvents.startFailed, { ...res, error: { message: error.message } });
 
       if (throwOnError) {
         throw new Error(description);
@@ -601,7 +618,7 @@ class BlockletManager extends BaseBlockletManager {
   async deleteComponent({ did, rootDid, keepData, keepState }, context) {
     logger.info('delete blocklet component', { did, rootDid, keepData });
 
-    const blocklet = await this.ensureBlocklet(rootDid);
+    const blocklet = await this.ensureBlocklet(rootDid, { validateEnv: false });
     const child = blocklet.children.find((x) => x.meta.did === did);
     if (!child) {
       throw new Error('Component does not exist');
@@ -708,7 +725,7 @@ class BlockletManager extends BaseBlockletManager {
 
     if (!attachRuntimeInfo) {
       try {
-        const blocklet = await this.ensureBlocklet(did);
+        const blocklet = await this.ensureBlocklet(did, { throwOnNotExist: false });
         return blocklet;
       } catch (e) {
         logger.error('get blocklet detail error', { error: e.message });
@@ -851,6 +868,18 @@ class BlockletManager extends BaseBlockletManager {
     return newState;
   }
 
+  async configPublicToStore({ did, publicToStore = false }) {
+    const blocklet = await this.ensureBlocklet(did);
+    // publicToStore 由用户传入
+    // handleInstanceInStore 方法写在前面，保证向 store 操作成功后才会更改 blocklet 中的 publicToStore值
+    // handleInstanceInStore 中会校验修改 publicToStore字段 的条件，不符合则会抛错，就不会执行下面更新 publicToStore 的逻辑
+    await handleInstanceInStore(blocklet, { publicToStore });
+    await states.blockletExtras.setSettings(did, { publicToStore });
+
+    const newState = await this.ensureBlocklet(did);
+    return newState;
+  }
+
   /**
    * upgrade blocklet from registry
    */
@@ -1230,14 +1259,17 @@ class BlockletManager extends BaseBlockletManager {
     return rootBlocklet;
   }
 
-  async ensureBlocklet(did, { e2eMode = false, validateEnv = true } = {}) {
+  async ensureBlocklet(did, { e2eMode = false, validateEnv = true, throwOnNotExist = true } = {}) {
     if (!isValidDid(did)) {
       throw new Error(`Blocklet did is invalid: ${did}`);
     }
 
     const blocklet = await states.blocklet.getBlocklet(did);
     if (!blocklet) {
-      throw new Error(`Can not find blocklet in database by did ${did}`);
+      if (throwOnNotExist) {
+        throw new Error(`Can not find blocklet in database by did ${did}`);
+      }
+      return null;
     }
 
     // app settings
@@ -1272,6 +1304,10 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
+  async hasBlocklet({ did }) {
+    return states.blocklet.hasBlocklet(did);
+  }
+
   async setInitialized({ did, owner }) {
     if (!validateOwner(owner)) {
       throw new Error('Blocklet owner is invalid');
@@ -1339,7 +1375,12 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     try {
-      let blocklet = await this.ensureBlocklet(did);
+      let blocklet = await this.ensureBlocklet(did, { throwOnNotExist: false });
+
+      if (!blocklet) {
+        return null;
+      }
+
       const fromCache = !!cachedBlocklet;
 
       // if from cached data, only use cache data of runtime info (engine, diskInfo, runtimeInfo...)
@@ -1487,7 +1528,12 @@ class BlockletManager extends BaseBlockletManager {
 
       preDownloadLock.release();
 
-      this.emit(BlockletEvents.downloadFailed, { meta: did });
+      this.emit(BlockletEvents.downloadFailed, {
+        meta: { did },
+        error: {
+          message: err.message,
+        },
+      });
       states.notification.create({
         title: 'Blocklet Download Failed',
         description: `Blocklet ${name}@${version} download failed with error: ${err.message}`,
@@ -1778,10 +1824,12 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('Root blocklet does not exist');
     }
 
+    const { inStore } = await parseSourceUrl(url);
+
     const meta = await getBlockletMetaFromUrl(url);
 
-    // 如果是一个付费的blocklet,需要携带token才能下载成功
-    if (!isFreeBlocklet(meta)) {
+    // 如果是一个付费的blocklet,并且url来源为Store, 需要携带token才能下载成功
+    if (!isFreeBlocklet(meta) && inStore) {
       const info = await states.node.read();
 
       // eslint-disable-next-line no-param-reassign
@@ -2617,7 +2665,12 @@ class BlockletManager extends BaseBlockletManager {
       logger.error('failed to install blocklet', { name, did, version, error: err });
       try {
         await this._rollback('install', did, oldBlocklet);
-        this.emit(BlockletEvents.installFailed, { meta: { did } });
+        this.emit(BlockletEvents.installFailed, {
+          meta: { did },
+          error: {
+            message: err.message,
+          },
+        });
         states.notification.create({
           title: 'Blocklet Install Failed',
           description: `Blocklet ${meta.name}@${meta.version} install failed with error: ${err.message}`,

package/lib/cert.js

@@ -103,14 +103,16 @@ class Cert extends EventEmitter {
 
   async add(data) {
     if (!data.certificate || !data.privateKey) {
-      throw new Error('certificate and privateKey is required');
+      throw new Error('certificate and privateKey are required');
     }
 
     Cert.fixCertificate(data);
 
-    await this.manager.add(data);
-    logger.info('add certificate result', { name: data.name });
-    this.emit('cert.added', data);
+    const result = await this.manager.add(data);
+    logger.info('add certificate result', { name: result.name });
+    this.emit('cert.added', result);
+
+    return result;
   }
 
   async issue({ domain }) {
@@ -120,7 +122,10 @@ class Cert extends EventEmitter {
   }
 
   async upsertByDomain(data) {
-    return this.manager.upsertByDomain(data);
+    const result = await this.manager.upsertByDomain(data);
+    this.emit('cert.updated', result);
+
+    return result;
   }
 
   async update(data) {

package/lib/event.js

@@ -5,6 +5,7 @@ const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
 const { BLOCKLET_MODES, BlockletStatus, BlockletSource, BlockletEvents } = require('@blocklet/meta/lib/constants');
 const { EVENTS } = require('@abtnode/constant');
+const handleInstanceInStore = require('@abtnode/util/lib/public-to-store');
 
 const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
@@ -160,6 +161,17 @@ module.exports = ({
       await handleBlockletUpgrade(eventName, payload);
     } else if ([BlockletEvents.removed].includes(eventName)) {
       await handleBlockletRemove(eventName, payload);
+    } else if ([BlockletEvents.started].includes(eventName)) {
+      try {
+        const blocklet = await blockletManager.ensureBlocklet(payload.meta.did);
+        const { publicToStore } = blocklet.settings;
+        // 如果一个 blocklet 没有设置 publicToStore，启动成功后不应给 store 发请求
+        if (publicToStore) {
+          await handleInstanceInStore(blocklet, { publicToStore });
+        }
+      } catch (error) {
+        logger.error('BlockletEvents started failed', { error });
+      }
     }
 
     if (payload.blocklet && !payload.meta) {

package/lib/index.js

@@ -226,6 +226,7 @@ function ABTNode(options) {
     getLatestBlockletVersion: blockletManager.getLatestBlockletVersion.bind(blockletManager),
     getBlockletMetaFromUrl: blockletManager.getMetaFromUrl.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
+    configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
 
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),
 
@@ -237,6 +238,7 @@ function ABTNode(options) {
     getBlocklets: blockletManager.list.bind(blockletManager),
     getBlocklet: blockletManager.detail.bind(blockletManager),
     getBlockletDiff: blockletManager.diff.bind(blockletManager),
+    hasBlocklet: blockletManager.hasBlocklet.bind(blockletManager),
     updateAllBlockletEnvironment: blockletManager.updateAllBlockletEnvironment.bind(blockletManager),
     setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
 

package/lib/router/helper.js

@@ -434,7 +434,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         isProtected: true,
       });
 
-      logger.info('dashboard certificate updated');
+      logger.info('dashboard certificate updated', { domain });
     } catch (error) {
       logger.error('update dashboard certificate failed', { error });
       throw error;
@@ -1103,6 +1103,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       certManager.on('cert.added', () => providers[providerName].reload());
       certManager.on('cert.removed', () => providers[providerName].reload());
       certManager.on('cert.issued', () => providers[providerName].reload());
+      certManager.on('cert.updated', () => providers[providerName].reload());
 
       await providers[providerName].start();
     }

package/lib/router/manager.js

@@ -8,7 +8,6 @@ const path = require('path');
 const os = require('os');
 const fse = require('fs-extra');
 const get = require('lodash/get');
-const { Certificate, PrivateKey } = require('@fidm/x509');
 const { EventEmitter } = require('events');
 const uuid = require('uuid');
 const isUrl = require('is-url');
@@ -564,39 +563,6 @@ class RouterManager extends EventEmitter {
     }
   }
 
-  validateCertificate(cert, domain) {
-    const certificate = Certificate.fromPEM(cert.certificate);
-    const privateKey = PrivateKey.fromPEM(cert.privateKey);
-
-    const data = Buffer.allocUnsafe(100);
-    const signature = privateKey.sign(data, 'sha512');
-    if (!certificate.publicKey.verify(data, signature, 'sha512')) {
-      throw new Error('Invalid certificate: signature verify failed');
-    }
-
-    const certDomain = get(certificate, 'subject.commonName', '');
-    if (domain && domain !== certDomain) {
-      throw new Error('Invalid certificate: domain does not match');
-    }
-
-    const validFrom = get(certificate, 'validFrom', '');
-    if (!validFrom || new Date(validFrom).getTime() > Date.now()) {
-      throw new Error('Invalid certificate: not in valid period');
-    }
-    const validTo = get(certificate, 'validTo', '');
-    if (!validTo || new Date(validTo).getTime() < Date.now()) {
-      throw new Error('Invalid certificate: not in valid period');
-    }
-
-    return certificate;
-  }
-
-  fixCertificate(entity) {
-    // Hack: this logic exists because gql does not allow line breaks in arg values
-    entity.privateKey = entity.privateKey.split('|').join('\n');
-    entity.certificate = entity.certificate.split('|').join('\n');
-  }
-
   fixRootBlockletRule(rule) {
     if (!rule.id) {
       rule.id = uuid.v4();

package/lib/states/audit-log.js

@@ -114,7 +114,11 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `upgraded blocklet ${getBlockletInfo(result, info)} to v${result.meta.version}`;
     case 'updateChildBlocklets':
       return `upgraded components for blocklet ${getBlockletInfo(result, info)}`;
-
+    case 'configPublicToStore':
+      if (args.publicToStore) {
+        return `set publicToStore to true for blocklet ${getBlockletInfo(result, info)}`;
+      }
+      return `set publicToStore to false for blocklet ${getBlockletInfo(result, info)}`;
     // store
     case 'addBlockletStore':
       return `added blocklet store ${args.url}`;
@@ -237,6 +241,7 @@ const getLogCategory = (action) => {
     case 'configBlocklet':
     case 'upgradeBlocklet':
     case 'updateChildBlocklets':
+    case 'configPublicToStore':
       return 'blocklet';
 
     // store

package/lib/states/blocklet.js

@@ -102,6 +102,22 @@ class BlockletState extends BaseState {
     });
   }
 
+  hasBlocklet(did) {
+    return new Promise((resolve, reject) => {
+      if (!did) {
+        resolve(false);
+      }
+
+      this.db.count({ $or: [{ 'meta.did': did }, { appDid: did }] }, (err, count) => {
+        if (err) {
+          return reject(err);
+        }
+
+        return resolve(!!count);
+      });
+    });
+  }
+
   getBlocklets(query = {}, projection) {
     return new Promise((resolve, reject) => {
       this.db

package/lib/states/session.js

@@ -10,7 +10,13 @@ class SessionState extends BaseState {
 
     this.db.ensureIndex({ fieldName: 'createdAt' }, (error) => {
       if (error) {
-        logger.error('ensure index failed', { error });
+        logger.error('ensure createdAt index failed', { error });
+      }
+    });
+
+    this.db.ensureIndex({ fieldName: 'expireDate', expireAfterSeconds: 0 }, (error) => {
+      if (error) {
+        logger.error('ensure expireDate index failed', { error });
       }
     });
   }

package/lib/util/blocklet.js

@@ -309,6 +309,7 @@ const getComponentSystemEnvironments = (blocklet) => {
   if (ports) {
     Object.assign(portEnvironments, ports);
   }
+
   return {
     BLOCKLET_REAL_DID: blocklet.env.id,
     BLOCKLET_DATA_DIR: blocklet.env.dataDir,
@@ -328,10 +329,19 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     return o;
   }, {});
 
+  // get devEnvironments, when blocklet is in dev mode
+  const devEnvironments =
+    blocklet.mode === BLOCKLET_MODES.DEVELOPMENT
+      ? {
+          BLOCKLET_DEV_MOUNT_POINT: blocklet?.mountPoint || '',
+        }
+      : {};
+
   return {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
     ...blocklet.environmentObj,
+    ...devEnvironments,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
@@ -934,11 +944,6 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
 
     const fillAppDirs = async (dir, level = 'root') => {
       if (level === 'version') {
-        if (!fs.existsSync(path.join(dir, 'blocklet.yml'))) {
-          logger.error('blocklet.yml does not exist in blocklet bundle dir', { dir });
-          return;
-        }
-
         appDirs.push({
           key: path.relative(installDir, dir),
           dir,

package/lib/util/index.js

@@ -398,7 +398,10 @@ const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'tex
       throw new Error(`Cannot get content-type from ${url}: ${err.message}`);
     }
 
-    if (expectedHttpResTypes.some((x) => res.headers['content-type'].includes(x)) === false) {
+    if (
+      res.headers['content-type'] &&
+      expectedHttpResTypes.some((x) => res.headers['content-type'].includes(x)) === false
+    ) {
       throw new Error(`Unexpected content-type from ${url}: ${res.headers['content-type']}`);
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.27",
+  "version": "1.8.2",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,31 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.27",
-    "@abtnode/constant": "1.7.27",
-    "@abtnode/cron": "1.7.27",
-    "@abtnode/db": "1.7.27",
-    "@abtnode/logger": "1.7.27",
-    "@abtnode/queue": "1.7.27",
-    "@abtnode/rbac": "1.7.27",
-    "@abtnode/router-provider": "1.7.27",
-    "@abtnode/static-server": "1.7.27",
-    "@abtnode/timemachine": "1.7.27",
-    "@abtnode/util": "1.7.27",
-    "@arcblock/did": "1.17.0",
+    "@abtnode/certificate-manager": "1.8.2",
+    "@abtnode/constant": "1.8.2",
+    "@abtnode/cron": "1.8.2",
+    "@abtnode/db": "1.8.2",
+    "@abtnode/logger": "1.8.2",
+    "@abtnode/queue": "1.8.2",
+    "@abtnode/rbac": "1.8.2",
+    "@abtnode/router-provider": "1.8.2",
+    "@abtnode/static-server": "1.8.2",
+    "@abtnode/timemachine": "1.8.2",
+    "@abtnode/util": "1.8.2",
+    "@arcblock/did": "1.17.2",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.0",
-    "@arcblock/event-hub": "1.17.0",
-    "@arcblock/jwt": "^1.17.0",
+    "@arcblock/did-util": "1.17.2",
+    "@arcblock/event-hub": "1.17.2",
+    "@arcblock/jwt": "^1.17.2",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.0",
-    "@blocklet/meta": "1.7.27",
+    "@arcblock/vc": "1.17.2",
+    "@blocklet/meta": "1.8.2",
     "@fidm/x509": "^1.2.1",
-    "@nedb/core": "^1.2.2",
-    "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "1.17.0",
-    "@ocap/util": "1.17.0",
-    "@ocap/wallet": "1.17.0",
+    "@nedb/core": "^1.3.1",
+    "@nedb/multi": "^1.3.1",
+    "@ocap/mcrypto": "1.17.2",
+    "@ocap/util": "1.17.2",
+    "@ocap/wallet": "1.17.2",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -81,5 +81,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "81a5492df66389b0aede13f033d1e493450833bc"
+  "gitHead": "fcbe3c97f3825c507ee16714f49bbf8f58c5b59f"
 }