@abtnode/core 1.16.13-beta-423a40b1 → 1.16.13-beta-a83ad86d

package/lib/blocklet/manager/disk.js

@@ -1397,8 +1397,12 @@ class BlockletManager extends BaseBlockletManager {
 
     const sessionConfig = cloneDeep(blocklet.settings.session || {});
 
-    sessionConfig.cacheTtl = validateConfig.cacheTtl;
-    sessionConfig.ttl = validateConfig.ttl;
+    if (validateConfig.cacheTtl) {
+      sessionConfig.cacheTtl = validateConfig.cacheTtl;
+    }
+    if (validateConfig.ttl) {
+      sessionConfig.ttl = validateConfig.ttl;
+    }
 
     await states.blockletExtras.setSettings(blocklet.meta.did, { session: sessionConfig });
 

package/lib/states/node.js

@@ -204,12 +204,19 @@ class NodeState extends BaseState {
     return updated;
   }
 
-  updateNftHolder(holder) {
+  async updateNftHolder(holder) {
     if (!holder) {
       throw new Error('NFT holder can not be empty');
     }
 
-    return this.update({ $set: { 'ownerNft.holder': holder } });
+    const { ownerNft } = await this.read();
+    if (isEmpty(ownerNft)) {
+      throw new Error('ownerNft is empty');
+    }
+
+    ownerNft.holder = holder;
+
+    return this.update({ $set: { ownerNft } });
   }
 
   async enterMode(mode) {
@@ -273,8 +280,12 @@ class NodeState extends BaseState {
   }
 
   async updateGateway(gateway) {
+    const { routing } = await this.read();
+    routing.requestLimit = gateway.requestLimit;
+    routing.cacheEnabled = gateway.cacheEnabled;
+
     const doc = await this.update({
-      $set: { 'routing.requestLimit': gateway.requestLimit, 'routing.cacheEnabled': gateway.cacheEnabled },
+      $set: { routing },
     });
 
     this.emit(EVENTS.RELOAD_GATEWAY, doc);
@@ -296,7 +307,7 @@ class NodeState extends BaseState {
   }
 
   async update(updates) {
-    await this.read();
+    await this.read(); // CAUTION: 这一行不要删，当 node state 不存在时，read() 会插入新数据
     const [, [updated]] = await super.update({ did: this.config.nodeDid }, updates);
     return updated;
   }

package/lib/validators/util.js

@@ -25,12 +25,10 @@ const createValidator = (schema) => (entity) => schema.validateAsync(entity);
 const sessionConfigSchema = Joi.object({
   cacheTtl: Joi.number()
     .min(5 * 60) // 5min
-    .max(86400) // 1d
-    .default(10 * 60), // 10min
+    .max(86400), // 1d
   ttl: Joi.number()
     .min(86400) // 1d
-    .max(86400 * 30) // 30d
-    .default(86400 * 7), // 7d
+    .max(86400 * 30), // 30d
 });
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-423a40b1",
+  "version": "1.16.13-beta-a83ad86d",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,32 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13-beta-423a40b1",
-    "@abtnode/certificate-manager": "1.16.13-beta-423a40b1",
-    "@abtnode/constant": "1.16.13-beta-423a40b1",
-    "@abtnode/cron": "1.16.13-beta-423a40b1",
-    "@abtnode/logger": "1.16.13-beta-423a40b1",
-    "@abtnode/models": "1.16.13-beta-423a40b1",
-    "@abtnode/queue": "1.16.13-beta-423a40b1",
-    "@abtnode/rbac": "1.16.13-beta-423a40b1",
-    "@abtnode/router-provider": "1.16.13-beta-423a40b1",
-    "@abtnode/static-server": "1.16.13-beta-423a40b1",
-    "@abtnode/timemachine": "1.16.13-beta-423a40b1",
-    "@abtnode/util": "1.16.13-beta-423a40b1",
+    "@abtnode/auth": "1.16.13-beta-a83ad86d",
+    "@abtnode/certificate-manager": "1.16.13-beta-a83ad86d",
+    "@abtnode/constant": "1.16.13-beta-a83ad86d",
+    "@abtnode/cron": "1.16.13-beta-a83ad86d",
+    "@abtnode/logger": "1.16.13-beta-a83ad86d",
+    "@abtnode/models": "1.16.13-beta-a83ad86d",
+    "@abtnode/queue": "1.16.13-beta-a83ad86d",
+    "@abtnode/rbac": "1.16.13-beta-a83ad86d",
+    "@abtnode/router-provider": "1.16.13-beta-a83ad86d",
+    "@abtnode/static-server": "1.16.13-beta-a83ad86d",
+    "@abtnode/timemachine": "1.16.13-beta-a83ad86d",
+    "@abtnode/util": "1.16.13-beta-a83ad86d",
     "@arcblock/did": "1.18.84",
     "@arcblock/did-auth": "1.18.84",
     "@arcblock/did-ext": "^1.18.84",
-    "@arcblock/did-motif": "^1.1.11",
+    "@arcblock/did-motif": "^1.1.12",
     "@arcblock/did-util": "1.18.84",
     "@arcblock/event-hub": "1.18.84",
     "@arcblock/jwt": "^1.18.84",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.84",
     "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.13-beta-423a40b1",
-    "@blocklet/meta": "1.16.13-beta-423a40b1",
-    "@blocklet/resolver": "1.16.13-beta-423a40b1",
-    "@blocklet/sdk": "1.16.13-beta-423a40b1",
+    "@blocklet/constant": "1.16.13-beta-a83ad86d",
+    "@blocklet/meta": "1.16.13-beta-a83ad86d",
+    "@blocklet/resolver": "1.16.13-beta-a83ad86d",
+    "@blocklet/sdk": "1.16.13-beta-a83ad86d",
     "@did-space/client": "^0.2.117",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.84",
@@ -97,5 +97,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "1aee04f45042bd4784ca72f9f8b93918980be4d4"
+  "gitHead": "dc2a4f7d5b55da109ebf873d8aa4d24f27a088c9"
 }