@jayfong/x-server 1.33.7 → 1.33.9

package/lib/_cjs/cli/build_util.js

@@ -41,6 +41,8 @@ class BuildUtil {
 
     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`);
 
     await _fsExtra.default.ensureDir(distDir);
@@ -160,17 +162,25 @@ class BuildUtil {
             },
           ],
         }
-      `); // 安装 external 依赖
-
-    await (0, _execa.default)('tyn', {
-      cwd: distDir,
-      stdio: 'inherit',
-      env: {
-        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
-        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
-        yarn_disable_self_update_check: 'true'
+      `);
+
+    if (externalWithVersions.length) {
+      if (options.noInstall) {
+        await _fsExtra.default.writeFile(distNoInstallFile, '');
+      } else {
+        // 安装 external 依赖
+        await (0, _execa.default)('tyn', {
+          cwd: distDir,
+          stdio: 'inherit',
+          env: {
+            // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+            // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+            yarn_disable_self_update_check: 'true'
+          }
+        });
       }
-    }); // 打包为 tgz
+    } // 打包为 tgz
+
 
     await _compressing.default.tgz.compressDir(distDir, distBundleFile);
   }

package/lib/_cjs/cli/cli.js

@@ -96,6 +96,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
+}).positional('no-install', {
+  alias: 'n',
+  describe: '是否不本地安装外部依赖',
+  type: 'boolean',
+  default: false
 }), async argv => {
   process.env.NODE_ENV = 'production';
   const envs = await _env_util.EnvUtil.parseFile({
@@ -120,7 +125,8 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     cwd: process.cwd(),
     external: argv.external,
     inlineEnvs: envs,
-    minify: argv.minify
+    minify: argv.minify,
+    noInstall: argv['no-install']
   });
   console.log('构建成功');
 }).command('api', '生成 API', async () => {

package/lib/_cjs/cli/deploy_util.js

@@ -47,6 +47,7 @@ class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/lib/_cjs/core/handler.js

@@ -84,17 +84,28 @@ class Handler {
           const process = async (type, fn) => {
             if (_.type === type) {
               let sent = false;
-              await fn({
-                data: _.data,
-                send: (...args) => {
-                  sent = true;
-                  return send(...args);
-                },
-                dispose: dispose
-              });
-
-              if (!sent) {
-                send();
+
+              try {
+                await fn({
+                  data: _.data,
+                  send: data => {
+                    sent = true;
+                    return send(data);
+                  },
+                  dispose: dispose
+                });
+
+                if (!sent) {
+                  send();
+                }
+              } catch (err) {
+                const _err = _http_error.HttpError.isHttpError(err) ? err : new _http_error.HttpError.InternalServerError();
+
+                send({
+                  statusCode: _err.statusCode,
+                  error: _err.name,
+                  message: _err.message
+                });
               }
             }
           };

package/lib/cli/build_util.d.ts

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

package/lib/cli/build_util.js

@@ -18,6 +18,7 @@ export class BuildUtil {
     const distMainFile = path.join(distDir, 'main.js');
     const distPkgFile = path.join(distDir, 'package.json');
     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`);
     await fs.ensureDir(distDir);
     await fs.ensureDir(tempDir); // 处理 external
@@ -134,17 +135,25 @@ export class BuildUtil {
             },
           ],
         }
-      `); // 安装 external 依赖
-
-    await exec('tyn', {
-      cwd: distDir,
-      stdio: 'inherit',
-      env: {
-        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
-        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
-        yarn_disable_self_update_check: 'true'
+      `);
+
+    if (externalWithVersions.length) {
+      if (options.noInstall) {
+        await fs.writeFile(distNoInstallFile, '');
+      } else {
+        // 安装 external 依赖
+        await exec('tyn', {
+          cwd: distDir,
+          stdio: 'inherit',
+          env: {
+            // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+            // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+            yarn_disable_self_update_check: 'true'
+          }
+        });
       }
-    }); // 打包为 tgz
+    } // 打包为 tgz
+
 
     await compressing.tgz.compressDir(distDir, distBundleFile);
   }

package/lib/cli/cli.js

@@ -78,6 +78,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
+}).positional('no-install', {
+  alias: 'n',
+  describe: '是否不本地安装外部依赖',
+  type: 'boolean',
+  default: false
 }), async argv => {
   process.env.NODE_ENV = 'production';
   const envs = await EnvUtil.parseFile({
@@ -102,7 +107,8 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     cwd: process.cwd(),
     external: argv.external,
     inlineEnvs: envs,
-    minify: argv.minify
+    minify: argv.minify,
+    noInstall: argv['no-install']
   });
   console.log('构建成功');
 }).command('api', '生成 API', async () => {

package/lib/cli/deploy_util.js

@@ -35,6 +35,7 @@ export class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/lib/core/handler.js

@@ -72,17 +72,28 @@ export class Handler {
           const process = async (type, fn) => {
             if (_.type === type) {
               let sent = false;
-              await fn({
-                data: _.data,
-                send: (...args) => {
-                  sent = true;
-                  return send(...args);
-                },
-                dispose: dispose
-              });
-
-              if (!sent) {
-                send();
+
+              try {
+                await fn({
+                  data: _.data,
+                  send: data => {
+                    sent = true;
+                    return send(data);
+                  },
+                  dispose: dispose
+                });
+
+                if (!sent) {
+                  send();
+                }
+              } catch (err) {
+                const _err = HttpError.isHttpError(err) ? err : new HttpError.InternalServerError();
+
+                send({
+                  statusCode: _err.statusCode,
+                  error: _err.name,
+                  message: _err.message
+                });
               }
             }
           };

package/package.json

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