@abtnode/core 1.16.23 → 1.16.24-beta-6975c2c0

package/lib/api/team.js

@@ -1380,7 +1380,7 @@ class TeamAPI extends EventEmitter {
   }
 
   // user-session management
-  async getUserSession({ teamDid, userDid, visitorId }) {
+  async getUserSession({ teamDid, userDid, visitorId, appPid }) {
     const state = await this.getUserSessionState(teamDid);
     const userState = await this.getUserState(teamDid);
 
@@ -1389,6 +1389,7 @@ class TeamAPI extends EventEmitter {
     };
     if (userDid) where.userDid = userDid;
     if (visitorId) where.visitorId = visitorId;
+    if (appPid) where.appPid = appPid;
 
     const userSessions = await state.model.findAll({
       where,

package/lib/blocklet/manager/disk.js

@@ -3175,13 +3175,17 @@ class DiskBlockletManager extends BaseBlockletManager {
         await this.configNavigations({ did, navigations: packConfig.navigations });
 
         for (const { did: componentDid, configs } of packConfig.components || []) {
-          await this.config({
-            did: [blocklet.meta.did, componentDid],
-            configs,
-            skipHook: true,
-            skipDidDocument: true,
-            skipEmitEvents: true,
-          });
+          if (blocklet.children.some((x) => x.meta.did === componentDid)) {
+            await this.config({
+              did: [blocklet.meta.did, componentDid],
+              configs,
+              skipHook: true,
+              skipDidDocument: true,
+              skipEmitEvents: true,
+            });
+          } else {
+            logger.error('component not found', { did: componentDid });
+          }
         }
       }
 

package/lib/blocklet/manager/helper/install-component-from-dev.js

@@ -43,7 +43,7 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
 
   const component = {
     meta: ensureMeta(meta),
-    mountPoint: mountPoint || `/${defaultPath}`,
+    mountPoint: (mountPoint || `/${defaultPath}`).toLowerCase(),
     source: BlockletSource.local,
     deployedFrom: folder,
     status: BlockletStatus.installed,

package/lib/blocklet/project/create-pack-release.js

@@ -175,6 +175,7 @@ const createPackRelease = async ({
       exportDir: releaseBundleDir,
       blockletDid,
       isPack: true,
+      selectedComponentDids: blockletComponents.map((x) => x.did),
     });
     const resourceList = await getResourceList(releaseBundleDir, { isPublic: false });
 

package/lib/blocklet/project/util.js

@@ -25,7 +25,15 @@ const getLogoFile = (blocklet, project) => {
   return { logoFile, logoFileName };
 };
 
-const exportBlockletResources = async ({ app, projectId, releaseId, exportDir, blockletDid, isPack }) => {
+const exportBlockletResources = async ({
+  app,
+  projectId,
+  releaseId,
+  exportDir,
+  blockletDid,
+  isPack,
+  selectedComponentDids,
+}) => {
   // create resource
   const projectDir = path.join(app.env.dataDir, PROJECT.DIR, `${projectId}`);
   const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
@@ -50,10 +58,17 @@ const exportBlockletResources = async ({ app, projectId, releaseId, exportDir, b
         .filter(Boolean),
     };
     const navigations = app.settings.navigations || [];
-    const componentsConfigs = app.children.map((x) => ({
-      did: x.meta.did,
-      configs: x.configs.filter((y) => !y.secure),
-    }));
+    const componentsConfigs = app.children
+      .filter((x) => {
+        if (selectedComponentDids.length) {
+          return selectedComponentDids.includes(x.meta.did);
+        }
+        return true;
+      })
+      .map((x) => ({
+        did: x.meta.did,
+        configs: x.configs.filter((y) => !y.secure),
+      }));
     await fs.outputJSON(path.join(packResourceDir, 'config.json'), {
       site,
       navigations,

package/lib/util/router.js

@@ -58,12 +58,14 @@ const revokeAndDeleteNFTDomainRecord = async ({ name, blocklet, nodeInfo }) => {
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
   const payload = {
-    delegatee: wallet.address,
+    delegatee: blocklet.appPid,
     domain: name,
   };
 
   const nftDomainServiceUrl = await getDidDomainServiceURL(nodeInfo.nftDomainUrl);
 
+  logger.info('will revoke and delete nft domain record', { name, appPid: blocklet.appPid, payload });
+
   try {
     const { data } = await axios({
       method: 'DELETE',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23",
+  "version": "1.16.24-beta-6975c2c0",
   "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.23",
-    "@abtnode/auth": "1.16.23",
-    "@abtnode/certificate-manager": "1.16.23",
-    "@abtnode/constant": "1.16.23",
-    "@abtnode/cron": "1.16.23",
-    "@abtnode/logger": "1.16.23",
-    "@abtnode/models": "1.16.23",
-    "@abtnode/queue": "1.16.23",
-    "@abtnode/rbac": "1.16.23",
-    "@abtnode/router-provider": "1.16.23",
-    "@abtnode/static-server": "1.16.23",
-    "@abtnode/timemachine": "1.16.23",
-    "@abtnode/util": "1.16.23",
+    "@abtnode/analytics": "1.16.24-beta-6975c2c0",
+    "@abtnode/auth": "1.16.24-beta-6975c2c0",
+    "@abtnode/certificate-manager": "1.16.24-beta-6975c2c0",
+    "@abtnode/constant": "1.16.24-beta-6975c2c0",
+    "@abtnode/cron": "1.16.24-beta-6975c2c0",
+    "@abtnode/logger": "1.16.24-beta-6975c2c0",
+    "@abtnode/models": "1.16.24-beta-6975c2c0",
+    "@abtnode/queue": "1.16.24-beta-6975c2c0",
+    "@abtnode/rbac": "1.16.24-beta-6975c2c0",
+    "@abtnode/router-provider": "1.16.24-beta-6975c2c0",
+    "@abtnode/static-server": "1.16.24-beta-6975c2c0",
+    "@abtnode/timemachine": "1.16.24-beta-6975c2c0",
+    "@abtnode/util": "1.16.24-beta-6975c2c0",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.23",
-    "@blocklet/env": "1.16.23",
-    "@blocklet/meta": "1.16.23",
-    "@blocklet/resolver": "1.16.23",
-    "@blocklet/sdk": "1.16.23",
-    "@did-space/client": "^0.3.60",
+    "@blocklet/constant": "1.16.24-beta-6975c2c0",
+    "@blocklet/env": "1.16.24-beta-6975c2c0",
+    "@blocklet/meta": "1.16.24-beta-6975c2c0",
+    "@blocklet/resolver": "1.16.24-beta-6975c2c0",
+    "@blocklet/sdk": "1.16.24-beta-6975c2c0",
+    "@did-space/client": "^0.3.63",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "5f395ec30436f222a0420545ec678753f7453ec5"
+  "gitHead": "0622d3897a7fb7a01d74e024fa2027e335bbe539"
 }