@abtnode/core 1.8.35 → 1.8.37

package/lib/api/node.js

@@ -7,24 +7,14 @@ 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');
 
 const IP = require('../util/ip');
 const { validateNodeInfo, validateUpdateGateway } = require('../validators/node');
 const { getAll } = require('../blocklet/manager/engine');
-const StoreUtil = require('../util/store');
 const { getDelegateState } = require('../util');
 
-const sanitizeUrl = (url) => {
-  if (!url) {
-    throw new Error('Registry URL should not be empty');
-  }
-
-  return url.trim();
-};
-
 class NodeAPI {
   /**
    *
@@ -37,69 +27,6 @@ class NodeAPI {
     this.state = state;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async addRegistry({ url }, context) {
-    logger.info('add registry', { 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) {
-      throw new Error(`Blocklet registry already exist: ${sanitized}`);
-    }
-
-    await StoreUtil.validateRegistryURL(sanitized);
-
-    const newBlockletRegistry = await StoreUtil.getRegistryMeta(sanitized);
-    const newBlockletRegistryList = info.blockletRegistryList.map((x) => ({ ...x, selected: false }));
-    newBlockletRegistryList.push({ ...newBlockletRegistry, url: sanitized, selected: true, protected: false });
-
-    return this.state.updateNodeInfo({ blockletRegistryList: newBlockletRegistryList });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async deleteRegistry({ url }, context) {
-    logger.info('delete registry', { url });
-    const sanitized = sanitizeUrl(url);
-    const info = await this.state.read();
-    const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
-    if (!exist) {
-      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
-    }
-
-    const blockletRegistryList = info.blockletRegistryList.filter((x) => x.url !== sanitized);
-    if (!blockletRegistryList.find((x) => x.selected)) {
-      blockletRegistryList[0].selected = true;
-    }
-    return this.state.updateNodeInfo({ blockletRegistryList });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async selectRegistry({ url }, context) {
-    logger.info('select registry', { url });
-    const sanitized = sanitizeUrl(url);
-    const info = await this.state.read();
-    const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
-    if (!exist) {
-      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
-    }
-
-    return this.state.updateNodeInfo({
-      blockletRegistryList: info.blockletRegistryList.map((x) => ({ ...x, selected: x.url === sanitized })),
-    });
-  }
-
   async updateNodeInfo(entity = {}, context) {
     await validateNodeInfo(entity, context);
 

package/lib/api/team.js

@@ -11,6 +11,7 @@ const {
   PASSPORT_STATUS,
   WELLKNOWN_SERVICE_PATH_PREFIX,
   MAX_USER_PAGE_SIZE,
+  STORE_DETAIL_PAGE_PATH_PREFIX,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/constant');
@@ -30,6 +31,15 @@ const { validateCreateRole, validateUpdateRole } = require('../validators/role')
 const { validateCreatePermission, validateUpdatePermission } = require('../validators/permission');
 
 const { getBlocklet } = require('../util/blocklet');
+const StoreUtil = require('../util/store');
+
+const sanitizeUrl = (url) => {
+  if (!url) {
+    throw new Error('Registry URL should not be empty');
+  }
+
+  return url.trim();
+};
 
 const validateReservedRole = (role) => {
   if (Object.values(ROLES).includes(role)) {
@@ -855,6 +865,55 @@ class TeamAPI extends EventEmitter {
     );
   }
 
+  // eslint-disable-next-line no-unused-vars
+  async addStore({ teamDid, url }, context) {
+    logger.info('add registry', { 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 storeList = await this.teamManager.getStoreList(teamDid);
+
+    const exist = storeList.find((x) => x.url === sanitized);
+    if (exist) {
+      throw new Error(`Blocklet registry already exist: ${sanitized}`);
+    }
+
+    await StoreUtil.validateRegistryURL(sanitized);
+
+    const store = await StoreUtil.getRegistryMeta(sanitized);
+
+    storeList.push({ ...store, url: sanitized, protected: false });
+
+    return this.teamManager.updateStoreList(teamDid, storeList);
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  async deleteStore({ teamDid, url }, context) {
+    logger.info('delete registry', { url });
+    const sanitized = sanitizeUrl(url);
+
+    const storeList = await this.teamManager.getStoreList(teamDid);
+    const exist = storeList.find((x) => x.url === sanitized);
+    if (!exist) {
+      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
+    }
+
+    return this.teamManager.updateStoreList(
+      teamDid,
+      storeList.filter((x) => x.url !== sanitized)
+    );
+  }
+
   // =======
   // Private
   // =======

package/lib/blocklet/manager/disk.js

@@ -3,6 +3,7 @@
 const fs = require('fs-extra');
 const { fileURLToPath } = require('url');
 const path = require('path');
+const flat = require('flat');
 const urlHttp = require('url-http');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
@@ -39,7 +40,6 @@ const {
   forEachChild,
   getComponentId,
   getComponentBundleId,
-  isExternalBlocklet,
 } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
@@ -109,6 +109,7 @@ const {
   ensureMeta,
   getBlocklet,
   ensureEnvDefault,
+  getConfigFromPreferences,
 } = require('../../util/blocklet');
 const StoreUtil = require('../../util/store');
 const states = require('../../states');
@@ -269,8 +270,8 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     if (source === BlockletSource.registry) {
-      const { did, controller, sync, delay } = params;
-      return this._installFromStore({ did, controller, sync, delay }, context);
+      const { did, controller, sync, delay, storeUrl } = params;
+      return this._installFromStore({ did, controller, sync, delay, storeUrl }, context);
     }
 
     if (source === BlockletSource.custom) {
@@ -836,6 +837,7 @@ class BlockletManager extends BaseBlockletManager {
     return result;
   }
 
+  // Get blocklet by blockletDid or appDid
   async detail({ did, attachConfig = true, attachRuntimeInfo = true }, context) {
     if (!did) {
       throw new Error('did should not be empty');
@@ -860,46 +862,54 @@ class BlockletManager extends BaseBlockletManager {
     return this.attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
   }
 
-  async list({ includeRuntimeInfo = true, useCache = true, filter } = {}, context) {
-    const blocklets = await states.blocklet.getBlocklets();
-    let list = blocklets;
+  async attachBlockletListRuntimeInfo({ blocklets, useCache }, context) {
+    const nodeInfo = await states.node.read();
+    const updated = (
+      await Promise.all(
+        blocklets.map((x) => {
+          if (isBeforeInstalled(x.status)) {
+            return x;
+          }
 
-    if (includeRuntimeInfo) {
-      const nodeInfo = await states.node.read();
-      const updated = (
-        await Promise.all(
-          blocklets.map((x) => {
-            if (isBeforeInstalled(x.status)) {
-              return x;
-            }
+          const cachedBlocklet =
+            useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
 
-            const cachedBlocklet =
-              useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
+          return this.attachRuntimeInfo({
+            did: x.meta.did,
+            nodeInfo,
+            diskInfo: false,
+            context,
+            cachedBlocklet,
+          });
+        })
+      )
+    ).filter(Boolean);
 
-            return this.attachRuntimeInfo({
-              did: x.meta.did,
-              nodeInfo,
-              diskInfo: false,
-              context,
-              cachedBlocklet,
-            });
-          })
-        )
-      ).filter(Boolean);
+    this.cachedBlocklets = cloneDeep(updated);
+    return updated;
+  }
 
-      this.cachedBlocklets = cloneDeep(updated);
-      list = updated;
+  async list({ includeRuntimeInfo = true, useCache = true, query, filter } = {}, context) {
+    const condition = { ...flat(query || {}) };
+    if (filter === 'external-only') {
+      condition.controller = {
+        $exists: true,
+      };
     }
 
     if (filter === 'external-excluded') {
-      return list.filter((x) => !isExternalBlocklet(x));
+      condition.controller = {
+        $exists: false,
+      };
     }
 
-    if (filter === 'external-only') {
-      return list.filter(isExternalBlocklet);
+    const blocklets = await states.blocklet.getBlocklets(condition);
+
+    if (includeRuntimeInfo) {
+      return this.attachBlockletListRuntimeInfo({ blocklets, useCache }, context);
     }
 
-    return list;
+    return blocklets;
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -1122,23 +1132,23 @@ class BlockletManager extends BaseBlockletManager {
   /**
    * upgrade blocklet from registry
    */
-  async upgrade({ did, registryUrl, sync }, context) {
+  async upgrade({ did, storeUrl, sync }, context) {
     const blocklet = await states.blocklet.getBlocklet(did);
 
-    if (!registryUrl && blocklet.source === BlockletSource.url) {
+    if (!storeUrl && blocklet.source === BlockletSource.url) {
       return this._installFromUrl({ url: blocklet.deployedFrom }, context);
     }
 
-    // TODO: 查看了下目前页面中的升级按钮，都是会传 registryUrl 过来的，这个函数里的逻辑感觉需要在以后做一个简化
-    if (!registryUrl && blocklet.source !== BlockletSource.registry) {
-      throw new Error('Wrong upgrade source, empty registryUrl or not installed from blocklet registry');
+    // TODO: 查看了下目前页面中的升级按钮，都是会传 storeUrl 过来的，这个函数里的逻辑感觉需要在以后做一个简化
+    if (!storeUrl && blocklet.source !== BlockletSource.registry) {
+      throw new Error('Wrong upgrade source, empty storeUrl or not installed from blocklet registry');
     }
 
-    const upgradeFromRegistry = registryUrl || blocklet.deployedFrom;
+    const upgradeFromStore = storeUrl || blocklet.deployedFrom;
 
     let newVersionMeta = await StoreUtil.getBlockletMeta({
       did: blocklet.meta.bundleDid,
-      registryUrl: upgradeFromRegistry,
+      storeUrl: upgradeFromStore,
     });
     newVersionMeta = ensureMeta(newVersionMeta, { name: blocklet.meta.name, did: blocklet.meta.did });
 
@@ -1189,7 +1199,7 @@ class BlockletManager extends BaseBlockletManager {
     return this._upgrade({
       meta: newVersionMeta,
       source: BlockletSource.registry,
-      deployedFrom: upgradeFromRegistry,
+      deployedFrom: upgradeFromStore,
       context,
       sync,
     });
@@ -1374,7 +1384,7 @@ class BlockletManager extends BaseBlockletManager {
 
     const meta = getBlockletMeta(folder);
     if (meta.group !== 'static' && (!meta.scripts || !meta.scripts.dev)) {
-      throw new Error('Incorrect blocklet manifest: missing `scripts.dev` field');
+      throw new Error('Incorrect blocklet.yml: missing `scripts.dev` field');
     }
 
     if (rootDid) {
@@ -1967,16 +1977,19 @@ class BlockletManager extends BaseBlockletManager {
    * @memberof BlockletManager
    */
   async _installFromStore(params, context) {
-    const { did, registry, sync, delay, controller } = params;
+    const { did, storeUrl, sync, delay, controller } = params;
 
     logger.debug('start install blocklet', { did });
     if (!isValidDid(did)) {
       throw new Error('Blocklet did is invalid');
     }
 
-    const registryUrl = registry || (await states.node.getBlockletRegistry());
-    const info = await StoreUtil.getRegistryMeta(registryUrl);
-    const meta = await StoreUtil.getBlockletMeta({ did, registryUrl });
+    if (!storeUrl) {
+      throw new Error('registry url should not be empty');
+    }
+
+    const info = await StoreUtil.getRegistryMeta(storeUrl);
+    const meta = await StoreUtil.getBlockletMeta({ did, storeUrl });
     if (!meta) {
       throw new Error('Can not install blocklet that not found in registry');
     }
@@ -1989,14 +2002,14 @@ class BlockletManager extends BaseBlockletManager {
       throw new Error('Can not install an already installed blocklet');
     }
 
-    if (controller?.vcId) {
-      // sometimes nedb will throw error if use states.blocklet.count({ ['controller.vcId']: controller.vcId })
+    if (controller?.nftId) {
+      // sometimes nedb will throw error if use states.blocklet.count({ ['controller.nftId']: controller.nftId })
       const blocklets = await states.blocklet.find({}, { controller: 1 });
-      const count = blocklets.filter((x) => x.controller?.vcId === controller.vcId).length;
+      const count = blocklets.filter((x) => x.controller?.nftId === controller.nftId).length;
 
       if (count >= (controller.appMaxCount || 1)) {
         throw new Error(
-          `You can only install ${controller.appMaxCount} blocklet with this credential: ${controller.vcId}`
+          `You can only install ${controller.appMaxCount} blocklet with this credential: ${controller.nftId}`
         );
       }
     }
@@ -2005,7 +2018,7 @@ class BlockletManager extends BaseBlockletManager {
     return this._install({
       meta: ensureMeta(meta, { did: blockletDid, name: blockletName }),
       source: BlockletSource.registry,
-      deployedFrom: info.cdnUrl || registryUrl,
+      deployedFrom: info.cdnUrl || storeUrl,
       sync,
       delay,
       controller,
@@ -2016,7 +2029,7 @@ class BlockletManager extends BaseBlockletManager {
   /**
    * @type {{
    *  id: string;
-   *  vcId: string;
+   *  nftId: string;
    *  expireDate: Date;
    * }} Controller
    *
@@ -2048,10 +2061,10 @@ class BlockletManager extends BaseBlockletManager {
     if (inStore) {
       const exist = await states.blocklet.getBlocklet(blockletDid);
       if (exist) {
-        return this.upgrade({ did: blockletDid, registryUrl, sync, delay }, context);
+        return this.upgrade({ did: blockletDid, storeUrl: registryUrl, sync, delay }, context);
       }
 
-      return this._installFromStore({ did: bundleDid, registry: registryUrl, controller, sync, delay }, context);
+      return this._installFromStore({ did: bundleDid, storeUrl: registryUrl, controller, sync, delay }, context);
     }
 
     const meta = ensureMeta(bundleMeta, { name: blockletName, did: blockletDid });
@@ -3482,11 +3495,11 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _setConfigsFromMeta(did, childDid) {
-    const blocklet = await states.blocklet.getBlocklet(did);
+    const blocklet = await getBlocklet({ states, dataDirs: this.dataDirs, did, validateEnv: false, ensureDirs: false });
 
     if (!childDid) {
       await forEachBlocklet(blocklet, async (b, { ancestors }) => {
-        const environments = get(b.meta, 'environments', []);
+        const environments = [...get(b.meta, 'environments', []), ...getConfigFromPreferences(b)];
 
         // remove default if ancestors has a value
         ensureEnvDefault(environments, ancestors);
@@ -3499,7 +3512,7 @@ class BlockletManager extends BaseBlockletManager {
       await forEachBlocklet(child, async (b, { ancestors }) => {
         await states.blockletExtras.setConfigs(
           [blocklet.meta.did, ...ancestors.map((x) => x.meta.did), b.meta.did],
-          get(b.meta, 'environments', [])
+          [...get(b.meta, 'environments', []), ...getConfigFromPreferences(child)]
         );
       });
     }
@@ -3548,13 +3561,13 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _getLatestBlockletVersionFromStore({ blocklet, version }) {
-    const { deployedFrom: registryUrl } = blocklet;
+    const { deployedFrom: storeUrl } = blocklet;
     const { did, bundleDid } = blocklet.meta;
 
     let versions = this.cachedBlockletVersions.get(did);
 
     if (!versions) {
-      const item = await StoreUtil.getBlockletMeta({ did: bundleDid, registryUrl });
+      const item = await StoreUtil.getBlockletMeta({ did: bundleDid, storeUrl });
 
       if (!item) {
         return null;
@@ -3571,23 +3584,7 @@ class BlockletManager extends BaseBlockletManager {
       return null;
     }
 
-    // When new version found from the store where the blocklet was installed from, we should use that store first
-    if (blocklet.source === BlockletSource.registry && blocklet.deployedFrom) {
-      const latestFromSameRegistry = versions.find((x) => x.registryUrl === blocklet.deployedFrom);
-      if (latestFromSameRegistry) {
-        return latestFromSameRegistry;
-      }
-    }
-
-    // Otherwise try upgrading from other store
-    let latestBlockletVersion = versions[0];
-    versions.forEach((item) => {
-      if (semver.lt(latestBlockletVersion.version, item.version)) {
-        latestBlockletVersion = item;
-      }
-    });
-
-    return latestBlockletVersion;
+    return versions[0];
   }
 
   async _getLatestBlockletVersionFromUrl({ blocklet, version }) {

package/lib/event.js

@@ -249,6 +249,8 @@ module.exports = ({
     }
   };
 
+  const listen = (subject, event, handler) => subject.on(event, (data) => handler(event, data));
+
   [
     BlockletEvents.added,
     BlockletEvents.downloadFailed,
@@ -265,12 +267,12 @@ module.exports = ({
     BlockletEvents.startFailed,
     BlockletEvents.stopped,
   ].forEach((eventName) => {
-    blockletManager.on(eventName, (data) => handleBlockletEvent(eventName, data));
+    listen(blockletManager, eventName, handleBlockletEvent);
   });
 
-  notificationState.on(EVENTS.NOTIFICATION_CREATE, (data) => onEvent(EVENTS.NOTIFICATION_CREATE, data));
+  listen(notificationState, EVENTS.NOTIFICATION_CREATE, onEvent);
 
-  nodeState.on(BlockletEvents.purchaseChange, (data) => onEvent(BlockletEvents.purchaseChange, data));
+  listen(nodeState, BlockletEvents.purchaseChange, onEvent);
   nodeState.on(EVENTS.ROUTING_UPDATED, (nodeInfo) => onEvent(EVENTS.ROUTING_UPDATED, { routing: nodeInfo.routing }));
   nodeState.once(EVENTS.NODE_ADDED_OWNER, () => downloadAddedBlocklet());
   nodeState.on(EVENTS.NODE_UPDATED, (nodeInfo, oldInfo) => {
@@ -285,7 +287,8 @@ module.exports = ({
       });
     }
   });
-  nodeState.on(EVENTS.NODE_UPGRADE_PROGRESS, (session) => onEvent(EVENTS.NODE_UPGRADE_PROGRESS, session));
+
+  listen(nodeState, EVENTS.NODE_UPGRADE_PROGRESS, onEvent);
   nodeState.on(EVENTS.RELOAD_GATEWAY, (nodeInfo) => {
     handleRouting(nodeInfo).catch((err) => {
       logger.error('Handle routing failed on node.updated', { error: err });
@@ -300,15 +303,16 @@ module.exports = ({
     });
   });
 
-  teamAPI.on(EVENTS.USER_ADDED, (data) => onEvent(EVENTS.USER_ADDED, data));
-  teamAPI.on(EVENTS.USER_REMOVED, (data) => onEvent(EVENTS.USER_REMOVED, data));
-  teamAPI.on(EVENTS.USER_UPDATED, (data) => onEvent(EVENTS.USER_UPDATED, data));
-  teamAPI.on(BlockletEvents.updated, (data) => onEvent(BlockletEvents.updated, data));
+  listen(teamAPI, EVENTS.USER_ADDED, onEvent);
+  listen(teamAPI, EVENTS.USER_REMOVED, onEvent);
+  listen(teamAPI, EVENTS.USER_UPDATED, onEvent);
+  listen(teamAPI, BlockletEvents.updated, onEvent);
+  listen(teamManager, BlockletEvents.storeChange, onEvent);
 
-  certManager.on('cert.issued', (data) => onEvent(EVENTS.CERT_ISSUED, data));
-  certManager.on('cert.error', (data) => onEvent(EVENTS.CERT_ERROR, data));
+  listen(certManager, EVENTS.CERT_ISSUED, onEvent);
+  listen(certManager, EVENTS.CERT_ERROR, onEvent);
 
-  routerManager.on(BlockletEvents.updated, (data) => onEvent(BlockletEvents.updated, data));
+  listen(routerManager, BlockletEvents.updated, onEvent);
 
   events.setEventHandler = (handler) => {
     if (typeof handler === 'function') {

package/lib/index.js

@@ -236,9 +236,6 @@ function ABTNode(options) {
     getNodeInfo: nodeAPI.getInfo.bind(nodeAPI),
     getNodeEnv: nodeAPI.getEnv.bind(nodeAPI),
     updateNodeInfo: nodeAPI.updateNodeInfo.bind(nodeAPI),
-    addBlockletStore: nodeAPI.addRegistry.bind(nodeAPI),
-    deleteBlockletStore: nodeAPI.deleteRegistry.bind(nodeAPI),
-    selectBlockletStore: nodeAPI.selectRegistry.bind(nodeAPI),
     getDelegationState: nodeAPI.getDelegationState.bind(nodeAPI),
     cleanupDirtyUpgradeState: states.node.cleanupDirtyUpgradeState.bind(states.node),
     updateNodeOwner: states.node.updateNodeOwner.bind(states.node),
@@ -307,6 +304,10 @@ function ABTNode(options) {
     configTrustedPassports: teamAPI.configTrustedPassports.bind(teamAPI),
     configPassportIssuance: teamAPI.configPassportIssuance.bind(teamAPI),
 
+    // Team Settings
+    addBlockletStore: teamAPI.addStore.bind(teamAPI),
+    deleteBlockletStore: teamAPI.deleteStore.bind(teamAPI),
+
     // Challenge
     generateChallenge: states.challenge.generate.bind(states.challenge),
     verifyChallenge: states.challenge.verify.bind(states.challenge),
@@ -355,6 +356,7 @@ function ABTNode(options) {
     // Access Key
     getAccessKeys: states.accessKey.list.bind(states.accessKey),
     getAccessKey: states.accessKey.detail.bind(states.accessKey),
+    getAccessKeyByTag: states.accessKey.getAccessKeyByTag.bind(states.accessKey),
     createAccessKey: states.accessKey.create.bind(states.accessKey),
     updateAccessKey: states.accessKey.update.bind(states.accessKey),
     deleteAccessKey: states.accessKey.remove.bind(states.accessKey),

package/lib/states/access-key.js

@@ -31,8 +31,8 @@ class AccessKeyState extends BaseState {
     });
   }
 
-  async create(input = {}, context) {
-    const { remark, passport } = input;
+  async create(input, context) {
+    const { remark, passport, tag } = input || {};
 
     validateRemark(remark);
     validatePassport(passport);
@@ -43,10 +43,15 @@ class AccessKeyState extends BaseState {
       accessKeyPublic: wallet.publicKey,
       passport,
     };
+
     if (remark) {
       data.remark = remark;
     }
 
+    if (tag) {
+      data.tag = tag;
+    }
+
     data.createdBy = getUserName(context);
     data.updatedBy = getUserName(context);
 
@@ -57,6 +62,14 @@ class AccessKeyState extends BaseState {
     };
   }
 
+  async getAccessKeyByTag({ tag } = {}) {
+    if (!tag) {
+      throw new Error('tag should not be empty');
+    }
+
+    return this.findOne({ tag });
+  }
+
   // eslint-disable-next-line no-unused-vars
   async list(params, context) {
     const res = await this.paginate({}, { createdAt: -1 }, { pageSize: 100 });

package/lib/states/audit-log.js

@@ -410,7 +410,7 @@ class AuditLogState extends BaseState {
       }
 
       try {
-        const { ip, ua, user } = context;
+        const { ip, ua, user = {} } = context;
         const [info, uaInfo] = await Promise.all([node.states.node.read(), parse(ua)]);
 
         fixActor(user);

package/lib/states/node.js

@@ -302,10 +302,6 @@ class NodeState extends BaseState {
     }));
   }
 
-  getBlockletRegistry() {
-    return this.read().then((info) => info.blockletRegistryList.find((item) => item.selected).url);
-  }
-
   async increaseCustomBlockletNumber() {
     const { _id, customBlockletNumber = 0 } = await this.read();
     const num = customBlockletNumber + 1;

package/lib/team/manager.js

@@ -9,6 +9,7 @@ const get = require('lodash/get');
 const { createRBAC, MemoryStorage, NedbStorage } = require('@abtnode/rbac');
 const logger = require('@abtnode/logger')('@abtnode/core:team:manager');
 const { ROLES, RBAC_CONFIG } = require('@abtnode/constant');
+const { BlockletEvents } = require('@blocklet/constant');
 const Lock = require('@abtnode/util/lib/lock');
 const UserState = require('../states/user');
 const SessionState = require('../states/session');
@@ -280,6 +281,26 @@ class TeamManager extends EventEmitter {
     }
   }
 
+  async getStoreList(did) {
+    if (this.isNodeTeam(did)) {
+      const nodeInfo = await this.states.node.read();
+      return nodeInfo.blockletRegistryList || [];
+    }
+
+    const settings = await this.states.blockletExtras.getSettings(did);
+    return get(settings, 'storeList', []) || [];
+  }
+
+  async updateStoreList(did, list) {
+    if (this.isNodeTeam(did)) {
+      await this.states.node.updateNodeInfo({ blockletRegistryList: list });
+      return;
+    }
+
+    await this.states.blockletExtras.setSettings(did, { storeList: list });
+    this.emit(BlockletEvents.storeChange, { meta: { did } });
+  }
+
   async getOwner(did) {
     let owner;
     if (this.isNodeTeam(did)) {

package/lib/util/blocklet.js

@@ -16,13 +16,15 @@ const { isValid: isValidDid } = 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 { formatEnv } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
 const CustomError = require('@abtnode/util/lib/custom-error');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
-const { BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
+const { BLOCKLET_MAX_MEM_LIMIT_IN_MB, BLOCKLET_STORE } = require('@abtnode/constant');
+const { BLOCKLET_PREFERENCE_FILE, BLOCKLET_PREFERENCE_PREFIX } = require('@blocklet/constant');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
@@ -148,7 +150,7 @@ const getComponentDirs = (
   }
 
   if (validate && !main && !startFromDevEntry && group !== BlockletGroup.gateway) {
-    throw new Error('Incorrect blocklet manifest: missing `main` field');
+    throw new Error('Incorrect blocklet.yml: missing `main` field');
   }
 
   let appDir = null;
@@ -380,7 +382,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     ? getBlockletWallet(blocklet.meta.did, nodeEnvironments.ABT_NODE_SK, undefined, 1)
     : null;
 
-  return {
+  const env = {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
     ...blocklet.environmentObj,
@@ -392,6 +394,13 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
+
+  // ensure all envs are literals and do not contain line breaks
+  Object.keys(env).forEach((key) => {
+    env[key] = formatEnv(env[key]);
+  });
+
+  return env;
 };
 
 const isUsefulError = (err) =>
@@ -1330,6 +1339,15 @@ const getBlocklet = async ({
   blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
   blocklet.settings = settings || {};
 
+  blocklet.settings.storeList = blocklet.settings.storeList || [];
+
+  if (!blocklet.settings.storeList.find((x) => x.url === BLOCKLET_STORE.url)) {
+    blocklet.settings.storeList.unshift({
+      ...BLOCKLET_STORE,
+      protected: true,
+    });
+  }
+
   // app site
   blocklet.site = await states.site.findOneByBlocklet(blocklet.meta.did);
 
@@ -1385,6 +1403,39 @@ const ensureEnvDefault = (environments, ancestors) => {
   return environments;
 };
 
+const fromProperty2Config = (properties = {}, result) => {
+  Object.keys(properties).forEach((key) => {
+    const prop = properties[key];
+    if (prop.properties) {
+      fromProperty2Config(prop.properties, result);
+    } else if (prop['x-decorator'] === 'FormItem') {
+      const secure = prop['x-component'] === 'Password';
+      result.push({
+        default: prop.default || '',
+        description: prop.title || key,
+        name: `${BLOCKLET_PREFERENCE_PREFIX}${key}`,
+        required: prop.required || false,
+        secure,
+        shared: !secure,
+      });
+    }
+  });
+};
+const getConfigFromPreferences = (blocklet) => {
+  const result = [];
+  const schemaFile = path.join(blocklet.env.appDir, BLOCKLET_PREFERENCE_FILE);
+  if (fs.existsSync(schemaFile)) {
+    try {
+      const schema = JSON.parse(fs.readFileSync(schemaFile, 'utf8'));
+      fromProperty2Config(schema.schema?.properties, result);
+    } catch {
+      // do nothing
+    }
+  }
+
+  return result;
+};
+
 module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
@@ -1425,4 +1476,5 @@ module.exports = {
   ensureMeta,
   getBlocklet,
   ensureEnvDefault,
+  getConfigFromPreferences,
 };

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

@@ -1,4 +1,4 @@
-const { NODE_REGISTER_URL, BLOCKLET_STORE_URL, BLOCKLET_STORE_URL_DEV } = require('@abtnode/constant');
+const { NODE_REGISTER_URL, BLOCKLET_STORE, BLOCKLET_STORE_DEV } = require('@abtnode/constant');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 
 const getDefaultAutoUpgrade = () => {
@@ -16,21 +16,11 @@ const defaultNodeConfigs = {
   blockletRegistryList: {
     getDefaultValue: () => [
       {
-        name: 'Official Store',
-        description: 'ArcBlock official blocklet registry',
-        url: BLOCKLET_STORE_URL,
-        logoUrl: '/logo.png',
-        maintainer: 'arcblock',
-        selected: true,
+        ...BLOCKLET_STORE,
         protected: true,
       },
       {
-        name: 'Dev Store',
-        description: 'ArcBlock dev registry that contains demo and example blocklets',
-        url: BLOCKLET_STORE_URL_DEV,
-        maintainer: 'arcblock',
-        logoUrl: '/logo.png',
-        selected: false,
+        ...BLOCKLET_STORE_DEV,
         protected: false,
       },
     ],

package/lib/util/store.js

@@ -84,7 +84,7 @@ const parseSourceUrl = async (url) => {
   };
 };
 
-const resolveTarballURL = async ({ did, tarball = '', registryUrl = '' }) => {
+const resolveTarballURL = async ({ did, tarball = '', storeUrl = '' }) => {
   if (!tarball) {
     return '';
   }
@@ -97,7 +97,7 @@ const resolveTarballURL = async ({ did, tarball = '', registryUrl = '' }) => {
     return tarball;
   }
 
-  if (!registryUrl) {
+  if (!storeUrl) {
     return '';
   }
 
@@ -105,11 +105,11 @@ const resolveTarballURL = async ({ did, tarball = '', registryUrl = '' }) => {
     return '';
   }
 
-  return joinURL(registryUrl, 'api', 'blocklets', did, tarball);
+  return joinURL(storeUrl, 'api', 'blocklets', did, tarball);
 };
 
-const getBlockletMeta = async ({ did, registryUrl }) => {
-  const url = joinURL(registryUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`);
+const getBlockletMeta = async ({ did, storeUrl }) => {
+  const url = joinURL(storeUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`);
 
   const { data } = await request.get(url);
   try {
@@ -122,7 +122,7 @@ const getBlockletMeta = async ({ did, registryUrl }) => {
     meta.dist.tarball = await resolveTarballURL({
       did,
       tarball: meta.dist.tarball,
-      registryUrl,
+      storeUrl,
     });
 
     return meta;

package/lib/validators/blocklet.js

@@ -5,7 +5,8 @@ const Joi = JOI.extend(didExtension);
 
 const blockletController = Joi.object({
   id: Joi.DID().required(), // userDid
-  vcId: Joi.DID().required(),
+  nftId: Joi.DID().required(),
+  nftOwner: Joi.DID().required(),
   appMaxCount: Joi.number().required().min(1),
   expireDate: Joi.date(),
 }).options({ stripUnknown: true });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.35",
+  "version": "1.8.37",
   "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.8.35",
-    "@abtnode/certificate-manager": "1.8.35",
-    "@abtnode/constant": "1.8.35",
-    "@abtnode/cron": "1.8.35",
-    "@abtnode/db": "1.8.35",
-    "@abtnode/logger": "1.8.35",
-    "@abtnode/queue": "1.8.35",
-    "@abtnode/rbac": "1.8.35",
-    "@abtnode/router-provider": "1.8.35",
-    "@abtnode/static-server": "1.8.35",
-    "@abtnode/timemachine": "1.8.35",
-    "@abtnode/util": "1.8.35",
+    "@abtnode/auth": "1.8.37",
+    "@abtnode/certificate-manager": "1.8.37",
+    "@abtnode/constant": "1.8.37",
+    "@abtnode/cron": "1.8.37",
+    "@abtnode/db": "1.8.37",
+    "@abtnode/logger": "1.8.37",
+    "@abtnode/queue": "1.8.37",
+    "@abtnode/rbac": "1.8.37",
+    "@abtnode/router-provider": "1.8.37",
+    "@abtnode/static-server": "1.8.37",
+    "@abtnode/timemachine": "1.8.37",
+    "@abtnode/util": "1.8.37",
     "@arcblock/did": "1.18.15",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.15",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.15",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.15",
-    "@blocklet/constant": "1.8.35",
-    "@blocklet/meta": "1.8.35",
-    "@blocklet/sdk": "1.8.35",
+    "@blocklet/constant": "1.8.37",
+    "@blocklet/meta": "1.8.37",
+    "@blocklet/sdk": "1.8.37",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.15",
     "@ocap/util": "1.18.15",
@@ -82,5 +82,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "dd89e7a61dc8cff64302608ad5ab6545dd903daa"
+  "gitHead": "f26f451c6e2b1168b36f78269eafdf3f671236bf"
 }