@abtnode/util 1.8.60 → 1.8.61

package/lib/format-name.js

@@ -0,0 +1,5 @@
+const slugify = require('slugify');
+
+const formatName = (name) => slugify(name.replace(/^[@./-]/, '').replace(/[@./_]/g, '-'));
+
+module.exports = formatName;

package/lib/log.js

@@ -1,6 +1,9 @@
 /* eslint-disable no-underscore-dangle */
 const path = require('path');
-const fs = require('fs');
+const createArchive = require('archiver');
+const fs = require('fs-extra');
+const dayjs = require('dayjs');
+const glob = require('fast-glob');
 const isEqual = require('lodash/isEqual');
 const { Tail } = require('tail');
 const readLastLines = require('read-last-lines');
@@ -177,12 +180,118 @@ const getLogFiles = async ({ name, node }) => {
       return {};
     }
 
-    return provider.getLogFilesForToday(path.join(node.dataDirs.router, providerName));
+    return provider.getLogFilesForToday();
   }
 
   return {};
 };
 
+const getDownloadLogFilesFromServer = async ({ dates, nodeInfo, node } = {}) => {
+  const logDir = path.join(node.dataDirs.logs, '_abtnode');
+
+  const pm2Log = path.join(logDir, 'pm2.log');
+  const pm2LogSrc = path.join(process.env.PM2_HOME, 'pm2.log');
+  if (fs.existsSync(pm2LogSrc)) {
+    await fs.copy(pm2LogSrc, pm2Log);
+  }
+
+  const provider = node.getRouterProvider(nodeInfo.routing.provider);
+  if (!provider) {
+    logger.error('router engine is empty');
+  }
+
+  const list = [];
+
+  dates.forEach((d) => {
+    // log file created by @abtnode/log
+    // log file created by abt-node-log-rotate
+    list.push(path.join(logDir, `*-${d}*`));
+
+    // log file create by router
+    const routerLogDir = provider.getLogDir();
+    if (routerLogDir) {
+      list.push(path.join(routerLogDir, `*-${d}*`));
+    }
+  });
+
+  // abt-node-daemon console & gateway
+  list.push(path.join(logDir, 'daemon.stdout.log*'));
+  list.push(path.join(logDir, 'daemon.stderr.log*'));
+  list.push(path.join(logDir, 'access.log*'));
+
+  // abt-node-service console & gateway
+  list.push(path.join(logDir, 'service.output.log*'));
+  list.push(path.join(logDir, 'service.error.log*'));
+  list.push(path.join(logDir, 'service.log*'));
+
+  // abt-node-db-hub console & backup
+  list.push(path.join(logDir, 'db.output.log*'));
+  list.push(path.join(logDir, 'db.error.log*'));
+
+  // abt-node-event-hub console
+  list.push(path.join(logDir, 'event.output.log*'));
+  list.push(path.join(logDir, 'event.error.log*'));
+
+  // abt-node-log-rotate console
+  list.push(path.join(logDir, 'pm2-logrotate.stdout.log*'));
+  list.push(path.join(logDir, 'pm2-logrotate.stderr.log*'));
+
+  // abt-node-updater console
+  list.push(path.join(logDir, 'updater.error.log*'));
+  list.push(path.join(logDir, 'updater.output.log*'));
+
+  // fallback log
+  list.push(path.join(logDir, 'stderr.log*'));
+  list.push(path.join(logDir, 'stdout.log*'));
+
+  // router
+  list.push(...Object.values(provider.getLogFilesForToday() || {}));
+
+  // pm2 log
+  list.push(pm2Log);
+
+  return glob(list);
+};
+
+const getDownloadLogFilesFromBlocklet = async ({ dates, blocklet } = {}) => {
+  const logDir = path.join(blocklet.env.logsDir);
+
+  const list = [];
+
+  dates.forEach((d) => {
+    // log file created by @abtnode/log
+    // log file created by abt-node-log-rotate
+    list.push(path.join(logDir, `*-${d}*`));
+  });
+
+  list.push(path.join(logDir, 'output.log*'));
+  list.push(path.join(logDir, 'error.log*'));
+  list.push(path.join(logDir, 'access.log*'));
+
+  return glob(list);
+};
+
+const getDownloadLogFiles = async ({ did, node, days = 1, now } = {}) => {
+  const dates = [dayjs(now).format('YYYY-MM-DD')];
+
+  for (let i = 1; i <= days; i++) {
+    dates.unshift(dayjs(now).subtract(i, 'day').format('YYYY-MM-DD'));
+  }
+
+  const nodeInfo = await node.getNodeInfo();
+
+  if (nodeInfo.did === did) {
+    return getDownloadLogFilesFromServer({ dates, node, nodeInfo });
+  }
+
+  const blocklet = await node.getBlocklet({ did, attachRuntimeInfo: false });
+  if (!blocklet) {
+    throw new Error('blocklet not found');
+  }
+
+  return getDownloadLogFilesFromBlocklet({ dates, blocklet });
+};
+
 const createStreamLogManager = ({ onLog, onGetLogFiles }) => {
   const store = {}; // Object<name: streamLog>
 
@@ -249,7 +358,34 @@ const createStreamLogManager = ({ onLog, onGetLogFiles }) => {
   };
 };
 
