@abtnode/core 1.16.29-beta-924d4db7 → 1.16.29-beta-87e06e1c

package/lib/api/team.js

@@ -2,9 +2,7 @@ const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
 const defaults = require('lodash/defaults');
 const cloneDeep = require('lodash/cloneDeep');
-const { joinURL, withQuery, resolveURL, withoutTrailingSlash } = require('ufo');
-const axios = require('@abtnode/util/lib/axios');
-const pRetry = require('p-retry');
+const { joinURL, withoutTrailingSlash } = require('ufo');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
 const {
@@ -210,13 +208,13 @@ class TeamAPI extends EventEmitter {
     return result;
   }
 
-  async addUser({ teamDid, user }) {
+  async addUser({ teamDid, user, force = false }) {
     const state = await this.getUserState(teamDid);
 
     if (user.role === ROLES.OWNER) {
       const nodeInfo = await this.node.read();
 
-      if (teamDid !== nodeInfo.did) {
+      if (teamDid !== nodeInfo.did && !force) {
         throw new Error('Cannot add user of owner role');
       }
 
@@ -1331,31 +1329,7 @@ class TeamAPI extends EventEmitter {
   async addStore({ teamDid, url, scope = '' }, context) {
     logger.info('add store', { teamDid, url, scope });
 
-    const urlObj = new URL(url);
-    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 sanitized = withoutTrailingSlash(await StoreUtil.getStoreUrl(url));
     const storeList = await this.teamManager.getStoreList(teamDid);
     const did = context?.user?.did;
     const exist = storeList.find((x) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-924d4db7",
+  "version": "1.16.29-beta-87e06e1c",
   "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.29-beta-924d4db7",
-    "@abtnode/auth": "1.16.29-beta-924d4db7",
-    "@abtnode/certificate-manager": "1.16.29-beta-924d4db7",
-    "@abtnode/constant": "1.16.29-beta-924d4db7",
-    "@abtnode/cron": "1.16.29-beta-924d4db7",
-    "@abtnode/logger": "1.16.29-beta-924d4db7",
-    "@abtnode/models": "1.16.29-beta-924d4db7",
-    "@abtnode/queue": "1.16.29-beta-924d4db7",
-    "@abtnode/rbac": "1.16.29-beta-924d4db7",
-    "@abtnode/router-provider": "1.16.29-beta-924d4db7",
-    "@abtnode/static-server": "1.16.29-beta-924d4db7",
-    "@abtnode/timemachine": "1.16.29-beta-924d4db7",
-    "@abtnode/util": "1.16.29-beta-924d4db7",
-    "@arcblock/did": "1.18.124",
-    "@arcblock/did-auth": "1.18.124",
-    "@arcblock/did-ext": "^1.18.124",
+    "@abtnode/analytics": "1.16.29-beta-87e06e1c",
+    "@abtnode/auth": "1.16.29-beta-87e06e1c",
+    "@abtnode/certificate-manager": "1.16.29-beta-87e06e1c",
+    "@abtnode/constant": "1.16.29-beta-87e06e1c",
+    "@abtnode/cron": "1.16.29-beta-87e06e1c",
+    "@abtnode/logger": "1.16.29-beta-87e06e1c",
+    "@abtnode/models": "1.16.29-beta-87e06e1c",
+    "@abtnode/queue": "1.16.29-beta-87e06e1c",
+    "@abtnode/rbac": "1.16.29-beta-87e06e1c",
+    "@abtnode/router-provider": "1.16.29-beta-87e06e1c",
+    "@abtnode/static-server": "1.16.29-beta-87e06e1c",
+    "@abtnode/timemachine": "1.16.29-beta-87e06e1c",
+    "@abtnode/util": "1.16.29-beta-87e06e1c",
+    "@arcblock/did": "1.18.126",
+    "@arcblock/did-auth": "1.18.126",
+    "@arcblock/did-ext": "^1.18.126",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.124",
-    "@arcblock/event-hub": "1.18.124",
-    "@arcblock/jwt": "^1.18.124",
+    "@arcblock/did-util": "1.18.126",
+    "@arcblock/event-hub": "1.18.126",
+    "@arcblock/jwt": "^1.18.126",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.124",
-    "@arcblock/vc": "1.18.124",
-    "@blocklet/constant": "1.16.29-beta-924d4db7",
-    "@blocklet/env": "1.16.29-beta-924d4db7",
-    "@blocklet/meta": "1.16.29-beta-924d4db7",
-    "@blocklet/resolver": "1.16.29-beta-924d4db7",
-    "@blocklet/sdk": "1.16.29-beta-924d4db7",
-    "@blocklet/store": "1.16.29-beta-924d4db7",
+    "@arcblock/validator": "^1.18.126",
+    "@arcblock/vc": "1.18.126",
+    "@blocklet/constant": "1.16.29-beta-87e06e1c",
+    "@blocklet/env": "1.16.29-beta-87e06e1c",
+    "@blocklet/meta": "1.16.29-beta-87e06e1c",
+    "@blocklet/resolver": "1.16.29-beta-87e06e1c",
+    "@blocklet/sdk": "1.16.29-beta-87e06e1c",
+    "@blocklet/store": "1.16.29-beta-87e06e1c",
     "@did-space/client": "^0.5.4",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.124",
-    "@ocap/util": "1.18.124",
-    "@ocap/wallet": "1.18.124",
+    "@ocap/mcrypto": "1.18.126",
+    "@ocap/util": "1.18.126",
+    "@ocap/wallet": "1.18.126",
     "@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": "8fc6562d1a2c77f028be9704027b516053504096"
+  "gitHead": "e6a32801bc392566448d4df00c2ae68717f39822"
 }