@abtnode/core 1.16.28 → 1.16.29-beta-e04c6f40

package/lib/api/team.js

@@ -661,7 +661,7 @@ class TeamAPI extends EventEmitter {
    * }
    * @returns
    */
-  async createMemberInvitation({ teamDid, role, expireTime, remark }, context) {
+  async createMemberInvitation({ teamDid, role, expireTime, remark, sourceAppPid }, context) {
     await this.teamManager.checkEnablePassportIssuance(teamDid);
 
     if (expireTime && expireTime <= 0) {
@@ -696,6 +696,7 @@ class TeamAPI extends EventEmitter {
       expireDate,
       inviter: user,
       teamDid,
+      sourceAppPid,
     });
 
     logger.info('Create invite member', { role, user, inviteId });
@@ -707,6 +708,7 @@ class TeamAPI extends EventEmitter {
       expireDate: new Date(expireDate).toString(),
       inviter: user,
       teamDid,
+      sourceAppPid,
     };
   }
 
@@ -731,6 +733,7 @@ class TeamAPI extends EventEmitter {
       teamDid: invitation.teamDid,
       status: invitation.status,
       receiver: invitation.receiver,
+      sourceAppPid: invitation.sourceAppPid || null,
     };
   }
 
@@ -749,6 +752,7 @@ class TeamAPI extends EventEmitter {
       teamDid: d.teamDid,
       status: d.status,
       receiver: d.receiver,
+      sourceAppPid: d.sourceAppPid || null,
     }));
   }
 
