@abtnode/core 1.16.11-next-61882496 → 1.16.11-next-b5795b3a

package/lib/api/team.js

@@ -642,7 +642,7 @@ class TeamAPI extends EventEmitter {
   /**
    * this function is only used to create server owner transfer invitation
    */
-  async createTransferInvitation({ teamDid, remark }, context = {}) {
+  createTransferInvitation({ teamDid, remark }, context = {}) {
     return this.createMemberInvitation(
       { teamDid, expireTime: this.transferOwnerExpireTime, remark, role: 'owner' },
       context
@@ -956,7 +956,7 @@ class TeamAPI extends EventEmitter {
 
   // Access Control
 
-  async getRoles({ teamDid }) {
+  getRoles({ teamDid }) {
     return this.teamManager.getRoles(teamDid);
   }
 
@@ -1171,15 +1171,15 @@ class TeamAPI extends EventEmitter {
   // Private
   // =======
 
-  async getRBAC(did) {
+  getRBAC(did) {
     return this.teamManager.getRBAC(did);
   }
 
-  async getUserState(did) {
+  getUserState(did) {
     return this.teamManager.getUserState(did);
   }
 
-  async getSessionState(did) {
+  getSessionState(did) {
     return this.teamManager.getSessionState(did);
   }
 

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

@@ -161,7 +161,7 @@ class BlockletDownloader extends EventEmitter {
       });
 
       const results = await Promise.all(
-        downloadList.map(async (meta) => {
+        downloadList.map((meta) => {
           const url = meta.dist.tarball;
           return this.bundleDownloader.download(meta, did, url, {
             ...options,
@@ -188,7 +188,7 @@ class BlockletDownloader extends EventEmitter {
     return { isCancelled: false };
   }
 
-  async cancelDownload(did) {
+  cancelDownload(did) {
     return this.bundleDownloader.cancelDownload(did);
   }
 

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

@@ -121,7 +121,7 @@ class BundleDownloader extends EventEmitter {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async cancelDownload(rootDid) {
+  cancelDownload(rootDid) {
     if (this.downloadCtrls[rootDid]) {
       for (const cancelCtrl of this.downloadCtrls[rootDid].values()) {
         cancelCtrl.cancel();
@@ -294,7 +294,7 @@ class BundleDownloader extends EventEmitter {
     await this.cache.set(CACHE_KEY, cacheList);
   }
 
-  async _getCachedTarFile(integrity) {
+  _getCachedTarFile(integrity) {
     // eslint-disable-next-line no-param-reassign
     integrity = toBase58(integrity);
 

package/lib/blocklet/hooks.js

@@ -57,7 +57,7 @@ const runUserHook = async (label, hookName, args) => {
 const preInstall = (label, ...args) => runUserHook(label, 'pre-install', ...args);
 const postInstall = (label, ...args) => runUserHook(label, 'post-install', ...args);
 const preConfig = (label, ...args) => runUserHook(label, 'pre-config', ...args);
-const preStart = async (blocklet, options) => {
+const preStart = (blocklet, options) => {
   // check required environments
   let environments = get(blocklet, 'meta.environments', []);
   if (!Array.isArray(environments)) {

package/lib/blocklet/manager/base.js

@@ -16,39 +16,39 @@ class BaseBlockletManager extends EventEmitter {
     }
   }
 
-  async install() {
+  install() {
     throw new Error('Install must be implemented in sub class');
   }
 
-  async start() {
+  start() {
     throw new Error('Install must be implemented in sub class');
   }
 
-  async stop() {
+  stop() {
     throw new Error('Stop must be implemented in sub class');
   }
 
-  async restart() {
+  restart() {
     throw new Error('Restart must be implemented in sub class');
   }
 
-  async reload() {
+  reload() {
     throw new Error('Reload must be implemented in sub class');
   }
 
-  async delete() {
+  delete() {
     throw new Error('Delete must be implemented in sub class');
   }
 
-  async detail() {
+  detail() {
     throw new Error('Detail must be implemented in sub class');
   }
 
-  async list() {
+  list() {
     throw new Error('List must be implemented in sub class');
   }
 
-  async config() {
+  config() {
     throw new Error('Config must be implemented in sub class');
   }
 }

package/lib/blocklet/manager/disk.js

@@ -410,7 +410,7 @@ class BlockletManager extends BaseBlockletManager {
     throw new Error('Unknown source');
   }
 
-  async diff({ did, hashFiles, rootDid }) {
+  diff({ did, hashFiles, rootDid }) {
     return diff({ did, hashFiles, rootDid, states, manager: this });
   }
 
@@ -418,7 +418,7 @@ class BlockletManager extends BaseBlockletManager {
    * After the dev function finished, the caller should send a BlockletEvents.installed event to the daemon
    * @returns {Object} blocklet
    */
-  async dev(folder, { rootDid, mountPoint, defaultStoreUrl } = {}) {
+  dev(folder, { rootDid, mountPoint, defaultStoreUrl } = {}) {
     logger.info('dev component', { folder, rootDid, mountPoint });
 
     const meta = getBlockletMeta(folder, { defaultStoreUrl });
@@ -433,15 +433,15 @@ class BlockletManager extends BaseBlockletManager {
     return installComponentFromDev({ folder, meta, rootDid, mountPoint, manager: this, states });
   }
 
-  async checkComponentsForUpdates({ did }) {
+  checkComponentsForUpdates({ did }) {
     return UpgradeComponents.check({ did, states });
   }
 
-  async upgradeComponents({ updateId, selectedComponents: componentDids }, context = {}) {
+  upgradeComponents({ updateId, selectedComponents: componentDids }, context = {}) {
     return UpgradeComponents.upgrade({ updateId, componentDids, context, states, manager: this });
   }
 
-  async migrateApplicationToStructV2({ did, appSk, context = {} }) {
+  migrateApplicationToStructV2({ did, appSk, context = {} }) {
     return migrateApplicationToStructV2({ did, appSk, context, manager: this, states });
   }
 
@@ -660,7 +660,7 @@ class BlockletManager extends BaseBlockletManager {
    * @memberof BlockletManager
    */
   // eslint-disable-next-line no-unused-vars
-  async restoreBlocklet(input, context) {
+  restoreBlocklet(input, context) {
     const { from, ...param } = input;
     if (from === 'spaces') {
       return this._restoreFromSpaces(param, context);
@@ -1060,7 +1060,7 @@ class BlockletManager extends BaseBlockletManager {
     return blocklets;
   }
 
-  async listBackups() {
+  listBackups() {
     return getBackupList(this.dataDirs.data);
   }
 
@@ -1390,15 +1390,15 @@ class BlockletManager extends BaseBlockletManager {
     });
   }
 
-  async ensureBlocklet(did, opts = {}) {
+  ensureBlocklet(did, opts = {}) {
     return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did, ensureIntegrity: true });
   }
 
-  async getBlocklet(did, opts = {}) {
+  getBlocklet(did, opts = {}) {
     return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did, ensureIntegrity: false });
   }
 
-  async hasBlocklet({ did }) {
+  hasBlocklet({ did }) {
     return states.blocklet.hasBlocklet(did);
   }
 
@@ -1461,9 +1461,11 @@ class BlockletManager extends BaseBlockletManager {
 
         try {
           const status = await getProcessState(component.env.processId);
+          const oldStatus = component.status;
           if (component.status !== status) {
             component.status = status;
             addToUpdates(component.meta.did, status);
+            logger.info('will sync status from pm2', { did, status, oldStatus, componentDid: component.meta.did });
           }
         } catch {
           if (
@@ -1488,6 +1490,7 @@ class BlockletManager extends BaseBlockletManager {
     // iterate updates
     if (updates.size > 0) {
       for (const [status, dids] of updates) {
+        logger.info('sync status from pm2', { did, status, componentDids: dids });
         await states.blocklet.setBlockletStatus(did, status, { componentDids: dids });
       }
     }
@@ -1497,7 +1500,7 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
-  async refreshListCache() {
+  refreshListCache() {
     this.list({ useCache: false }).catch((err) => {
       logger.error('refresh blocklet list failed', { error: err });
     });
@@ -1699,7 +1702,7 @@ class BlockletManager extends BaseBlockletManager {
    * @return {Promise<Array<import('@abtnode/client').Backup>>}
    * @memberof BlockletManager
    */
-  async getBlockletBackups({ did }) {
+  getBlockletBackups({ did }) {
     return states.backup.getBlockletBackups({ did });
   }
 
@@ -2493,6 +2496,8 @@ class BlockletManager extends BaseBlockletManager {
 
       // update state
       await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
+      // ensure component status is upgrading
+      await states.blocklet.setBlockletStatus(did, BlockletStatus.upgrading, { componentDids });
       await this._setConfigsFromMeta(did);
 
       // should ensure blocklet integrity
@@ -2533,14 +2538,14 @@ class BlockletManager extends BaseBlockletManager {
 
       logger.info('updated blocklet for upgrading', { did, version, source, name });
 
-      const status =
-        oldBlocklet.status === BlockletStatus.installed ? BlockletStatus.installed : BlockletStatus.stopped;
-      await states.blocklet.setBlockletStatus(did, status, { componentDids });
-
-      // start new process
       if (oldBlocklet.status === BlockletStatus.running) {
+        // start new process
         await this.start({ did, componentDids }, context);
         logger.info('started blocklet for upgrading', { did, version });
+      } else {
+        const status =
+          oldBlocklet.status === BlockletStatus.installed ? BlockletStatus.installed : BlockletStatus.stopped;
+        await states.blocklet.setBlockletStatus(did, status, { componentDids });
       }
 
       blocklet = await this.getBlocklet(did, context);
@@ -2621,7 +2626,7 @@ class BlockletManager extends BaseBlockletManager {
    * @return {*}
    * @memberof BlockletManager
    */
-  async _downloadBlocklet(blocklet, context = {}) {
+  _downloadBlocklet(blocklet, context = {}) {
     const {
       appDid,
       meta: { did },
@@ -2638,7 +2643,7 @@ class BlockletManager extends BaseBlockletManager {
           this.emit(BlockletEvents.statusChange, blocklet1);
         }
       },
-      onProgress: async (data) => {
+      onProgress: (data) => {
         this.emit(BlockletEvents.downloadBundleProgress, { appDid: appDid || did, meta: { did }, ...data });
       },
       postDownload: async ({ isCancelled }) => {

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

@@ -203,7 +203,7 @@ const installApplicationFromBackup = async ({
       // 从 store 下载 blocklet
       await manager.blockletDownloader.download(blockletState, {
         skipCheckIntegrity: true,
-        onProgress: async (data) => {
+        onProgress: (data) => {
           manager.emit(BlockletEvents.downloadBundleProgress, { appDid: wallet.address, meta: { did }, ...data });
         },
       });

package/lib/blocklet/migration.js

@@ -78,14 +78,14 @@ async function runScripts({
   return true;
 }
 
-async function doBackup({ dbDir, backupDir, printInfo, printSuccess }) {
+function doBackup({ dbDir, backupDir, printInfo, printSuccess }) {
   printInfo('Backing up before migration...');
   fs.emptyDirSync(backupDir);
   fs.copySync(dbDir, backupDir);
   printSuccess('Backup success');
 }
 
-async function doRestore({ dbDir, backupDir, printInfo, printSuccess }) {
+function doRestore({ dbDir, backupDir, printInfo, printSuccess }) {
   printInfo('Restoring when migration failed...');
   fs.emptyDirSync(dbDir);
   fs.copySync(backupDir, dbDir);

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

@@ -68,6 +68,7 @@ class BaseBackup {
     this.securityContext = backup.securityContext;
   }
 
+  // eslint-disable-next-line require-await
   async export() {
     throw new Error('not implemented');
   }

package/lib/blocklet/storage/backup/blocklet-extras.js

@@ -42,7 +42,7 @@ class BlockletExtrasBackup extends BaseBackup {
    * @return {Promise<any>}
    * @memberof BlockletExtrasBackup
    */
-  async cleanData(raw) {
+  cleanData(raw) {
     const blockletExtra = cloneDeep(raw);
 
     const queue = [blockletExtra];

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

@@ -28,7 +28,7 @@ class BlockletBackup extends BaseBackup {
    * @return {Promise<import('@abtnode/client').BlockletState>}
    * @memberof BlockletBackup
    */
-  async cleanData() {
+  cleanData() {
     const clone = cloneDeep(this.blocklet);
 
     /** @type {import('@abtnode/client').ComponentState[]} */

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

@@ -111,6 +111,7 @@ class DiskBackup extends BaseBackup {
     this.securityContext = await this._getSecurityContext(states);
   }
 
+  // eslint-disable-next-line require-await
   async export() {
     return this._exportData(this.dataBackup, this.storages);
   }

package/lib/blocklet/storage/restore/blocklet-extras.js

@@ -8,7 +8,7 @@ const { BaseRestore } = require('./base');
 class BlockletExtrasRestore extends BaseRestore {
   filename = 'blocklet-extras.json';
 
-  async import(params) {
+  import(params) {
     const extras = this.cleanExtras(this.getExtras(), params);
     removeSync(join(this.restoreDir, this.filename));
     outputJsonSync(join(this.restoreDir, this.filename), extras);

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

@@ -8,7 +8,7 @@ const { BaseRestore } = require('./base');
 class BlockletRestore extends BaseRestore {
   filename = 'blocklet.json';
 
-  async import(params) {
+  import(params) {
     const blocklet = this.decrypt(this.getBlocklet(), params);
     removeSync(join(this.restoreDir, this.filename));
     outputJsonSync(join(this.restoreDir, this.filename), blocklet);

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

@@ -61,7 +61,7 @@ class DiskRestore extends BaseRestore {
     }
   }
 
-  async initialize() {
+  initialize() {
     this.serverDir = process.env.ABT_NODE_DATA_DIR;
     this.restoreDir = getBackupDirs(this.serverDir, this.input.appDid).restoreDir;
     if (existsSync(this.restoreDir)) {

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

@@ -82,7 +82,7 @@ class SpacesRestore extends BaseRestore {
     }
   }
 
-  async initialize() {
+  initialize() {
     this.serverDir = process.env.ABT_NODE_DATA_DIR;
     this.restoreDir = join(this.serverDir, 'tmp/restore', this.input.appDid);
     if (existsSync(this.restoreDir)) {

package/lib/cert.js

@@ -4,7 +4,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:cert');
 const { EVENTS } = require('@abtnode/constant');
 const { BlockletEvents } = require('@blocklet/constant');
 
-const onCertExpired = async (cert, states) => {
+const onCertExpired = (cert, states) => {
   logger.info('send certificate expire notification', { domain: cert.domain });
   states.notification.create({
     title: 'SSL Certificate Expired',
@@ -120,7 +120,7 @@ class Cert extends EventEmitter {
    *   did?:string // blocklet.meta.did
    * }}
    */
-  async issue({ domain, did }) {
+  issue({ domain, did }) {
     logger.info(`generate certificate for ${domain}`);
 
     if (did) {
@@ -137,7 +137,7 @@ class Cert extends EventEmitter {
     return result;
   }
 
-  async update(data) {
+  update(data) {
     return this.manager.update(data.id, { name: data.name, public: data.public });
   }
 
@@ -149,11 +149,11 @@ class Cert extends EventEmitter {
     return {};
   }
 
-  async addWithoutValidations(data) {
+  addWithoutValidations(data) {
     return this.manager.addWithoutValidations(data);
   }
 
-  async updateWithoutValidations(id, data) {
+  updateWithoutValidations(id, data) {
     return this.manager.updateWithoutValidations(id, data);
   }
 

package/lib/crons/rotate-pm2-logs/index.js

@@ -7,7 +7,7 @@ const getCron = () => ({
   name: 'rotate-pm2-logs',
   time: '0 0 * * *', // default : every day at midnight
   options: { runOnInit: false },
-  fn: async () => {
+  fn: () => {
     console.info(`Log rotator started on ${new Date().toISOString()}`);
     const child = spawn('node', [path.join(__dirname, './script.js')], {
       detached: true,

package/lib/migrations/index.js

@@ -78,7 +78,7 @@ const getMigrationScripts = (scriptsDir) => {
   return sorted;
 };
 
-const doBackup = async ({ dataDir, configFile, printInfo, printSuccess }) => {
+const doBackup = ({ dataDir, configFile, printInfo, printSuccess }) => {
   printInfo('Backing up state db and config before migration...');
 
   const backupDir = path.join(dataDir, 'migration', Date.now().toString());
@@ -96,7 +96,7 @@ const doBackup = async ({ dataDir, configFile, printInfo, printSuccess }) => {
   return backupDir;
 };
 
-const doRestore = async ({ dataDir, configFile, backupPath, printInfo, printSuccess }) => {
+const doRestore = ({ dataDir, configFile, backupPath, printInfo, printSuccess }) => {
   printInfo('Restoring when migration failed...');
 
   const dbBackup = path.join(backupPath, BACKUP_FILE_DB);
@@ -309,7 +309,7 @@ const runDataMigrations = async ({
   }
 };
 
-const closeDatabaseConnections = async ({
+const closeDatabaseConnections = ({
   dataDir,
   blocklets = [],
   printInfo = console.info, // eslint-disable-line

package/lib/processes/updater.js

@@ -109,7 +109,7 @@ const verifyBlockletServer = async (version) => {
 };
 
 // Restart Blocklet Server
-const restartBlockletServer = async (dataDir) => {
+const restartBlockletServer = (dataDir) => {
   // We put this in the event loop because it will terminate the current node process
   // But we need to wait for the session state to transition from restarting to cleanup
   process.nextTick(async () => {

package/lib/router/helper.js

@@ -168,7 +168,7 @@ const ensureServiceRule = async (sites) => {
     return site;
   });
 };
-const ensureRootRule = async (sites) => {
+const ensureRootRule = (sites) => {
   return sites.map((site) => {
     if (!isBasicSite(site.domain) && !site.rules.some((x) => x.from.pathPrefix === '/')) {
       site.rules.push({
@@ -388,7 +388,7 @@ const ensureCorsForWebWallet = async (sites) => {
  * @param {Array<import('@abtnode/client').BlockletState>} blocklets
  * @return {Promise<any>}
  */
-const ensureCorsForDidSpace = async (sites = [], blocklets) => {
+const ensureCorsForDidSpace = (sites = [], blocklets) => {
   return sites.map((site) => {
     const blocklet = blocklets.find((x) => x.meta.did === site.blockletDid);
     if (blocklet) {
@@ -404,7 +404,7 @@ const ensureCorsForDidSpace = async (sites = [], blocklets) => {
   });
 };
 
-const filterSitesForRemovedBlocklets = async (sites = [], blocklets) => {
+const filterSitesForRemovedBlocklets = (sites = [], blocklets) => {
   return sites.filter((site) => {
     if (!site.domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX)) {
       return true;
@@ -420,7 +420,7 @@ const filterSitesForRemovedBlocklets = async (sites = [], blocklets) => {
  *
  * @returns {boolean} if routing changed
  */
-const ensureBlockletWellknownRules = async (sites, blocklets) => {
+const ensureBlockletWellknownRules = (sites, blocklets) => {
   /**
    * 1. component blocklet 不允许有相同多的 wellknown
    * 1. wellknown 可以访问的路由:
@@ -488,7 +488,7 @@ const ensureBlockletWellknownRules = async (sites, blocklets) => {
     .filter(Boolean);
 };
 
-const ensureBlockletCache = async (sites = [], blocklets) => {
+const ensureBlockletCache = (sites = [], blocklets) => {
   return sites
     .map((site) => {
       if (!site.domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX)) {

package/lib/states/audit-log.js

@@ -493,7 +493,7 @@ class AuditLogState extends BaseState {
     });
   }
 
-  async findPaginated({ scope, category, paging } = {}) {
+  findPaginated({ scope, category, paging } = {}) {
     const conditions = {};
     if (scope) {
       conditions.scope = scope;

package/lib/states/backup.js

@@ -35,7 +35,7 @@ class BackupState extends BaseState {
   /**
    * @param {Pick<import('@abtnode/models').BackupState, 'appPid' | 'userDid' | 'strategy' | 'sourceUrl' | 'target'>} backup
    */
-  async start(backup) {
+  start(backup) {
     const { error, value } = validateBackupStart.validate(backup, {
       stripUnknown: true,
       allowUnknown: true,
@@ -52,7 +52,7 @@ class BackupState extends BaseState {
    * @param {string} id
    * @param {Pick<import('@abtnode/models').BackupState, 'targetUrl'>} successBackupInfo
    */
-  async success(id, successBackupInfo) {
+  success(id, successBackupInfo) {
     const { error, value } = validateBackupSuccess.validate(successBackupInfo, {
       stripUnknown: true,
       allowUnknown: true,
@@ -78,7 +78,7 @@ class BackupState extends BaseState {
    * @param {string} id
    * @param {Pick<import('@abtnode/models').BackupState, 'message'>} errorBackupInfo
    */
-  async fail(id, errorBackupInfo) {
+  fail(id, errorBackupInfo) {
     const { error, value } = validateBackupFail.validate(errorBackupInfo, {
       stripUnknown: true,
       allowUnknown: true,
@@ -104,6 +104,7 @@ class BackupState extends BaseState {
    * @param {import('@abtnode/models').BackupState} backup
    * @return {Promise<import('@abtnode/models').BackupState>}
    */
+  // eslint-disable-next-line require-await
   async create(backup) {
     const { error, value } = validateBackup.validate(backup, {
       allowUnknown: true,
@@ -121,7 +122,7 @@ class BackupState extends BaseState {
    * @param {{ did: string }} { did }
    * @return {Promise<Array<import('@abtnode/models').BackupState>>}
    */
-  async getBlockletBackups({ did }) {
+  getBlockletBackups({ did }) {
     return this.find({ appPid: did }, {}, { updatedAt: -1 });
   }
 }

package/lib/states/blocklet-extras.js

@@ -207,7 +207,7 @@ class BlockletExtrasState extends BaseState {
     return super.upsert({ did }, { $set: entity });
   }
 
-  async getMeta(did) {
+  getMeta(did) {
     return super.findOne({ did }, { did: 1, controller: 1, meta: 1 });
   }
 

package/lib/states/blocklet.js

@@ -540,7 +540,7 @@ class BlockletState extends BaseState {
     return this.updateBlocklet(did, pick(doc, ['status', 'children']));
   }
 
-  async setInstalledAt(did) {
+  setInstalledAt(did) {
     logger.info('setInstalledAt', { did });
     return this.updateBlocklet(did, { installedAt: new Date() });
   }
@@ -638,7 +638,7 @@ class BlockletState extends BaseState {
     });
   }
 
-  async updateStructV1Did(did, v1Did) {
+  updateStructV1Did(did, v1Did) {
     return this.updateBlocklet(did, { structV1Did: v1Did });
   }
 }

package/lib/states/cache.js

@@ -15,7 +15,7 @@ class CacheState extends BaseState {
     return doc && doc.value;
   }
 
-  async delete(key) {
+  delete(key) {
     return this.remove({ key });
   }
 }

package/lib/states/node.js

@@ -204,7 +204,7 @@ class NodeState extends BaseState {
     return updated;
   }
 
-  async updateNftHolder(holder) {
+  updateNftHolder(holder) {
     if (!holder) {
       throw new Error('NFT holder can not be empty');
     }
@@ -242,6 +242,7 @@ class NodeState extends BaseState {
     return this.updateNodeInfo({ previousMode: '', mode: info.previousMode });
   }
 
+  // eslint-disable-next-line require-await
   async setMode(mode) {
     if (Object.values(NODE_MODES).includes(mode) === false) {
       throw new Error(`Can not update server to unsupported mode: ${mode}`);
@@ -250,7 +251,7 @@ class NodeState extends BaseState {
     return this.updateNodeInfo({ previousMode: '', mode });
   }
 
-  async getEnvironments() {
+  getEnvironments() {
     return this.read().then((info) => ({
       ABT_NODE: info.version,
       ABT_NODE_VERSION: info.version,
@@ -280,6 +281,7 @@ class NodeState extends BaseState {
     return doc.routing;
   }
 
+  // eslint-disable-next-line require-await
   async updateStatus(status) {
     if (!Object.values(SERVER_STATUS).includes(status)) {
       throw new Error('status is invalid');
@@ -288,6 +290,7 @@ class NodeState extends BaseState {
     return this.update({ $set: { status } });
   }
 
+  // eslint-disable-next-line require-await
   async resetStatus() {
     return this.updateStatus(SERVER_STATUS.RUNNING);
   }

package/lib/states/notification.js

@@ -44,7 +44,7 @@ class NotificationState extends BaseState {
     return doc;
   }
 
-  async findPaginated({ read, paging } = {}) {
+  findPaginated({ read, paging } = {}) {
     const conditions = {};
     if (typeof read === 'boolean') {
       conditions.read = read;

package/lib/states/routing-snapshot.js

@@ -49,7 +49,7 @@ module.exports = class RoutingSnapshot {
   init() {
     return this.timemachine
       .getLastSnapshot(true)
-      .then(async (hash) => {
+      .then((hash) => {
         if (hash) {
           return hash;
         }

package/lib/states/site.js

@@ -80,7 +80,7 @@ class SiteState extends BaseState {
     return sites.find((x) => x.domainAliases.some((y) => y.value === domain));
   }
 
-  async findOneByBlocklet(did) {
+  findOneByBlocklet(did) {
     return this.findOne({ domain: getBlockletDomainGroupName(did) });
   }
 

package/lib/states/user.js

@@ -105,11 +105,11 @@ class User extends ExtendBase {
     return this.getUser(did);
   }
 
-  async revokePassportById({ did, id }) {
+  revokePassportById({ did, id }) {
     return this._setPassportStatusById({ did, id, status: PASSPORT_STATUS.REVOKED });
   }
 
-  async enablePassportById({ did, id }) {
+  enablePassportById({ did, id }) {
     return this._setPassportStatusById({ did, id, status: PASSPORT_STATUS.VALID });
   }
 
@@ -160,6 +160,7 @@ class User extends ExtendBase {
   /**
    * Get blocklet service user list
    */
+  // eslint-disable-next-line require-await
   async getUsers({ query, sort, paging } = {}) {
     const where = {};
     const { approved, role, search } = query || {};
@@ -201,6 +202,7 @@ class User extends ExtendBase {
     return this.paginate({ where }, sorting, paging);
   }
 
+  // eslint-disable-next-line require-await
   async getUsersByDids({ dids, query }) {
     const { approved } = query || {};
     const condition = { did: dids };
@@ -211,6 +213,7 @@ class User extends ExtendBase {
     return this.find({ where: condition });
   }
 
+  // eslint-disable-next-line require-await
   async countByPassport({ name, status = PASSPORT_STATUS.VALID }) {
     if (name === '$none') {
       return this.count({
@@ -338,6 +341,7 @@ class User extends ExtendBase {
     return { ...updated, _action: exist ? 'update' : 'add' };
   }
 
+  // eslint-disable-next-line require-await
   async getUserByDid(did) {
     return this.findOne({ did }, { did: 1, pk: 1, fullName: 1, email: 1, role: 1, approved: 1 });
   }

package/lib/team/manager.js

@@ -96,19 +96,19 @@ class TeamManager extends EventEmitter {
     };
   }
 
-  async getUserState(teamDid) {
+  getUserState(teamDid) {
     return this.getState(teamDid, 'user');
   }
 
-  async getPassportState(teamDid) {
+  getPassportState(teamDid) {
     return this.getState(teamDid, 'passport');
   }
 
-  async getConnectedAccountState(teamDid) {
+  getConnectedAccountState(teamDid) {
     return this.getState(teamDid, 'connectedAccount');
   }
 
-  async getSessionState(teamDid) {
+  getSessionState(teamDid) {
     return this.getState(teamDid, 'session');
   }
 
@@ -207,7 +207,7 @@ class TeamManager extends EventEmitter {
     return this.states.blockletExtras.setSettings(metaDid, { trustedPassports });
   }
 
-  async configTrustedFactories(did, trustedFactories) {
+  configTrustedFactories(did, trustedFactories) {
     if (this.isNodeTeam(did)) {
       return this.states.node.updateNodeInfo({ trustedFactories });
     }
@@ -408,7 +408,7 @@ class TeamManager extends EventEmitter {
     }
   }
 
-  async getPid(did) {
+  getPid(did) {
     return this.isNodeTeam(did) ? did : this.states.blocklet.getBlockletMetaDid(did);
   }
 }

package/lib/util/blocklet.js

@@ -635,7 +635,7 @@ const startBlockletProcess = async (
  * Stop all precesses of a blocklet
  * @param {*} blocklet should contain env props
  */
-const stopBlockletProcess = async (blocklet, { preStop = noop, skippedProcessIds = [], componentDids } = {}) => {
+const stopBlockletProcess = (blocklet, { preStop = noop, skippedProcessIds = [], componentDids } = {}) => {
   return deleteBlockletProcess(blocklet, { preDelete: preStop, skippedProcessIds, componentDids });
 };
 
@@ -673,7 +673,7 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
  * Reload all precesses of a blocklet
  * @param {*} blocklet should contain env props
  */
-const reloadBlockletProcess = async (blocklet, { componentDids } = {}) =>
+const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
   forEachBlocklet(
     blocklet,
     async (b) => {
@@ -714,7 +714,7 @@ const getProcessInfo = (processId, { throwOnNotExist = true } = {}) =>
 
 const deleteProcess = (processId) =>
   new Promise((resolve, reject) => {
-    pm2.delete(processId, async (err) => {
+    pm2.delete(processId, (err) => {
       if (isUsefulError(err)) {
         logger.error('blocklet process delete failed', { error: err });
         return reject(err);
@@ -725,7 +725,7 @@ const deleteProcess = (processId) =>
 
 const reloadProcess = (processId) =>
   new Promise((resolve, reject) => {
-    pm2.reload(processId, async (err) => {
+    pm2.reload(processId, (err) => {
       if (err) {
         if (isUsefulError(err)) {
           logger.error('blocklet reload failed', { error: err });
@@ -859,7 +859,7 @@ const parseComponents = async (component, context = {}) => {
 };
 
 const validateBlocklet = (blocklet) =>
-  forEachBlocklet(blocklet, async (b) => {
+  forEachBlocklet(blocklet, (b) => {
     isRequirementsSatisfied(b.meta.requirements);
     validateEngine(getBlockletEngineNameByPlatform(b.meta));
   });

package/lib/util/rpc.js

@@ -9,7 +9,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:rpc');
 const host = '127.0.0.1';
 const port = Number(process.env.ABT_NODE_UPDATER_PORT || 40405);
 
-const doRpcCall = async (message) =>
+const doRpcCall = (message) =>
   new Promise((resolve) => {
     logger.info('try send rpc request', message);
     const sock = axon.socket('req');

package/lib/util/store.js

@@ -120,7 +120,7 @@ const parseSourceUrl = async (url) => {
   };
 };
 
-const resolveTarballURL = async ({ did, tarball = '', storeUrl = '' }) => {
+const resolveTarballURL = ({ did, tarball = '', storeUrl = '' }) => {
   if (!tarball) {
     return '';
   }

package/lib/webhook/sender/api/index.js

@@ -20,7 +20,7 @@ class APISender extends BaseSender {
     }
   }
 
-  async sendTestMessage(params, message) {
+  sendTestMessage(params, message) {
     return this.send(params, {
       description: message,
       status: 'info',

package/lib/webhook/sender/slack/index.js

@@ -64,7 +64,7 @@ class SlackSender extends BaseSender {
     }
   }
 
-  async sendTestMessage(params, message) {
+  sendTestMessage(params, message) {
     return this.send(
       params,
       {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-61882496",
+  "version": "1.16.11-next-b5795b3a",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-61882496",
-    "@abtnode/certificate-manager": "1.16.11-next-61882496",
-    "@abtnode/constant": "1.16.11-next-61882496",
-    "@abtnode/cron": "1.16.11-next-61882496",
-    "@abtnode/logger": "1.16.11-next-61882496",
-    "@abtnode/models": "1.16.11-next-61882496",
-    "@abtnode/queue": "1.16.11-next-61882496",
-    "@abtnode/rbac": "1.16.11-next-61882496",
-    "@abtnode/router-provider": "1.16.11-next-61882496",
-    "@abtnode/static-server": "1.16.11-next-61882496",
-    "@abtnode/timemachine": "1.16.11-next-61882496",
-    "@abtnode/util": "1.16.11-next-61882496",
+    "@abtnode/auth": "1.16.11-next-b5795b3a",
+    "@abtnode/certificate-manager": "1.16.11-next-b5795b3a",
+    "@abtnode/constant": "1.16.11-next-b5795b3a",
+    "@abtnode/cron": "1.16.11-next-b5795b3a",
+    "@abtnode/logger": "1.16.11-next-b5795b3a",
+    "@abtnode/models": "1.16.11-next-b5795b3a",
+    "@abtnode/queue": "1.16.11-next-b5795b3a",
+    "@abtnode/rbac": "1.16.11-next-b5795b3a",
+    "@abtnode/router-provider": "1.16.11-next-b5795b3a",
+    "@abtnode/static-server": "1.16.11-next-b5795b3a",
+    "@abtnode/timemachine": "1.16.11-next-b5795b3a",
+    "@abtnode/util": "1.16.11-next-b5795b3a",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-61882496",
-    "@blocklet/meta": "1.16.11-next-61882496",
-    "@blocklet/sdk": "1.16.11-next-61882496",
+    "@blocklet/constant": "1.16.11-next-b5795b3a",
+    "@blocklet/meta": "1.16.11-next-b5795b3a",
+    "@blocklet/sdk": "1.16.11-next-b5795b3a",
     "@did-space/client": "^0.2.113",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "75e004bf1084bd138e89aadf7629f9fd061ec74d"
+  "gitHead": "3a3586bb115318b2149e72ab99e441684122b3e3"
 }