@abtnode/core 1.16.14-beta-c2843ec5 → 1.16.14-beta-be739405

package/lib/api/node.js

@@ -24,8 +24,7 @@ class NodeAPI {
    * @param {object} states StateDB
    * @param {string} nodeDid
    */
-  // eslint-disable-next-line no-unused-vars
-  constructor(states, nodeDid, getRouterCapabilities = (_) => ({})) {
+  constructor(states, nodeDid) {
     assert.notStrictEqual(states, undefined, 'argument states can not be undefined');
     assert.notStrictEqual(states, null, 'argument states can not be null');
 
@@ -40,7 +39,6 @@ class NodeAPI {
     });
 
     this.state = states.node;
-    this.getRouterCapabilities = getRouterCapabilities;
   }
 
   async updateNodeInfo(entity = {}, context) {
@@ -75,7 +73,6 @@ class NodeAPI {
     }
 
     info.uptime = process.uptime() * 1000;
-    info.capabilities = this.getRouterCapabilities(info);
 
     return info;
   }

package/lib/blocklet/downloader/blocklet-downloader.js

@@ -209,7 +209,7 @@ class BlockletDownloader extends EventEmitter {
 
     const cachedBundles = (await this.cache.get(CACHE_KEY)) || [];
 
-    forEachComponentV2Sync(blocklet, (component) => {
+    const handle = (component) => {
       const bundleId = getComponentBundleId(component);
 
       if (scheduled[bundleId]) {
@@ -238,7 +238,10 @@ class BlockletDownloader extends EventEmitter {
 
       scheduled[bundleId] = component.meta;
       downloadComponentIds.push(component.meta.did);
-    });
+    };
+
+    handle(blocklet);
+    forEachComponentV2Sync(blocklet, handle);
 
     const downloadList = Object.values(scheduled);
     const skipList = Object.values(skipped);

package/lib/blocklet/manager/disk.js

@@ -46,6 +46,7 @@ const {
   forEachComponentV2,
   forEachComponentV2Sync,
   findComponentByIdV2,
+  isGatewayBlocklet,
 } = require('@blocklet/meta/lib/util');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
@@ -159,7 +160,7 @@ const { sessionConfigSchema } = require('../../validators/util');
 
 const request = require('../../util/request');
 
-const { formatEnvironments, getBlockletMeta, validateOwner } = util;
+const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
 const statusLock = new Lock('blocklet-status-lock');
 const limitSync = pLimit(1);
@@ -1045,9 +1046,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (attachRuntimeInfo) {
-      const nodeInfo = await states.node.read();
-
-      return this._attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
+      return this._attachRuntimeInfo({ did, diskInfo: true, context });
     }
 
     if (useCache && this.cachedBlocklets.has(did)) {
@@ -1641,7 +1640,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       {
         name: 'refresh-accessible-ip',
         time: '0 */10 * * * *', // 10min
-        options: { runOnInit: true },
+        options: { runOnInit: true, runInService: true },
         fn: async () => {
           const nodeInfo = await states.node.read();
           await refreshAccessibleExternalNodeIp(nodeInfo);
@@ -2272,7 +2271,6 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async _attachBlockletListRuntimeInfo({ blocklets }, context) {
-    const nodeInfo = await states.node.read();
     return (
       await Promise.all(
         blocklets.map((x) => {
@@ -2282,7 +2280,6 @@ class DiskBlockletManager extends BaseBlockletManager {
 
           return this._attachRuntimeInfo({
             did: x.meta.did,
-            nodeInfo,
             diskInfo: false,
             context,
           });
@@ -2291,7 +2288,20 @@ class DiskBlockletManager extends BaseBlockletManager {
     ).filter(Boolean);
   }
 
-  async _attachRuntimeInfo({ did, nodeInfo, diskInfo = true, context }) {
+  // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
+  async getDomainAliases(blocklet, context = {}) {
+    if (blocklet?.site?.domainAliases?.length) {
+      const nodeIp = await getAccessibleExternalNodeIp();
+      return blocklet.site.domainAliases.map((x) => ({
+        ...x,
+        value: util.replaceDomainSlot({ domain: x.value, context, nodeIp }),
+      }));
+    }
+
+    return [];
+  }
+
+  async _attachRuntimeInfo({ did, diskInfo = true, context }) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -2303,14 +2313,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         return null;
       }
 
-      // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
-      if (blocklet?.site?.domainAliases?.length) {
-        const nodeIp = await getAccessibleExternalNodeIp(nodeInfo);
-        blocklet.site.domainAliases = blocklet.site.domainAliases.map((x) => ({
-          ...x,
-          value: util.replaceDomainSlot({ domain: x.value, context, nodeIp }),
-        }));
-      }
+      blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
 
       // app runtime info, app status
       blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
@@ -2368,7 +2371,16 @@ class DiskBlockletManager extends BaseBlockletManager {
     return children;
   }
 
-  async _addBlocklet({ component, mode = BLOCKLET_MODES.PRODUCTION, name, did, title, description, skSource = '' }) {
+  async _addBlocklet({
+    component,
+    mode = BLOCKLET_MODES.PRODUCTION,
+    name,
+    did,
+    title,
+    description,
+    skSource = '',
+    folder,
+  }) {
     const environments = component?.meta?.environments || [];
 
     const meta = {
@@ -2397,7 +2409,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     let children;
     if (mode === BLOCKLET_MODES.DEVELOPMENT) {
-      children = [component];
+      children = isGatewayBlocklet(component.meta) ? [] : [component];
     } else {
       children = component ? await this._getChildrenForInstallation(component) : [];
     }
@@ -2417,6 +2429,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       meta.logo = component.meta.logo;
     } else if (children[0]?.meta?.logo) {
       meta.logo = children[0].meta.logo;
+    } else if (mode === BLOCKLET_MODES.DEVELOPMENT && isGatewayBlocklet(component.meta)) {
+      meta.logo = component.meta.logo;
     }
 
     await validateBlocklet({ meta, children });
@@ -2442,6 +2456,11 @@ class DiskBlockletManager extends BaseBlockletManager {
       params.deployedFrom = containerSourceUrl;
     }
 
+    if (mode === BLOCKLET_MODES.DEVELOPMENT && isGatewayBlocklet(component.meta)) {
+      params.source = BlockletSource.local;
+      params.deployedFrom = folder;
+    }
+
     const blocklet = await states.blocklet.addBlocklet(params);
 
     // set chain type
@@ -2997,6 +3016,10 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async _createNotification(did, notification) {
+    if (isCLI()) {
+      return;
+    }
+
     try {
       const extra = await states.blockletExtras.getMeta(did);
       const isExternal = !!extra?.controller;
@@ -3468,14 +3491,16 @@ class FederatedBlockletManager extends DiskBlockletManager {
     const blocklet = await this.getBlocklet(did);
     const nodeInfo = await states.node.read();
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+    const domainAliases = await this.getDomainAliases(blocklet);
     const { permanentWallet } = blockletInfo;
     const memberSite = {
       appId: blocklet.appDid,
       appPid: blocklet.appPid,
-      aliasDid: (blocklet.migratedFrom || []).map((item) => item.appDid),
+      aliasDid: (blocklet.migratedFrom || []).map((x) => x.appDid),
       appName: blockletInfo.name,
       appDescription: blockletInfo.description,
       appUrl: blockletInfo.appUrl,
+      aliasDomain: domainAliases.map((x) => x.value),
       appLogo:
         blocklet.environmentObj.BLOCKLET_APP_LOGO ||
         normalizePathPrefix(`${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`) ||
@@ -3689,16 +3714,22 @@ class FederatedBlockletManager extends DiskBlockletManager {
     const waitingList = federated.sites
       .filter((item) => item.appId !== federated.config.appId)
       .map((item) => {
-        return limitSync(() =>
-          pRetry(
-            () =>
-              request.post(`${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`, {
-                signer: permanentWallet.address,
-                data: signV2(permanentWallet.address, permanentWallet.secretKey, { sites: federated.sites }),
-              }),
-            { retries: 3 }
-          )
-        );
+        return limitSync(async () => {
+          const url = `${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`;
+          try {
+            // NOTICE: 即使通知某个 member 失败了，也不影响其他 member 接收同步结果
+            await pRetry(
+              () =>
+                request.post(url, {
+                  signer: permanentWallet.address,
+                  data: signV2(permanentWallet.address, permanentWallet.secretKey, { sites: federated.sites }),
+                }),
+              { retries: 3 }
+            );
+          } catch (error) {
+            logger.warn('Failed to sync federated sites', { error, did, url, action: 'audit' });
+          }
+        });
       });
     await Promise.all(waitingList);
     return newState;

package/lib/blocklet/manager/helper/install-application-from-dev.js

@@ -37,6 +37,7 @@ const installApplicationFromDev = async ({ folder, meta, states, manager } = {})
     name,
     did,
     mode: BLOCKLET_MODES.DEVELOPMENT,
+    folder,
   });
   logger.info('add blocklet for dev', { did, version, meta });
 

package/lib/blocklet/manager/helper/install-component-from-dev.js

@@ -1,7 +1,7 @@
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-dev');
 
 const { BlockletStatus, BlockletSource, BLOCKLET_MODES, fromBlockletStatus } = require('@blocklet/constant');
-const { isInProgress } = require('@blocklet/meta/lib/util');
+const { isInProgress, isGatewayBlocklet } = require('@blocklet/meta/lib/util');
 const {
   parseComponents,
   filterDuplicateComponents,
@@ -59,7 +59,15 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
       existRoot.children.filter((x) => x.meta.did !== component.meta.did)
     );
   }
-  children.unshift(component);
+
+  if (!isGatewayBlocklet(meta)) {
+    children.unshift(component);
+  }
+
+  if (children.length <= 0) {
+    return manager.getBlocklet(rootDid);
+  }
+
   checkVersionCompatibility([...children, ...existRoot.children]);
 
   const componentDids = children.map((x) => x.meta.did);

package/lib/index.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const get = require('lodash/get');
 const uniq = require('lodash/uniq');
 const md5 = require('@abtnode/util/lib/md5');
 const formatContext = require('@abtnode/util/lib/format-context');
@@ -206,10 +207,9 @@ function ABTNode(options) {
     deleteRoutingRule,
     addDomainAlias,
     deleteDomainAlias,
-    getRouterCapabilities,
   } = getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager });
 
-  const nodeAPI = new NodeAPI(states, options.nodeDid, getRouterCapabilities);
+  const nodeAPI = new NodeAPI(states, options.nodeDid);
   const teamAPI = new TeamAPI({ states, teamManager, dataDirs });
 
   blockletManager.resetSiteByDid = resetSiteByDid;
@@ -254,6 +254,7 @@ function ABTNode(options) {
     checkComponentsForUpdates: blockletManager.checkComponentsForUpdates.bind(blockletManager),
     upgradeComponents: blockletManager.upgradeComponents.bind(blockletManager),
     getBlockletForLauncher: blockletManager.getBlockletForLauncher.bind(blockletManager),
+    getBlockletDomainAliases: blockletManager.getDomainAliases.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),
     configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
@@ -529,7 +530,7 @@ function ABTNode(options) {
         LogRotator.getCron(),
         ...getStateCrons(states),
         ...nodeAPI.getCrons(),
-      ],
+      ].filter((x) => options.daemon || (options.service && get(x, 'options.runInService'))),
       onError: (error, name) => {
         states.notification.create({
           title: 'Run job failed',
@@ -556,8 +557,8 @@ function ABTNode(options) {
       .catch(console.error);
   };
 
-  if (options.daemon) {
-    onStatesReady(() => {
+  onStatesReady(() => {
+    if (options.daemon) {
       // start cert manager
       certManager
         .start()
@@ -575,8 +576,8 @@ function ABTNode(options) {
           logger.info('Cron jobs start successfully on daemon start');
         }
       }, 1000);
-    });
-  }
+    }
+  });
 
   events.on(EVENTS.NODE_STOPPED, () => {
     pm2Events.pause();

package/lib/router/helper.js

@@ -7,7 +7,6 @@ const UUID = require('uuid');
 const dayjs = require('@abtnode/util/lib/dayjs');
 const isUrl = require('is-url');
 const get = require('lodash/get');
-const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
 const groupBy = require('lodash/groupBy');
 const isEqual = require('lodash/isEqual');
@@ -1282,16 +1281,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     }
   };
 
-  const getRouterCapabilities = (info) => {
-    const providerName = get(info, 'routing.provider', null);
-
-    if (providerName && providers[providerName]) {
-      return pick(providers[providerName].capabilities || {}, ['httpImageFilter']);
-    }
-
-    return {};
-  };
-
   const analyzeRouterLog = async () => {
     const info = await nodeState.read();
     const sites = await getRoutingSites({});
@@ -1602,7 +1591,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     deleteDomainAlias,
 
     isGatewayCacheEnabled,
-    getRouterCapabilities,
   };
 };
 

package/lib/router/index.js

@@ -96,7 +96,6 @@ class Router {
     }
 
     this.provider = provider;
-    this.capabilities = provider.capabilities;
     this.getRoutingParams = getRoutingParams;
     this.routingTable = [];
   }

package/lib/util/get-accessible-external-node-ip.js

@@ -12,8 +12,8 @@ const timeout = process.env.NODE_ENV === 'test' ? 500 : 5000;
 
 // check if node dashboard https endpoint return 2xx
 // FIXME: check connected by wellknown endpoint
-const checkConnected = async ({ ip, nodeInfo }) => {
-  const { adminPath = WELLKNOWN_SERVER_ADMIN_PATH } = nodeInfo.routing || {};
+const checkConnected = async ({ ip, info }) => {
+  const { adminPath = WELLKNOWN_SERVER_ADMIN_PATH } = info.routing || {};
   const origin = `https://${getNodeDomain(ip)}`;
   const endpoint = joinUrl(origin, adminPath);
   await axios.get(endpoint, { timeout });
@@ -22,25 +22,32 @@ const checkConnected = async ({ ip, nodeInfo }) => {
 /**
  * Get accessible external ip of abtnode
  */
-const fetch = async (nodeInfo) => {
-  const { external } = await getIp();
+const fetch = async (info) => {
+  const { external, internal } = await getIp();
   logger.info('refresh external ip:', external);
 
-  if (!external) {
-    return null;
-  }
-
-  if (cache === external) {
+  if ([external, internal].includes(cache)) {
     return cache;
   }
 
+  // prefer external ip
   try {
-    await checkConnected({ ip: external, nodeInfo });
+    await checkConnected({ ip: external, info });
     cache = external;
   } catch {
     cache = null;
   }
 
+  // fallback to internal ip
+  if (!cache) {
+    try {
+      await checkConnected({ ip: internal, info });
+      cache = external;
+    } catch {
+      cache = null;
+    }
+  }
+
   return cache;
 };
 

package/lib/util/get-domain-for-blocklet.js

@@ -6,8 +6,8 @@ const getIpDnsDomainForBlocklet = (blocklet) => {
   return `${encodeBase32(blocklet.meta.did)}-${SLOT_FOR_IP_DNS_SITE}.${DEFAULT_IP_DOMAIN_SUFFIX}`;
 };
 
-const getDidDomainForBlocklet = ({ appPid, didDomain }) => {
-  return `${encodeBase32(appPid)}.${didDomain || DEFAULT_DID_DOMAIN}`;
+const getDidDomainForBlocklet = ({ appPid, didDomain = DEFAULT_DID_DOMAIN }) => {
+  return `${encodeBase32(appPid)}.${didDomain}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet, formatName };

package/lib/util/ip.js

@@ -20,6 +20,7 @@ const cron = {
   name: 'refetch-ip',
   time: '0 */30 * * * *', // refetch every 30 minutes
   fn: fetch,
+  options: { runOnInit: true, runInService: true },
 };
 
 module.exports.fetch = fetch;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-c2843ec5",
+  "version": "1.16.14-beta-be739405",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.14-beta-c2843ec5",
-    "@abtnode/auth": "1.16.14-beta-c2843ec5",
-    "@abtnode/certificate-manager": "1.16.14-beta-c2843ec5",
-    "@abtnode/constant": "1.16.14-beta-c2843ec5",
-    "@abtnode/cron": "1.16.14-beta-c2843ec5",
-    "@abtnode/logger": "1.16.14-beta-c2843ec5",
-    "@abtnode/models": "1.16.14-beta-c2843ec5",
-    "@abtnode/queue": "1.16.14-beta-c2843ec5",
-    "@abtnode/rbac": "1.16.14-beta-c2843ec5",
-    "@abtnode/router-provider": "1.16.14-beta-c2843ec5",
-    "@abtnode/static-server": "1.16.14-beta-c2843ec5",
-    "@abtnode/timemachine": "1.16.14-beta-c2843ec5",
-    "@abtnode/util": "1.16.14-beta-c2843ec5",
+    "@abtnode/analytics": "1.16.14-beta-be739405",
+    "@abtnode/auth": "1.16.14-beta-be739405",
+    "@abtnode/certificate-manager": "1.16.14-beta-be739405",
+    "@abtnode/constant": "1.16.14-beta-be739405",
+    "@abtnode/cron": "1.16.14-beta-be739405",
+    "@abtnode/logger": "1.16.14-beta-be739405",
+    "@abtnode/models": "1.16.14-beta-be739405",
+    "@abtnode/queue": "1.16.14-beta-be739405",
+    "@abtnode/rbac": "1.16.14-beta-be739405",
+    "@abtnode/router-provider": "1.16.14-beta-be739405",
+    "@abtnode/static-server": "1.16.14-beta-be739405",
+    "@abtnode/timemachine": "1.16.14-beta-be739405",
+    "@abtnode/util": "1.16.14-beta-be739405",
     "@arcblock/did": "1.18.87",
     "@arcblock/did-auth": "1.18.87",
     "@arcblock/did-ext": "^1.18.87",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.87",
     "@arcblock/vc": "1.18.87",
-    "@blocklet/constant": "1.16.14-beta-c2843ec5",
-    "@blocklet/meta": "1.16.14-beta-c2843ec5",
-    "@blocklet/resolver": "1.16.14-beta-c2843ec5",
-    "@blocklet/sdk": "1.16.14-beta-c2843ec5",
+    "@blocklet/constant": "1.16.14-beta-be739405",
+    "@blocklet/meta": "1.16.14-beta-be739405",
+    "@blocklet/resolver": "1.16.14-beta-be739405",
+    "@blocklet/sdk": "1.16.14-beta-be739405",
     "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.87",
@@ -99,5 +99,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "968bfad93779a21dd1374eede3ac7d4d6d40822b"
+  "gitHead": "4a7be8e8a321f8be5b172c10c09c32af216a1c73"
 }