@@ -1323,8 +1327,8 @@ class TeamAPI extends EventEmitter {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async addStore({ teamDid, url }, context) {
-    logger.info('add registry', { url });
+  async addStore({ teamDid, url, scope = '' }, context) {
+    logger.info('add store', { teamDid, url, scope });
 
     const urlObj = new URL(url);
     let newUrl = urlObj.origin;
@@ -1352,7 +1356,7 @@ class TeamAPI extends EventEmitter {
       throw new Error(`Blocklet registry already exist: ${sanitized}`);
     }
 
-    storeList.push({ ...store, url: sanitized, protected: false });
+    storeList.push({ ...store, scope, url: sanitized, protected: false });
 
     return this.teamManager.updateStoreList(teamDid, storeList);
   }

package/lib/blocklet/manager/disk.js

@@ -204,6 +204,7 @@ const {
   connectToStore,
   publishToStore,
   connectByStudio,
+  disconnectFromStore,
 } = require('../project');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
@@ -1983,6 +1984,10 @@ class DiskBlockletManager extends BaseBlockletManager {
           return;
         }
 
+        if (getBlockletEngine(component.meta)?.interpreter === 'blocklet') {
+          return;
+        }
+
         try {
           const status = await getProcessState(component.env.processId);
           const oldStatus = component.status;
@@ -2399,6 +2404,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     return connectToStore({ ...params, manager: this });
   }
 
+  disconnectFromStore(params) {
+    return disconnectFromStore({ ...params, manager: this });
+  }
+
   connectByStudio(params, context) {
     return connectByStudio({ ...params, context, manager: this });
   }

package/lib/blocklet/project/disconnect-from-store.js

@@ -0,0 +1,11 @@
+const disconnectFromStore = async ({ did, storeId, projectId, manager }) => {
+  if (!did) {
+    throw new Error('Invalid did');
+  }
+  const { projectState } = await manager._getProjectState(did);
+  const project = await projectState.findOne({ id: projectId });
+  project.connectedStores = (project.connectedStores || []).filter((x) => x.storeId !== storeId);
+  await projectState.updateProject(projectId, project);
+};
+
+module.exports = disconnectFromStore;

package/lib/blocklet/project/index.js

@@ -28,6 +28,7 @@ const createPackRelease = require('./create-pack-release');
 const connectToStore = require('./connect-to-store');
 const publishToStore = require('./publish-to-store');
 const connectByStudio = require('./connect-by-studio');
+const disconnectFromStore = require('./disconnect-from-store');
 
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
@@ -375,8 +376,7 @@ const createRelease = async ({
       meta.engine = {
         interpreter: 'blocklet',
         source: {
-          // FIXME: @wangshijun publish this to production store
-          store: 'https://test.store.blocklet.dev',
+          store: 'https://store.blocklet.dev',
           name: 'z2qa2dGC9EmsjB2WJtUcmuRWx43zTwPUZQF7g',
           version: 'latest',
         },
@@ -529,6 +529,7 @@ module.exports = {
   updateSelectedResources: ensureProjectCreateBy(updateSelectedResources),
   deleteProject,
   connectToStore,
+  disconnectFromStore,
   connectByStudio,
   publishToStore,
 };

package/lib/blocklet/project/publish-to-store.js

@@ -57,6 +57,7 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     storeUrl,
     accessToken,
     developerDid,
+    source: 'STUDIO',
   });
 
   release.publishedStoreIds = ensureArray(release.publishedStoreIds);

package/lib/index.js

@@ -346,6 +346,7 @@ function ABTNode(options) {
     updateProject: blockletManager.updateProject.bind(blockletManager),
     createRelease: blockletManager.createRelease.bind(blockletManager),
     connectToStore: blockletManager.connectToStore.bind(blockletManager),
+    disconnectFromStore: blockletManager.disconnectFromStore.bind(blockletManager),
     connectByStudio: blockletManager.connectByStudio.bind(blockletManager),
     publishToStore: blockletManager.publishToStore.bind(blockletManager),
     getReleases: blockletManager.getReleases.bind(blockletManager),

package/lib/states/audit-log.js

@@ -178,7 +178,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `update component mount point to **${args.mountPoint}**`;
     // store
     case 'addBlockletStore':
-      return `added blocklet store ${args.url}`;
+      return `added blocklet store ${args.url}${args.scope ? ` for ${args.scope}` : ''}`;
     case 'deleteBlockletStore':
       return `removed blocklet store ${args.url}`;
     case 'selectBlockletStore':
@@ -273,7 +273,7 @@ ${JSON.stringify(syncData, null, 2)}
     case 'deletePassportIssuance':
       return `removed passport issuance ${args.sessionId}`;
     case 'createMemberInvitation':
-      return `created member invitation(${result.inviteId}: ${args.remark}) with **${args.role}** passport`; // prettier-ignore
+      return `created member invitation(${result.inviteId}: ${args.remark}) with **${args.role}** passport(within app: ${args.sourceAppPid})`; // prettier-ignore
     case 'deleteInvitation':
       return `removed unused member invitation(${args.inviteId})`;
     case 'createRole':

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.28",
+  "version": "1.16.29-beta-e04c6f40",
   "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.28",
-    "@abtnode/auth": "1.16.28",
-    "@abtnode/certificate-manager": "1.16.28",
-    "@abtnode/constant": "1.16.28",
-    "@abtnode/cron": "1.16.28",
-    "@abtnode/logger": "1.16.28",
-    "@abtnode/models": "1.16.28",
-    "@abtnode/queue": "1.16.28",
-    "@abtnode/rbac": "1.16.28",
-    "@abtnode/router-provider": "1.16.28",
-    "@abtnode/static-server": "1.16.28",
-    "@abtnode/timemachine": "1.16.28",
-    "@abtnode/util": "1.16.28",
+    "@abtnode/analytics": "1.16.29-beta-e04c6f40",
+    "@abtnode/auth": "1.16.29-beta-e04c6f40",
+    "@abtnode/certificate-manager": "1.16.29-beta-e04c6f40",
+    "@abtnode/constant": "1.16.29-beta-e04c6f40",
+    "@abtnode/cron": "1.16.29-beta-e04c6f40",
+    "@abtnode/logger": "1.16.29-beta-e04c6f40",
+    "@abtnode/models": "1.16.29-beta-e04c6f40",
+    "@abtnode/queue": "1.16.29-beta-e04c6f40",
+    "@abtnode/rbac": "1.16.29-beta-e04c6f40",
+    "@abtnode/router-provider": "1.16.29-beta-e04c6f40",
+    "@abtnode/static-server": "1.16.29-beta-e04c6f40",
+    "@abtnode/timemachine": "1.16.29-beta-e04c6f40",
+    "@abtnode/util": "1.16.29-beta-e04c6f40",
     "@arcblock/did": "1.18.123",
     "@arcblock/did-auth": "1.18.123",
     "@arcblock/did-ext": "^1.18.123",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.123",
     "@arcblock/vc": "1.18.123",
-    "@blocklet/constant": "1.16.28",
-    "@blocklet/env": "1.16.28",
-    "@blocklet/meta": "1.16.28",
-    "@blocklet/resolver": "1.16.28",
-    "@blocklet/sdk": "1.16.28",
-    "@blocklet/store": "1.16.28",
+    "@blocklet/constant": "1.16.29-beta-e04c6f40",
+    "@blocklet/env": "1.16.29-beta-e04c6f40",
+    "@blocklet/meta": "1.16.29-beta-e04c6f40",
+    "@blocklet/resolver": "1.16.29-beta-e04c6f40",
+    "@blocklet/sdk": "1.16.29-beta-e04c6f40",
+    "@blocklet/store": "1.16.29-beta-e04c6f40",
     "@did-space/client": "^0.5.1",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.123",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "54db076a7e520bbc260f8cbf0af31dd50b86aef1"
+  "gitHead": "f3e8f2ce931215b95ada33e87aee997d8ae52a69"
 }