@abtnode/core 1.16.33 → 1.16.34-beta-20241120-080738-bbbe036c

package/README.md

@@ -1,3 +1,3 @@
 # ABT Node Core
 
-ABT Node core state management lib, that powers `@abtnode/cli` and `@abtnode/webapp`.
+ABT Node core state management lib, that powers `@blocklet/cli` and `@abtnode/webapp`.

package/lib/blocklet/manager/disk.js

@@ -216,7 +216,11 @@ const statusLock = new Lock('blocklet-status-lock');
 const getHookArgs = (blocklet) => ({
   output: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'output.log'),
   error: blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '' : path.join(blocklet.env.logsDir, 'error.log'),
-  timeout: (get(blocklet, 'meta.timeout.script') || 120) * 1000,
+  timeout:
+    Math.max(
+      get(blocklet, 'meta.timeout.script', 120),
+      ...(blocklet?.children || []).map((child) => child.meta?.timeout?.script || 0)
+    ) * 1000,
 });
 
 const pm2StatusMap = {
@@ -906,6 +910,7 @@ class DiskBlockletManager extends BaseBlockletManager {
                 env: nextEnv,
                 hookName: 'preStop',
                 nodeInfo,
+                timeout: getHookArgs(b).timeout,
               });
             }
             return null;
@@ -1124,6 +1129,7 @@ class DiskBlockletManager extends BaseBlockletManager {
                 script: b.meta.scripts.preUninstall,
                 hookName: 'preUninstall',
                 nodeInfo,
+                timeout: getHookArgs(b).timeout,
               });
             }
             return null;
