@abtnode/core 1.16.43-beta-20250505-062139-b156e7da → 1.16.43-beta-20250507-124320-c405ab23

package/lib/api/node.js

@@ -87,7 +87,7 @@ class NodeAPI {
   }
 
   async getEnv() {
-    const info = await IP.get();
+    const info = await IP.get({ timeout: 5000 });
     info.internalV4 = info.internal;
     info.externalV4 = info.external;
 

package/lib/blocklet/downloader/bundle-downloader.js

@@ -108,6 +108,7 @@ class BundleDownloader extends EventEmitter {
       await resolveDownload(tarballPath, this.installDir, {
         removeTarFile: false,
         nodeInfo,
+        dist,
         onProgress: ({ name: _name }) => {
           onProgress({ status: 'extracting', name: _name });
         },

package/lib/blocklet/downloader/resolve-download.js

@@ -21,7 +21,11 @@ const asyncFs = fs.promises;
  *   nodeInfo: { enableDocker: boolean };
  * }} option
  */
-const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = defaultLogger, onProgress } = {}) => {
+const resolveDownload = async (
+  tarFile,
+  distDir,
+  { removeTarFile = true, logger = defaultLogger, onProgress, dist } = {}
+) => {
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
   const tmp = `${downloadDir}-tmp`;
   try {
@@ -56,11 +60,14 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
       dir = path.join(dir, BLOCKLET_BUNDLE_FOLDER);
     }
 
-    logger.info('Move downloadDir to installDir', { downloadDir });
+    logger.info('Move expandDir to downloadDir', { expandDir: dir, downloadDir });
     await fs.move(dir, downloadDir, { overwrite: true });
     fs.removeSync(tmp);
 
     meta = getBlockletMeta(downloadDir);
+    if (dist?.integrity) {
+      meta.dist = dist;
+    }
     const { name, version } = meta;
 
     if (typeof onProgress === 'function') {
@@ -68,7 +75,7 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
     }
     await ensureBlockletExpanded(meta, downloadDir);
 
-    installDir = getBundleDir(dist, meta);
+    installDir = getBundleDir(distDir, meta);
     if (fs.existsSync(installDir)) {
       fs.removeSync(installDir);
       logger.info('cleanup blocklet upgrade dir', { name, version, installDir });
@@ -76,6 +83,7 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
 
     fs.mkdirSync(installDir, { recursive: true });
 
+    logger.info('Move downloadDir to installDir with full', { downloadDir, installDir, dist: meta.dist });
     await fs.move(downloadDir, installDir, { overwrite: true });
   } catch (error) {
     fs.removeSync(downloadDir);
@@ -88,13 +96,13 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
 
 const resolveDiffDownload = async (
   tarFile,
-  dist,
-  { meta: oldMeta, deleteSet, cwd = '/', logger = defaultLogger } = {}
+  distDir,
+  { meta: oldMeta, deleteSet, cwd = '/', logger = defaultLogger, dist } = {}
 ) => {
   // eslint-disable-next-line no-param-reassign
   tarFile = path.join(cwd, tarFile);
   // eslint-disable-next-line no-param-reassign
-  dist = path.join(cwd, dist);
+  distDir = path.join(cwd, distDir);
 
   logger.info('Resolve diff download', { tarFile, cwd });
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
@@ -107,8 +115,8 @@ const resolveDiffDownload = async (
     logger.error('expand blocklet tar file error', { error });
     throw error;
   }
-  logger.info('Copy installDir to downloadDir', { installDir: dist, downloadDir });
-  await fs.copy(getBundleDir(dist, oldMeta), downloadDir);
+  logger.info('Copy installDir to downloadDir', { installDir: distDir, downloadDir });
+  await fs.copy(getBundleDir(distDir, oldMeta), downloadDir);
   try {
     // delete
     logger.info('Delete files from downloadDir', { fileNum: deleteSet.length });
@@ -135,15 +143,18 @@ const resolveDiffDownload = async (
     await walkDiff(diffDir);
     fs.removeSync(diffDir);
     const meta = getBlockletMeta(downloadDir);
+    if (dist?.integrity) {
+      meta.dist = dist;
+    }
 
     await ensureBlockletExpanded(meta, downloadDir);
 
     // move to installDir
-    const bundleDir = getBundleDir(dist, meta);
-    logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
-    await fs.move(downloadDir, bundleDir, { overwrite: true });
+    const installDir = getBundleDir(distDir, meta);
+    logger.info('Move downloadDir to installDir with diff', { downloadDir, installDir });
+    await fs.move(downloadDir, installDir, { overwrite: true });
 
-    return { meta, installDir: bundleDir };
+    return { meta, installDir };
   } catch (error) {
     fs.removeSync(downloadDir);
     fs.removeSync(diffDir);

package/lib/blocklet/manager/disk.js

@@ -631,6 +631,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       sync,
       downloadTokenList,
       onlyRequired,
+      dist,
     },
     context = {}
   ) {
@@ -652,6 +653,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         context,
         states,
         manager: this,
+        dist,
       });
     }
 

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

@@ -31,6 +31,7 @@ const installComponentFromUpload = async ({
   context = {},
   manager,
   states,
+  dist,
 }) => {
   logger.info('install component', { from: 'upload file' });
 
@@ -67,10 +68,10 @@ const installComponentFromUpload = async ({
       throw new Error('Blocklet version changed when diff deploying');
     }
 
-    meta = (await resolveDiffDownload(tarFile, manager.installDir, { deleteSet, meta: oldChild.meta })).meta;
+    meta = (await resolveDiffDownload(tarFile, manager.installDir, { deleteSet, meta: oldChild.meta, dist })).meta;
   } else {
     // full deploy
-    meta = (await resolveDownload(tarFile, manager.installDir)).meta;
+    meta = (await resolveDownload(tarFile, manager.installDir, { dist })).meta;
   }
 
   if (meta.did === rootDid) {

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

@@ -945,7 +945,7 @@ const initLogger =
       ),
     });
 
-    if (process.env.NODE_ENV === 'production') {
+    if (process.env.NODE_ENV === 'production' || process.env.ABT_LOG_TO_FILE === 'true') {
       logger.level = level || 'info';
       if (!fs.existsSync(logDir)) {
         fs.mkdirSync(logDir, { recursive: true });

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

@@ -119,16 +119,27 @@ const publishToEndpoint = async ({ did, projectId, endpointId, releaseId, manage
     releaseDir = `${releaseDir}-${endpointId}`;
   }
 
-  // const metaFile = path.join(releaseDir, '.blocklet', 'release', 'blocklet.json');
   const bundleDir = path.join(releaseDir, '.blocklet', 'bundle');
   let localMeta;
+  const metaFile = path.join(releaseDir, '.blocklet', 'release', 'blocklet.json');
+  let metaExists = false;
   try {
-    localMeta = getBlockletMeta(bundleDir);
-  } catch (error) {
-    throw new Error(`Get blocklet meta failed: ${error.message}`);
+    await fs.access(metaFile);
+    metaExists = true;
+  } catch (_) {
+    //
   }
-  if (hasReservedKey(localMeta.environments)) {
-    throw new Error('Blocklet key of environments can not start with `ABT_NODE_` or `BLOCKLET_`');
+  if (metaExists) {
+    localMeta = JSON.parse(await fs.readFile(metaFile, 'utf-8'));
+  } else {
+    try {
+      localMeta = getBlockletMeta(bundleDir);
+    } catch (error) {
+      throw new Error(`Get blocklet meta failed: ${error.message}`);
+    }
+    if (hasReservedKey(localMeta.environments)) {
+      throw new Error('Blocklet key of environments can not start with `ABT_NODE_` or `BLOCKLET_`');
+    }
   }
 
   const mountPoint = getMountPoint(localMeta);
@@ -213,6 +224,10 @@ const publishToEndpoint = async ({ did, projectId, endpointId, releaseId, manage
     deleteSet,
     mountPoint,
     rootDid,
+    dist: {
+      tarball: localMeta.dist?.tarball || '',
+      integrity: localMeta.dist?.integrity || '',
+    },
   });
 
   try {

package/lib/router/index.js

@@ -146,10 +146,13 @@ class Router {
       blockPolicy.blacklist = await expandBlacklist(blockPolicy.blacklist);
 
       // remove current internal ip from blacklist to avoid blocking self
-      const result = await IP.get({ includeExternal: false, timeout: 2000 });
+      const result = await IP.get({ timeout: 2000 });
       if (result?.internal) {
         blockPolicy.blacklist = blockPolicy.blacklist.filter((x) => x !== result.internal);
       }
+      if (result?.external) {
+        blockPolicy.blacklist = blockPolicy.blacklist.filter((x) => x !== result.external);
+      }
 
       // Append blocked ips from database
       const blockedIps = await getActiveBlacklist();

package/lib/states/access-key.js

@@ -7,11 +7,11 @@ const CustomError = require('@abtnode/util/lib/custom-error');
 
 const logger = require('@abtnode/logger')('@abtnode/core:states:access-key');
 const BaseState = require('./base');
-const { accessKeySchema } = require('../validators/access-key');
+const { accessKeySchema, REMARK_MAX_LENGTH } = require('../validators/access-key');
 
 const validateRemark = (remark) => {
-  if (remark && remark.length > 50) {
-    throw new CustomError(400, 'Remark length should NOT be more than 50 characters');
+  if (remark && remark.length > REMARK_MAX_LENGTH) {
+    throw new CustomError(400, `Remark length should NOT be more than ${REMARK_MAX_LENGTH} characters`);
   }
 };
 

package/lib/states/backup.js

@@ -193,7 +193,7 @@ class BackupState extends BaseState {
     const dateColumn = this.model.sequelize.fn(
       'strftime',
       '%Y-%m-%d', // 提取年月日
-      this.model.sequelize.fn('datetime', this.model.sequelize.col('createdAt'), `+${offset} minutes`)
+      this.model.sequelize.fn('datetime', this.model.sequelize.col('createdAt'), `${offset} minutes`)
     );
     /**
      * @type {import('sequelize').WhereOptions<import('@abtnode/models').BackupState>}

package/lib/util/blocklet.js

@@ -141,6 +141,18 @@ const blockletCache = new SingleFlightLRUCache({
   ttl: BLOCKLET_CACHE_TTL,
 });
 
+const getVersionScope = (meta) => {
+  if (meta.dist?.integrity) {
+    const safeHash = meta.dist.integrity
+      .replace('sha512-', '')
+      .slice(0, 8)
+      .replace(/[^a-zA-Z0-9]/g, '');
+    return `${meta.version}-${safeHash}`;
+  }
+
+  return meta.version;
+};
+
 const deleteBlockletCache = (did) => {
   const flags = [false, true];
   flags.forEach((ensureIntegrity) => {
@@ -1182,6 +1194,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
   for (const blocklet of blocklets) {
     forEachBlockletSync(blocklet, (component) => {
       blockletMap[`${component.meta.bundleName}/${component.meta.version}`] = true;
+      blockletMap[`${component.meta.bundleName}/${getVersionScope(component.meta)}`] = true;
     });
   }
   for (const setting of blockletSettings) {
@@ -1189,6 +1202,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
       if (child.status !== BlockletStatus.deleted) {
         forEachBlockletSync(child, (component) => {
           blockletMap[`${component.meta.bundleName}/${component.meta.version}`] = true;
+          blockletMap[`${component.meta.bundleName}/${getVersionScope(component.meta)}`] = true;
         });
       }
     }
@@ -1466,7 +1480,27 @@ const getDiffFiles = async (inputFiles, sourceDir) => {
   };
 };
 
-const getBundleDir = (installDir, meta) => path.join(installDir, meta.bundleName || meta.name, meta.version);
+const checkCompatibleOnce = {};
+
+// TODO: 梁柱， 这里为了兼容旧版的 blocklet，需要暂时保留，未来所有 blocklet 都使用新路径了可以删除
+const compatibleWithOldBlocklets = (dir) => {
+  if (checkCompatibleOnce[dir] !== undefined) {
+    return checkCompatibleOnce[dir];
+  }
+
+  checkCompatibleOnce[dir] = !!fs.existsSync(path.join(dir, 'blocklet.yml'));
+
+  return checkCompatibleOnce[dir];
+};
+
+const getBundleDir = (installDir, meta) => {
+  const oldDir = path.join(installDir, meta.bundleName || meta.name, meta.version);
+  if (compatibleWithOldBlocklets(oldDir)) {
+    return oldDir;
+  }
+
+  return path.join(installDir, meta.bundleName || meta.name, getVersionScope(meta));
+};
 
 const needBlockletDownload = (blocklet, oldBlocklet) => {
   if ([BlockletSource.upload, BlockletSource.local, BlockletSource.custom].includes(blocklet.source)) {

package/lib/util/launcher.js

@@ -356,7 +356,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context, pro
       userDid: ownerDid,
       appPid: appDid,
       status: 'online',
-      visitorId: context?.visitorId,
+      // visitorId: context?.visitorId, // NOTICE: @2025-05-06 初始化新应用时，使用新的 visitorId
       ua: context?.ua, // NOTICE: @2024-12-01 webapp 暂不做 userSession 纠正 ua 的处理，因为 webapp 中不涉及 userSession 管理
       lastLoginIp: context?.lastLoginIp,
       extra: {

package/lib/validators/access-key.js

@@ -3,6 +3,8 @@ const { didExtension } = require('@blocklet/meta/lib/extension');
 
 const Joi = JOI.extend(didExtension);
 
+const REMARK_MAX_LENGTH = 200;
+
 const accessKeySchema = Joi.object({
   accessKeyId: Joi.string().required().min(1).max(40).messages({
     'string.empty': 'Access Key ID cannot be empty',
@@ -20,9 +22,12 @@ const accessKeySchema = Joi.object({
     'string.max': 'Passport length must be less than or equal to 40 characters long',
   }),
 
-  remark: Joi.string().allow('').max(128).messages({
-    'string.max': 'Remark length must be less than or equal to 128 characters long',
-  }),
+  remark: Joi.string()
+    .allow('')
+    .max(REMARK_MAX_LENGTH)
+    .messages({
+      'string.max': `Remark length must be less than or equal to ${REMARK_MAX_LENGTH} characters long`,
+    }),
 
   createdBy: Joi.string().trim().required(),
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.43-beta-20250505-062139-b156e7da",
+  "version": "1.16.43-beta-20250507-124320-c405ab23",
   "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.43-beta-20250505-062139-b156e7da",
-    "@abtnode/auth": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/certificate-manager": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/client": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/constant": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/cron": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/docker-utils": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/logger": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/models": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/queue": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/rbac": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/router-provider": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/static-server": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/timemachine": "1.16.43-beta-20250505-062139-b156e7da",
-    "@abtnode/util": "1.16.43-beta-20250505-062139-b156e7da",
+    "@abtnode/analytics": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/auth": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/certificate-manager": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/client": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/constant": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/cron": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/docker-utils": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/logger": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/models": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/queue": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/rbac": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/router-provider": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/static-server": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/timemachine": "1.16.43-beta-20250507-124320-c405ab23",
+    "@abtnode/util": "1.16.43-beta-20250507-124320-c405ab23",
     "@arcblock/did": "1.20.4",
     "@arcblock/did-auth": "1.20.4",
     "@arcblock/did-ext": "1.20.4",
@@ -44,14 +44,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.4",
     "@arcblock/vc": "1.20.4",
-    "@blocklet/constant": "1.16.43-beta-20250505-062139-b156e7da",
+    "@blocklet/constant": "1.16.43-beta-20250507-124320-c405ab23",
     "@blocklet/did-space-js": "^1.0.49",
-    "@blocklet/env": "1.16.43-beta-20250505-062139-b156e7da",
+    "@blocklet/env": "1.16.43-beta-20250507-124320-c405ab23",
     "@blocklet/error": "^0.2.4",
-    "@blocklet/meta": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/resolver": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/sdk": "1.16.43-beta-20250505-062139-b156e7da",
-    "@blocklet/store": "1.16.43-beta-20250505-062139-b156e7da",
+    "@blocklet/meta": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/resolver": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/sdk": "1.16.43-beta-20250507-124320-c405ab23",
+    "@blocklet/store": "1.16.43-beta-20250507-124320-c405ab23",
     "@blocklet/theme": "^2.13.21",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.4",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "b1056718bbb5c25aef0cacc08d29762ebc420f66"
+  "gitHead": "4e5087dfaa52788676f313d23bfdd3ac68d63503"
 }