@abtnode/core 1.16.20-beta-9c254d14 → 1.16.20-beta-e6e3b017

package/lib/blocklet/manager/disk.js

@@ -2483,31 +2483,38 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _updateBlockletEnvironment(did) {
+  async getBlockletEnvironments(did) {
     const blockletWithEnv = await this.getBlocklet(did);
-    const blocklet = await states.blocklet.getBlocklet(did);
     const nodeInfo = await states.node.read();
-
     const appSystemEnvironments = {
       ...getAppSystemEnvironments(blockletWithEnv, nodeInfo, this.dataDirs),
       ...getAppOverwrittenEnvironments(blockletWithEnv, nodeInfo),
     };
 
     // fill environments to blocklet and components
-    blocklet.environments = formatEnvironments({
-      ...getComponentSystemEnvironments(blockletWithEnv),
-      ...appSystemEnvironments,
-    });
+    return {
+      all: formatEnvironments({
+        ...getComponentSystemEnvironments(blockletWithEnv),
+        ...appSystemEnvironments,
+      }),
+      appSystemEnvironments,
+    };
+  }
+
+  async _updateBlockletEnvironment(did) {
+    const blockletWithEnv = await this.getBlocklet(did);
+    const blocklet = await states.blocklet.getBlocklet(did);
+
+    const { all, appSystemEnvironments } = await this.getBlockletEnvironments(did);
+    blocklet.environments = all;
 
     const envMap = {};
     forEachBlockletSync(blockletWithEnv, (child, { ancestors }) => {
       const id = getComponentId(child, ancestors);
       envMap[id] = child;
     });
-
     forEachChildSync(blocklet, (child, { ancestors }) => {
       const id = getComponentId(child, ancestors);
-
       const childWithEnv = envMap[id];
       if (childWithEnv) {
         child.environments = formatEnvironments({
@@ -2516,10 +2523,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         });
       }
     });
-
     // put BLOCKLET_APP_ID at root level for indexing
     blocklet.appDid = appSystemEnvironments.BLOCKLET_APP_ID;
-
     if (!Array.isArray(blocklet.migratedFrom)) {
       blocklet.migratedFrom = [];
     }
@@ -2527,7 +2532,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (!blocklet.appPid) {
       blocklet.appPid = appSystemEnvironments.BLOCKLET_APP_PID;
     }
-
     // update state to db
     await states.blockletExtras.updateByDid(did, { appDid: blocklet.appDid });
     return states.blocklet.updateBlocklet(did, blocklet);

package/lib/index.js

@@ -309,6 +309,7 @@ function ABTNode(options) {
     getBlocklet: blockletManager.detail.bind(blockletManager),
     getBlockletDiff: blockletManager.diff.bind(blockletManager),
     hasBlocklet: blockletManager.hasBlocklet.bind(blockletManager),
+    getBlockletEnvironments: blockletManager.getBlockletEnvironments.bind(blockletManager),
     updateAllBlockletEnvironment: blockletManager.updateAllBlockletEnvironment.bind(blockletManager),
     setBlockletInitialized: blockletManager.setInitialized.bind(blockletManager),
     setBlockletOwner: blockletManager.updateOwner.bind(blockletManager),

package/lib/util/blocklet.js

@@ -426,7 +426,6 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     ...getSharedConfigObj((ancestors || [])[0], blocklet),
     ...blocklet.environmentObj,
     ...devEnvironments,
-    BLOCKLET_WEB_PORTS: JSON.stringify(ports),
     BLOCKLET_MOUNT_POINTS: JSON.stringify(componentsInternalInfo),
     BLOCKLET_MODE: blocklet.mode || BLOCKLET_MODES.PRODUCTION,
     BLOCKLET_APP_EK: tmp?.secretKey,

package/lib/util/launcher.js

@@ -2,6 +2,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const joinUrl = require('url-join');
 const pick = require('lodash/pick');
+const isEmpty = require('lodash/isEmpty');
 const {
   getUserAvatarUrl,
   extractUserAvatar,
@@ -17,7 +18,7 @@ const { getLauncherUser, getLauncherSession: getLauncherSessionRaw, doRequest }
 const { createAuthToken, getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
 const { createPassportVC, createPassport, createUserPassport } = require('@abtnode/auth/lib/passport');
 
-const { BlockletStatus, LOGIN_PROVIDER } = require('@blocklet/constant');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const {
   WELLKNOWN_SERVICE_PATH_PREFIX,
   NODE_DATA_DIR_NAME,
@@ -88,8 +89,12 @@ const setupAppOwner = async (node, sessionId) => {
   if (!blocklet) {
     throw new Error(`Blocklet not found in server: ${appDid}`);
   }
-  if (blocklet.status !== BlockletStatus.installed) {
-    throw new Error(`Blocklet status not expected: ${appDid}`);
+
+  // 安装后 blocklet.environments 可能不会立即有值，可以从 node.getBlockletEnvironments 获取
+  if (isEmpty(blocklet.environments)) {
+    const { all } = await node.getBlockletEnvironments(appDid);
+
+    blocklet.environments = all;
   }
 
   const { wallet } = getBlockletInfo(blocklet, info.sk);
@@ -193,8 +198,6 @@ const setupAppOwner = async (node, sessionId) => {
   });
 
   await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
-  await node.endSession({ id: sessionId });
-  logger.info('Complete install for blocklet', { appDid, ownerDid, sessionId });
 
   return {
     session,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.20-beta-9c254d14",
+  "version": "1.16.20-beta-e6e3b017",
   "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.20-beta-9c254d14",
-    "@abtnode/auth": "1.16.20-beta-9c254d14",
-    "@abtnode/certificate-manager": "1.16.20-beta-9c254d14",
-    "@abtnode/constant": "1.16.20-beta-9c254d14",
-    "@abtnode/cron": "1.16.20-beta-9c254d14",
-    "@abtnode/logger": "1.16.20-beta-9c254d14",
-    "@abtnode/models": "1.16.20-beta-9c254d14",
-    "@abtnode/queue": "1.16.20-beta-9c254d14",
-    "@abtnode/rbac": "1.16.20-beta-9c254d14",
-    "@abtnode/router-provider": "1.16.20-beta-9c254d14",
-    "@abtnode/static-server": "1.16.20-beta-9c254d14",
-    "@abtnode/timemachine": "1.16.20-beta-9c254d14",
-    "@abtnode/util": "1.16.20-beta-9c254d14",
+    "@abtnode/analytics": "1.16.20-beta-e6e3b017",
+    "@abtnode/auth": "1.16.20-beta-e6e3b017",
+    "@abtnode/certificate-manager": "1.16.20-beta-e6e3b017",
+    "@abtnode/constant": "1.16.20-beta-e6e3b017",
+    "@abtnode/cron": "1.16.20-beta-e6e3b017",
+    "@abtnode/logger": "1.16.20-beta-e6e3b017",
+    "@abtnode/models": "1.16.20-beta-e6e3b017",
+    "@abtnode/queue": "1.16.20-beta-e6e3b017",
+    "@abtnode/rbac": "1.16.20-beta-e6e3b017",
+    "@abtnode/router-provider": "1.16.20-beta-e6e3b017",
+    "@abtnode/static-server": "1.16.20-beta-e6e3b017",
+    "@abtnode/timemachine": "1.16.20-beta-e6e3b017",
+    "@abtnode/util": "1.16.20-beta-e6e3b017",
     "@arcblock/did": "1.18.103",
     "@arcblock/did-auth": "1.18.103",
     "@arcblock/did-ext": "^1.18.103",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.103",
     "@arcblock/vc": "1.18.103",
-    "@blocklet/constant": "1.16.20-beta-9c254d14",
-    "@blocklet/env": "1.16.20-beta-9c254d14",
-    "@blocklet/meta": "1.16.20-beta-9c254d14",
-    "@blocklet/resolver": "1.16.20-beta-9c254d14",
-    "@blocklet/sdk": "1.16.20-beta-9c254d14",
+    "@blocklet/constant": "1.16.20-beta-e6e3b017",
+    "@blocklet/env": "1.16.20-beta-e6e3b017",
+    "@blocklet/meta": "1.16.20-beta-e6e3b017",
+    "@blocklet/resolver": "1.16.20-beta-e6e3b017",
+    "@blocklet/sdk": "1.16.20-beta-e6e3b017",
     "@did-space/client": "^0.3.41",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.103",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "2f74601e9a8f2e07e872a629b6abc8d4bc1fd371"
+  "gitHead": "764869cd8c889713e56416f4e60385cc70b9482e"
 }