@abtnode/core 1.16.29-beta-e04c6f40 → 1.16.29-beta-db5c4ed6

package/lib/api/team.js

@@ -2,7 +2,9 @@ const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
 const cloneDeep = require('lodash/cloneDeep');
-const { joinURL } = require('ufo');
+const { joinURL, withQuery, resolveURL, withoutTrailingSlash } = require('ufo');
+const axios = require('@abtnode/util/lib/axios');
+const pRetry = require('p-retry');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
 const {
@@ -12,7 +14,6 @@ const {
   PASSPORT_STATUS,
   WELLKNOWN_SERVICE_PATH_PREFIX,
   MAX_USER_PAGE_SIZE,
-  STORE_DETAIL_PAGE_PATH_PREFIX,
   MAIN_CHAIN_ENDPOINT,
   USER_AVATAR_URL_PREFIX,
   SESSION_TTL,
@@ -1331,56 +1332,91 @@ class TeamAPI extends EventEmitter {
     logger.info('add store', { teamDid, url, scope });
 
     const urlObj = new URL(url);
-    let newUrl = urlObj.origin;
-
-    // if the pathname is store blocklet list or blocklet detail
-    if (urlObj.pathname?.includes(STORE_DETAIL_PAGE_PATH_PREFIX)) {
-      const lastIndex = urlObj.pathname.lastIndexOf(STORE_DETAIL_PAGE_PATH_PREFIX);
-      const pathnamePrefix = urlObj.pathname.substring(0, lastIndex);
-      newUrl = `${newUrl}${pathnamePrefix || ''}`;
+    const jsonUrl = withQuery(resolveURL(url, '__blocklet__.js'), {
+      type: 'json',
+    });
+    let blockletJson;
+    try {
+      const blockletFetchResult = await pRetry(
+        () =>
+          axios.get(jsonUrl, {
+            headers: {
+              'Content-Type': 'json',
+            },
+          }),
+        { retries: 3 }
+      );
+      blockletJson = blockletFetchResult?.data;
+    } catch (error) {
+      logger.error(`Failed to get Blockelt Store blockletMeta: ${url}`, { error });
+      console.error(error);
+      throw new Error(`Failed to get Blocklet Store blockletMeta, please check the url's validity: ${url}`);
     }
+    const newUrl = withoutTrailingSlash(joinURL(urlObj.origin, blockletJson?.prefix || '/'));
 
     const sanitized = sanitizeUrl(newUrl);
 
     const storeList = await this.teamManager.getStoreList(teamDid);
+    const did = context?.user?.did;
+    const exist = storeList.find((x) => {
+      if (x.url !== sanitized) {
+        return false;
+      }
+      if (x.scope && x.scope === did) {
+        return true;
+      }
+      if (!x.scope || x.scope === 'studio') {
+        return true;
+      }
+      return x.scope === scope;
+    });
 
-    const exist = storeList.find((x) => x.url === sanitized);
     if (exist) {
-      throw new Error(`Blocklet registry already exist: ${sanitized}`);
+      throw new Error(`Blocklet Store already exist: ${sanitized}`);
     }
 
     const store = await StoreUtil.getStoreMeta(sanitized);
 
-    const existById = storeList.find((x) => x.id === store.id);
-    if (existById) {
-      throw new Error(`Blocklet registry already exist: ${sanitized}`);
-    }
-
     storeList.push({ ...store, scope, url: sanitized, protected: false });
 
     return this.teamManager.updateStoreList(teamDid, storeList);
   }
 
   // eslint-disable-next-line no-unused-vars
-  async deleteStore({ teamDid, url, projectId }, context) {
+  async deleteStore({ teamDid, url, projectId, scope }, context) {
     logger.info('delete registry', { url });
     const sanitized = sanitizeUrl(url);
 
     const storeList = await this.teamManager.getStoreList(teamDid);
-    const exist = storeList.find((x) => x.url === sanitized);
-    if (!exist) {
-      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
+    let storeIndex;
+    if (scope) {
+      storeIndex = storeList.findIndex((x) => {
+        if (x.protected) {
+          return false;
+        }
+        return x.url === sanitized && x.scope === scope;
+      });
+      if (storeIndex === -1) {
+        throw new Error(`No permission to delete the Store registry: ${sanitized}`);
+      }
+    } else {
+      storeIndex = storeList.findIndex((x) => x.url === sanitized && !x.scope);
+      if (storeIndex === -1) {
+        throw new Error(`Store registry does not exist: ${sanitized}`);
+      }
     }
 
-    if (projectId) {
+    if (projectId && scope) {
       const { projectState } = await this.teamManager.getProjectState(teamDid);
-      await projectState.deleteConnectedStore(projectId, url);
+      const store = await StoreUtil.getStoreMeta(sanitized);
+      await projectState.deleteConnectedStore({
+        projectId,
+        storeId: store.id,
+        createdBy: scope === 'studio' ? null : context?.user?.did,
+      });
     }
-
-    return this.teamManager.updateStoreList(
-      teamDid,
-      storeList.filter((x) => x.url !== sanitized)
-    );
+    storeList.splice(storeIndex, 1);
+    return this.teamManager.updateStoreList(teamDid, storeList);
   }
 
   createNotification = (payload) => {

package/lib/blocklet/manager/disk.js

@@ -2400,12 +2400,12 @@ class DiskBlockletManager extends BaseBlockletManager {
     return deleteRelease({ did, projectId, releaseId, context, manager: this });
   }
 
-  connectToStore(params) {
-    return connectToStore({ ...params, manager: this });
+  connectToStore(params, context) {
+    return connectToStore({ ...params, context, manager: this });
   }
 
-  disconnectFromStore(params) {
-    return disconnectFromStore({ ...params, manager: this });
+  disconnectFromStore(params, context) {
+    return disconnectFromStore({ ...params, context, manager: this });
   }
 
   connectByStudio(params, context) {

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

@@ -42,7 +42,7 @@ const installComponentFromUrl = async ({
 
   checkStructVersion(blocklet);
 
-  const { inStore, registryUrl } = await StoreUtil.parseSourceUrl(url);
+  const { inStore, registryUrl } = await StoreUtil.getStoreInfo(url);
 
   const meta = await getBlockletMetaFromUrl(url);
 

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

@@ -1,6 +1,7 @@
 const validUrl = require('valid-url');
 
 const { createConnect } = require('@blocklet/store');
+const { getDisplayName } = require('@blocklet/meta/lib/util');
 
 function sanitizeBlockletTitle(blockletTitle) {
   let sanitizedTitle = blockletTitle.replace(/[^a-zA-Z0-9-_]/g, '');
@@ -38,10 +39,12 @@ const connectByStudio = ({
   // eslint-disable-next-line no-async-promise-executor
   return new Promise(async (resolve, reject) => {
     try {
+      const blocklet = await manager.getBlocklet(did);
       const fetchData = await createConnect({
         connectUrl: storeUrl,
         connectAction: 'connect-studio',
         enableEncrypt: true,
+        source: `Blocklet Studio (${getDisplayName(blocklet)})`,
         // monikers 必须满足一个规则, 而 blockletTitle 是更宽松的规则
         monikers: sanitizeBlockletTitle(blockletTitle) || 'blocklet',
         openPage: (pageUrl) => {
@@ -66,6 +69,7 @@ const connectByStudio = ({
         developerDid,
         developerName: name,
         developerEmail: email,
+        createdBy: context?.user?.did,
       };
       await projectState.createProject({
         blockletTitle,

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

@@ -1,8 +1,9 @@
 const validUrl = require('valid-url');
 
 const { createConnect } = require('@blocklet/store');
+const { getDisplayName } = require('@blocklet/meta/lib/util');
 
-const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager }) => {
+const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager, context }) => {
   if (!did) {
     throw new Error('Invalid did');
   }
@@ -14,21 +15,11 @@ const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager
   // eslint-disable-next-line no-async-promise-executor
   return new Promise(async (resolve, reject) => {
     try {
-      // 基于 nextWorkflow 这样的实现目前体验有些问题, 暂时还无法使用 connect-by-studio
-      // const fetchData = await createConnect({
-      //   connectUrl: storeUrl,
-      //   projectId,
-      //   userDid,
-      //   connectAction: 'connect-by-studio',
-      //   enableEncrypt: true,
-      //   openPage: (pageUrl) => {
-      //     resolve(pageUrl);
-      //   },
-      // });
-
+      const blocklet = await manager.getBlocklet(did);
       const fetchData = await createConnect({
         connectUrl: storeUrl,
         connectAction: 'connect-cli',
+        source: `Blocklet Studio (${getDisplayName(blocklet)})`,
         enableEncrypt: true,
         openPage: (pageUrl) => {
           resolve(pageUrl);
@@ -52,6 +43,7 @@ const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager
         developerDid,
         developerName: name,
         developerEmail: email,
+        createdBy: context?.user?.did,
       };
 
       const oldStore = project.connectedStores.find((x) => x.storeId === storeId);

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

@@ -1,11 +1,13 @@
-const disconnectFromStore = async ({ did, storeId, projectId, manager }) => {
+const disconnectFromStore = async ({ did, storeId, projectId, manager, storeScope, context }) => {
   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);
+  return projectState.deleteConnectedStore({
+    projectId,
+    storeId,
+    createdBy: storeScope === 'studio' ? null : context?.user?.did,
+  });
 };
 
 module.exports = disconnectFromStore;

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { PROJECT } = require('@blocklet/constant');
 const { upload } = require('@blocklet/store');
+const { getDisplayName } = require('@blocklet/meta/lib/util');
 
 function ensureArray(value) {
   if (!value) {
@@ -57,7 +58,7 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     storeUrl,
     accessToken,
     developerDid,
-    source: 'STUDIO',
+    source: `Blocklet Studio (${getDisplayName(blocklet)})`,
   });
 
   release.publishedStoreIds = ensureArray(release.publishedStoreIds);

package/lib/blocklet/project/util.js

@@ -161,10 +161,15 @@ const checkUploadExists = async (projectDir, action, releaseId, uploadedResource
   }
   fs.ensureDirSync(resourceDir);
 
-  await expandBundle(uploadedFile, resourceDir);
+  try {
+    await expandBundle(uploadedFile, resourceDir);
+  } catch (err) {
+    throw new Error('Only zip or gz archives are supported as resources.');
+  }
+
   const files = ['index.html', 'index.htm'];
   if (files.every((file) => fs.existsSync(path.join(resourceDir, file)) === false)) {
-    throw new Error(`Uploaded resource does not contain index.html or index.htm: ${uploadedResource}`);
+    throw new Error('The uploaded resource does not contain an index.html file in the root directory of the archive');
   }
 };
 

package/lib/states/audit-log.js

@@ -27,9 +27,14 @@ const getComponentNames = (blocklet, componentDids, withVersion) =>
   uniq(componentDids || [])
     .map((x) => {
       const component = blocklet.children.find((y) => y.meta.did === x);
-      const version = withVersion ? `@${component.meta.version}` : '';
-      return `${component.meta.title}${version}`;
+      if (component) {
+        const version = withVersion ? `@${component.meta.version}` : '';
+        return `${component.meta.title}${version}`;
+      }
+
+      return '';
     })
+    .filter(Boolean)
     .join(', ');
 const getComponentNamesWithVersion = (blocklet, componentDids) => getComponentNames(blocklet, componentDids, true);
 const componentOrApplicationInfo = (app, componentDids) =>

package/lib/states/project.js

@@ -87,13 +87,19 @@ class Project extends BaseState {
     return updated;
   }
 
-  async deleteConnectedStore(id, url) {
-    const project = await this.findOne({ id });
+  async deleteConnectedStore({ projectId, storeId, createdBy }) {
+    const project = await this.findOne({ id: projectId });
     if (!project) {
       throw new Error('Project not found');
     }
-    const connectedStores = (project.connectedStores || []).filter((x) => x.storeUrl !== url);
-    const [, [updated]] = await this.update({ id }, { $set: { connectedStores } });
+    const index = (project.connectedStores || []).findIndex(
+      (x) => x.storeId === storeId && (createdBy ? x.createdBy === createdBy : true)
+    );
+    if (index === -1) {
+      return null;
+    }
+    project.connectedStores.splice(index, 1);
+    const [, [updated]] = await this.update({ id: projectId }, { $set: { connectedStores: project.connectedStores } });
 
     return updated;
   }

package/lib/util/get-meta-from-url.js

@@ -3,17 +3,16 @@ const { isFreeBlocklet } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('getMetaFromUrl');
 
 const { getBlockletMetaFromUrl } = require('./blocklet');
-const { getStoreMeta, parseSourceUrl } = require('./store');
+const { getStoreInfo } = require('./store');
 const { getFactoryState } = require('./chain');
 
 const getMetaFromUrl = async ({ url, checkPrice = false }) => {
   const meta = await getBlockletMetaFromUrl(url);
   let isFree = isFreeBlocklet(meta);
 
-  if (checkPrice && !isFree && meta.nftFactory) {
+  const { inStore, registryUrl, registryMeta } = await getStoreInfo(url);
+  if (checkPrice && !isFree && meta.nftFactory && inStore && registryMeta) {
     try {
-      const registryMeta = await getStoreMeta(new URL(url).origin);
-
       if (registryMeta.chainHost) {
         const state = await getFactoryState(registryMeta.chainHost, meta.nftFactory);
         if (state) {
@@ -25,8 +24,6 @@ const getMetaFromUrl = async ({ url, checkPrice = false }) => {
     }
   }
 
-  const { inStore, registryUrl } = await parseSourceUrl(url);
-
   return { meta, isFree, inStore, registryUrl };
 };
 

package/lib/util/store.js

@@ -2,7 +2,7 @@ const { joinURL, withQuery } = require('ufo');
 const pick = require('lodash/pick');
 const isBase64 = require('is-base64');
 
-const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH } = require('@abtnode/constant');
+const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH, BLOCKLET_STORE_DID } = require('@abtnode/constant');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const verifyMultiSig = require('@blocklet/meta/lib/verify-multi-sig');
 const isRequirementsSatisfied = require('./requirement');
@@ -46,6 +46,7 @@ const fixAndVerifyMetaFromStore = (meta) => {
   return fixAndValidateService(meta);
 };
 
+// Note: registry should contain the store endpoint
 const getStoreMeta = async (registry) => {
   try {
     const url = withQuery(joinURL(registry, BLOCKLET_STORE_META_PATH), {
@@ -81,18 +82,37 @@ const getStoreMeta = async (registry) => {
   }
 };
 
-const parseSourceUrl = async (url) => {
-  const { origin, pathname } = new URL(url);
+async function getStoreUrl(url) {
+  const { origin } = new URL(url);
+  let mountPoint = '';
+  try {
+    const { data: meta } = await request.get(joinURL(origin, '__blocklet__.js?type=json&nocache=1'));
+    const component = meta.componentMountPoints?.find((item) => item.did === BLOCKLET_STORE_DID);
+
+    if (component) {
+      mountPoint = component.mountPoint;
+    }
+  } catch {
+    // Do nothing
+  }
 
-  const match = pathname.match(/^\/api\/blocklets\/(\w*)\/blocklet\.json/);
+  return joinURL(origin, mountPoint);
+}
+
+async function getStoreInfo(url) {
+  const { pathname } = new URL(url);
+
+  const match = pathname.match(/\/api\/blocklets\/(\w*)\/blocklet\.json$/);
   if (match) {
     try {
-      const m = await getStoreMeta(origin);
-      if (m && m.id) {
+      const registryUrl = await getStoreUrl(url);
+      const meta = await getStoreMeta(registryUrl);
+      if (meta && meta.id) {
         return {
           inStore: true,
-          registryUrl: origin,
+          registryUrl,
           blockletDid: match[1],
+          registryMeta: meta,
         };
       }
     } catch {
@@ -103,7 +123,7 @@ const parseSourceUrl = async (url) => {
   return {
     inStore: false,
   };
-};
+}
 
 const resolveTarballURL = ({ did, tarball = '', storeUrl = '' }) => {
   if (!tarball) {
@@ -158,7 +178,8 @@ const getBlockletMeta = async ({ did, storeUrl }) => {
 
 module.exports = {
   getStoreMeta,
-  parseSourceUrl,
+  getStoreInfo,
+  getStoreUrl,
   getBlockletMeta,
   resolveTarballURL,
   getBlockletMetaUrl,

package/package.json

@@ -3,14 +3,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-e04c6f40",
+  "version": "1.16.29-beta-db5c4ed6",
   "description": "",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "scripts": {
-    "lint": "eslint tests lib",
+    "lint": "eslint tests lib --ignore-pattern 'tests/assets/*'",
     "lint:fix": "eslint --fix tests lib",
     "test": "node tools/jest.js",
     "coverage": "npm run test -- --coverage"
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@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",
+    "@abtnode/analytics": "1.16.29-beta-db5c4ed6",
+    "@abtnode/auth": "1.16.29-beta-db5c4ed6",
+    "@abtnode/certificate-manager": "1.16.29-beta-db5c4ed6",
+    "@abtnode/constant": "1.16.29-beta-db5c4ed6",
+    "@abtnode/cron": "1.16.29-beta-db5c4ed6",
+    "@abtnode/logger": "1.16.29-beta-db5c4ed6",
+    "@abtnode/models": "1.16.29-beta-db5c4ed6",
+    "@abtnode/queue": "1.16.29-beta-db5c4ed6",
+    "@abtnode/rbac": "1.16.29-beta-db5c4ed6",
+    "@abtnode/router-provider": "1.16.29-beta-db5c4ed6",
+    "@abtnode/static-server": "1.16.29-beta-db5c4ed6",
+    "@abtnode/timemachine": "1.16.29-beta-db5c4ed6",
+    "@abtnode/util": "1.16.29-beta-db5c4ed6",
+    "@arcblock/did": "1.18.124",
+    "@arcblock/did-auth": "1.18.124",
+    "@arcblock/did-ext": "^1.18.124",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.123",
-    "@arcblock/event-hub": "1.18.123",
-    "@arcblock/jwt": "^1.18.123",
+    "@arcblock/did-util": "1.18.124",
+    "@arcblock/event-hub": "1.18.124",
+    "@arcblock/jwt": "^1.18.124",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.123",
-    "@arcblock/vc": "1.18.123",
-    "@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",
+    "@arcblock/validator": "^1.18.124",
+    "@arcblock/vc": "1.18.124",
+    "@blocklet/constant": "1.16.29-beta-db5c4ed6",
+    "@blocklet/env": "1.16.29-beta-db5c4ed6",
+    "@blocklet/meta": "1.16.29-beta-db5c4ed6",
+    "@blocklet/resolver": "1.16.29-beta-db5c4ed6",
+    "@blocklet/sdk": "1.16.29-beta-db5c4ed6",
+    "@blocklet/store": "1.16.29-beta-db5c4ed6",
+    "@did-space/client": "^0.5.4",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.123",
-    "@ocap/util": "1.18.123",
-    "@ocap/wallet": "1.18.123",
+    "@ocap/mcrypto": "1.18.124",
+    "@ocap/util": "1.18.124",
+    "@ocap/wallet": "1.18.124",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.2",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "f3e8f2ce931215b95ada33e87aee997d8ae52a69"
+  "gitHead": "b15f6442fd30f217c08c7f892dce5d38e340ea28"
 }