+const createDownloadLogStream = async ({ node, did, days, now }) => {
+  const files = await getDownloadLogFiles({ node, did, days, now });
+
+  if (!files.length) {
+    throw new Error('Log file does not found');
+  }
+
+  const cwd = path.dirname(node.dataDirs.logs);
+
+  const archive = createArchive('zip', { zlib: { level: 9 } });
+  files.forEach((x) => {
+    archive.file(x, {
+      name: x.replace(`${cwd}/logs`, '/logs').replace(`${cwd}`, '/logs').replace('/_abtnode', '/blocklet-server'),
+    });
+  });
+
+  archive.rawPipe = archive.pipe.bind(archive);
+  archive.pipe = (s) => {
+    archive.rawPipe(s);
+    archive.finalize();
+  };
+
+  return archive;
+};
+
 module.exports = {
   createStreamLogManager,
   getLogFiles,
+  getDownloadLogFiles,
+  createDownloadLogStream,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.60",
+  "version": "1.8.61",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,18 +18,21 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.60",
-    "@abtnode/logger": "1.8.60",
-    "@arcblock/jwt": "^1.18.34",
-    "@blocklet/constant": "1.8.60",
-    "@ocap/mcrypto": "1.18.34",
-    "@ocap/util": "1.18.34",
-    "@ocap/wallet": "1.18.34",
+    "@abtnode/constant": "1.8.61",
+    "@abtnode/logger": "1.8.61",
+    "@arcblock/jwt": "^1.18.36",
+    "@blocklet/constant": "1.8.61",
+    "@ocap/mcrypto": "1.18.36",
+    "@ocap/util": "1.18.36",
+    "@ocap/wallet": "1.18.36",
+    "archiver": "^5.3.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
     "cross-spawn": "^7.0.3",
+    "dayjs": "^1.11.7",
     "debug": "^4.3.4",
+    "fast-glob": "^3.2.12",
     "find-up": "^5.0.0",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
@@ -50,8 +53,10 @@
     "semver": "^7.3.8",
     "semver-sort": "^1.0.0",
     "shelljs": "^0.8.5",
+    "slugify": "^1.6.5",
     "stream-to-promise": "^3.0.0",
     "tail": "^2.2.4",
+    "tar": "^6.1.11",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-semver": "^3.0.0",
@@ -62,7 +67,8 @@
     "detect-port": "^1.5.1",
     "express": "^4.18.2",
     "fs-extra": "^10.1.0",
-    "jest": "^27.5.1"
+    "jest": "^27.5.1",
+    "unzipper": "^0.10.11"
   },
-  "gitHead": "0a56dc596f58d83f22d1ea0d0145d84e7151f5be"
+  "gitHead": "f68ac14c2074400d392e2171d328f12dbd2e64cb"
 }