@abtnode/core 1.16.44-beta-20250516-225119-c0b5ec8d → 1.16.44-beta-20250520-004606-6cd8a0d3

package/lib/blocklet/manager/disk.js

@@ -1595,8 +1595,9 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   // Get blocklet by blockletDid or appDid
-  detail(
+  async detail(
     {
+      domain,
       did,
       attachConfig = true,
       attachRuntimeInfo = false,
@@ -1606,23 +1607,32 @@ class DiskBlockletManager extends BaseBlockletManager {
     },
     context
   ) {
-    if (!did) {
+    let targetDid = did;
+    if (domain) {
+      const aliasDomainSite = await states.site.findByDomainAlias(domain);
+      if (!aliasDomainSite) {
+        return null;
+      }
+      targetDid = (aliasDomainSite.domain || '').replace('.blocklet-domain-group', '');
+    }
+
+    if (!targetDid) {
       throw new Error('did should not be empty');
     }
 
     if (!attachConfig) {
-      return states.blocklet.getBlocklet(did);
+      return states.blocklet.getBlocklet(targetDid);
     }
 
     if (attachRuntimeInfo) {
-      return this._attachRuntimeInfo({ did, diskInfo: !!attachDiskInfo, context, getOptionalComponents });
+      return this._attachRuntimeInfo({ did: targetDid, diskInfo: !!attachDiskInfo, context, getOptionalComponents });
     }
 
     try {
-      return this.getBlocklet(did, { throwOnNotExist: false, getOptionalComponents, useCache });
+      return this.getBlocklet(targetDid, { throwOnNotExist: false, getOptionalComponents, useCache });
     } catch (e) {
       logger.error('get blocklet detail error', { error: e });
-      return states.blocklet.getBlocklet(did);
+      return states.blocklet.getBlocklet(targetDid);
     }
   }
 

package/lib/blocklet/migration-dist/migration.cjs

@@ -38744,7 +38744,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.53","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.37","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.43","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.43","@abtnode/auth":"1.16.43","@abtnode/certificate-manager":"1.16.43","@abtnode/client":"1.16.43","@abtnode/constant":"1.16.43","@abtnode/cron":"1.16.43","@abtnode/docker-utils":"1.16.43","@abtnode/logger":"1.16.43","@abtnode/models":"1.16.43","@abtnode/queue":"1.16.43","@abtnode/rbac":"1.16.43","@abtnode/router-provider":"1.16.43","@abtnode/static-server":"1.16.43","@abtnode/timemachine":"1.16.43","@abtnode/util":"1.16.43","@arcblock/did":"1.20.11","@arcblock/did-auth":"1.20.11","@arcblock/did-ext":"1.20.11","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.11","@arcblock/event-hub":"1.20.11","@arcblock/jwt":"1.20.11","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.11","@arcblock/vc":"1.20.11","@blocklet/constant":"1.16.43","@blocklet/did-space-js":"^1.0.53","@blocklet/env":"1.16.43","@blocklet/error":"^0.2.4","@blocklet/meta":"1.16.43","@blocklet/resolver":"1.16.43","@blocklet/sdk":"1.16.43","@blocklet/store":"1.16.43","@blocklet/theme":"^2.13.39","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.11","@ocap/util":"1.20.11","@ocap/wallet":"1.20.11","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

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

@@ -80,6 +80,8 @@ const connectByStudio = ({
         componentDid,
         messageId,
         createdBy: context.user.did,
+        autoUpload: true,
+        possibleSameStore: true,
         connectedStores: [nextStore],
       });
     } catch (error) {

package/lib/blocklet/project/create-pack-release.js

@@ -87,7 +87,7 @@ const createPackRelease = async ({
       throw new Error('release not found');
     }
     if (release.status !== 'draft') {
-      throw new Error('Can not update a published release');
+      throw new Error(`Can not update a published release: ${releaseId}`);
     }
   }
 

package/lib/blocklet/project/util.js

@@ -170,9 +170,31 @@ const checkUploadExists = async (projectDir, action, releaseId, uploadedResource
     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('The uploaded resource does not contain an index.html file in the root directory of the archive');
+  const hasHtmlFile = (dir) => {
+    const files = ['index.html', 'index.htm'];
+    return files.some((file) => fs.existsSync(path.join(dir, file)));
+  };
+
+  if (!hasHtmlFile(resourceDir)) {
+    const entries = fs.readdirSync(resourceDir, { withFileTypes: true });
+    const dirs = entries.filter((e) => e.isDirectory());
+    const files = entries.filter((e) => e.isFile());
+
+    // 如果只有一个文件夹，并且没有文件, 并且文件夹内有 index.html，则使用子文件夹作为根目录
+    if (dirs.length === 1 && files.length === 0) {
+      const subDir = path.join(resourceDir, dirs[0].name);
+      if (hasHtmlFile(subDir)) {
+        fs.copySync(subDir, resourceDir, { overwrite: true });
+        fs.rmSync(subDir, { recursive: true });
+      }
+    }
+  }
+
+  // 最终再次检查是否有 index.html
+  if (!hasHtmlFile(resourceDir)) {
+    throw new Error(
+      'The uploaded resource does not contain an index.html file in the root directory or its only subdirectory'
+    );
   }
 };
 

package/lib/states/project.js

@@ -18,9 +18,11 @@ class Project extends BaseState {
     connectedStores,
     createdBy,
     messageId,
+    autoUpload,
+    possibleSameStore,
     connectedEndpoints,
   }) {
-    const doc = { id: blockletDid, type, blockletDid, blockletTitle, createdBy };
+    const doc = { id: blockletDid, type, blockletDid, blockletTitle, createdBy, autoUpload, possibleSameStore };
     if (componentDid) {
       doc.componentDid = componentDid;
     }

package/lib/team/manager.js

@@ -229,8 +229,9 @@ class TeamManager extends EventEmitter {
         });
 
         const validUsers = queryUsers.filter((user) => {
-          const { passports } = user;
-          if (passports.length && passports.some((x) => !this.isPassportExpired(x))) {
+          const { passports = [] } = user;
+          // 如果用户没有 passport，或者 有一个 passport 没有过期，则返回 true
+          if (!passports.length || passports.some((x) => !this.isPassportExpired(x))) {
             return true;
           }
           logger.warn(`user's passports are all expired: ${user.did}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250516-225119-c0b5ec8d",
+  "version": "1.16.44-beta-20250520-004606-6cd8a0d3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/auth": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/certificate-manager": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/client": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/cron": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/docker-utils": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/logger": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/models": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/queue": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/rbac": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/router-provider": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/static-server": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/timemachine": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@abtnode/util": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@abtnode/analytics": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/auth": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/certificate-manager": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/client": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/constant": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/cron": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/docker-utils": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/logger": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/models": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/queue": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/rbac": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/router-provider": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/static-server": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/timemachine": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@abtnode/util": "1.16.44-beta-20250520-004606-6cd8a0d3",
     "@arcblock/did": "1.20.11",
     "@arcblock/did-auth": "1.20.11",
     "@arcblock/did-ext": "1.20.11",
@@ -44,15 +44,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.11",
     "@arcblock/vc": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/constant": "1.16.44-beta-20250520-004606-6cd8a0d3",
     "@blocklet/did-space-js": "^1.0.53",
-    "@blocklet/env": "1.16.44-beta-20250516-225119-c0b5ec8d",
+    "@blocklet/env": "1.16.44-beta-20250520-004606-6cd8a0d3",
     "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@blocklet/resolver": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@blocklet/sdk": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@blocklet/store": "1.16.44-beta-20250516-225119-c0b5ec8d",
-    "@blocklet/theme": "^2.13.37",
+    "@blocklet/meta": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@blocklet/resolver": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@blocklet/sdk": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@blocklet/store": "1.16.44-beta-20250520-004606-6cd8a0d3",
+    "@blocklet/theme": "^2.13.39",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.11",
     "@ocap/util": "1.20.11",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "eb15dee761c0ea273981c848992e5f29b94a69dc"
+  "gitHead": "105e9a3d56958052180da541acbf8b8739ddbd01"
 }