@abtnode/core 1.16.19-beta-e93c5bf3 → 1.16.19-beta-e6aac665

package/lib/blocklet/manager/disk.js

@@ -27,6 +27,8 @@ const {
   MONITOR_RECORD_INTERVAL_SEC,
   INSTALL_ACTIONS,
   BACKUPS,
+  DEFAULT_DID_DOMAIN,
+  FEDERATED,
 } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -91,6 +93,7 @@ const pLimit = require('p-limit');
 const pRetry = require('p-retry');
 
 const isFunction = require('lodash/isFunction');
+const { encode } = require('@abtnode/util/lib/base32');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -191,7 +194,6 @@ const { callFederated } = require('../../util/federated');
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
 const statusLock = new Lock('blocklet-status-lock');
-const limitSync = pLimit(1);
 
 const getHooksOutputFiles = (blocklet) => ({
   output: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'output.log'),
@@ -2330,10 +2332,23 @@ class DiskBlockletManager extends BaseBlockletManager {
    */
   async _onBackupToSpaces({ did, context, backupState }) {
     const {
-      referrer,
       user: { did: userDid, locale },
     } = context;
 
+    let { referrer } = context;
+    if (isEmpty(referrer)) {
+      // fixes: https://github.com/ArcBlock/did-spaces/issues/908, referrer 在某些情况下会不存在
+      /**
+       * @type {import('@abtnode/client').NodeState}
+       */
+      const node = await states.node.read();
+      referrer = joinUrl(
+        `https://${encode(node.did)}.${DEFAULT_DID_DOMAIN}`,
+        node.routing.adminPath,
+        `/blocklets/${did}/storage`
+      );
+    }
+
     const blocklet = await states.blocklet.getBlocklet(did);
     const {
       appDid,
@@ -3403,9 +3418,8 @@ class DiskBlockletManager extends BaseBlockletManager {
           const { did } = data;
           const assetState = await util.getNFTState(data.controller.chainHost, data.controller.nftId);
           const isExpired = isNFTExpired(assetState);
-          const blocklet = await states.blocklet.getBlocklet(did);
 
-          if (isExpired && blocklet.status !== BlockletStatus.stopped) {
+          if (isExpired) {
             const expiredAt = getNftExpirationDate(assetState);
             logger.info('the blocklet already expired and will be stopped', {
               blockletDid: did,
@@ -3413,7 +3427,13 @@ class DiskBlockletManager extends BaseBlockletManager {
               expiredAt,
             });
 
-            await this.stop({ did });
+            // 如果 Blocklet 没停止, 先停止
+            const blocklet = await states.blocklet.getBlocklet(did);
+            if (blocklet.status !== BlockletStatus.stopped) {
+              await this.stop({ did });
+              logger.info('the expired blocklet is stopped', { did, blockletDid: did });
+            }
+
             await states.blockletExtras.updateByDid(did, {
               controller: {
                 ...data.controller,
@@ -3424,11 +3444,6 @@ class DiskBlockletManager extends BaseBlockletManager {
               },
             });
             logger.info('the expired blocklet is stopped', { did });
-
-            // 为了减小服务器压力，每次删除一个 blocklet 后，休息 10s
-            if (process.env.NODE_ENV !== 'test') {
-              await sleep(10 * 1000);
-            }
           }
         } catch (error) {
           logger.error('stop expired blocklet failed', {
@@ -3893,6 +3908,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
         },
         masterAppUrl: masterSite.appUrl,
       });
+      const limitSync = pLimit(FEDERATED.SYNC_LIMIT);
 
       const disbandQueue = federated.sites
         .filter((item) => item.appPid !== did)
@@ -4101,6 +4117,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
 
     const nodeInfo = await states.node.read();
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    const limitSync = pLimit(FEDERATED.SYNC_LIMIT);
 
     const waitingList = federated.sites
       .filter((item) => {
@@ -4115,22 +4132,34 @@ class FederatedBlockletManager extends DiskBlockletManager {
         }
         return false;
       })
-      .map((item) => {
-        return limitSync(async () => {
+      .map(async (item) => {
+        const resultItem = await limitSync(async () => {
           try {
             // NOTICE: 即使通知某个站点失败了，也不影响其他站点接收同步结果
-            await callFederated({
+            const result = await callFederated({
               action: 'sync',
               permanentWallet,
               site: item,
               data: safeData,
             });
+            return result;
           } catch (error) {
-            logger.warn('Failed to sync federated sites', { error, did, action: 'sync' });
+            logger.warn('Failed to sync federated sites', {
+              error,
+              action: 'sync',
+              site: item,
+              data: safeData,
+            });
+            return null;
           }
         });
+        return {
+          site: item,
+          result: resultItem,
+        };
       });
-    await Promise.all(waitingList);
+    const resultList = await Promise.all(waitingList);
+    return resultList;
   }
 
   async loginFederated({ did, site, data }) {

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

@@ -40,6 +40,12 @@ const { RoutingRuleBackup } = require('./routing-rule');
 const { translate } = require('../../../locales');
 const { getFolderSize } = require('../utils/disk');
 
+/**
+ * @param {{ appDid: string, appPid: string }} params
+ * @returns {{ appDid: string, meta: { did: string } }}
+ */
+const getAppId = (params) => ({ appDid: params.appDid, meta: { did: params.appPid } });
+
 class SpacesBackup extends BaseBackup {
   /**
    *
@@ -168,8 +174,7 @@ class SpacesBackup extends BaseBackup {
 
   async export() {
     this.input.event.emit(BlockletEvents.backupProgress, {
-      appDid: this.input.appDid,
-      meta: { did: this.input.appPid },
+      ...getAppId(this.input),
       message: 'Preparing data for backup...',
       progress: 15,
       completed: false,
@@ -182,8 +187,7 @@ class SpacesBackup extends BaseBackup {
     this.syncObjects = await this.collectSyncObjects(this.dataBackup, this.storages);
 
     this.input.event.emit(BlockletEvents.backupProgress, {
-      appDid: this.input.appDid,
-      meta: { did: this.input.appPid },
+      ...getAppId(this.input),
       message: 'Data ready, start backup...',
       progress: 20,
       completed: false,
@@ -272,8 +276,7 @@ class SpacesBackup extends BaseBackup {
             message: progressMessage,
           });
           this.input.event.emit(BlockletEvents.backupProgress, {
-            appDid: this.input.appDid,
-            meta: { did: this.input.appDid },
+            ...getAppId(this.input),
             message: progressMessage,
             // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
             progress,

package/lib/event/auto-backup-handler.js

@@ -36,7 +36,8 @@ const debouncedFuncs = {};
  */
 function autoBackupHandlerFactory(id, fn) {
   if (!debouncedFuncs[id]) {
-    debouncedFuncs[id] = debounce(fn, 3000);
+    // 自动备份立即执行的间隔时间暂定为 1 min
+    debouncedFuncs[id] = debounce(fn, 1000 * 60);
   }
   return debouncedFuncs[id];
 }

package/lib/event/index.js

@@ -10,7 +10,7 @@ const {
   BlockletEvents,
   BlockletInternalEvents,
 } = require('@blocklet/constant');
-const { EVENTS } = require('@abtnode/constant');
+const { EVENTS, BACKUPS } = require('@abtnode/constant');
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const handleInstanceInStore = require('../util/public-to-store');
 const { isCLI } = require('../util');
@@ -27,7 +27,8 @@ const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DE
 /**
  *
  * @param {{
- *  blockletManager: import('../blocklet/manager/disk')
+ *  blockletManager: import('../blocklet/manager/disk'),
+ *  node: import('../index')
  * }} param0
  * @returns
  */
@@ -107,6 +108,10 @@ module.exports = ({
       safeData = wipeSensitiveData(cloneDeep(data));
     }
 
+    if (get(safeData, 'blocklet.meta.did', '')) {
+      safeData.blocklet = wipeSensitiveData(cloneDeep(safeData.blocklet));
+    }
+
     logger.debug('proxy event to event hub', { name });
     eventHub.broadcast(name, safeData);
     events.emit(name, safeData);
@@ -317,12 +322,13 @@ module.exports = ({
           strategy: payload.backup.strategy,
         };
 
-        await node.createAuditLog({
-          action: 'backupToSpaces',
-          args,
-          context: payload?.context ?? {},
-          result: cloneDeep(blocklet),
-        });
+        if (payload.backup.strategy === BACKUPS.STRATEGY.MANUAL) {
+          await node.createAuditLog({
+            action: 'backupToSpaces',
+            args,
+            context: payload?.context ?? {},
+          });
+        }
 
         if (payload?.progress !== 100) {
           await node.createNotification({

package/lib/states/audit-log.js

@@ -5,7 +5,7 @@ const get = require('lodash/get');
 const uniq = require('lodash/uniq');
 const joinUrl = require('url-join');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
-const { BLOCKLET_SITE_GROUP_SUFFIX, NODE_SERVICES, BACKUPS } = require('@abtnode/constant');
+const { BLOCKLET_SITE_GROUP_SUFFIX, NODE_SERVICES } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
 
 const BaseState = require('./base');
@@ -140,10 +140,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
     // @see: core/state/lib/event.js#311
     case 'backupToSpaces':
       if (args?.success) {
-        if (args.strategy === BACKUPS.STRATEGY.MANUAL) {
-          return `Manual backup application to ${args.url} successfully:\n- Backup files have been stored [here](${args.backupUrl})`;
-        }
-        return `Automatic backup application to ${args.url} successfully:\n- Backup files have been stored [here](${args.backupUrl})`;
+        // @note: 目前只需要给出手动备份的审计日志,自动备份的审计日志不再显示出来
+        return `Manual backup application to ${args.url} successfully:\n- Backup files have been stored [here](${args.backupUrl})`;
       }
       return `Backup application to ${args.url} failed:\n- Reason: <span style='color:red'>${args.errorMessage}</span>`;
     case 'configPublicToStore':
@@ -200,6 +198,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
       const syncData = {
         users: args.users,
         sites: args.sites,
+        userSessions: args.userSessions,
       };
       return `sync federated: site ${getSiteInfo(args.callerSite)} sync data:
 \`\`\`json

package/lib/states/user.js

@@ -371,7 +371,7 @@ class User extends ExtendBase {
       }
       // update user, connectedAccount, passport
       updates.connectedAccounts = updateConnectedAccount(exist.connectedAccounts, user.connectedAccount);
-      updated = await this.updateUser(user.did, updates);
+      updated = await this.updateUser(exist.did, updates);
     } else {
       // create user, connectedAccount, passport
       updates.did = user.did;

package/lib/util/log.js

@@ -141,11 +141,12 @@ const getLogFiles = async ({ name, node }) => {
   if (name === 'blocklet-services') {
     const logDir = path.join(node.dataDirs.logs, '_abtnode');
     const info = path.join(logDir, 'service.log');
+    const error = path.join(logDir, 'service-error.log');
     const access = path.join(logDir, 'service.access.log');
     const stdout = path.join(logDir, 'service.stdout.log');
     const stderr = path.join(logDir, 'service.stderr.log');
-    createFile({ info, access, stdout, stderr });
-    return { info, access, stdout, stderr };
+    createFile({ error, info, access, stdout, stderr });
+    return { error, info, access, stdout, stderr };
   }
 
   if (name.indexOf('blocklet-') === 0) {

package/lib/validators/user.js

@@ -35,7 +35,7 @@ const loginSchema = Joi.object({
   remark: Joi.string().empty(''),
   lastLoginIp: Joi.string().empty(''),
   passport: passportSchema.optional(),
-  sourceAppPid: Joi.string().empty(null),
+  sourceAppPid: Joi.DID().trim().empty(null),
   connectedAccount: Joi.alternatives()
     .try(connectedAccountSchema.required(), Joi.array().items(connectedAccountSchema).min(1).sparse(true))
     .required(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.19-beta-e93c5bf3",
+  "version": "1.16.19-beta-e6aac665",
   "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.19-beta-e93c5bf3",
-    "@abtnode/auth": "1.16.19-beta-e93c5bf3",
-    "@abtnode/certificate-manager": "1.16.19-beta-e93c5bf3",
-    "@abtnode/constant": "1.16.19-beta-e93c5bf3",
-    "@abtnode/cron": "1.16.19-beta-e93c5bf3",
-    "@abtnode/logger": "1.16.19-beta-e93c5bf3",
-    "@abtnode/models": "1.16.19-beta-e93c5bf3",
-    "@abtnode/queue": "1.16.19-beta-e93c5bf3",
-    "@abtnode/rbac": "1.16.19-beta-e93c5bf3",
-    "@abtnode/router-provider": "1.16.19-beta-e93c5bf3",
-    "@abtnode/static-server": "1.16.19-beta-e93c5bf3",
-    "@abtnode/timemachine": "1.16.19-beta-e93c5bf3",
-    "@abtnode/util": "1.16.19-beta-e93c5bf3",
+    "@abtnode/analytics": "1.16.19-beta-e6aac665",
+    "@abtnode/auth": "1.16.19-beta-e6aac665",
+    "@abtnode/certificate-manager": "1.16.19-beta-e6aac665",
+    "@abtnode/constant": "1.16.19-beta-e6aac665",
+    "@abtnode/cron": "1.16.19-beta-e6aac665",
+    "@abtnode/logger": "1.16.19-beta-e6aac665",
+    "@abtnode/models": "1.16.19-beta-e6aac665",
+    "@abtnode/queue": "1.16.19-beta-e6aac665",
+    "@abtnode/rbac": "1.16.19-beta-e6aac665",
+    "@abtnode/router-provider": "1.16.19-beta-e6aac665",
+    "@abtnode/static-server": "1.16.19-beta-e6aac665",
+    "@abtnode/timemachine": "1.16.19-beta-e6aac665",
+    "@abtnode/util": "1.16.19-beta-e6aac665",
     "@arcblock/did": "1.18.95",
     "@arcblock/did-auth": "1.18.95",
     "@arcblock/did-ext": "^1.18.95",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.95",
     "@arcblock/vc": "1.18.95",
-    "@blocklet/constant": "1.16.19-beta-e93c5bf3",
-    "@blocklet/env": "1.16.19-beta-e93c5bf3",
-    "@blocklet/meta": "1.16.19-beta-e93c5bf3",
-    "@blocklet/resolver": "1.16.19-beta-e93c5bf3",
-    "@blocklet/sdk": "1.16.19-beta-e93c5bf3",
-    "@did-space/client": "^0.3.25",
+    "@blocklet/constant": "1.16.19-beta-e6aac665",
+    "@blocklet/env": "1.16.19-beta-e6aac665",
+    "@blocklet/meta": "1.16.19-beta-e6aac665",
+    "@blocklet/resolver": "1.16.19-beta-e6aac665",
+    "@blocklet/sdk": "1.16.19-beta-e6aac665",
+    "@did-space/client": "^0.3.28",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
     "@ocap/util": "1.18.95",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "c98ddc97776f05c267398b18010710afd7082409"
+  "gitHead": "09b0172831521ef73f7879940b977c2696b5b247"
 }