@jayfong/x-server 2.70.0 → 2.72.0

package/lib/_cjs/cli/build_util.js

@@ -16,8 +16,8 @@ class BuildUtil {
     const mainFile = _nodePath.default.join(options.cwd, 'src/main.ts');
     const pkgFile = _nodePath.default.join(options.cwd, 'package.json');
     const pkgContent = await _fsExtra.default.readJson(pkgFile);
-    const distDir = _nodePath.default.join(options.cwd, 'dist');
-    const tempDir = _nodePath.default.join(options.cwd, 'temp');
+    const distDir = _nodePath.default.join(options.cwd, options.channel ? `dist/${options.channel}` : 'dist');
+    const tempDir = _nodePath.default.join(options.cwd, options.channel ? `temp/${options.channel}` : 'temp');
     const distMainFile = _nodePath.default.join(distDir, 'main.js');
     const distPkgFile = _nodePath.default.join(distDir, 'package.json');
     const distNvmrcFile = _nodePath.default.join(distDir, '.nvmrc');

package/lib/_cjs/cli/cli.js

@@ -50,7 +50,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   await _template_util.TemplateUtil.init(process.cwd());
   const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
   const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = _chokidar.default.watch(['src', '.env', '.env.*'], {
+  const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
     cwd: process.cwd(),
     ignored: ['**/*.test.*', ...xsignoreContent]
   });
@@ -124,7 +124,8 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     external: externals,
     inlineEnvs: envMap,
     minify: argv.minify,
-    noInstall: argv['no-install']
+    noInstall: argv['no-install'],
+    channel: argv.channel
   });
   console.log('构建成功');
 }).command('api', '生成 API', _ => _.positional('channel', {
@@ -230,6 +231,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       host: deployEnv.HOST,
       user: deployEnv.USER,
       key: deployEnv.KEY,
+      pass: deployEnv.PASSWORD,
       token: appEnv.APP_TOKEN,
       port: appEnv.APP_PORT,
       env: appEnv
@@ -240,10 +242,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       host: deployEnv.HOST,
       user: deployEnv.USER,
       key: deployEnv.KEY,
+      pass: deployEnv.PASSWORD,
       dir: deployEnv.DIR,
       cmd: deployEnv.CMD,
       memory: deployEnv.MEMORY,
-      cron: deployEnv.CRON
+      cron: deployEnv.CRON,
+      channel: argv.channel
     });
   }
 }).parse();

package/lib/_cjs/cli/deploy_util.js

