@abtnode/core 1.16.13-beta-90ded76f → 1.16.13-beta-ef672597

package/lib/blocklet/manager/disk.js

@@ -458,10 +458,37 @@ class BlockletManager extends BaseBlockletManager {
     return { did, isInstalled: !!blocklet, isRunning };
   }
 
-  async start({ did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids }, context) {
+  async start(
+    { did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids: inputComponentDids, atomic },
+    context
+  ) {
+    const blocklet = await this.ensureBlocklet(did, { e2eMode });
+
+    if (atomic || !blocklet.structVersion) {
+      return this._start(
+        { did, throwOnError, checkHealthImmediately, e2eMode, componentDids: inputComponentDids },
+        context
+      );
+    }
+
+    const componentDids = inputComponentDids?.length ? inputComponentDids : blocklet.children.map((x) => x.meta.did);
+
+    const tasks = componentDids.map((componentDid) =>
+      this._start({ did, throwOnError, checkHealthImmediately, e2eMode, componentDids: [componentDid] }, context)
+    );
+
+    return Promise.any(tasks).catch((err) => {
+      throw new Error(err.errors.join(', '));
+    });
+  }
+
+  async _start(
+    { blocklet: inputBlocklet, did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids },
+    context
+  ) {
     logger.info('start blocklet', { did, componentDids, throwOnError, checkHealthImmediately, e2eMode });
     // should check blocklet integrity
-    const blocklet1 = await this.ensureBlocklet(did, { e2eMode });
+    const blocklet1 = inputBlocklet || (await this.ensureBlocklet(did, { e2eMode }));
 
     await this.checkControllerStatus(blocklet1, 'start');
 
@@ -485,9 +512,9 @@ class BlockletManager extends BaseBlockletManager {
       // blocklet may be manually stopped durning starting
       // so error message would not be sent if blocklet is stopped
       // so we need update status first
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.starting, { componentDids });
+      const doc1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.starting, { componentDids });
       blocklet1.status = BlockletStatus.starting;
-      this.emit(BlockletEvents.statusChange, blocklet1);
+      this.emit(BlockletEvents.statusChange, doc1);
 
       if (blocklet1.mode === BLOCKLET_MODES.DEVELOPMENT) {
         const { logsDir } = blocklet1.env;
@@ -569,6 +596,7 @@ class BlockletManager extends BaseBlockletManager {
       await this.deleteProcess({ did, componentDids });
       const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
       this.emit(BlockletEvents.startFailed, { ...res, error: { message: error.message } });
+      this.emit(BlockletEvents.statusChange, { ...res, error: { message: error.message } });
 
       if (throwOnError) {
         throw new Error(description);
@@ -585,9 +613,9 @@ class BlockletManager extends BaseBlockletManager {
     const { processId } = blocklet.env;
 
     if (updateStatus) {
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids });
+      const doc = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids });
       blocklet.status = BlockletStatus.stopping;
-      this.emit(BlockletEvents.statusChange, blocklet);
+      this.emit(BlockletEvents.statusChange, doc);
     }
 
     try {
@@ -1994,6 +2022,7 @@ class BlockletManager extends BaseBlockletManager {
         components: getComponentsInternalInfo(res),
       });
 
+      this.emit(BlockletEvents.statusChange, res);
       this.emit(BlockletEvents.started, res);
       logger.info('blocklet healthy', { did, name, time: Date.now() - startedAt });
     } catch (error) {
@@ -2006,7 +2035,7 @@ class BlockletManager extends BaseBlockletManager {
       logger.error('check blocklet if started failed', { did, name, context, timeout, error });
 
       await this.deleteProcess({ did, componentDids }, context);
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
+      const doc = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
 
       this._createNotification(did, {
         title: 'Blocklet Start Failed',
@@ -2017,6 +2046,7 @@ class BlockletManager extends BaseBlockletManager {
       });
 
       this.emit(BlockletEvents.startFailed, { meta, error });
+      this.emit(BlockletEvents.statusChange, { ...doc, error });
 
       if (throwOnError) {
         throw error;

package/lib/blocklet/storage/restore/spaces.js

@@ -25,6 +25,7 @@ const { BaseRestore } = require('./base');
 const { BlockletExtrasRestore } = require('./blocklet-extras');
 const { BlockletRestore } = require('./blocklet');
 const { BlockletsRestore } = require('./blocklets');
+const states = require('../../../states');
 
 class SpacesRestore extends BaseRestore {
   /**
@@ -105,6 +106,11 @@ class SpacesRestore extends BaseRestore {
 
   async syncFromSpaces() {
     const { endpoint, wallet, delegation } = this.input;
+    /**
+     * @type {import('@abtnode/client').NodeState}
+     */
+    const node = await states.node.read();
+    const serverDid = node.did;
 
     const spaceClient = new SpaceClient({
       endpoint,
@@ -131,6 +137,7 @@ class SpacesRestore extends BaseRestore {
 
         userDid: this.input.userDid,
         referrer: this.input.referrer,
+        serverDid,
       })
     );
 

package/lib/router/helper.js

@@ -19,7 +19,7 @@ const downloadFile = require('@abtnode/util/lib/download-file');
 const { updateBlockletDocument } = require('@abtnode/util/lib/did-document');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { forEachBlockletSync } = require('@blocklet/meta/lib/util');
-const { processLogByDate } = require('@abtnode/insights');
+const { processLogByDate } = require('@abtnode/analytics');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   DOMAIN_FOR_IP_SITE_REGEXP,
@@ -39,6 +39,7 @@ const {
   WELLKNOWN_ACME_CHALLENGE_PREFIX,
   WELLKNOWN_DID_RESOLVER_PREFIX,
   WELLKNOWN_PING_PREFIX,
+  WELLKNOWN_ANALYTICS_PREFIX,
   LOG_RETAIN_IN_DAYS,
   EVENTS,
   DEFAULT_IP_DOMAIN,
@@ -54,8 +55,9 @@ const {
   BLOCKLET_MODES,
 } = require('@blocklet/constant');
 
-// eslint-disable-next-line global-require
-const logger = require('@abtnode/logger')(`${require('../../package.json').name}:router:helper`);
+const pkg = require('../../package.json');
+// eslint-disable-next-line
+const logger = require('@abtnode/logger')(`${pkg.name}:router:helper`);
 const {
   getProviderFromNodeInfo,
   getHttpsCertInfo,
@@ -79,6 +81,32 @@ const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
 const hasRuleByPrefix = (site, value) => site.rules.find((x) => x.isProtected && get(x, 'from.pathPrefix') === value);
 
+const pingWellknownRule = {
+  isProtected: true,
+  from: { pathPrefix: WELLKNOWN_PING_PREFIX },
+  to: {
+    type: ROUTING_RULE_TYPES.DIRECT_RESPONSE,
+    response: {
+      status: 200,
+      contentType: 'application/javascript',
+      body: "'pong'",
+    },
+  },
+};
+
+const analyticsWellknownRule = {
+  isProtected: true,
+  from: { pathPrefix: WELLKNOWN_ANALYTICS_PREFIX },
+  to: {
+    type: ROUTING_RULE_TYPES.DIRECT_RESPONSE,
+    response: {
+      status: 200,
+      contentType: 'text/html',
+      body: pkg.version,
+    },
+  },
+};
+
 /**
  * replace 888-888-888-888 with accessible ip for domain
  */
@@ -796,46 +824,12 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         to: proxyTarget,
       };
 
-      const pingWellknownRule = {
-        isProtected: true,
-        from: { pathPrefix: WELLKNOWN_PING_PREFIX },
-        to: {
-          type: ROUTING_RULE_TYPES.DIRECT_RESPONSE,
-          response: {
-            status: 200,
-            contentType: 'application/javascript',
-            body: "'pong'",
-          },
-          port: info.port,
-        },
-      };
-
       if (site) {
-        const didResolverRuleUpdateRes = await upsertSiteRule(
-          {
-            site,
-            rule: didResolverWellknownRule,
-          },
-          context
-        );
-
-        const acmeRuleUpdateRes = await upsertSiteRule(
-          {
-            site,
-            rule: acmeChallengeWellknownRule,
-          },
-          context
-        );
-
-        const pingRuleRes = await upsertSiteRule(
-          {
-            site,
-            rule: pingWellknownRule,
-          },
-          context
-        );
-
-        return didResolverRuleUpdateRes || acmeRuleUpdateRes || pingRuleRes;
+        const didResolverRuleUpdateRes = await upsertSiteRule({ site, rule: didResolverWellknownRule }, context);
+        const acmeRuleUpdateRes = await upsertSiteRule({ site, rule: acmeChallengeWellknownRule }, context);
+        const pingRuleRes = await upsertSiteRule({ site, rule: pingWellknownRule }, context);
+        const analyticsRuleRes = await upsertSiteRule({ site, rule: analyticsWellknownRule }, context);
+        return didResolverRuleUpdateRes || acmeRuleUpdateRes || pingRuleRes || analyticsRuleRes;
       }
 
       await routerManager.addRoutingSite(
@@ -844,7 +838,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
             domain: DOMAIN_FOR_INTERNAL_SITE,
             port: await getWellknownSitePort(),
             name: NAME_FOR_WELLKNOWN_SITE,
-            rules: [didResolverWellknownRule, acmeChallengeWellknownRule, pingWellknownRule],
+            rules: [didResolverWellknownRule, acmeChallengeWellknownRule, pingWellknownRule, analyticsWellknownRule],
             isProtected: true,
           },
           skipCheckDynamicBlacklist: true,
@@ -911,13 +905,19 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
     try {
       const result = await siteState.update({ id: dashboardSite.id }, { $set: { domainAliases } });
-
       updatedResult.push(result);
     } catch (error) {
       logger.error('add dashboard domain rule failed', { error });
       console.error('Add dashboard domain rule failed:', error);
     }
 
+    try {
+      const result = await upsertSiteRule({ site: dashboardSite, rule: analyticsWellknownRule }, context);
+      updatedResult.push(result);
+    } catch (error) {
+      logger.error('add dashboard analytics rule failed', { error });
+    }
+
     const defaultRule = sites.find((x) => x.domain === DOMAIN_FOR_DEFAULT_SITE);
     if (!defaultRule) {
       try {
@@ -1293,7 +1293,9 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     }
 
     const groups = [];
-    const server = sites.find((x) => x.domainAliases.some((a) => a.value === DOMAIN_FOR_IP_SITE));
+    const server = sites.find((x) =>
+      x.rules.some((rule) => rule.to.type === ROUTING_RULE_TYPES.DAEMON && rule.to.did === info.did)
+    );
     if (server) {
       groups.push({
         did: info.did,
@@ -1312,12 +1314,13 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
           hosts: site.domainAliases.map((d) => d.value).filter(Boolean),
         });
       });
+    logger.info('Prepare analyze router logs', groups);
 
     const logDir = providers[providerName].getLogDir();
-    const doAnalyze = async (date) => {
-      logger.info('Start analyze router logs', { date, groups, logDir });
+    const doAnalyze = async (date, groupsRaw) => {
+      logger.info('Start analyze router logs', { date });
       try {
-        let results = await processLogByDate(logDir, dataDirs.tmp, dataDirs.data, date, groups);
+        let results = await processLogByDate(logDir, dataDirs.tmp, dataDirs.data, date, groupsRaw);
         logger.info('Done analyze router logs', { date, results });
 
         results = await Promise.all(
@@ -1328,7 +1331,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
         );
         logger.info('Done insert insight results', { date, results });
       } catch (err) {
-        console.error(err);
         logger.error('Failed to analyze router logs', { date, error: err });
       }
     };
@@ -1337,13 +1339,13 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     if (fs.existsSync(analyzeLock)) {
       // FIXME: @wangshijun how do we support real time logs
       const date = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
-      await doAnalyze(date);
+      await doAnalyze(date, cloneDeep(groups));
     } else {
       fs.writeFileSync(analyzeLock, '1');
       for (let i = 1; i <= 30; i++) {
         const date = dayjs().subtract(i, 'day').format('YYYY-MM-DD');
         // eslint-disable-next-line no-await-in-loop
-        await doAnalyze(date);
+        await doAnalyze(date, cloneDeep(groups));
       }
     }
   };

package/lib/states/blocklet.js

@@ -519,12 +519,16 @@ class BlockletState extends BaseState {
       const doc = await this.getBlocklet(did);
 
       if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
-        return this.updateBlocklet(did, { status });
+        const res = await this.updateBlocklet(did, { status });
+        statusLock.release();
+        return res;
       }
 
       // for backward compatibility
       if (!doc.structVersion && !doc.children?.length) {
-        return this.updateBlocklet(did, { status });
+        const res = await this.updateBlocklet(did, { status });
+        statusLock.release();
+        return res;
       }
 
       // update children status
@@ -661,10 +665,10 @@ class BlockletState extends BaseState {
 
   _getStatusLock(did) {
     if (!this.statusLocks.has(did)) {
-      this.statusLocks[did] = new Lock();
+      this.statusLocks.set(did, new Lock());
     }
 
-    return this.statusLocks[did];
+    return this.statusLocks.get(did);
   }
 
   async _getOccupiedPorts() {

package/lib/util/blocklet.js

@@ -570,7 +570,7 @@ const startBlockletProcess = async (
       };
 
       const clusterMode = get(b.meta, 'capabilities.clusterMode', false);
-      if (clusterMode && blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
+      if (clusterMode && b.mode !== BLOCKLET_MODES.DEVELOPMENT) {
         const clusterSize = Number(blocklet.configObj.BLOCKLET_CLUSTER_SIZE) || +process.env.ABT_NODE_MAX_CLUSTER_SIZE;
         options.execMode = 'cluster';
         options.mergeLogs = true;

package/lib/util/spaces.js

@@ -63,7 +63,9 @@ async function getSpaceNameByEndpoint(endpoint, defaultValue = '') {
       timeout: 3000,
     });
 
-    return headers['x-space-name'] ?? defaultValue;
+    const spaceName = headers['x-space-name'];
+
+    return spaceName ? decodeURIComponent(spaceName) : defaultValue;
   } catch (error) {
     console.error(error);
     return defaultValue;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-90ded76f",
+  "version": "1.16.13-beta-ef672597",
   "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/auth": "1.16.13-beta-90ded76f",
-    "@abtnode/certificate-manager": "1.16.13-beta-90ded76f",
-    "@abtnode/constant": "1.16.13-beta-90ded76f",
-    "@abtnode/cron": "1.16.13-beta-90ded76f",
-    "@abtnode/insights": "1.16.13-beta-90ded76f",
-    "@abtnode/logger": "1.16.13-beta-90ded76f",
-    "@abtnode/models": "1.16.13-beta-90ded76f",
-    "@abtnode/queue": "1.16.13-beta-90ded76f",
-    "@abtnode/rbac": "1.16.13-beta-90ded76f",
-    "@abtnode/router-provider": "1.16.13-beta-90ded76f",
-    "@abtnode/static-server": "1.16.13-beta-90ded76f",
-    "@abtnode/timemachine": "1.16.13-beta-90ded76f",
-    "@abtnode/util": "1.16.13-beta-90ded76f",
+    "@abtnode/analytics": "1.16.13-beta-ef672597",
+    "@abtnode/auth": "1.16.13-beta-ef672597",
+    "@abtnode/certificate-manager": "1.16.13-beta-ef672597",
+    "@abtnode/constant": "1.16.13-beta-ef672597",
+    "@abtnode/cron": "1.16.13-beta-ef672597",
+    "@abtnode/logger": "1.16.13-beta-ef672597",
+    "@abtnode/models": "1.16.13-beta-ef672597",
+    "@abtnode/queue": "1.16.13-beta-ef672597",
+    "@abtnode/rbac": "1.16.13-beta-ef672597",
+    "@abtnode/router-provider": "1.16.13-beta-ef672597",
+    "@abtnode/static-server": "1.16.13-beta-ef672597",
+    "@abtnode/timemachine": "1.16.13-beta-ef672597",
+    "@abtnode/util": "1.16.13-beta-ef672597",
     "@arcblock/did": "1.18.84",
     "@arcblock/did-auth": "1.18.84",
     "@arcblock/did-ext": "^1.18.84",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.84",
     "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.13-beta-90ded76f",
-    "@blocklet/meta": "1.16.13-beta-90ded76f",
-    "@blocklet/resolver": "1.16.13-beta-90ded76f",
-    "@blocklet/sdk": "1.16.13-beta-90ded76f",
-    "@did-space/client": "^0.2.117",
+    "@blocklet/constant": "1.16.13-beta-ef672597",
+    "@blocklet/meta": "1.16.13-beta-ef672597",
+    "@blocklet/resolver": "1.16.13-beta-ef672597",
+    "@blocklet/sdk": "1.16.13-beta-ef672597",
+    "@did-space/client": "^0.2.124",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.84",
     "@ocap/util": "1.18.84",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "e6d4b88fe2cb45e00e5d745e1cd148dc76a019a4"
+  "gitHead": "ed5abea5072dee26860ed43139bfee17461b19a1"
 }