@abtnode/core 1.16.19-beta-340de95d → 1.16.19-beta-7b2db880

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/index.js

@@ -86,7 +86,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'jobs',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -102,7 +104,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'install_queue',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -120,7 +124,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'backup_queue',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -140,7 +146,9 @@ function ABTNode(options) {
     name: 'restore_queue',
     model: states.job,
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },

package/lib/migrations/index.js

@@ -5,50 +5,13 @@ const path = require('path');
 const semver = require('semver');
 const uniqBy = require('lodash/uniqBy');
 const logger = require('@abtnode/logger')('@abtnode/core:migration');
-const {
-  doSchemaMigration,
-  doDataMigration,
-  getBlockletModels,
-  getServerModels,
-  getServiceModels,
-  getCertificateManagerModels,
-  createSequelize,
-} = require('@abtnode/models');
+const { doSchemaMigration, createSequelize } = require('@abtnode/models');
 const { getDbFilePath } = require('../util');
 
 const BACKUP_FILE_DB = 'server.db';
 const BACKUP_FILE_CONFIG = 'config.yml';
 
 const MODULES = ['certificate-manager'];
-const MAPPINGS = {
-  server: {
-    access_key: 'AccessKey',
-    'audit-log': 'AuditLog',
-    blocklet: 'Blocklet',
-    blocklet_extras: 'BlockletExtra',
-    cache: 'Cache',
-    migration: 'Migration',
-    node: 'Server',
-    notification: 'Notification',
-    routing_rule: 'Site',
-    session: 'Session',
-    user: 'User',
-    webhook: 'WebHook',
-  },
-  blocklet: {
-    user: 'User',
-    session: 'Session',
-    rbac: 'Rbac',
-  },
-  service: {
-    message: 'Message',
-  },
-  'certificate-manager': {
-    account: 'Account',
-    certificate: 'Certificate',
-    'http-challenge': 'HttpChallenge',
-  },
-};
 
 const getMigrationScripts = (scriptsDir) => {
   const files = fs.readdirSync(scriptsDir);
@@ -243,72 +206,6 @@ const runSchemaMigrations = async ({
   }
 };
 
-const runDataMigrations = async ({
-  dataDir,
-  blocklets = [],
-  printInfo = console.info, // eslint-disable-line
-  printSuccess = console.info, // eslint-disable-line
-  printError = console.error,
-}) => {
-  // migrate server data
-  await doDataMigration({
-    srcDir: path.join(dataDir, 'core'),
-    dbFile: path.join(dataDir, 'core/server.db'),
-    mapping: MAPPINGS.server,
-    models: getServerModels(),
-    printInfo,
-    printError,
-    printSuccess,
-  });
-  printSuccess('Server data successfully migrated');
-
-  // migrate service data
-  await doDataMigration({
-    srcDir: path.join(dataDir, 'services'),
-    dbFile: path.join(dataDir, 'services/service.db'),
-    models: getServiceModels(),
-    mapping: MAPPINGS.service,
-    printInfo,
-    printError,
-    printSuccess,
-  });
-  printSuccess('Service data successfully migrated');
-
-  // migrate blocklet data
-  for (let i = 0; i < blocklets.length; i++) {
-    const blocklet = blocklets[i];
-    const env = blocklet.environments.find((x) => x.key === 'BLOCKLET_DATA_DIR');
-    if (env) {
-      await doDataMigration({
-        srcDir: path.join(env.value),
-        dbFile: path.join(env.value, 'blocklet.db'),
-        models: getBlockletModels(),
-        mapping: MAPPINGS.blocklet,
-        printInfo,
-        printError,
-        printSuccess,
-      });
-      printSuccess(`Blocklet data successfully migrated: ${blocklet.appPid}`);
-    } else {
-      printInfo(`Skip migrate data for blocklet: ${blocklet.appPid}`);
-    }
-  }
-
-  // migrate certificate manager schema
-  for (let i = 0; i < MODULES.length; i++) {
-    await doDataMigration({
-      srcDir: path.join(dataDir, `modules/${MODULES[i]}/db`),
-      dbFile: path.join(dataDir, `modules/${MODULES[i]}/module.db`),
-      models: getCertificateManagerModels(),
-      mapping: MAPPINGS[MODULES[i]],
-      printInfo,
-      printError,
-      printSuccess,
-    });
-    printSuccess(`${MODULES[i]} data successfully migrated`);
-  }
-};
-
 const closeDatabaseConnections = ({
   dataDir,
   blocklets = [],
@@ -340,7 +237,6 @@ module.exports = {
   getMigrationScripts,
   runMigrationScripts,
   runSchemaMigrations,
-  runDataMigrations,
   closeDatabaseConnections,
   doBackup,
   doRestore,

package/lib/router/helper.js

@@ -949,6 +949,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     }
 
     if (updatedResult.length) {
+      // eslint-disable-next-line no-use-before-define
       const hash = await takeRoutingSnapshot({ message: 'ensure dashboard routing rules', dryRun: false }, context);
       logger.info('take routing snapshot on ensure dashboard routing rules', { updatedResult, hash });
       return true;
@@ -1168,6 +1169,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const clearBlockletRoutingCache = async (blocklet) => {
     const info = await nodeState.read();
+    // eslint-disable-next-line no-use-before-define
     const provider = providers[info.routing.provider];
     if (provider) {
       await provider.clearCache(blocklet.appPid);
@@ -1214,6 +1216,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     await removeBlockletRouting(blocklet);
     await ensureBlockletRouting(blocklet);
     if (refreshRouterProvider) {
+      // eslint-disable-next-line no-use-before-define
       const hash = await takeRoutingSnapshot({ message: `Reset blocklet ${did}`, dryRun: false });
       logger.info('reset blocklet routing rules', { did, hash });
     }
@@ -1301,6 +1304,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const analyzeRouterLog = async () => {
     const info = await nodeState.read();
+    // eslint-disable-next-line no-use-before-define
     const sites = await getRoutingSites({});
     const providerName = get(info, 'routing.provider', null);
     if (!providerName || !providers[providerName]) {
@@ -1404,6 +1408,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
       // We need to take snapshot after system rules ensured
       if (ensureBlockletResults.filter(Boolean).length) {
+        // eslint-disable-next-line no-use-before-define
         await takeRoutingSnapshot({ message: `Switch routing engine to ${newProvider}`, dryRun: false }, context);
         logger.info(`take routing snapshot on switch engine: ${newProvider}`, { ensureBlockletResults });
       }

package/lib/router/index.js

@@ -19,6 +19,18 @@ const { isGatewayCacheEnabled, isBlockletSite } = require('../util');
 
 const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
+const mergeAllowedOrigins = (domain, allowedOrigins) => {
+  const origins = Array.isArray(allowedOrigins) ? allowedOrigins : [domain];
+  if (origins.includes(domain) === false) {
+    origins.push(domain);
+  }
+
+  // skip site if domain is BLOCKLET_SITE_GROUP
+  const res = origins.filter((x) => !x.endsWith(BLOCKLET_SITE_GROUP_SUFFIX));
+
+  return res;
+};
+
 const expandSites = (sites = []) => {
   const result = [];
 
@@ -51,19 +63,8 @@ const expandSites = (sites = []) => {
   return result;
 };
 
-const mergeAllowedOrigins = (domain, allowedOrigins) => {
-  const origins = Array.isArray(allowedOrigins) ? allowedOrigins : [domain];
-  if (origins.includes(domain) === false) {
-    origins.push(domain);
-  }
-
-  // skip site if domain is BLOCKLET_SITE_GROUP
-  const res = origins.filter((x) => !x.endsWith(BLOCKLET_SITE_GROUP_SUFFIX));
-
-  return res;
-};
-
 const getRoutingTable = ({ sites, nodeInfo }) => {
+  // eslint-disable-next-line no-use-before-define
   let routingTable = Router.formatSites(sites);
   routingTable = expandSites(routingTable);
 

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/node.js

@@ -284,14 +284,6 @@ class NodeState extends BaseState {
     }));
   }
 
-  // deprecated
-  async increaseCustomBlockletNumber() {
-    const { customBlockletNumber = 0 } = await this.read();
-    const num = customBlockletNumber + 1;
-    await this.update({ $set: { customBlockletNumber: num } });
-    return num;
-  }
-
   async updateGateway(gateway) {
     const { routing } = await this.read();
     routing.requestLimit = gateway.requestLimit;

package/lib/states/runtime-insight.js

@@ -18,7 +18,7 @@ class RuntimeInsight extends BaseState {
       where.date[Op.lte] = endDate;
     }
 
-    return super.paginate({ where }, { date: -1 }, paging);
+    return this.paginate({ where }, { date: -1 }, paging);
   }
 }
 

package/lib/states/traffic-insight.js

@@ -18,7 +18,7 @@ class TrafficInsight extends BaseState {
       where.date[Op.lte] = endDate;
     }
 
-    return super.paginate({ where }, { date: -1 }, paging);
+    return this.paginate({ where }, { date: -1 }, paging);
   }
 }
 

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/blocklet.js

@@ -158,6 +158,7 @@ const getComponentDirs = (component, { dataDirs, ensure = false, ancestors = []
   if (component.source === BlockletSource.local) {
     appDir = component.deployedFrom;
   } else {
+    // eslint-disable-next-line no-use-before-define
     appDir = getBundleDir(dataDirs.blocklets, component.meta);
   }
 
@@ -523,6 +524,7 @@ const startBlockletProcess = async (
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip start process not selected', { processId });
         return;
@@ -616,6 +618,7 @@ const startBlockletProcess = async (
 
       await pm2.startAsync(options);
 
+      // eslint-disable-next-line no-use-before-define
       const status = await getProcessState(processId);
       if (status === BlockletStatus.error) {
         throw new Error(`${processId} is not running within 3 seconds`);
@@ -636,6 +639,7 @@ const startBlockletProcess = async (
  * @param {*} blocklet should contain env props
  */
 const stopBlockletProcess = (blocklet, { preStop = noop, skippedProcessIds = [], componentDids } = {}) => {
+  // eslint-disable-next-line no-use-before-define
   return deleteBlockletProcess(blocklet, { preDelete: preStop, skippedProcessIds, componentDids });
 };
 
@@ -657,6 +661,7 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta?.did, componentDids)) {
         logger.info(`skip delete process not selected: ${b.meta.did}`, { processId: b.env.processId });
         return;
@@ -667,6 +672,7 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
       }
 
       await preDelete(b, { ancestors });
+      // eslint-disable-next-line no-use-before-define
       await deleteProcess(b.env.processId);
     },
     { parallel: true }
@@ -685,11 +691,13 @@ const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip reload process', { processId: b.env.processId });
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       await reloadProcess(b.env.processId);
       logger.info('done reload process', { processId: b.env.processId });
     },
@@ -701,6 +709,7 @@ const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
  * @returns {BlockletStatus}
  */
 const getProcessState = async (processId) => {
+  // eslint-disable-next-line no-use-before-define
   const info = await getProcessInfo(processId);
   if (!statusMap[info.pm2_env.status]) {
     logger.error('Cannot find the blocklet status for pm2 status mapping', {
@@ -773,6 +782,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip check component healthy', { processId: b.env.processId });
         return;
@@ -781,6 +791,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
       const logToTerminal = [blocklet.mode, b.mode].includes(BLOCKLET_MODES.DEVELOPMENT);
 
       const startedAt = Date.now();
+      // eslint-disable-next-line no-use-before-define
       await _checkProcessHealthy(b, { minConsecutiveTime, timeout, logToTerminal });
       logger.info('done check component healthy', { processId: b.env.processId, time: Date.now() - startedAt });
     },
@@ -1334,6 +1345,7 @@ const getConfigFromPreferences = (blocklet) => {
 
 const getBlockletURLForLauncher = ({ blocklet, nodeInfo }) => {
   const didDomain = getDidDomainForBlocklet({
+    // eslint-disable-next-line no-use-before-define
     did: getSlpDid(nodeInfo.did, blocklet.appPid),
     didDomain: nodeInfo.slpDomain,
   });
@@ -1676,11 +1688,13 @@ const getBlockletDidDomainList = (blocklet, nodeInfo) => {
     domainAliases.push({ value: domain, isProtected: true });
   });
 
+  // eslint-disable-next-line no-use-before-define
   const enableSlpDomain = shouldEnableSlpDomain({
     mode: nodeInfo.mode,
     launcher: nodeInfo.launcher,
   });
   if (enableSlpDomain) {
+    // eslint-disable-next-line no-use-before-define
     const slpDid = getSlpDid(nodeInfo.did, blocklet.appPid);
     const domain = getDidDomainForBlocklet({ did: slpDid, didDomain: nodeInfo.slpDomain });
 

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-340de95d",
+  "version": "1.16.19-beta-7b2db880",
   "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-340de95d",
-    "@abtnode/auth": "1.16.19-beta-340de95d",
-    "@abtnode/certificate-manager": "1.16.19-beta-340de95d",
-    "@abtnode/constant": "1.16.19-beta-340de95d",
-    "@abtnode/cron": "1.16.19-beta-340de95d",
-    "@abtnode/logger": "1.16.19-beta-340de95d",
-    "@abtnode/models": "1.16.19-beta-340de95d",
-    "@abtnode/queue": "1.16.19-beta-340de95d",
-    "@abtnode/rbac": "1.16.19-beta-340de95d",
-    "@abtnode/router-provider": "1.16.19-beta-340de95d",
-    "@abtnode/static-server": "1.16.19-beta-340de95d",
-    "@abtnode/timemachine": "1.16.19-beta-340de95d",
-    "@abtnode/util": "1.16.19-beta-340de95d",
+    "@abtnode/analytics": "1.16.19-beta-7b2db880",
+    "@abtnode/auth": "1.16.19-beta-7b2db880",
+    "@abtnode/certificate-manager": "1.16.19-beta-7b2db880",
+    "@abtnode/constant": "1.16.19-beta-7b2db880",
+    "@abtnode/cron": "1.16.19-beta-7b2db880",
+    "@abtnode/logger": "1.16.19-beta-7b2db880",
+    "@abtnode/models": "1.16.19-beta-7b2db880",
+    "@abtnode/queue": "1.16.19-beta-7b2db880",
+    "@abtnode/rbac": "1.16.19-beta-7b2db880",
+    "@abtnode/router-provider": "1.16.19-beta-7b2db880",
+    "@abtnode/static-server": "1.16.19-beta-7b2db880",
+    "@abtnode/timemachine": "1.16.19-beta-7b2db880",
+    "@abtnode/util": "1.16.19-beta-7b2db880",
     "@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-340de95d",
-    "@blocklet/env": "1.16.19-beta-340de95d",
-    "@blocklet/meta": "1.16.19-beta-340de95d",
-    "@blocklet/resolver": "1.16.19-beta-340de95d",
-    "@blocklet/sdk": "1.16.19-beta-340de95d",
-    "@did-space/client": "^0.3.25",
+    "@blocklet/constant": "1.16.19-beta-7b2db880",
+    "@blocklet/env": "1.16.19-beta-7b2db880",
+    "@blocklet/meta": "1.16.19-beta-7b2db880",
+    "@blocklet/resolver": "1.16.19-beta-7b2db880",
+    "@blocklet/sdk": "1.16.19-beta-7b2db880",
+    "@did-space/client": "^0.3.28",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
     "@ocap/util": "1.18.95",
@@ -80,7 +80,7 @@
     "p-retry": "4.6.1",
     "read-last-lines": "^1.8.0",
     "semver": "^7.3.8",
-    "sequelize": "^6.31.0",
+    "sequelize": "^6.35.0",
     "shelljs": "^0.8.5",
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "cc7afa5fe28ef4b0304f97b7e0b9ad8194427ae7"
+  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2"
 }