@abtnode/core 1.16.24 → 1.16.25-beta-4f765cf3

package/lib/api/team.js

@@ -26,6 +26,7 @@ const {
   createUserPassport,
 } = require('@abtnode/auth/lib/passport');
 const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
+const { callFederated, getFederatedMaster, findFederatedSite } = require('@abtnode/auth/lib/util/federated');
 const { hasActiveOwnerPassport } = require('@abtnode/util/lib/passport');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { getUserAvatarUrl, getAppAvatarUrl, extractUserAvatar, getAvatarByUrl } = require('@abtnode/util/lib/user');
@@ -41,7 +42,6 @@ const { validateCreatePermission, validateUpdatePermission } = require('../valid
 const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
 const { profileSchema } = require('../validators/user');
-const { callFederated, getFederatedMaster, findFederatedSite } = require('../util/federated');
 
 const sanitizeUrl = (url) => {
   if (!url) {

package/lib/blocklet/manager/disk.js

@@ -54,6 +54,7 @@ const {
   getDisplayName,
 } = require('@blocklet/meta/lib/util');
 const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
+const { getRequiredComponentsLayers } = require('@blocklet/meta/lib/get-required-components-layers');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
 const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
@@ -99,6 +100,8 @@ const isFunction = require('lodash/isFunction');
 const { encode } = require('@abtnode/util/lib/base32');
 const formatContext = require('@abtnode/util/lib/format-context');
 const md5 = require('@abtnode/util/lib/md5');
+const { callFederated } = require('@abtnode/auth/lib/util/federated');
+const pAll = require('p-all');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -197,7 +200,6 @@ const {
   getSelectedResources,
   updateSelectedResources,
 } = require('../project');
-const { callFederated } = require('../../util/federated');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -603,13 +605,68 @@ class DiskBlockletManager extends BaseBlockletManager {
     return migrateApplicationToStructV2({ did, appSk, context, manager: this, states });
   }
 
+  async startRequiredComponents({
+    componentDids,
+    inputComponentDids,
+    blocklet,
+    throwOnError,
+    checkHealthImmediately,
+    e2eMode,
+    context,
+    atomic,
+  }) {
+    if (!blocklet.children) {
+      return componentDids;
+    }
+
+    const targetDid = !inputComponentDids?.length ? componentDids[0] : inputComponentDids[0];
+
+    const canStartStatus = {
+      [BlockletStatus.installed]: true,
+      [BlockletStatus.error]: true,
+      [BlockletStatus.stopped]: true,
+    };
+
+    const requiredDidsLayers = getRequiredComponentsLayers({
+      targetDid,
+      children: blocklet.children,
+      filter: (child) => atomic || canStartStatus[child.status],
+    });
+
+    // 让当前的组件的状态提前变成 starting, 不然用户会很奇怪, 明明点了启动, 但是当前组件没变化.
+    const targetChild = blocklet.children.find((x) => x.meta.did === targetDid);
+    const doc = await states.blocklet.setBlockletStatus(blocklet.meta?.did, BlockletStatus.starting, {
+      componentDids: [targetDid],
+    });
+    targetChild.status = BlockletStatus.starting;
+    this.emit(BlockletEvents.statusChange, doc);
+
+    // start by dependency
+    for (const dids of requiredDidsLayers) {
+      if (atomic) {
+        await this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: dids }, context);
+      } else {
+        const tasks = dids.map(
+          (x) => () =>
+            this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [x] }, context)
+        );
+        await pAll(tasks, { concurrency: 4 }).catch((err) => {
+          throw new Error(err.errors.join(', '));
+        });
+      }
+    }
+
+    // remove the components that have just been started
+    const startedDids = new Set(requiredDidsLayers.flat());
+    return componentDids.filter((x) => !startedDids.has(x));
+  }
+
   async start(
     { did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids: inputComponentDids, atomic },
     context
   ) {
     const blocklet = await this.ensureBlocklet(did, { e2eMode });
-
-    const componentDids = inputComponentDids?.length ? inputComponentDids : blocklet.children.map((x) => x.meta.did);
+    let componentDids = inputComponentDids?.length ? inputComponentDids : blocklet.children.map((x) => x.meta.did);
 
     // sync component config before at first to ensure resource component config is ready
     const serverSk = (await states.node.read()).sk;
@@ -619,20 +676,29 @@ class DiskBlockletManager extends BaseBlockletManager {
       )
     );
 
