@abtnode/core 1.16.17 → 1.16.18-beta-7aa6be5a

package/lib/blocklet/manager/disk.js

@@ -230,13 +230,13 @@ class DiskBlockletManager extends BaseBlockletManager {
        *
        * @param {{
        *  id: string,
-       *  job: { blocklet: import('@abtnode/client').BlockletState }
+       *  job: { did: string }
        * }} param0
        */
       const handleBackupComplete = async ({ id: jobId, job }) => {
         await this.backupQueue.delete(jobId);
 
-        const autoBackup = await this.getAutoBackup({ did: job.blocklet.meta.did });
+        const autoBackup = await this.getAutoBackup({ did: job.did });
         if (autoBackup?.enabled) {
           this.backupQueue.push(job, jobId, true, BACKUPS.JOB.INTERVAL);
         }
@@ -1916,13 +1916,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     logger.info('updateAutoBackup.$value', value);
 
     if (value.enabled) {
-      const blocklet = await states.blocklet.getBlocklet(did);
-
       this.backupQueue.push(
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          blocklet,
+          did,
           context,
         },
         jobId,
@@ -2331,6 +2329,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @param {{
+   *  did: string,
    *  blocklet: import('@abtnode/client').BlockletState,
    *  context: {
    *    referrer: string;
@@ -2342,11 +2341,13 @@ class DiskBlockletManager extends BaseBlockletManager {
    * }} { blocklet, context }
    * @memberof BlockletManager
    */
-  async _onBackupToSpaces({ blocklet, context, backupState }) {
+  async _onBackupToSpaces({ did, context, backupState }) {
     const {
       referrer,
       user: { did: userDid, locale },
     } = context;
+
+    const blocklet = await states.blocklet.getBlocklet(did);
     const {
       appDid,
       meta: { did: appPid },
@@ -3589,7 +3590,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          blocklet,
+          did,
           context,
           backupState: {
             strategy: BACKUPS.STRATEGY.MANUAL,

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

@@ -23,7 +23,7 @@ async function autoBackupHandler(eventName, payload, blockletManager) {
       {
         entity: 'blocklet',
         action: 'backupToSpaces',
-        blocklet: payload,
+        did,
         context: payload.context,
       },
       jobId

package/lib/router/helper.js

@@ -1026,7 +1026,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     }
 
     const existRule = (existSite.rules || []).find((y) => get(y, 'from.pathPrefix') === pathPrefix);
-    if (existRule) {
+    if (
+      existRule &&
+      (rule.to?.type !== ROUTING_RULE_TYPES.BLOCKLET || existRule.to?.type === ROUTING_RULE_TYPES.BLOCKLET)
+    ) {
       await routerManager.updateRoutingRule({
         id: existSite.id,
         rule: {

package/lib/router/manager.js

@@ -307,7 +307,16 @@ class RouterManager extends EventEmitter {
       const existedRule = dbSite.rules.find((x) => x.from.pathPrefix === rule.from.pathPrefix);
 
       if (existedRule) {
-        throw new Error(`addRoutingRule: path prefix '${originalPathPrefix}' already exists`);
+        if (
+          rule.from.pathPrefix === '/' &&
+          rule.to.type === ROUTING_RULE_TYPES.BLOCKLET &&
+          existedRule.to.type !== ROUTING_RULE_TYPES.BLOCKLET
+        ) {
+          // Do nothing
+          // This is a special case that we allow a non-blocklet rule already exists in '/'
+        } else {
+          throw new Error(`addRoutingRule: path prefix '${originalPathPrefix}' already exists`);
+        }
       }
     }
 

package/lib/states/blocklet.js

@@ -159,6 +159,13 @@ class BlockletState extends BaseState {
     this.statusLocks = new Map();
   }
 
+  /**
+   * @description
+   * @param {string} did
+   * @param {*} [{ decryptSk = true }={}]
+   * @return {Promise<import('@abtnode/client').BlockletState>}
+   * @memberof BlockletState
+   */
   async getBlocklet(did, { decryptSk = true } = {}) {
     if (!did) {
       return null;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17",
+  "version": "1.16.18-beta-7aa6be5a",
   "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.17",
-    "@abtnode/auth": "1.16.17",
-    "@abtnode/certificate-manager": "1.16.17",
-    "@abtnode/constant": "1.16.17",
-    "@abtnode/cron": "1.16.17",
-    "@abtnode/logger": "1.16.17",
-    "@abtnode/models": "1.16.17",
-    "@abtnode/queue": "1.16.17",
-    "@abtnode/rbac": "1.16.17",
-    "@abtnode/router-provider": "1.16.17",
-    "@abtnode/static-server": "1.16.17",
-    "@abtnode/timemachine": "1.16.17",
-    "@abtnode/util": "1.16.17",
+    "@abtnode/analytics": "1.16.18-beta-7aa6be5a",
+    "@abtnode/auth": "1.16.18-beta-7aa6be5a",
+    "@abtnode/certificate-manager": "1.16.18-beta-7aa6be5a",
+    "@abtnode/constant": "1.16.18-beta-7aa6be5a",
+    "@abtnode/cron": "1.16.18-beta-7aa6be5a",
+    "@abtnode/logger": "1.16.18-beta-7aa6be5a",
+    "@abtnode/models": "1.16.18-beta-7aa6be5a",
+    "@abtnode/queue": "1.16.18-beta-7aa6be5a",
+    "@abtnode/rbac": "1.16.18-beta-7aa6be5a",
+    "@abtnode/router-provider": "1.16.18-beta-7aa6be5a",
+    "@abtnode/static-server": "1.16.18-beta-7aa6be5a",
+    "@abtnode/timemachine": "1.16.18-beta-7aa6be5a",
+    "@abtnode/util": "1.16.18-beta-7aa6be5a",
     "@arcblock/did": "1.18.93",
     "@arcblock/did-auth": "1.18.93",
     "@arcblock/did-ext": "^1.18.93",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.93",
     "@arcblock/vc": "1.18.93",
-    "@blocklet/constant": "1.16.17",
-    "@blocklet/env": "1.16.17",
-    "@blocklet/meta": "1.16.17",
-    "@blocklet/resolver": "1.16.17",
-    "@blocklet/sdk": "1.16.17",
+    "@blocklet/constant": "1.16.18-beta-7aa6be5a",
+    "@blocklet/env": "1.16.18-beta-7aa6be5a",
+    "@blocklet/meta": "1.16.18-beta-7aa6be5a",
+    "@blocklet/resolver": "1.16.18-beta-7aa6be5a",
+    "@blocklet/sdk": "1.16.18-beta-7aa6be5a",
     "@did-space/client": "^0.3.12",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.93",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "628ba2f5dac74749900bc1e9fd81bab8d320412a"
+  "gitHead": "b2da6c7e30adf84d7eca941ada27427344c49044"
 }