@@ -1178,7 +1184,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       const nodeInfo = await states.node.read();
       // 如果删除因为权限问题失败，尝试用 docker 用户去调整用户组为宿主机当前用户
       if (checkDockerRunHistory(nodeInfo) && error.code === 'EACCES') {
-        await dockerExecChown(`${did}-${childDid}`, dirs);
+        await dockerExecChown(`${did}-${childDid}-remove-catch`, dirs);
         for (const dir of dirs) {
           fs.removeSync(dir);
           logger.info(`removed blocklet ${did} ${childDid}: ${dir}`);
@@ -1246,7 +1252,12 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   async deleteComponent({ did, rootDid, keepData, keepState }, context) {
     logger.info('delete blocklet component', { did, rootDid, keepData });
-
+    const nodeInfo = await states.node.read();
+    if (checkDockerRunHistory(nodeInfo)) {
+      await dockerExecChown(`${did}-${rootDid}-deleteComponent`, [
+        path.join(process.env.ABT_NODE_DATA_DIR, 'data', rootDid),
+      ]);
+    }
     const app = await this.getBlocklet(rootDid);
 
     const child = app.children.find((x) => x.meta.did === did);
@@ -1602,7 +1613,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             nodeInfo,
             env: nextEnv,
             script: blocklet.meta.scripts.preConfig,
-            timeout: 1000 * 10,
+            timeout: getHookArgs(blocklet).timeout,
             retry: 0,
             hookName: 'preConfig',
           });
@@ -4121,6 +4132,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     const dataDir = path.join(this.dataDirs.data, name);
     const logsDir = path.join(this.dataDirs.logs, name);
     const cacheDir = path.join(this.dataDirs.cache, name);
+    const nodeInfo = await states.node.read();
+    if (checkDockerRunHistory(nodeInfo)) {
+      await dockerExecChown(`${blocklet.meta.did}-clean-data`, [dataDir, logsDir, cacheDir]);
+    }
 
     logger.info(`clean blocklet ${blocklet.meta.did} data`, { keepData, keepLogsDir, keepConfigs });
 
@@ -4580,7 +4595,10 @@ class DiskBlockletManager extends BaseBlockletManager {
   // eslint-disable-next-line no-unused-vars
   async _backupToDisk({ blocklet }, context) {
     const { appDid } = blocklet;
-
+    const nodeInfo = await states.node.read();
+    if (checkDockerRunHistory(nodeInfo)) {
+      await dockerExecChown(`${appDid}-backup-to-disk`, [path.join(process.env.ABT_NODE_DATA_DIR, 'data', appDid)]);
+    }
     const diskBackup = new DiskBackup({ appDid, event: this });
     await diskBackup.backup();
 

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -67,6 +67,9 @@ const installApplicationFromBackup = async ({
     );
   }
 
+  /** @type {import('@abtnode/client').RoutingSite} */
+  const routingSite = omit(fs.readJSONSync(path.join(dir, 'routing_rule.json')));
+
   const { meta } = blockletState;
   const { did, name: appName } = meta;
 
@@ -135,6 +138,10 @@ const installApplicationFromBackup = async ({
   let blocklet = null;
 
   try {
+    // 还原 routing rule
+    await states.site.remove({ id: routingSite.id });
+    await states.site.insert(routingSite);
+
     // copy extra
     const existExtra = await states.blockletExtras.find({ did });
     if (existExtra) {

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

@@ -38532,7 +38532,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.32","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.32","@abtnode/auth":"1.16.32","@abtnode/certificate-manager":"1.16.32","@abtnode/constant":"1.16.32","@abtnode/cron":"1.16.32","@abtnode/logger":"1.16.32","@abtnode/models":"1.16.32","@abtnode/queue":"1.16.32","@abtnode/rbac":"1.16.32","@abtnode/router-provider":"1.16.32","@abtnode/static-server":"1.16.32","@abtnode/timemachine":"1.16.32","@abtnode/util":"1.16.32","@arcblock/did":"1.18.139","@arcblock/did-auth":"1.18.139","@arcblock/did-ext":"^1.18.139","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.18.139","@arcblock/event-hub":"1.18.139","@arcblock/jwt":"^1.18.139","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.18.139","@arcblock/vc":"1.18.139","@blocklet/constant":"1.16.32","@blocklet/env":"1.16.32","@blocklet/meta":"1.16.32","@blocklet/resolver":"1.16.32","@blocklet/sdk":"1.16.32","@blocklet/store":"1.16.32","@blocklet/did-space-js":"^0.5.65","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.18.139","@ocap/util":"1.18.139","@ocap/wallet":"1.18.139","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.5","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","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-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":"^6.0.0","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-map":"^4.0.0","p-limit":"^3.1.0","p-retry":"^4.6.2","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","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 = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.33","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.33","@abtnode/auth":"1.16.33","@abtnode/certificate-manager":"1.16.33","@abtnode/constant":"1.16.33","@abtnode/cron":"1.16.33","@abtnode/logger":"1.16.33","@abtnode/models":"1.16.33","@abtnode/queue":"1.16.33","@abtnode/rbac":"1.16.33","@abtnode/router-provider":"1.16.33","@abtnode/static-server":"1.16.33","@abtnode/timemachine":"1.16.33","@abtnode/util":"1.16.33","@arcblock/did":"1.18.139","@arcblock/did-auth":"1.18.139","@arcblock/did-ext":"^1.18.139","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.18.139","@arcblock/event-hub":"1.18.139","@arcblock/jwt":"^1.18.139","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.18.139","@arcblock/vc":"1.18.139","@blocklet/constant":"1.16.33","@blocklet/did-space-js":"^0.5.65","@blocklet/env":"1.16.33","@blocklet/meta":"1.16.33","@blocklet/resolver":"1.16.33","@blocklet/sdk":"1.16.33","@blocklet/store":"1.16.33","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.18.139","@ocap/util":"1.18.139","@ocap/wallet":"1.18.139","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.5","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","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-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":"^6.0.0","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","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","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/index.js

@@ -273,7 +273,14 @@ function ABTNode(options) {
     deleteRoutingRule,
     addDomainAlias,
     deleteDomainAlias,
-  } = getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager });
+  } = getRouterHelpers({
+    dataDirs,
+    routingSnapshot,
+    routerManager,
+    blockletManager,
+    certManager,
+    daemon: options.daemon,
+  });
 
   blockletManager.resetSiteByDid = resetSiteByDid;
 

package/lib/router/helper.js

@@ -74,6 +74,7 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 
 const Router = require('./index');
 const states = require('../states');
+const monitor = require('../util/monitor');
 const { getBlockletDomainGroupName, getDidFromDomainGroupName, createProviderInstance } = require('../util/router');
 const {
   getBlockletDidDomainList,
@@ -679,7 +680,14 @@ const getDidDomainCertDownloadUrl = (baseUrl) => joinCertDownUrl(baseUrl, 'did-a
 const getDownloadCertBaseUrl = (info) =>
   process.env.ABT_NODE_WILDCARD_CERT_HOST || get(info, 'routing.wildcardCertHost', '');
 
-module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager }) {
+module.exports = function getRouterHelpers({
+  dataDirs,
+  routingSnapshot,
+  routerManager,
+  blockletManager,
+  certManager,
+  daemon = false,
+}) {
   const nodeState = states.node;
   const blockletState = states.blocklet;
   const siteState = states.site;
@@ -1317,6 +1325,20 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       await providers[providerName].start();
     }
 
+    if (daemon && process.env.ABT_NODE_MONITOR_GATEWAY_5XX) {
+      monitor.stopLogWatcher();
+      const logs = providers[providerName].getLogFilesForToday();
+      monitor.startLogWatcher(logs.access, (logEntries) => {
+        notification.create({
+          title: 'Server 5xx Alert',
+          description: `5xx request detected: ${JSON.stringify(logEntries, null, 2)}`,
+          entityType: 'server',
+          severity: 'error',
+          sticky: true,
+        });
+      });
+    }
+
     logger.info('done handle routing', { cost: Date.now() - now });
   };
 
@@ -1325,7 +1347,20 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     const providerName = get(info, 'routing.provider', null);
 
     if (providerName && providers[providerName] && typeof providers[providerName].rotateLogs === 'function') {
+      monitor.stopLogWatcher();
       await providers[providerName].rotateLogs({ retain: LOG_RETAIN_IN_DAYS });
+      if (daemon && process.env.ABT_NODE_MONITOR_GATEWAY_5XX) {
+        const logs = providers[providerName].getLogFilesForToday();
+        monitor.startLogWatcher(logs.access, (logEntries) => {
+          notification.create({
+            title: 'Server 5xx Alert',
+            description: `5xx request detected: ${JSON.stringify(logEntries, null, 2)}`,
+            entityType: 'server',
+            severity: 'error',
+            sticky: true,
+          });
+        });
+      }
     }
   };
 

package/lib/util/blocklet.js

@@ -524,8 +524,11 @@ const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
   }
 
   // Let's wait for at least 1 minute for the blocklet to go live
-  let startTimeout = process.env.NODE_ENV === 'test' ? 10 : 60;
-  startTimeout = Math.max(get(blocklet, 'meta.timeout.start', startTimeout), startTimeout) * 1000;
+  const startTimeout =
+    Math.max(
+      get(blocklet, 'meta.timeout.start', process.env.NODE_ENV === 'test' ? 10 : 60),
+      ...(blocklet?.children || []).map((child) => child.meta?.timeout?.start || 0)
+    ) * 1000;
 
   return {
     startTimeout,
@@ -970,8 +973,10 @@ const expandTarball = async ({ source, dest, strip = 1 }) => {
 };
 
 const verifyIntegrity = async ({ file, integrity: expected }) => {
-  const result = await ssri.checkStream(fs.createReadStream(file), ssri.parse(expected));
+  const stream = fs.createReadStream(file);
+  const result = await ssri.checkStream(stream, ssri.parse(expected));
   logger.debug('verify integrity result', { result });
+  stream.destroy();
   return true;
 };
 

package/lib/util/docker/docker-exec-chown.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const logger = require('@abtnode/logger')('@abtnode/docker-exec-chown');
 const debianDockerfile = require('./debian-dockerfile');
 const promiseSpawn = require('../promise-spawn');
+const parseDockerName = require('./parse-docker-name');
 
 async function dockerExecChown(name, targetDirs) {
   const uid = process.getuid();
@@ -15,7 +16,7 @@ async function dockerExecChown(name, targetDirs) {
   const command = dirs
     .map((dir) => `chown -R ${uid}:${gid} ${path.join(baseDir, dir.replace(process.env.ABT_NODE_DATA_DIR, ''))}`)
     .join(' && ');
-  const realName = `blocklet-chown-${name.replace(/\\/g, '_')}`;
+  const realName = parseDockerName(`blocklet-chown-${name.replace(/\\/g, '_')}`);
   const startTime = Date.now();
   try {
     await promiseSpawn(

package/lib/util/docker/parse-docker-options-from-pm2.js

@@ -7,6 +7,7 @@ const fs = require('fs');
 const os = require('os');
 const logger = require('@abtnode/logger')('@abtnode/docker');
 const { existsSync, writeFileSync } = require('fs-extra');
+const { NODE_MODES } = require('@abtnode/constant');
 
 const parseDockerName = require('./parse-docker-name');
 const { createDockerImage } = require('./create-docker-image');
@@ -35,6 +36,8 @@ async function parseDockerOptionsFromPm2({ options, nodeInfo, meta, ports, overr
     return options;
   }
 
+  const isServerless = nodeInfo.mode === NODE_MODES.SERVERLESS;
+
   const dockerInfo = await createDockerImage({
     appDir: options.env.BLOCKLET_APP_DIR,
     dataDir: options.env.BLOCKLET_DATA_DIR,
@@ -46,13 +49,30 @@ async function parseDockerOptionsFromPm2({ options, nodeInfo, meta, ports, overr
   nextOptions.env = { ...nextOptions.env };
   const name = parseDockerName(options.name);
 
+  const defaultCpus = '2';
+  const defaultMemory = '2g';
+  const defaultDiskSize = '0g';
+
+  const cpus = isServerless
+    ? process.env.ABT_NODE_DOCKER_CPUS
+    : options.env.DOCKER_CPUS || process.env.ABT_NODE_DOCKER_CPUS;
+
+  const memory = isServerless
+    ? process.env.ABT_NODE_DOCKER_MEMORY
+    : options.env.DOCKER_MEMORY || process.env.ABT_NODE_DOCKER_MEMORY;
+
+  const diskSize = isServerless
+    ? process.env.ABT_NODE_DOCKER_DISK_SIZE
+    : options.env.DOCKER_DISK_SIZE || process.env.ABT_NODE_DOCKER_DISK_SIZE;
+
   // Ensure environment variables are properly set within the Docker container
   const envDefaults = {
-    BLOCKLET_DOCKER_CPUS: '2',
-    BLOCKLET_DOCKER_MEMORY: '2g',
-    BLOCKLET_DOCKER_DISK_SIZE: '0g',
+    BLOCKLET_DOCKER_CPUS: cpus || defaultCpus,
+    BLOCKLET_DOCKER_MEMORY: memory || defaultMemory,
+    BLOCKLET_DOCKER_DISK_SIZE: diskSize || defaultDiskSize,
     BLOCKLET_DOCKER_NAME: name,
     INTERNAL_HOST: 'host.docker.internal',
+    NODE_MODES: options.env.NODE_MODES || (isServerless ? NODE_MODES.SERVERLESS : NODE_MODES.PRODUCTION),
     HTTP_PROXY: process.env.DOCKER_HTTP_PROXY || '',
     HTTPS_PROXY: process.env.DOCKER_HTTPS_PROXY || '',
   };
@@ -163,11 +183,13 @@ async function parseDockerOptionsFromPm2({ options, nodeInfo, meta, ports, overr
       target: path.join(dockerEnv.BLOCKLET_APP_DATA_DIR, '.assets'),
       canEdit: false,
     },
-    {
-      source: nextOptions.env.BLOCKLET_APP_DATA_DIR,
-      target: dockerEnv.BLOCKLET_APP_DATA_DIR,
-      canEdit: false,
-    },
+    options.env.SHARE_DOCKER_APP_DATA_DIR
+      ? {
+          source: nextOptions.env.BLOCKLET_APP_DATA_DIR,
+          target: dockerEnv.BLOCKLET_APP_DATA_DIR,
+          canEdit: false,
+        }
+      : null,
     { source: nextOptions.env.BLOCKLET_APP_DIR, target: dockerEnv.BLOCKLET_APP_DIR, canEdit: true },
     { source: nextOptions.env.BLOCKLET_DATA_DIR, target: dockerEnv.BLOCKLET_DATA_DIR, canEdit: true },
     { source: nextOptions.env.BLOCKLET_LOG_DIR, target: dockerEnv.BLOCKLET_LOG_DIR, canEdit: true },
@@ -188,6 +210,9 @@ async function parseDockerOptionsFromPm2({ options, nodeInfo, meta, ports, overr
       canEdit: true,
     },
   ].filter((v) => {
+    if (!v) {
+      return false;
+    }
     if (targetDirs.has(v.target)) {
       return false;
     }

package/lib/util/monitor.js

@@ -0,0 +1,159 @@
+/* eslint-disable no-await-in-loop */
+const fs = require('fs');
+
+const THROTTLE_DELAY = 1000; // 1 second throttle
+
+// Function to parse the log entry and extract relevant information
+function parseLogEntry(line) {
+  const regex =
+    /^(\S+) - (\S+) \[([^\]]+)\] (\S+) "([^"]+)" "([^"]+)" (\d{3}) (\d+) "(.*?)" "(.*?)" "(.*?)" rt="(\S+)" uid="(.+?)" uos="(.+?)" uct="(\S+)" uht="(\S+)" urt="(\S+)"/;
+  const match = line.match(regex);
+  if (match) {
+    return {
+      ip: match[1],
+      remoteUser: match[2],
+      timeIso8601: match[3],
+      requestId: match[4],
+      host: match[5],
+      request: match[6],
+      status: parseInt(match[7], 10),
+      bodyBytesSent: parseInt(match[8], 10),
+      referer: match[9],
+      userAgent: match[10],
+      forwardedFor: match[11],
+      requestTime: parseFloat(match[12]),
+      connectedDid: match[13],
+      connectedWalletOs: match[14],
+      upstreamConnectTime: parseFloat(match[15]),
+      upstreamHeaderTime: parseFloat(match[16]),
+      upstreamResponseTime: parseFloat(match[17]),
+    };
+  }
+  return null;
+}
+
+async function readLogFile(filePath, startPosition = 0) {
+  let fd = null;
+  try {
+    if (!fs.existsSync(filePath)) {
+      return { lines: [], fileSize: 0 };
+    }
+
+    const realPath = await fs.promises.realpath(filePath);
+    fd = await fs.promises.open(realPath, 'r');
+    const stats = await fd.stat();
+    const fileSize = stats.size;
+
+    if (startPosition < 0) {
+      // eslint-disable-next-line no-param-reassign
+      startPosition = Math.max(0, fileSize + startPosition);
+    }
+
+    if (startPosition >= fileSize) {
+      return { lines: [], fileSize };
+    }
+
+    const readSize = fileSize - startPosition;
+    if (readSize <= 0) {
+      return { lines: [], fileSize };
+    }
+
+    const buffer = Buffer.alloc(readSize);
+    const { bytesRead } = await fd.read(buffer, 0, readSize, startPosition);
+    const content = buffer.slice(0, bytesRead).toString();
+
+    const lines = content
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean);
+
+    return { lines, fileSize };
+  } finally {
+    if (fd) {
+      await fd.close();
+    }
+  }
+}
+
+let watcher;
+process.on('SIGINT', () => {
+  watcher?.close();
+});
+
+process.on('SIGTERM', () => {
+  watcher?.close();
+});
+
+function startLogWatcher(logFilePath, onLogEntry, initialBufferSize = 10240) {
+  if (!fs.existsSync(logFilePath)) {
+    console.error(`Log file ${logFilePath} does not exist`);
+    return;
+  }
+
+  console.warn(`Start watching ${logFilePath} for 5xx requests...`);
+
+  let isProcessing = false;
+  let isFirstRun = true;
+  let timeoutId = null;
+  let lastProcessedPosition = 0;
+
+  async function processLogChanges() {
+    isProcessing = true;
+    try {
+      const { lines, fileSize } = await readLogFile(
+        logFilePath,
+        isFirstRun ? -initialBufferSize : lastProcessedPosition
+      );
+      const entries = [];
+
+      for (const line of lines) {
+        const logEntry = parseLogEntry(line);
+        if (logEntry && logEntry.status >= 500 && logEntry.status <= 599) {
+          console.warn(`5xx request detected: ${logEntry.host}`, line);
+          entries.push(logEntry);
+        }
+      }
+
+      if (entries.length > 0) {
+        onLogEntry(entries);
+      }
+
+      lastProcessedPosition = fileSize;
+      isFirstRun = false;
+    } catch (error) {
+      console.error(`Error reading log file ${logFilePath}`, error);
+    } finally {
+      isProcessing = false;
+    }
+  }
+
+  watcher = fs.watch(logFilePath, { persistent: true }, async (eventType, filename) => {
+    if (!filename || eventType !== 'change') return;
+
+    // Clear any pending timeout
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+
+    // If already processing, schedule for later
+    if (isProcessing) {
+      timeoutId = setTimeout(() => {
+        processLogChanges();
+      }, THROTTLE_DELAY);
+      return;
+    }
+
+    await processLogChanges();
+  });
+}
+
+function stopLogWatcher() {
+  watcher?.close();
+}
+
+module.exports = {
+  parseLogEntry,
+  readLogFile,
+  startLogWatcher,
+  stopLogWatcher,
+};

package/lib/util/rotator.js

@@ -112,6 +112,12 @@ module.exports = class LogRotate {
     }
 
     const onError = (err) => {
+      if (GZIP) {
+        GZIP.close();
+      }
+      readStream?.close();
+      writeStream?.close();
+
       logError(err);
       callback(err);
     };
@@ -128,8 +134,8 @@ module.exports = class LogRotate {
       if (GZIP) {
         GZIP.close();
       }
-      readStream.close();
-      writeStream.close();
+      readStream?.close();
+      writeStream?.close();
 
       fs.truncateSync(file);
       logInfo('rotated file:', finalName);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.33",
+  "version": "1.16.34-beta-20241120-080738-bbbe036c",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.33",
-    "@abtnode/auth": "1.16.33",
-    "@abtnode/certificate-manager": "1.16.33",
-    "@abtnode/constant": "1.16.33",
-    "@abtnode/cron": "1.16.33",
-    "@abtnode/logger": "1.16.33",
-    "@abtnode/models": "1.16.33",
-    "@abtnode/queue": "1.16.33",
-    "@abtnode/rbac": "1.16.33",
-    "@abtnode/router-provider": "1.16.33",
-    "@abtnode/static-server": "1.16.33",
-    "@abtnode/timemachine": "1.16.33",
-    "@abtnode/util": "1.16.33",
+    "@abtnode/analytics": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/auth": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/certificate-manager": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/constant": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/cron": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/logger": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/models": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/queue": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/rbac": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/router-provider": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/static-server": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/timemachine": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@abtnode/util": "1.16.34-beta-20241120-080738-bbbe036c",
     "@arcblock/did": "1.18.139",
     "@arcblock/did-auth": "1.18.139",
     "@arcblock/did-ext": "^1.18.139",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.139",
     "@arcblock/vc": "1.18.139",
-    "@blocklet/constant": "1.16.33",
+    "@blocklet/constant": "1.16.34-beta-20241120-080738-bbbe036c",
     "@blocklet/did-space-js": "^0.5.65",
-    "@blocklet/env": "1.16.33",
-    "@blocklet/meta": "1.16.33",
-    "@blocklet/resolver": "1.16.33",
-    "@blocklet/sdk": "1.16.33",
-    "@blocklet/store": "1.16.33",
+    "@blocklet/env": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@blocklet/meta": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@blocklet/resolver": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@blocklet/sdk": "1.16.34-beta-20241120-080738-bbbe036c",
+    "@blocklet/store": "1.16.34-beta-20241120-080738-bbbe036c",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.139",
     "@ocap/util": "1.18.139",
@@ -106,5 +106,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "f314706b7a6150adbf6bf700f06d2989981eaf1f"
+  "gitHead": "4bc345b51743e28a95bf09f7e0c0740838b39ad3"
 }