@jayfong/x-server 2.39.2 → 2.40.0

package/lib/_cjs/cli/build_util.js

@@ -21,6 +21,7 @@ class BuildUtil {
     const tempDir = _nodePath.default.join(options.cwd, 'temp');
     const distMainFile = _nodePath.default.join(distDir, 'main.js');
     const distPkgFile = _nodePath.default.join(distDir, 'package.json');
+    const distNvmrcFile = _nodePath.default.join(distDir, '.nvmrc');
     const distPm2File = _nodePath.default.join(distDir, 'pm2.config.js');
     const distNoInstallFile = _nodePath.default.join(distDir, 'no_install.lock');
     const distBundleFile = _nodePath.default.join(tempDir, `app.${pkgContent.version}.tgz`);
@@ -156,9 +157,11 @@ class BuildUtil {
     };
     await _fsExtra.default.writeJSON(distPkgFile, distPkgContent);
 
-    // Node 版本
-    const nodeVersionFile = _nodePath.default.join(options.cwd, '.nvmrc');
-    const nodeVersion = (await _fsExtra.default.pathExists(nodeVersionFile)) ? (await _fsExtra.default.readFile(nodeVersionFile, 'utf-8')).trim() : '';
+    // .nvmrc
+    const nvmrcFile = _nodePath.default.join(options.cwd, '.nvmrc');
+    if (await _fsExtra.default.pathExists(nvmrcFile)) {
+      await _fsExtra.default.writeFile(distNvmrcFile, await _fsExtra.default.readFile(nvmrcFile));
+    }
 
     // 写入 pm2 配置
     await _fsExtra.default.writeFile(distPm2File, (0, _vtils.dedent)`
@@ -166,10 +169,6 @@ class BuildUtil {
           apps: [
             {
               name: ${JSON.stringify(pkgContent.name)},
-              ...(${JSON.stringify(nodeVersion ? {
-      interpreter: 'fnm',
-      interpreter_args: ['exec', '--using', nodeVersion, 'node']
-    } : {})}),
               script: './main.js',
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },

package/lib/_cjs/cli/deploy_util.js

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.DeployUtil = void 0;
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
-var _vtils = require("vtils");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _nodeSsh = require("node-ssh");
+var _vtils = require("vtils");
 class DeployUtil {
   static async deploy(options) {
     const pkgContent = await _fsExtra.default.readJson(_path.default.join(options.cwd, 'package.json'));
@@ -38,6 +38,7 @@ class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
+        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/_cjs/services/log.js

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.LogService = void 0;
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
-var _date = require("vtils/date");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _vtils = require("vtils");
+var _date = require("vtils/date");
 var _x = require("../x");
 class LogService {
   constructor() {
@@ -27,21 +27,25 @@ class LogService {
   get logFile() {
     return this.getLogFile(new Date());
   }
-  parseLogLineText(text) {
+  parseLogLineText(text, keys) {
     const [time, level, title, ...desc] = text.split(this.separator);
     return {
       time: time,
       level: level,
       title: title,
-      desc: desc.reduce((res, item) => {
-        const i = item.indexOf(':');
-        res[item.substring(0, i)] = item.substring(i + 1);
+      desc: desc.reduce((res, item, index) => {
+        if (keys) {
+          res[keys[index]] = item;
+        } else {
+          const i = item.indexOf(':');
+          res[item.substring(0, i)] = item.substring(i + 1);
+        }
         return res;
       }, {})
     };
   }
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...Object.keys(payload.desc || {}).map(key => `${key}:${payload.desc[key]}`)].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
+    this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
   }
   info(title, desc) {
     this.log({

package/lib/cli/build_util.js

@@ -15,6 +15,7 @@ export class BuildUtil {
     const tempDir = path.join(options.cwd, 'temp');
     const distMainFile = path.join(distDir, 'main.js');
     const distPkgFile = path.join(distDir, 'package.json');
+    const distNvmrcFile = path.join(distDir, '.nvmrc');
     const distPm2File = path.join(distDir, 'pm2.config.js');
     const distNoInstallFile = path.join(distDir, 'no_install.lock');
     const distBundleFile = path.join(tempDir, `app.${pkgContent.version}.tgz`);
@@ -150,9 +151,11 @@ export class BuildUtil {
     };
     await fs.writeJSON(distPkgFile, distPkgContent);
 
-    // Node 版本
-    const nodeVersionFile = path.join(options.cwd, '.nvmrc');
-    const nodeVersion = (await fs.pathExists(nodeVersionFile)) ? (await fs.readFile(nodeVersionFile, 'utf-8')).trim() : '';
+    // .nvmrc
+    const nvmrcFile = path.join(options.cwd, '.nvmrc');
+    if (await fs.pathExists(nvmrcFile)) {
+      await fs.writeFile(distNvmrcFile, await fs.readFile(nvmrcFile));
+    }
 
     // 写入 pm2 配置
     await fs.writeFile(distPm2File, dedent`
@@ -160,10 +163,6 @@ export class BuildUtil {
           apps: [
             {
               name: ${JSON.stringify(pkgContent.name)},
-              ...(${JSON.stringify(nodeVersion ? {
-      interpreter: 'fnm',
-      interpreter_args: ['exec', '--using', nodeVersion, 'node']
-    } : {})}),
               script: './main.js',
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },

package/lib/cli/deploy_util.js

@@ -1,7 +1,7 @@
-import fs from 'fs-extra';
 import path from 'path';
-import { dedent } from 'vtils';
+import fs from 'fs-extra';
 import { NodeSSH } from 'node-ssh';
+import { dedent } from 'vtils';
 export class DeployUtil {
   static async deploy(options) {
     const pkgContent = await fs.readJson(path.join(options.cwd, 'package.json'));
@@ -33,6 +33,7 @@ export class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
+        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/services/log.d.ts

@@ -1,9 +1,10 @@
 import { BaseService } from './base';
 export type LogServiceLevel = 'error' | 'info' | 'success';
+export type LogServiceDesc = Record<string, any> | any[];
 export type LogServicePayload = {
     level: LogServiceLevel;
     title: string;
-    desc?: Record<string, any>;
+    desc?: LogServiceDesc;
 };
 export type LogServicePayloadWithTime = LogServicePayload & {
     time: string;
@@ -14,11 +15,11 @@ export declare class LogService implements BaseService {
     getLogFile(date: Date): string;
     private get logFile();
     private getLogWriter;
-    parseLogLineText(text: string): LogServicePayloadWithTime;
+    parseLogLineText(text: string, keys?: string[]): LogServicePayloadWithTime;
     private log;
-    info(title: string, desc?: Record<string, any>): void;
-    success(title: string, desc?: Record<string, any>): void;
-    error(title: string, desc?: Record<string, any>): void;
+    info(title: string, desc?: LogServiceDesc): void;
+    success(title: string, desc?: LogServiceDesc): void;
+    error(title: string, desc?: LogServiceDesc): void;
 }
 declare module '../x' {
     interface X {

package/lib/services/log.js

@@ -1,7 +1,7 @@
-import fs from 'fs-extra';
 import path from 'path';
-import { formatDate } from 'vtils/date';
+import fs from 'fs-extra';
 import { memoize } from 'vtils';
+import { formatDate } from 'vtils/date';
 import { x } from "../x";
 export class LogService {
   constructor() {
@@ -22,21 +22,25 @@ export class LogService {
   get logFile() {
     return this.getLogFile(new Date());
   }
-  parseLogLineText(text) {
+  parseLogLineText(text, keys) {
     const [time, level, title, ...desc] = text.split(this.separator);
     return {
       time: time,
       level: level,
       title: title,
-      desc: desc.reduce((res, item) => {
-        const i = item.indexOf(':');
-        res[item.substring(0, i)] = item.substring(i + 1);
+      desc: desc.reduce((res, item, index) => {
+        if (keys) {
+          res[keys[index]] = item;
+        } else {
+          const i = item.indexOf(':');
+          res[item.substring(0, i)] = item.substring(i + 1);
+        }
         return res;
       }, {})
     };
   }
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...Object.keys(payload.desc || {}).map(key => `${key}:${payload.desc[key]}`)].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
+    this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
   }
   info(title, desc) {
     this.log({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.39.2",
+  "version": "2.40.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",