@abtnode/core 1.8.1 → 1.8.2

package/lib/blocklet/manager/disk.js

@@ -870,7 +870,9 @@ class BlockletManager extends BaseBlockletManager {
 
   async configPublicToStore({ did, publicToStore = false }) {
     const blocklet = await this.ensureBlocklet(did);
-
+    // publicToStore 由用户传入
+    // handleInstanceInStore 方法写在前面，保证向 store 操作成功后才会更改 blocklet 中的 publicToStore值
+    // handleInstanceInStore 中会校验修改 publicToStore字段 的条件，不符合则会抛错，就不会执行下面更新 publicToStore 的逻辑
     await handleInstanceInStore(blocklet, { publicToStore });
     await states.blockletExtras.setSettings(did, { publicToStore });
 
@@ -1302,6 +1304,10 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
+  async hasBlocklet({ did }) {
+    return states.blocklet.hasBlocklet(did);
+  }
+
   async setInitialized({ did, owner }) {
     if (!validateOwner(owner)) {
       throw new Error('Blocklet owner is invalid');

package/lib/event.js

@@ -164,9 +164,13 @@ module.exports = ({
     } else if ([BlockletEvents.started].includes(eventName)) {
       try {
         const blocklet = await blockletManager.ensureBlocklet(payload.meta.did);
-        await handleInstanceInStore(blocklet);
+        const { publicToStore } = blocklet.settings;
+        // 如果一个 blocklet 没有设置 publicToStore，启动成功后不应给 store 发请求
+        if (publicToStore) {
+          await handleInstanceInStore(blocklet, { publicToStore });
+        }
       } catch (error) {
-        logger.error('handleInstanceInStore failed', { error });
+        logger.error('BlockletEvents started failed', { error });
       }
     }
 

package/lib/index.js

@@ -238,6 +238,7 @@ function ABTNode(options) {
     getBlocklets: blockletManager.list.bind(blockletManager),
     getBlocklet: blockletManager.detail.bind(blockletManager),
     getBlockletDiff: blockletManager.diff.bind(blockletManager),
+    hasBlocklet: blockletManager.hasBlocklet.bind(blockletManager),
     updateAllBlockletEnvironment: blockletManager.updateAllBlockletEnvironment.bind(blockletManager),
     setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
 

package/lib/states/blocklet.js

@@ -102,6 +102,22 @@ class BlockletState extends BaseState {
     });
   }
 
+  hasBlocklet(did) {
+    return new Promise((resolve, reject) => {
+      if (!did) {
+        resolve(false);
+      }
+
+      this.db.count({ $or: [{ 'meta.did': did }, { appDid: did }] }, (err, count) => {
+        if (err) {
+          return reject(err);
+        }
+
+        return resolve(!!count);
+      });
+    });
+  }
+
   getBlocklets(query = {}, projection) {
     return new Promise((resolve, reject) => {
       this.db

package/lib/util/blocklet.js

@@ -309,6 +309,7 @@ const getComponentSystemEnvironments = (blocklet) => {
   if (ports) {
     Object.assign(portEnvironments, ports);
   }
+
   return {
     BLOCKLET_REAL_DID: blocklet.env.id,
     BLOCKLET_DATA_DIR: blocklet.env.dataDir,
@@ -328,10 +329,19 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     return o;
   }, {});
 
+  // get devEnvironments, when blocklet is in dev mode
+  const devEnvironments =
+    blocklet.mode === BLOCKLET_MODES.DEVELOPMENT
+      ? {
+          BLOCKLET_DEV_MOUNT_POINT: blocklet?.mountPoint || '',
+        }
+      : {};
+
   return {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
     ...blocklet.environmentObj,
+    ...devEnvironments,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,31 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.1",
-    "@abtnode/constant": "1.8.1",
-    "@abtnode/cron": "1.8.1",
-    "@abtnode/db": "1.8.1",
-    "@abtnode/logger": "1.8.1",
-    "@abtnode/queue": "1.8.1",
-    "@abtnode/rbac": "1.8.1",
-    "@abtnode/router-provider": "1.8.1",
-    "@abtnode/static-server": "1.8.1",
-    "@abtnode/timemachine": "1.8.1",
-    "@abtnode/util": "1.8.1",
-    "@arcblock/did": "1.17.0",
+    "@abtnode/certificate-manager": "1.8.2",
+    "@abtnode/constant": "1.8.2",
+    "@abtnode/cron": "1.8.2",
+    "@abtnode/db": "1.8.2",
+    "@abtnode/logger": "1.8.2",
+    "@abtnode/queue": "1.8.2",
+    "@abtnode/rbac": "1.8.2",
+    "@abtnode/router-provider": "1.8.2",
+    "@abtnode/static-server": "1.8.2",
+    "@abtnode/timemachine": "1.8.2",
+    "@abtnode/util": "1.8.2",
+    "@arcblock/did": "1.17.2",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.0",
-    "@arcblock/event-hub": "1.17.0",
-    "@arcblock/jwt": "^1.17.0",
+    "@arcblock/did-util": "1.17.2",
+    "@arcblock/event-hub": "1.17.2",
+    "@arcblock/jwt": "^1.17.2",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.0",
-    "@blocklet/meta": "1.8.1",
+    "@arcblock/vc": "1.17.2",
+    "@blocklet/meta": "1.8.2",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.3.1",
     "@nedb/multi": "^1.3.1",
-    "@ocap/mcrypto": "1.17.0",
-    "@ocap/util": "1.17.0",
-    "@ocap/wallet": "1.17.0",
+    "@ocap/mcrypto": "1.17.2",
+    "@ocap/util": "1.17.2",
+    "@ocap/wallet": "1.17.2",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
@@ -81,5 +81,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "c970b8a386bebd7fe6dbc8b8eedf8bd8328b4bb5"
+  "gitHead": "fcbe3c97f3825c507ee16714f49bbf8f58c5b59f"
 }