@abtnode/core 1.16.27-beta-725ce3a6 → 1.16.27-beta-d1555a79

package/lib/blocklet/manager/disk.js

@@ -201,6 +201,7 @@ const {
   updateSelectedResources,
   connectToStore,
   publishToStore,
+  connectByStudio,
 } = require('../project');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
@@ -2326,57 +2327,61 @@ class DiskBlockletManager extends BaseBlockletManager {
     return this.configSynchronizer.syncAppConfig(did, { serverVersion });
   }
 
-  createProject({ did, ...params } = {}) {
-    return createProject({ did, ...params, manager: this });
+  createProject({ did, ...params } = {}, context) {
+    return createProject({ did, ...params, context, manager: this });
   }
 
-  getProjects({ did, componentDid } = {}) {
-    return getProjects({ did, componentDid, manager: this });
+  getProjects({ did, componentDid, tenantScope } = {}, context) {
+    return getProjects({ did, componentDid, tenantScope, context, manager: this });
   }
 
-  getProject({ did, projectId } = {}) {
-    return getProject({ did, projectId, manager: this });
+  getProject({ did, projectId, messageId } = {}, context) {
+    return getProject({ did, projectId, messageId, context, manager: this });
   }
 
-  updateProject({ did, projectId, ...params } = {}) {
-    return updateProject({ did, projectId, ...params, manager: this });
+  updateProject({ did, projectId, ...params } = {}, context) {
+    return updateProject({ did, projectId, ...params, context, manager: this });
   }
 
-  deleteProject({ did, projectId } = {}) {
-    return deleteProject({ did, projectId, manager: this });
+  deleteProject({ did, projectId } = {}, context) {
+    return deleteProject({ did, projectId, context, manager: this });
   }
 
   // eslint-disable-next-line no-unused-vars
   createRelease({ did, projectId, ...params } = {}, context) {
-    return createRelease({ did, projectId, ...params, manager: this });
+    return createRelease({ did, projectId, ...params, context, manager: this });
   }
 
-  getReleases({ did, projectId } = {}) {
-    return getReleases({ did, projectId, manager: this });
+  getReleases({ did, projectId } = {}, context) {
+    return getReleases({ did, projectId, context, manager: this });
   }
 
-  getRelease({ did, projectId, releaseId } = {}) {
-    return getRelease({ did, projectId, releaseId, manager: this });
+  getRelease({ did, projectId, releaseId } = {}, context) {
+    return getRelease({ did, projectId, releaseId, context, manager: this });
   }
 
-  deleteRelease({ did, projectId, releaseId } = {}) {
-    return deleteRelease({ did, projectId, releaseId, manager: this });
+  deleteRelease({ did, projectId, releaseId } = {}, context) {
+    return deleteRelease({ did, projectId, releaseId, context, manager: this });
   }
 
   connectToStore(params) {
     return connectToStore({ ...params, manager: this });
   }
 
-  publishToStore(params) {
-    return publishToStore({ ...params, manager: this });
+  connectByStudio(params, context) {
+    return connectByStudio({ ...params, context, manager: this });
   }
 
-  getSelectedResources({ did, projectId, releaseId, componentDid } = {}) {
-    return getSelectedResources({ did, projectId, releaseId, componentDid, manager: this });
+  publishToStore(params, context) {
+    return publishToStore({ ...params, context, manager: this });
   }
 
-  updateSelectedResources({ did, projectId, releaseId, componentDid, resources } = {}) {
-    return updateSelectedResources({ did, projectId, releaseId, componentDid, resources, manager: this });
+  getSelectedResources({ did, projectId, releaseId, componentDid } = {}, context) {
+    return getSelectedResources({ did, projectId, releaseId, componentDid, context, manager: this });
+  }
+
+  updateSelectedResources({ did, projectId, releaseId, componentDid, resources } = {}, context) {
+    return updateSelectedResources({ did, projectId, releaseId, componentDid, resources, context, manager: this });
   }
 
   // ============================================================================================

package/lib/blocklet/project/connect-by-studio.js

@@ -0,0 +1,86 @@
+const validUrl = require('valid-url');
+
+const { createConnect } = require('@blocklet/store');
+
+function sanitizeBlockletTitle(blockletTitle) {
+  let sanitizedTitle = blockletTitle.replace(/[^a-zA-Z0-9-_]/g, '');
+  sanitizedTitle = sanitizedTitle.replace(/^[^a-zA-Z0-9]+/, '');
+  if (sanitizedTitle.length > 128) {
+    sanitizedTitle = sanitizedTitle.slice(0, 128);
+  }
+  if (sanitizedTitle.length < 4) {
+    sanitizedTitle = sanitizedTitle.padEnd(4, '0');
+  }
+  return sanitizedTitle;
+}
+
+const connectByStudio = ({
+  did,
+  componentDid,
+  blockletTitle,
+  type,
+  tenantScope,
+  storeName,
+  storeId,
+  storeUrl,
+  messageId,
+  manager,
+  context,
+}) => {
+  if (!did) {
+    throw new Error('Invalid did');
+  }
+  // 校验是否为合法的url地址（必须是 http 或 https 协议）,例如：https://store.blocklet.dev/
+  if (!validUrl.isWebUri(storeUrl)) {
+    throw new Error('Invalid store url:', storeUrl);
+  }
+
+  // eslint-disable-next-line no-async-promise-executor
+  return new Promise(async (resolve, reject) => {
+    try {
+      const fetchData = await createConnect({
+        connectUrl: storeUrl,
+        connectAction: 'connect-studio',
+        enableEncrypt: true,
+        // monikers 必须满足一个规则, 而 blockletTitle 是更宽松的规则
+        monikers: sanitizeBlockletTitle(blockletTitle) || 'blocklet',
+        openPage: (pageUrl) => {
+          resolve(pageUrl);
+        },
+      });
+
+      if (!fetchData) {
+        throw new Error('Failed to connect to store');
+      }
+
+      const { secretKey, developerDid, name, email } = fetchData.developer;
+      const { address: blockletDid } = fetchData.blocklet;
+
+      const { projectState } = await manager._getProjectState(did);
+
+      const nextStore = {
+        storeId,
+        storeName,
+        storeUrl,
+        accessToken: secretKey,
+        developerDid,
+        developerName: name,
+        developerEmail: email,
+      };
+      await projectState.createProject({
+        blockletTitle,
+        type,
+        tenantScope,
+        blockletDid,
+        componentDid,
+        messageId,
+        createdBy: context.user.did,
+        connectedStores: [nextStore],
+      });
+    } catch (error) {
+      reject(error);
+    }
+  });
+};
+
+module.exports = connectByStudio;

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

@@ -1,7 +1,6 @@
 const validUrl = require('valid-url');
 
 const { createConnect } = require('@blocklet/store');
-const { STUDIO_CONNECTED_STORE } = require('@abtnode/constant');
 
 const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager }) => {
   if (!did) {
@@ -63,16 +62,6 @@ const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager
       }
 
       await projectState.updateProject(projectId, project);
-
-      await manager.teamManager.createNotification({
-        teamDid: did,
-        title: `Connected ${storeName} successfully`,
-        description: `You can publish your blocklet to ${storeName} now`,
-        entityType: 'blocklet',
-        entityId: did,
-        meta: { did, eventType: STUDIO_CONNECTED_STORE },
-        severity: 'success',
-      });
     } catch (error) {
       reject(error);
     }

package/lib/blocklet/project/get-is-multiple-tenant.js

@@ -0,0 +1,8 @@
+const { BLOCKLET_TENANT_MODES } = require('@blocklet/constant');
+
+const getIsMultipleTenant = async (manager, did) => {
+  const env = await manager.getBlockletEnvironments(did);
+  return env?.appSystemEnvironments?.BLOCKLET_APP_TENANT_MODE === BLOCKLET_TENANT_MODES.MULTIPLE;
+};
+
+module.exports = getIsMultipleTenant;

package/lib/blocklet/project/index.js

@@ -12,27 +12,62 @@ const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const logger = require('@abtnode/logger')('create-resource-blocklet');
 
 const { createReleaseSchema } = require('../../validators/project');
+const getIsMultipleTenant = require('./get-is-multiple-tenant');
 
 const { getLogoFile, exportBlockletResources, getResourceList, checkResourceExists } = require('./util');
 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 COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
 // project
 
-const createProject = async ({ did, type, blockletTitle, blockletDid, componentDid, manager }) => {
+const ensureProjectCreateBy = (fn) => {
+  return async ({ did, projectId, messageId, context, manager, ...rest }) => {
+    const isMultipleTenant = await getIsMultipleTenant(manager, did);
+    if (isMultipleTenant) {
+      const { projectState } = await manager._getProjectState(did);
+      const createdBy = context?.user?.did;
+      if (!createdBy) {
+        throw new Error('No permission to perform this project');
+      }
+      const project = await projectState.findOne(messageId ? { messageId, createdBy } : { id: projectId, createdBy });
+      if (!project) {
+        throw new Error('No permission to perform this project');
+      }
+    }
+    return fn({ did, projectId, messageId, context, manager, ...rest });
+  };
+};
+
+const createProject = async ({
+  did,
+  type,
+  blockletTitle,
+  blockletDid,
+  componentDid,
+  tenantScope,
+  manager,
+  context,
+}) => {
   await titleSchema.validateAsync(blockletTitle);
   validateNewDid(blockletDid);
   if (!PROJECT.TYPES[type]) {
     throw new Error(`type is invalid: ${type}`);
   }
-
   const blocklet = await manager.getBlocklet(did, { useCache: true });
   const { projectState } = await manager._getProjectState(did);
 
-  const project = await projectState.createProject({ blockletTitle, blockletDid, type, componentDid });
+  const project = await projectState.createProject({
+    blockletTitle,
+    blockletDid,
+    type,
+    componentDid,
+    tenantScope,
+    createdBy: context?.user?.did,
+  });
 
   // create project dir
   const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${project.id}`);
@@ -46,15 +81,24 @@ const createProject = async ({ did, type, blockletTitle, blockletDid, componentD
   return project;
 };
 
-const getProjects = async ({ did, manager, componentDid, showAccessToken }) => {
+const getProjects = async ({ did, manager, componentDid, showAccessToken, tenantScope, context }) => {
+  const isMultipleTenant = await getIsMultipleTenant(manager, did);
+  if (isMultipleTenant && componentDid && !tenantScope) {
+    throw new Error('Multiple tenant mode in component, tenantScope is required');
+  }
   const { projectState } = await manager._getProjectState(did);
-  const projects = await projectState.getProjects({ componentDid, showAccessToken });
+  const query = { componentDid, showAccessToken };
+  if (isMultipleTenant) {
+    query.tenantScope = tenantScope;
+    query.createdBy = context.user.did;
+  }
+  const projects = await projectState.getProjects(query);
   return { projects };
 };
 
-const getProject = async ({ did, projectId, manager, showAccessToken }) => {
+const getProject = async ({ did, projectId, messageId, showAccessToken, manager }) => {
   const { projectState } = await manager._getProjectState(did);
-  const project = await projectState.findOne({ id: projectId });
+  const project = await projectState.findOne(messageId ? { messageId } : { id: projectId });
   if (!showAccessToken) {
     project.connectedStores?.forEach((store) => {
       store.accessToken = store.accessToken ? '__encrypted__' : '';
@@ -63,12 +107,13 @@ const getProject = async ({ did, projectId, manager, showAccessToken }) => {
   return project;
 };
 
-const updateProject = async ({ did, projectId, manager, ...params }) => {
+const updateProject = async ({ did, projectId, manager, context, ...params }) => {
   const { projectState } = await manager._getProjectState(did);
   const project = await projectState.updateProject(projectId, params);
   return project;
 };
 
+// 这个接口不会被前端直接调用
 const deleteProject = async ({ did, projectId, manager }) => {
   if (!projectId) {
     throw new Error('projectId is required');
@@ -104,7 +149,6 @@ const deleteRelease = async ({ did, projectId, releaseId, manager }) => {
   const blocklet = await manager.getBlocklet(did);
   const { releaseState } = await manager._getProjectState(did);
   const releaseDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`, PROJECT.RELEASE_DIR, `${releaseId}`);
-
   await releaseState.remove({ projectId, id: releaseId });
   await fs.remove(releaseDir);
 };
@@ -409,15 +453,16 @@ const updateSelectedResources = async ({ did, projectId, releaseId, componentDid
 module.exports = {
   createProject,
   getProjects,
-  getProject,
-  updateProject,
+  getProject: ensureProjectCreateBy(getProject),
+  updateProject: ensureProjectCreateBy(updateProject),
+  createRelease: ensureProjectCreateBy(createRelease),
+  getReleases: ensureProjectCreateBy(getReleases),
+  getRelease: ensureProjectCreateBy(getRelease),
+  deleteRelease: ensureProjectCreateBy(deleteRelease),
+  getSelectedResources: ensureProjectCreateBy(getSelectedResources),
+  updateSelectedResources: ensureProjectCreateBy(updateSelectedResources),
   deleteProject,
-  createRelease,
-  getReleases,
-  getRelease,
-  deleteRelease,
-  getSelectedResources,
-  updateSelectedResources,
   connectToStore,
+  connectByStudio,
   publishToStore,
 };

package/lib/index.js

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

package/lib/states/project.js

@@ -8,20 +8,46 @@ const isUndefinedOrNull = (x) => x === undefined || x === null;
  * @extends BaseState<import('@abtnode/models').ProjectState>
  */
 class Project extends BaseState {
-  createProject({ type, blockletDid, blockletTitle, componentDid }) {
-    const doc = { id: blockletDid, type, blockletDid, blockletTitle };
+  createProject({
+    type,
+    blockletDid,
+    blockletTitle,
+    componentDid,
+    tenantScope,
+    connectedStores,
+    createdBy,
+    messageId,
+  }) {
+    const doc = { id: blockletDid, type, blockletDid, blockletTitle, createdBy };
     if (componentDid) {
       doc.componentDid = componentDid;
     }
-
+    if (tenantScope) {
+      doc.tenantScope = tenantScope;
+    }
+    if (connectedStores) {
+      doc.connectedStores = connectedStores;
+    }
+    if (messageId) {
+      if (messageId.length < 20) {
+        throw new Error('Invalid messageId');
+      }
+      doc.messageId = messageId;
+    }
     return this.insert(doc);
   }
 
-  async getProjects({ componentDid, showAccessToken }) {
+  async getProjects({ componentDid, tenantScope, showAccessToken, createdBy }) {
     const query = {};
     if (componentDid) {
       query.componentDid = componentDid;
     }
+    if (tenantScope) {
+      query.tenantScope = tenantScope;
+    }
+    if (createdBy) {
+      query.createdBy = createdBy;
+    }
     const projects = await this.find(
       query,
       {},

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27-beta-725ce3a6",
+  "version": "1.16.27-beta-d1555a79",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.27-beta-725ce3a6",
-    "@abtnode/auth": "1.16.27-beta-725ce3a6",
-    "@abtnode/certificate-manager": "1.16.27-beta-725ce3a6",
-    "@abtnode/constant": "1.16.27-beta-725ce3a6",
-    "@abtnode/cron": "1.16.27-beta-725ce3a6",
-    "@abtnode/logger": "1.16.27-beta-725ce3a6",
-    "@abtnode/models": "1.16.27-beta-725ce3a6",
-    "@abtnode/queue": "1.16.27-beta-725ce3a6",
-    "@abtnode/rbac": "1.16.27-beta-725ce3a6",
-    "@abtnode/router-provider": "1.16.27-beta-725ce3a6",
-    "@abtnode/static-server": "1.16.27-beta-725ce3a6",
-    "@abtnode/timemachine": "1.16.27-beta-725ce3a6",
-    "@abtnode/util": "1.16.27-beta-725ce3a6",
-    "@arcblock/did": "1.18.120",
-    "@arcblock/did-auth": "1.18.120",
-    "@arcblock/did-ext": "^1.18.120",
+    "@abtnode/analytics": "1.16.27-beta-d1555a79",
+    "@abtnode/auth": "1.16.27-beta-d1555a79",
+    "@abtnode/certificate-manager": "1.16.27-beta-d1555a79",
+    "@abtnode/constant": "1.16.27-beta-d1555a79",
+    "@abtnode/cron": "1.16.27-beta-d1555a79",
+    "@abtnode/logger": "1.16.27-beta-d1555a79",
+    "@abtnode/models": "1.16.27-beta-d1555a79",
+    "@abtnode/queue": "1.16.27-beta-d1555a79",
+    "@abtnode/rbac": "1.16.27-beta-d1555a79",
+    "@abtnode/router-provider": "1.16.27-beta-d1555a79",
+    "@abtnode/static-server": "1.16.27-beta-d1555a79",
+    "@abtnode/timemachine": "1.16.27-beta-d1555a79",
+    "@abtnode/util": "1.16.27-beta-d1555a79",
+    "@arcblock/did": "1.18.121",
+    "@arcblock/did-auth": "1.18.121",
+    "@arcblock/did-ext": "^1.18.121",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.120",
-    "@arcblock/event-hub": "1.18.120",
-    "@arcblock/jwt": "^1.18.120",
+    "@arcblock/did-util": "1.18.121",
+    "@arcblock/event-hub": "1.18.121",
+    "@arcblock/jwt": "^1.18.121",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.120",
-    "@arcblock/vc": "1.18.120",
-    "@blocklet/constant": "1.16.27-beta-725ce3a6",
-    "@blocklet/env": "1.16.27-beta-725ce3a6",
-    "@blocklet/meta": "1.16.27-beta-725ce3a6",
-    "@blocklet/resolver": "1.16.27-beta-725ce3a6",
-    "@blocklet/sdk": "1.16.27-beta-725ce3a6",
-    "@blocklet/store": "1.16.27-beta-725ce3a6",
-    "@did-space/client": "^0.4.5",
+    "@arcblock/validator": "^1.18.121",
+    "@arcblock/vc": "1.18.121",
+    "@blocklet/constant": "1.16.27-beta-d1555a79",
+    "@blocklet/env": "1.16.27-beta-d1555a79",
+    "@blocklet/meta": "1.16.27-beta-d1555a79",
+    "@blocklet/resolver": "1.16.27-beta-d1555a79",
+    "@blocklet/sdk": "1.16.27-beta-d1555a79",
+    "@blocklet/store": "1.16.27-beta-d1555a79",
+    "@did-space/client": "^0.4.9",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.120",
-    "@ocap/util": "1.18.120",
-    "@ocap/wallet": "1.18.120",
+    "@ocap/mcrypto": "1.18.121",
+    "@ocap/util": "1.18.121",
+    "@ocap/wallet": "1.18.121",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^0.27.2",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6110607f520136996b78b8d9c05a0744016dfa21"
+  "gitHead": "10055507ae6190a13ee83e2f6446fd64523dd298"
 }