+    componentDids = await this.startRequiredComponents({
+      componentDids,
+      inputComponentDids,
+      blocklet,
+      throwOnError,
+      checkHealthImmediately,
+      e2eMode,
+      context,
+      atomic,
+    });
+
     if (atomic || !blocklet.structVersion) {
-      return this._start(
-        { did, throwOnError, checkHealthImmediately, e2eMode, componentDids: inputComponentDids },
-        context
-      );
+      return this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids }, context);
     }
 
-    const tasks = componentDids.map((componentDid) =>
-      this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [componentDid] }, context)
+    const tasks = componentDids.map(
+      (componentDid) => () =>
+        this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [componentDid] }, context)
     );
 
-    return Promise.any(tasks).catch((err) => {
-      throw new Error(err.errors.join(', '));
-    });
+    const rest = await pAll(tasks, { concurrency: 4 });
+
+    return rest[0];
   }
 
   async _start(
@@ -1257,7 +1323,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   // Get blocklet by blockletDid or appDid
-  async detail({ did, attachConfig = true, attachRuntimeInfo, useCache }, context) {
+  async detail({ did, attachConfig = true, attachRuntimeInfo, useCache, getOptionalComponents }, context) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -1267,7 +1333,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (attachRuntimeInfo) {
-      return this._attachRuntimeInfo({ did, diskInfo: true, context });
+      return this._attachRuntimeInfo({ did, diskInfo: true, context, getOptionalComponents });
     }
 
     if (useCache && this.cachedBlocklets.has(did)) {
@@ -1275,7 +1341,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     try {
-      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
+      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false, getOptionalComponents });
 
       if (blocklet) {
         if (blocklet.appDid) {
@@ -3026,13 +3092,13 @@ class DiskBlockletManager extends BaseBlockletManager {
     return [];
   }
 
-  async _attachRuntimeInfo({ did, diskInfo = true, context }) {
+  async _attachRuntimeInfo({ did, diskInfo = true, context, getOptionalComponents }) {
     if (!did) {
       throw new Error('did should not be empty');
     }
 
     try {
-      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
+      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false, getOptionalComponents });
 
       if (!blocklet) {
         return null;

package/lib/states/user.js

@@ -209,7 +209,9 @@ class User extends ExtendBase {
     if (role && role !== '$all' && !where.did) {
       if (role === '$none') {
         where.did = {
-          [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports)'),
+          [Op.notIn]: Sequelize.literal(
+            `(SELECT DISTINCT userDid FROM passports WHERE status = '${PASSPORT_STATUS.VALID}')`
+          ),
         };
       } else {
         where.did = {
@@ -265,7 +267,9 @@ class User extends ExtendBase {
       return this.count({
         where: {
           did: {
-            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports)'),
+            [Op.notIn]: Sequelize.literal(
+              `(SELECT DISTINCT userDid FROM passports WHERE status = '${PASSPORT_STATUS.VALID}')`
+            ),
           },
         },
       });

package/lib/util/blocklet.js

@@ -1255,6 +1255,7 @@ const getBlocklet = async ({
   e2eMode = false,
   throwOnNotExist = true,
   ensureIntegrity = false,
+  getOptionalComponents = false,
 } = {}) => {
   if (!did) {
     throw new Error('Blocklet did does not exist');
@@ -1333,8 +1334,12 @@ const getBlocklet = async ({
     fillBlockletConfigs(component, configs);
   });
 
-  const optionalComponents = await parseOptionalComponents(blocklet.children);
-  blocklet.optionalComponents = optionalComponents;
+  if (getOptionalComponents) {
+    const optionalComponents = await parseOptionalComponents(blocklet);
+    blocklet.optionalComponents = optionalComponents;
+  } else {
+    blocklet.optionalComponents = [];
+  }
 
   return blocklet;
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24",
+  "version": "1.16.25-beta-4f765cf3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,39 +19,39 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.24",
-    "@abtnode/auth": "1.16.24",
-    "@abtnode/certificate-manager": "1.16.24",
-    "@abtnode/constant": "1.16.24",
-    "@abtnode/cron": "1.16.24",
-    "@abtnode/logger": "1.16.24",
-    "@abtnode/models": "1.16.24",
-    "@abtnode/queue": "1.16.24",
-    "@abtnode/rbac": "1.16.24",
-    "@abtnode/router-provider": "1.16.24",
-    "@abtnode/static-server": "1.16.24",
-    "@abtnode/timemachine": "1.16.24",
-    "@abtnode/util": "1.16.24",
-    "@arcblock/did": "1.18.110",
-    "@arcblock/did-auth": "1.18.110",
-    "@arcblock/did-ext": "^1.18.110",
+    "@abtnode/analytics": "1.16.25-beta-4f765cf3",
+    "@abtnode/auth": "1.16.25-beta-4f765cf3",
+    "@abtnode/certificate-manager": "1.16.25-beta-4f765cf3",
+    "@abtnode/constant": "1.16.25-beta-4f765cf3",
+    "@abtnode/cron": "1.16.25-beta-4f765cf3",
+    "@abtnode/logger": "1.16.25-beta-4f765cf3",
+    "@abtnode/models": "1.16.25-beta-4f765cf3",
+    "@abtnode/queue": "1.16.25-beta-4f765cf3",
+    "@abtnode/rbac": "1.16.25-beta-4f765cf3",
+    "@abtnode/router-provider": "1.16.25-beta-4f765cf3",
+    "@abtnode/static-server": "1.16.25-beta-4f765cf3",
+    "@abtnode/timemachine": "1.16.25-beta-4f765cf3",
+    "@abtnode/util": "1.16.25-beta-4f765cf3",
+    "@arcblock/did": "1.18.113",
+    "@arcblock/did-auth": "1.18.113",
+    "@arcblock/did-ext": "^1.18.113",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.110",
-    "@arcblock/event-hub": "1.18.110",
-    "@arcblock/jwt": "^1.18.110",
+    "@arcblock/did-util": "1.18.113",
+    "@arcblock/event-hub": "1.18.113",
+    "@arcblock/jwt": "^1.18.113",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.110",
-    "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24",
-    "@blocklet/env": "1.16.24",
-    "@blocklet/meta": "1.16.24",
-    "@blocklet/resolver": "1.16.24",
-    "@blocklet/sdk": "1.16.24",
+    "@arcblock/validator": "^1.18.113",
+    "@arcblock/vc": "1.18.113",
+    "@blocklet/constant": "1.16.25-beta-4f765cf3",
+    "@blocklet/env": "1.16.25-beta-4f765cf3",
+    "@blocklet/meta": "1.16.25-beta-4f765cf3",
+    "@blocklet/resolver": "1.16.25-beta-4f765cf3",
+    "@blocklet/sdk": "1.16.25-beta-4f765cf3",
     "@did-space/client": "^0.3.67",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.110",
-    "@ocap/util": "1.18.110",
-    "@ocap/wallet": "1.18.110",
+    "@ocap/mcrypto": "1.18.113",
+    "@ocap/util": "1.18.113",
+    "@ocap/wallet": "1.18.113",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6cd6669cb3569f96433e18b1dac346432741a1a7"
+  "gitHead": "7783a4bf883bb44b4266651b04008ef65bf6c2ce"
 }

package/lib/util/federated.js

@@ -1,43 +0,0 @@
-const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
-const pRetry = require('p-retry');
-const { signV2 } = require('@arcblock/jwt');
-const joinUrl = require('url-join');
-
-const request = require('./request');
-
-function isMaster(site) {
-  return site?.isMaster !== false;
-}
-
-function getFederatedMaster(blocklet) {
-  const { sites } = blocklet?.settings?.federated || {};
-  const masterSite = (sites || []).find((item) => isMaster(item));
-  return masterSite || null;
-}
-
-function findFederatedSite(blocklet, targetAppPid) {
-  const { sites } = blocklet?.settings?.federated || {};
-  const targetSite = (sites || []).find((item) => item.appPid === targetAppPid);
-  return targetSite || null;
-}
-
-async function callFederated({ site, permanentWallet, data, action }) {
-  const url = new URL(site.appUrl);
-  url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
-  const result = await pRetry(
-    () =>
-      request.post(url.href, {
-        signer: permanentWallet.address,
-        data: signV2(permanentWallet.address, permanentWallet.secretKey, data),
-      }),
-    { retries: 3 }
-  );
-  return result.data;
-}
-
-module.exports = {
-  callFederated,
-  getFederatedMaster,
-  findFederatedSite,
-  isMaster,
-};