@abtnode/core 1.6.19 → 1.6.20

package/lib/blocklet/manager/disk.js

@@ -1328,14 +1328,15 @@ class BlockletManager extends BaseBlockletManager {
     const blocklet = await states.blocklet.getBlocklet(did);
     const nodeInfo = await states.node.read();
 
-    const rootSystemEnvironments = getRootSystemEnvironments(blockletWithEnv, nodeInfo);
-    const overwrittenEnvironments = getOverwrittenEnvironments(blockletWithEnv, nodeInfo);
+    const rootSystemEnvironments = {
+      ...getRootSystemEnvironments(blockletWithEnv, nodeInfo),
+      ...getOverwrittenEnvironments(blockletWithEnv, nodeInfo),
+    };
 
     // fill environments to blocklet and blocklet.children
     blocklet.environments = formatEnvironments({
       ...getSystemEnvironments(blockletWithEnv),
       ...rootSystemEnvironments,
-      ...overwrittenEnvironments,
     });
 
     for (const child of blocklet.children) {
@@ -1344,11 +1345,13 @@ class BlockletManager extends BaseBlockletManager {
         child.environments = formatEnvironments({
           ...getSystemEnvironments(childWithEnv), // system env of child blocklet
           ...rootSystemEnvironments, // system env of root blocklet
-          ...overwrittenEnvironments,
         });
       }
     }
 
+    // put BLOCKLET_APP_ID at root level for indexing
+    blocklet.appDid = rootSystemEnvironments.BLOCKLET_APP_ID;
+
     // update state to db
     return states.blocklet.updateBlocklet(did, blocklet);
   }

package/lib/event.js

@@ -132,7 +132,7 @@ module.exports = ({
     onEvent(name, blocklet);
   };
 
-  const handleCLIEvent = (eventName) => {
+  const handleServerEvent = (eventName) => {
     const [, status] = eventName.split('.');
     onEvent(eventName, {
       title: `Blocklet Server ${status}`,
@@ -209,7 +209,8 @@ module.exports = ({
 
   events.handleBlockletAdd = handleBlockletAdd;
   events.handleBlockletRemove = handleBlockletRemove;
-  events.handleCLIEvent = handleCLIEvent;
+  events.handleServerEvent = handleServerEvent;
+  events.onEvent = onEvent;
 
   return events;
 };

package/lib/states/blocklet.js

@@ -80,7 +80,11 @@ class BlockletState extends BaseState {
 
   getBlocklet(did) {
     return new Promise((resolve, reject) => {
-      this.db.findOne({ 'meta.did': did }, (err, doc) => {
+      if (!did) {
+        resolve(null);
+      }
+
+      this.db.findOne({ $or: [{ 'meta.did': did }, { appDid: did }] }, (err, doc) => {
         if (err) {
           return reject(err);
         }
@@ -160,6 +164,7 @@ class BlockletState extends BaseState {
             // add to db
             this.db.insert(
               {
+                appDid: null, // will updated later when updating blocklet environments
                 mode,
                 meta: omit(sanitized, ['htmlAst']),
                 status,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.19",
+  "version": "1.6.20",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,28 +19,28 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.6.19",
-    "@abtnode/constant": "1.6.19",
-    "@abtnode/cron": "1.6.19",
-    "@abtnode/db": "1.6.19",
-    "@abtnode/logger": "1.6.19",
-    "@abtnode/queue": "1.6.19",
-    "@abtnode/rbac": "1.6.19",
-    "@abtnode/router-provider": "1.6.19",
-    "@abtnode/static-server": "1.6.19",
-    "@abtnode/timemachine": "1.6.19",
-    "@abtnode/util": "1.6.19",
-    "@arcblock/did": "^1.14.11",
-    "@arcblock/event-hub": "1.14.11",
+    "@abtnode/certificate-manager": "1.6.20",
+    "@abtnode/constant": "1.6.20",
+    "@abtnode/cron": "1.6.20",
+    "@abtnode/db": "1.6.20",
+    "@abtnode/logger": "1.6.20",
+    "@abtnode/queue": "1.6.20",
+    "@abtnode/rbac": "1.6.20",
+    "@abtnode/router-provider": "1.6.20",
+    "@abtnode/static-server": "1.6.20",
+    "@abtnode/timemachine": "1.6.20",
+    "@abtnode/util": "1.6.20",
+    "@arcblock/did": "^1.14.13",
+    "@arcblock/event-hub": "1.14.13",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.14.11",
-    "@blocklet/meta": "1.6.19",
+    "@arcblock/vc": "^1.14.13",
+    "@blocklet/meta": "1.6.20",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.11",
-    "@ocap/util": "^1.14.11",
-    "@ocap/wallet": "^1.14.11",
+    "@ocap/mcrypto": "^1.14.13",
+    "@ocap/util": "^1.14.13",
+    "@ocap/wallet": "^1.14.13",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.25.0",
     "axon": "^2.0.3",
@@ -75,5 +75,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "42a1290f14fca261eccafb05561eecf8683ed66a"
+  "gitHead": "e695a9fa4e2cbf7fcef554be3309090c37919d94"
 }