@@ -10,7 +10,7 @@ var _vtils = require("vtils");
 class DeployUtil {
   static async deploy(options) {
     const pkgContent = await _fsExtra.default.readJson(_path.default.join(options.cwd, 'package.json'));
-    const appFile = _path.default.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
+    const appFile = _path.default.join(options.cwd, `temp${options.channel ? `/${options.channel}` : ''}/app.${pkgContent.version}.tgz`);
     if (!(await _fsExtra.default.pathExists(appFile))) {
       throw new Error('请先构建');
     }
@@ -18,7 +18,8 @@ class DeployUtil {
     await ssh.connect({
       host: options.host,
       username: options.user,
-      privateKey: options.key
+      privateKey: options.key,
+      password: options.pass
     });
     const appName = pkgContent.name;
     const appDir = `./${appName}`;
@@ -52,7 +53,8 @@ class DeployUtil {
     await ssh.connect({
       host: options.host,
       username: options.user,
-      privateKey: options.key
+      privateKey: options.key,
+      password: options.pass
     });
     await ssh.execCommand((0, _vtils.dedent)`
         set -ex

package/lib/cli/build_util.d.ts

@@ -4,6 +4,7 @@ export interface BuildOptions {
     inlineEnvs?: Record<string, any>;
     minify?: boolean;
     noInstall?: boolean;
+    channel?: string;
 }
 export declare class BuildUtil {
     static build(options: BuildOptions): Promise<void>;

package/lib/cli/build_util.js

@@ -10,8 +10,8 @@ export class BuildUtil {
     const mainFile = path.join(options.cwd, 'src/main.ts');
     const pkgFile = path.join(options.cwd, 'package.json');
     const pkgContent = await fs.readJson(pkgFile);
-    const distDir = path.join(options.cwd, 'dist');
-    const tempDir = path.join(options.cwd, 'temp');
+    const distDir = path.join(options.cwd, options.channel ? `dist/${options.channel}` : 'dist');
+    const tempDir = path.join(options.cwd, options.channel ? `temp/${options.channel}` : 'temp');
     const distMainFile = path.join(distDir, 'main.js');
     const distPkgFile = path.join(distDir, 'package.json');
     const distNvmrcFile = path.join(distDir, '.nvmrc');

package/lib/cli/cli.js

@@ -47,7 +47,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   await TemplateUtil.init(process.cwd());
   const xsignoreFile = path.join(process.cwd(), '.xsignore');
   const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = chokidar.watch(['src', '.env', '.env.*'], {
+  const watcher = chokidar.watch(['src', '.env', '.env*'], {
     cwd: process.cwd(),
     ignored: ['**/*.test.*', ...xsignoreContent]
   });
@@ -121,7 +121,8 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     external: externals,
     inlineEnvs: envMap,
     minify: argv.minify,
-    noInstall: argv['no-install']
+    noInstall: argv['no-install'],
+    channel: argv.channel
   });
   console.log('构建成功');
 }).command('api', '生成 API', _ => _.positional('channel', {
@@ -227,6 +228,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       host: deployEnv.HOST,
       user: deployEnv.USER,
       key: deployEnv.KEY,
+      pass: deployEnv.PASSWORD,
       token: appEnv.APP_TOKEN,
       port: appEnv.APP_PORT,
       env: appEnv
@@ -237,10 +239,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       host: deployEnv.HOST,
       user: deployEnv.USER,
       key: deployEnv.KEY,
+      pass: deployEnv.PASSWORD,
       dir: deployEnv.DIR,
       cmd: deployEnv.CMD,
       memory: deployEnv.MEMORY,
-      cron: deployEnv.CRON
+      cron: deployEnv.CRON,
+      channel: argv.channel
     });
   }
 }).parse();

package/lib/cli/deploy_util.d.ts

@@ -2,16 +2,19 @@ export interface DeployOptions {
     cwd: string;
     host: string;
     user: string;
-    key: string;
+    key?: string;
+    pass?: string;
     dir: string;
     memory?: string;
     cron?: string;
     cmd?: string;
+    channel?: string;
 }
 export interface DeployEnvOptions {
     host: string;
     user: string;
-    key: string;
+    key?: string;
+    pass?: string;
     port: number;
     token: string;
     env: Record<string, any>;

package/lib/cli/deploy_util.js

@@ -5,7 +5,7 @@ import { dedent } from 'vtils';
 export class DeployUtil {
   static async deploy(options) {
     const pkgContent = await fs.readJson(path.join(options.cwd, 'package.json'));
-    const appFile = path.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
+    const appFile = path.join(options.cwd, `temp${options.channel ? `/${options.channel}` : ''}/app.${pkgContent.version}.tgz`);
     if (!(await fs.pathExists(appFile))) {
       throw new Error('请先构建');
     }
@@ -13,7 +13,8 @@ export class DeployUtil {
     await ssh.connect({
       host: options.host,
       username: options.user,
-      privateKey: options.key
+      privateKey: options.key,
+      password: options.pass
     });
     const appName = pkgContent.name;
     const appDir = `./${appName}`;
@@ -47,7 +48,8 @@ export class DeployUtil {
     await ssh.connect({
       host: options.host,
       username: options.user,
-      privateKey: options.key
+      privateKey: options.key,
+      password: options.pass
     });
     await ssh.execCommand(dedent`
         set -ex

package/package.json

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