@abtnode/core 1.16.34 → 1.16.35

package/lib/api/team.js

@@ -18,7 +18,7 @@ const {
   SESSION_TTL,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
-const { BlockletEvents, TeamEvents } = require('@blocklet/constant');
+const { BlockletEvents, TeamEvents, BlockletInternalEvents } = require('@blocklet/constant');
 const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
 const {
   createPassportVC,
@@ -1907,6 +1907,12 @@ class TeamAPI extends EventEmitter {
     await this.states.blockletExtras.setSettings(blocklet.meta.did, { session: sessionConfig });
     this.emit(BlockletEvents.updated, { meta: { did: teamDid } });
 
+    // NOTE: we need emit appConfigChanged event to update sessionSalt in blocklet-sdk
+    this.emit(BlockletInternalEvents.appConfigChanged, {
+      appDid: teamDid,
+      configs: [{ key: 'BLOCKLET_APP_SALT', value: sessionConfig.salt }],
+    });
+
     return 1;
   }
 }

package/lib/blocklet/manager/disk.js

@@ -64,6 +64,7 @@ const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('
 const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
 const { encrypt } = require('@blocklet/sdk/lib/security');
 const Lock = require('@abtnode/util/lib/lock');
+const { generateRandomString } = require('@abtnode/models/lib/util');
 const { getComponentApiKey, getBlockletLogos } = require('@abtnode/util/lib/blocklet');
 
 const {
@@ -1490,7 +1491,14 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   // Get blocklet by blockletDid or appDid
   async detail(
-    { did, attachConfig = true, attachRuntimeInfo, attachDiskInfo = false, useCache, getOptionalComponents },
+    {
+      did,
+      attachConfig = true,
+      attachRuntimeInfo = false,
+      attachDiskInfo = false,
+      useCache = false,
+      getOptionalComponents = false,
+    },
     context
   ) {
     if (!did) {
@@ -3620,7 +3628,9 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (['eth', 'ethereum'].includes(customChainType)) {
       chainTypeEnv.value = 'ethereum';
     }
+
     await states.blockletExtras.setConfigs(blocklet.meta.did, [chainTypeEnv]);
+    await states.blockletExtras.setSettings(blocklet.meta.did, { session: { salt: generateRandomString(16) } });
 
     return blocklet;
   }

package/lib/blocklet/project/index.js

@@ -244,6 +244,7 @@ const createRelease = async ({
       blockletSupport,
       blockletCommunity,
       blockletRepository,
+      blockletVideos,
       blockletScreenshots,
       blockletComponents,
       blockletResourceType,

package/lib/event/index.js

@@ -498,7 +498,9 @@ module.exports = ({
     listen(teamAPI, TeamEvents[key], onEvent);
   });
 
+  listen(teamAPI, BlockletInternalEvents.appConfigChanged, onEvent);
   listen(teamAPI, BlockletEvents.updated, onEvent);
+
   listen(teamManager, BlockletEvents.storeChange, onEvent);
   listen(teamManager, EVENTS.NOTIFICATION_BLOCKLET_CREATE, onEvent);
 

package/lib/util/blocklet.js

@@ -358,6 +358,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
     BLOCKLET_APP_URL: appUrl,
     BLOCKLET_APP_DATA_DIR: path.join(dataDirs.data, blocklet.meta.name),
     BLOCKLET_APP_TENANT_MODE: result.tenantMode || BLOCKLET_TENANT_MODES.SINGLE,
+    BLOCKLET_APP_SALT: blocklet.settings?.session?.salt || '',
   };
 };
 

package/lib/util/launcher.js

@@ -14,7 +14,6 @@ const {
   getAvatarByUrl,
   getAppAvatarUrl,
 } = require('@abtnode/util/lib/user');
-const { Hasher } = require('@ocap/mcrypto');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { getBlockletLogos } = require('@abtnode/util/lib/blocklet');
@@ -208,7 +207,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
     launcherUrl,
     launcherSessionId,
   } = session;
-  const [info, blocklet] = await Promise.all([states.node.read(), states.blocklet.getBlocklet(appDid)]);
+  const [info, blocklet] = await Promise.all([states.node.read(), node.getBlocklet({ did: appDid })]);
   if (!blocklet) {
     throw new Error(`Blocklet not found in server: ${appDid}`);
   }
@@ -216,11 +215,10 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
   // 安装后 blocklet.environments 可能不会立即有值，可以从 node.getBlockletEnvironments 获取
   if (isEmpty(blocklet.environments)) {
     const { all } = await node.getBlockletEnvironments(appDid);
-
     blocklet.environments = all;
   }
 
-  const { wallet } = getBlockletInfo(blocklet, info.sk);
+  const { wallet, secret } = getBlockletInfo(blocklet, info.sk);
   const appUrl = blocklet.environments.find((x) => x.key === 'BLOCKLET_APP_URL').value;
   const dataDir = blocklet.environments.find((x) => x.key === 'BLOCKLET_DATA_DIR').value;
   const serverDataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
@@ -311,13 +309,12 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
   logger.info('Create owner for blocklet', { appDid, ownerDid, sessionId });
 
   // create owner login token that can be used to login on blocklet site
-  const appSecret = Hasher.SHA3.hash256(Buffer.concat([wallet.secretKey, wallet.address].map((v) => Buffer.from(v))));
   const setupToken = createAuthToken({
     did: ownerDid,
     passport,
     role,
     fullName: appOwnerProfile?.fullName,
-    secret: appSecret,
+    secret,
     expiresIn: '1h',
     elevated: true,
   });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.34",
+  "version": "1.16.35",
   "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.34",
-    "@abtnode/auth": "1.16.34",
-    "@abtnode/certificate-manager": "1.16.34",
-    "@abtnode/constant": "1.16.34",
-    "@abtnode/cron": "1.16.34",
-    "@abtnode/logger": "1.16.34",
-    "@abtnode/models": "1.16.34",
-    "@abtnode/queue": "1.16.34",
-    "@abtnode/rbac": "1.16.34",
-    "@abtnode/router-provider": "1.16.34",
-    "@abtnode/static-server": "1.16.34",
-    "@abtnode/timemachine": "1.16.34",
-    "@abtnode/util": "1.16.34",
+    "@abtnode/analytics": "1.16.35",
+    "@abtnode/auth": "1.16.35",
+    "@abtnode/certificate-manager": "1.16.35",
+    "@abtnode/constant": "1.16.35",
+    "@abtnode/cron": "1.16.35",
+    "@abtnode/logger": "1.16.35",
+    "@abtnode/models": "1.16.35",
+    "@abtnode/queue": "1.16.35",
+    "@abtnode/rbac": "1.16.35",
+    "@abtnode/router-provider": "1.16.35",
+    "@abtnode/static-server": "1.16.35",
+    "@abtnode/timemachine": "1.16.35",
+    "@abtnode/util": "1.16.35",
     "@arcblock/did": "1.18.162",
     "@arcblock/did-auth": "1.18.162",
     "@arcblock/did-ext": "^1.18.162",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.162",
     "@arcblock/vc": "1.18.162",
-    "@blocklet/constant": "1.16.34",
+    "@blocklet/constant": "1.16.35",
     "@blocklet/did-space-js": "^0.5.82",
-    "@blocklet/env": "1.16.34",
-    "@blocklet/meta": "1.16.34",
-    "@blocklet/resolver": "1.16.34",
-    "@blocklet/sdk": "1.16.34",
-    "@blocklet/store": "1.16.34",
+    "@blocklet/env": "1.16.35",
+    "@blocklet/meta": "1.16.35",
+    "@blocklet/resolver": "1.16.35",
+    "@blocklet/sdk": "1.16.35",
+    "@blocklet/store": "1.16.35",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.162",
     "@ocap/util": "1.18.162",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "843b12c2cbf9c11497dea690783735f0a83551c9"
+  "gitHead": "a1888a5814c97a1cf6adfcee4e4d0721eabba7c3"
 }