@abtnode/core 1.16.29-beta-e04c6f40 → 1.16.29-beta-88bdefe8

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,14 +1332,27 @@ 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);
 
@@ -1346,14 +1360,14 @@ class TeamAPI extends EventEmitter {
 
     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}`);
+      throw new Error(`Blocklet Store already exist: ${sanitized}`);
     }
 
     storeList.push({ ...store, scope, url: sanitized, protected: false });

package/lib/blocklet/project/util.js

@@ -161,10 +161,17 @@ const checkUploadExists = async (projectDir, action, releaseId, uploadedResource
   }
   fs.ensureDirSync(resourceDir);
 
-  await expandBundle(uploadedFile, resourceDir);
+  try {
+    await expandBundle(uploadedFile, resourceDir);
+  } catch (err) {
+    throw new Error('When uploading resources from your disk, only zip archives are supported.');
+  }
+
   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: ${uploadedResource}`
+    );
   }
 };
 

package/package.json

@@ -3,14 +3,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-e04c6f40",
+  "version": "1.16.29-beta-88bdefe8",
   "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,19 +19,19 @@
   "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",
+    "@abtnode/analytics": "1.16.29-beta-88bdefe8",
+    "@abtnode/auth": "1.16.29-beta-88bdefe8",
+    "@abtnode/certificate-manager": "1.16.29-beta-88bdefe8",
+    "@abtnode/constant": "1.16.29-beta-88bdefe8",
+    "@abtnode/cron": "1.16.29-beta-88bdefe8",
+    "@abtnode/logger": "1.16.29-beta-88bdefe8",
+    "@abtnode/models": "1.16.29-beta-88bdefe8",
+    "@abtnode/queue": "1.16.29-beta-88bdefe8",
+    "@abtnode/rbac": "1.16.29-beta-88bdefe8",
+    "@abtnode/router-provider": "1.16.29-beta-88bdefe8",
+    "@abtnode/static-server": "1.16.29-beta-88bdefe8",
+    "@abtnode/timemachine": "1.16.29-beta-88bdefe8",
+    "@abtnode/util": "1.16.29-beta-88bdefe8",
     "@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.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",
+    "@blocklet/constant": "1.16.29-beta-88bdefe8",
+    "@blocklet/env": "1.16.29-beta-88bdefe8",
+    "@blocklet/meta": "1.16.29-beta-88bdefe8",
+    "@blocklet/resolver": "1.16.29-beta-88bdefe8",
+    "@blocklet/sdk": "1.16.29-beta-88bdefe8",
+    "@blocklet/store": "1.16.29-beta-88bdefe8",
     "@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": "f3e8f2ce931215b95ada33e87aee997d8ae52a69"
+  "gitHead": "2a91288d21c8defe019e1debfc242b6ef708573e"
 }