@abtnode/core 1.16.12 → 1.16.13-beta-118c3420

package/lib/blocklet/manager/disk.js

@@ -539,7 +539,7 @@ class BlockletManager extends BaseBlockletManager {
           entity: 'blocklet',
           action: 'check_if_started',
           ...params,
-          id: did,
+          id: `${did}/${(componentDids || []).join(',')}`,
         });
       }
 
@@ -701,7 +701,7 @@ class BlockletManager extends BaseBlockletManager {
     const ticket = this.startQueue.push({
       entity: 'blocklet',
       action: 'restart',
-      id: did,
+      id: `${did}/${(componentDids || []).join(',')}`,
       did,
       componentDids,
       context,

package/lib/states/blocklet.js

@@ -153,6 +153,7 @@ class BlockletState extends BaseState {
     this.defaultPort = config.blockletPort || 5555;
     // @didMap: { [did: string]: metaDid: string }
     this.didMap = new Map();
+    this.statusLocks = new Map();
   }
 
   async getBlocklet(did, { decryptSk = true } = {}) {
@@ -207,6 +208,8 @@ class BlockletState extends BaseState {
 
     this.didMap.delete(doc.meta?.did);
     this.didMap.delete(doc.appDid);
+    this.statusLocks.delete(doc.meta?.did);
+    this.statusLocks.delete(doc.appDid);
 
     this.emit('remove', doc);
     return formatBlocklet(doc, 'onRead', this.config.dek);
@@ -505,39 +508,49 @@ class BlockletState extends BaseState {
       throw new Error('Unsupported blocklet status');
     }
 
-    const doc = await this.getBlocklet(did);
-
-    if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
-      return this.updateBlocklet(did, { status });
-    }
+    const statusLock = this._getStatusLock(did);
 
-    // for backward compatibility
-    if (!doc.structVersion && !doc.children?.length) {
-      return this.updateBlocklet(did, { status });
-    }
+    try {
+      await statusLock.acquire();
+      const doc = await this.getBlocklet(did);
 
-    // update children status
-    forEachComponentV2Sync(doc, (component) => {
-      if (component.meta.group === BlockletGroup.gateway) {
-        return;
+      if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
+        return this.updateBlocklet(did, { status });
       }
 
-      if (shouldSkipComponent(component.meta.did, componentDids)) {
-        return;
+      // for backward compatibility
+      if (!doc.structVersion && !doc.children?.length) {
+        return this.updateBlocklet(did, { status });
       }
 
-      component.status = status;
-      if (status === BlockletStatus.running) {
-        component.startedAt = new Date();
-        component.stoppedAt = null;
-      }
-      if (status === BlockletStatus.stopped) {
-        component.startedAt = null;
-        component.stoppedAt = new Date();
-      }
-    });
+      // update children status
+      forEachComponentV2Sync(doc, (component) => {
+        if (component.meta.group === BlockletGroup.gateway) {
+          return;
+        }
 
-    return this.updateBlocklet(did, pick(doc, ['status', 'children']));
+        if (shouldSkipComponent(component.meta.did, componentDids)) {
+          return;
+        }
+
+        component.status = status;
+        if (status === BlockletStatus.running) {
+          component.startedAt = new Date();
+          component.stoppedAt = null;
+        }
+        if (status === BlockletStatus.stopped) {
+          component.startedAt = null;
+          component.stoppedAt = new Date();
+        }
+      });
+
+      const res = await this.updateBlocklet(did, pick(doc, ['status', 'children']));
+      statusLock.release();
+      return res;
+    } catch (error) {
+      statusLock.release();
+      throw error;
+    }
   }
 
   setInstalledAt(did) {
@@ -641,6 +654,14 @@ class BlockletState extends BaseState {
   updateStructV1Did(did, v1Did) {
     return this.updateBlocklet(did, { structV1Did: v1Did });
   }
+
+  _getStatusLock(did) {
+    if (!this.statusLocks.has(did)) {
+      this.statusLocks[did] = new Lock();
+    }
+
+    return this.statusLocks[did];
+  }
 }
 
 BlockletState.BlockletStatus = BlockletStatus;

package/lib/util/blocklet.js

@@ -41,6 +41,13 @@ const {
   APP_STRUCT_VERSION,
   EXPIRED_BLOCKLET_DATA_RETENTION_DAYS,
 } = require('@abtnode/constant');
+const {
+  parseComponents,
+  ensureMeta,
+  filterDuplicateComponents,
+  validateBlockletMeta,
+  getComponentConfig,
+} = require('@blocklet/resolver');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
@@ -67,7 +74,6 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
-const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const {
   forEachBlocklet,
   getDisplayName,
@@ -75,7 +81,6 @@ const {
   forEachBlockletSync,
   forEachChildSync,
   forEachComponentV2Sync,
-  isComponentBlocklet,
   getSharedConfigObj,
   getComponentName,
   isEnvShareable,
@@ -85,13 +90,8 @@ const {
   isInProgress,
   isRunning,
 } = require('@blocklet/meta/lib/util');
-const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
-const {
-  getSourceUrlsFromConfig,
-  getBlockletMetaFromUrls,
-  getBlockletMetaFromUrl,
-} = require('@blocklet/meta/lib/util-meta');
+const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
@@ -103,12 +103,6 @@ const externalIpUtil = require('./get-accessible-external-node-ip');
 const { getIpDnsDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { replaceDomainSlot } = require('./index');
 
-const getComponentConfig = (meta) => {
-  const components = meta.components || meta.children || [];
-  const staticComponents = (meta.staticComponents || []).map((x) => ({ ...x, static: true }));
-  return [...components, ...staticComponents];
-};
-
 /**
  * get blocklet engine info, default is node
  * @param {object} blockletMeta blocklet meta
@@ -736,128 +730,6 @@ const reloadProcess = (processId) =>
     });
   });
 
-/**
- * this function has side effect to component (will set component.children: Array<staticComponent> )
- * this function has side effect to dynamicComponents (will push dynamicComponent in dynamicComponents)
- *
- * @param {Component} component
- * @param {{
- *   ancestors: Array<{meta}>
- *   dynamicComponents: Array<{Component}>
- * }} context
- * @returns {{
- *   dynamicComponents: Array<Component>,
- *   staticComponents: Array<Component>,
- * }}
- */
-const parseComponents = async (component, context = {}) => {
-  const { ancestors = [], dynamicComponents = [] } = context;
-  if (ancestors.length > 40) {
-    throw new Error('The depth of component should not exceed 40');
-  }
-
-  const configs = getComponentConfig(component.meta) || [];
-
-  if (!configs || !configs.length) {
-    return {
-      staticComponents: [],
-      dynamicComponents,
-    };
-  }
-
-  const staticComponents = [];
-
-  // FIXME @linchen 改成并行获取
-  for (const config of configs) {
-    const isStatic = !!config.static;
-
-    if (isStatic) {
-      if (!config.name) {
-        throw new Error(`Name does not found in child ${config.name}`);
-      }
-
-      if (!config.mountPoint) {
-        throw new Error(`MountPoint does not found in child ${config.name}`);
-      }
-    }
-
-    const urls = getSourceUrlsFromConfig(config);
-
-    let rawMeta;
-    try {
-      rawMeta = await getBlockletMetaFromUrls(urls, { logger });
-    } catch (error) {
-      throw new Error(`Failed get component meta. Component: ${urls.join(', ')}, reason: ${error.message}`);
-    }
-
-    if (rawMeta.group === BlockletGroup.gateway) {
-      throw new Error(`Cannot add gateway component ${rawMeta.title || rawMeta.did}`);
-    }
-
-    validateBlockletMeta(rawMeta, { ensureDist: true });
-
-    if (!isComponentBlocklet(rawMeta)) {
-      throw new Error(
-        `The blocklet cannot be a component: ${rawMeta.title}. The reason may be that the developer set capabilities.component to false in blocklet.yml`
-      );
-    }
-
-    const webInterface = findWebInterface(rawMeta);
-    if (!webInterface) {
-      throw new Error(`Web interface does not found in component ${rawMeta.title || rawMeta.name}`);
-    }
-
-    const meta = ensureMeta(rawMeta, { name: isStatic ? config.name : null });
-
-    // check circular dependencies
-    if (ancestors.map((x) => x.meta?.bundleDid).indexOf(meta.bundleDid) > -1) {
-      throw new Error('Blocklet components have circular dependencies');
-    }
-
-    if (config.title) {
-      meta.title = config.title;
-      meta.title = await titleSchema.validateAsync(config.title);
-    }
-
-    if (config.description) {
-      meta.description = await descriptionSchema.validateAsync(config.description);
-    }
-
-    const mountPoint = isStatic ? config.mountPoint : config.mountPoint || `/${meta.did}`;
-
-    const child = {
-      mountPoint,
-      meta,
-      bundleSource: config.source,
-      dependencies: [],
-    };
-
-    if (isStatic) {
-      staticComponents.push(child);
-    } else {
-      dynamicComponents.push(child);
-      component.dependencies = component.dependencies || [];
-      component.dependencies.push({
-        did: child.meta.bundleDid,
-        required: !!config.required,
-        version: config.source.version || 'latest',
-      });
-    }
-
-    await parseComponents(child, {
-      ancestors: [...ancestors, { meta }],
-      dynamicComponents,
-    });
-  }
-
-  component.children = staticComponents;
-
-  return {
-    staticComponents,
-    dynamicComponents,
-  };
-};
-
 const validateBlocklet = (blocklet) =>
   forEachBlocklet(blocklet, (b) => {
     isRequirementsSatisfied(b.meta.requirements);
@@ -1327,45 +1199,6 @@ const needBlockletDownload = (blocklet, oldBlocklet) => {
   return get(oldBlocklet, 'meta.dist.integrity') !== get(blocklet, 'meta.dist.integrity');
 };
 
-const isDidMatchName = (did, name) => {
-  if (isValidDid(did) && name === did) {
-    return true;
-  }
-
-  return toBlockletDid(name) === did;
-};
-
-/**
- * set bundleDid and bundleMeta in meta
- * update name and did to server index
- * in app structure 2.0, application's bundleDid, bundleName, meta, did will be same
- */
-const ensureMeta = (meta, { name, did } = {}) => {
-  if (name && did && !isDidMatchName(did, name)) {
-    throw new Error(`name does not match with did: ${name}, ${did}`);
-  }
-
-  const newMeta = {
-    ...meta,
-  };
-
-  if (!newMeta.did || !newMeta.name || !isDidMatchName(newMeta.did, newMeta.name)) {
-    throw new Error(`name does not match with did in meta: ${newMeta.name}, ${newMeta.did}`);
-  }
-
-  if (!meta.bundleDid) {
-    newMeta.bundleDid = meta.did;
-    newMeta.bundleName = meta.name;
-  }
-
-  if (name) {
-    newMeta.name = name;
-    newMeta.did = did || toBlockletDid(name);
-  }
-
-  return newMeta;
-};
-
 const getBlocklet = async ({
   did,
   dataDirs,
@@ -1784,36 +1617,6 @@ const checkVersionCompatibility = (components) => {
   }
 };
 
-const filterDuplicateComponents = (components = [], currents = []) => {
-  const arr = [];
-
-  components.forEach((component) => {
-    if (currents.some((x) => x.meta.did === component.meta.did)) {
-      return;
-    }
-
-    const index = arr.findIndex((x) => x.meta.did === component.meta.did);
-    if (index > -1) {
-      const exist = arr[index];
-
-      // 选择最小版本:
-      // 如果 com1 和 com2 都依赖某个 component, com1 声明依赖版本 1.0.0, 实际获取版本 1.0.0; com2 声明依赖版本 latest(不限), 实际获取版本 2.0.0 -> 则应该取 1.0.0
-      if (semver.lt(component.meta.version, exist.meta.version)) {
-        arr.splice(index, 1, component);
-      }
-    } else {
-      arr.push(component);
-    }
-  });
-
-  return arr;
-};
-
-const validateBlockletMeta = (meta, opts = {}) => {
-  fixAndValidateService(meta);
-  return validateMeta(meta, { ensureName: true, skipValidateDidName: true, schemaOptions: { ...opts } });
-};
-
 const getBlockletKnownAs = (blocklet) => {
   const alsoKnownAs = [blocklet.appDid];
   if (Array.isArray(blocklet.migratedFrom)) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.12",
+  "version": "1.16.13-beta-118c3420",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.12",
-    "@abtnode/certificate-manager": "1.16.12",
-    "@abtnode/constant": "1.16.12",
-    "@abtnode/cron": "1.16.12",
-    "@abtnode/logger": "1.16.12",
-    "@abtnode/models": "1.16.12",
-    "@abtnode/queue": "1.16.12",
-    "@abtnode/rbac": "1.16.12",
-    "@abtnode/router-provider": "1.16.12",
-    "@abtnode/static-server": "1.16.12",
-    "@abtnode/timemachine": "1.16.12",
-    "@abtnode/util": "1.16.12",
+    "@abtnode/auth": "1.16.13-beta-118c3420",
+    "@abtnode/certificate-manager": "1.16.13-beta-118c3420",
+    "@abtnode/constant": "1.16.13-beta-118c3420",
+    "@abtnode/cron": "1.16.13-beta-118c3420",
+    "@abtnode/logger": "1.16.13-beta-118c3420",
+    "@abtnode/models": "1.16.13-beta-118c3420",
+    "@abtnode/queue": "1.16.13-beta-118c3420",
+    "@abtnode/rbac": "1.16.13-beta-118c3420",
+    "@abtnode/router-provider": "1.16.13-beta-118c3420",
+    "@abtnode/static-server": "1.16.13-beta-118c3420",
+    "@abtnode/timemachine": "1.16.13-beta-118c3420",
+    "@abtnode/util": "1.16.13-beta-118c3420",
     "@arcblock/did": "1.18.84",
     "@arcblock/did-auth": "1.18.84",
     "@arcblock/did-ext": "^1.18.84",
@@ -41,9 +41,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.84",
     "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.12",
-    "@blocklet/meta": "1.16.12",
-    "@blocklet/sdk": "1.16.12",
+    "@blocklet/constant": "1.16.13-beta-118c3420",
+    "@blocklet/meta": "1.16.13-beta-118c3420",
+    "@blocklet/resolver": "1.16.13-beta-118c3420",
+    "@blocklet/sdk": "1.16.13-beta-118c3420",
     "@did-space/client": "^0.2.117",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.84",
@@ -96,5 +97,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "f91a92c7621b0defbdb6b119ac657d712b1ca5bc"
+  "gitHead": "93e00311f882c8c153a1c6c3d18aa29c154f08f6"
 }