@jayfong/x-server 2.49.0 → 2.49.3

package/lib/_cjs/cli/build_util.js

@@ -29,7 +29,9 @@ class BuildUtil {
     await _fsExtra.default.ensureDir(tempDir);
 
     // 处理 external
-    const external = (0, _vtils.uniq)(options.external || []);
+    const external = (0, _vtils.uniq)([...(options.external || []),
+    // bull 始终作为外部依赖
+    'bull']);
     const externalWithVersions = (await Promise.all(external.map(async item => {
       try {
         // 为何不用 require.resolve:
@@ -91,17 +93,23 @@ class BuildUtil {
               loader: 'js'
             };
           });
-          build.onLoad({
-            filter: /\/bull\/lib\/commands\/index\.js$/
-          }, async args => {
-            let js = await _fsExtra.default.readFile(args.path, 'utf-8');
-            js = js.replace(/__dirname/g, '"./assets/bull/commands"');
-            await _fsExtra.default.copy(_nodePath.default.dirname(require.resolve('bull/lib/commands/index.js')), _nodePath.default.join(distDir, 'assets/bull/commands'));
-            return {
-              contents: js,
-              loader: 'js'
-            };
-          });
+
+          // build.onLoad(
+          //   { filter: /\/bull\/lib\/commands\/index\.js$/ },
+          //   async args => {
+          //     let js = await fs.readFile(args.path, 'utf-8');
+          //     js = js.replace(/__dirname/g, '"./assets/bull/commands"');
+          //     await fs.copy(
+          //       path.dirname(require.resolve('bull/lib/commands/index.js')),
+          //       path.join(distDir, 'assets/bull/commands'),
+          //     );
+          //     return {
+          //       contents: js,
+          //       loader: 'js',
+          //     };
+          //   },
+          // );
+
           build.onLoad({
             filter: /\/vm2\/lib\/vm\.js$/
           }, async args => {

package/lib/_cjs/core/handler.js

@@ -61,38 +61,47 @@ class Handler {
           throw new _http_error.HttpError.BadRequest(err.message);
         }
       }
-      let res = await this.options.handle(data, ctx);
-      if (res instanceof _http_redirect.HttpRedirect) {
-        ctx.redirect(res.url, res.permanently);
-        return {};
-      }
-
-      // 设置响应的 Content-Type 头
-      if (this.options.responseContentType) {
-        ctx.setHeader('Content-Type', this.options.responseContentType);
-      }
+      try {
+        let res = await this.options.handle(data, ctx);
+        if (res instanceof _http_redirect.HttpRedirect) {
+          ctx.redirect(res.url, res.permanently);
+          return {};
+        }
 
-      // 打包返回数据
-      if (this.options.responseDataPack) {
-        res = _vtils.DataPacker.packAsRawType(res);
-      }
+        // 设置响应的 Content-Type 头
+        if (this.options.responseContentType) {
+          ctx.setHeader('Content-Type', this.options.responseContentType);
+        }
 
-      // 混淆返回数据
-      if (this.options.responseDataObfuscate) {
-        res = {
-          '_#': _lzString.default.compress(JSON.stringify(res))
-        };
-      }
+        // 打包返回数据
+        if (this.options.responseDataPack) {
+          res = _vtils.DataPacker.packAsRawType(res);
+        }
 
-      // 加密返回数据
-      if (this.options.responseDataEncrypt && _server.Server.options.responseEncryptAlgorithm) {
-        if (_server.Server.options.responseEncryptAlgorithm === 'simple') {
+        // 混淆返回数据
+        if (this.options.responseDataObfuscate) {
           res = {
-            _$: (0, _vtils.rot13)((0, _vtils.base64UrlEncode)(`${Date.now()}${JSON.stringify(res)}`))
+            '_#': _lzString.default.compress(JSON.stringify(res))
           };
         }
+
+        // 加密返回数据
+        if (this.options.responseDataEncrypt && _server.Server.options.responseEncryptAlgorithm) {
+          if (_server.Server.options.responseEncryptAlgorithm === 'simple') {
+            res = {
+              _$: (0, _vtils.rot13)((0, _vtils.base64UrlEncode)(`${Date.now()}${JSON.stringify(res)}`))
+            };
+          }
+        }
+        return res == null ? {} : res;
+      } catch (err) {
+        // 业务错误
+        if (_http_error.HttpError.isHttpError(err)) {
+          throw err;
+        }
+        console.log('服务器错误', err);
+        throw new _http_error.HttpError.InternalServerError('服务器错误');
       }
-      return res == null ? {} : res;
     };
     this.handleWs = async (_data, ctx) => {
       const dispose = new _dispose.DisposeService();

package/lib/_cjs/core/http_header.js

@@ -19,7 +19,7 @@ ${'/'}**
 ${item.pascalName} = '${item.name}',
 `).join('\n\n')
 */
-let HttpRequestHeader = /*#__PURE__*/function (HttpRequestHeader) {
+let HttpRequestHeader = exports.HttpRequestHeader = /*#__PURE__*/function (HttpRequestHeader) {
   HttpRequestHeader["A_IM"] = "A-IM";
   HttpRequestHeader["ACCEPT"] = "Accept";
   HttpRequestHeader["ACCEPT_CHARSET"] = "Accept-Charset";
@@ -78,8 +78,7 @@ let HttpRequestHeader = /*#__PURE__*/function (HttpRequestHeader) {
   HttpRequestHeader["SAVE_DATA"] = "Save-Data";
   return HttpRequestHeader;
 }({});
-exports.HttpRequestHeader = HttpRequestHeader;
-let HttpResponseHeader = /*#__PURE__*/function (HttpResponseHeader) {
+let HttpResponseHeader = exports.HttpResponseHeader = /*#__PURE__*/function (HttpResponseHeader) {
   HttpResponseHeader["ACCESS_CONTROL_ALLOW_ORIGIN"] = "Access-Control-Allow-Origin";
   HttpResponseHeader["ACCESS_CONTROL_ALLOW_CREDENTIALS"] = "Access-Control-Allow-Credentials";
   HttpResponseHeader["ACCESS_CONTROL_EXPOSE_HEADERS"] = "Access-Control-Expose-Headers";
@@ -140,5 +139,4 @@ let HttpResponseHeader = /*#__PURE__*/function (HttpResponseHeader) {
   HttpResponseHeader["X_UA_COMPATIBLE"] = "X-UA-Compatible";
   HttpResponseHeader["X_XSS_PROTECTION"] = "X-XSS-Protection";
   return HttpResponseHeader;
-}({});
-exports.HttpResponseHeader = HttpResponseHeader;
+}({});

package/lib/_cjs/core/http_method.js

@@ -2,11 +2,10 @@
 
 exports.__esModule = true;
 exports.HandlerMethodToHttpMethod = void 0;
-const HandlerMethodToHttpMethod = {
+const HandlerMethodToHttpMethod = exports.HandlerMethodToHttpMethod = {
   GET: 'GET',
   POST: 'POST',
   FILE: 'POST',
   WS: 'GET',
   XML: 'POST'
-};
-exports.HandlerMethodToHttpMethod = HandlerMethodToHttpMethod;
+};

package/lib/_cjs/core/server.js

@@ -78,8 +78,7 @@ class Server {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
         const isWS = handlerMethod === 'WS';
-        const url = `${appUrl}${
-        // 结构：/test/sss?x=2
+        const url = `${appUrl}${// 结构：/test/sss?x=2
         path != null ? path : isWS ? res.url : req.url}`;
         if (isWS) {
           await item.handler.handle(undefined, {

package/lib/_cjs/core/types.js

@@ -2,15 +2,7 @@
 
 exports.__esModule = true;
 exports.XTask = exports.XServer = exports.XHandler = exports.XCron = void 0;
-let XServer;
-exports.XServer = XServer;
-(function (_XServer) {})(XServer || (exports.XServer = XServer = {}));
-let XHandler;
-exports.XHandler = XHandler;
-(function (_XHandler) {})(XHandler || (exports.XHandler = XHandler = {}));
-let XTask;
-exports.XTask = XTask;
-(function (_XTask) {})(XTask || (exports.XTask = XTask = {}));
-let XCron;
-exports.XCron = XCron;
-(function (_XCron) {})(XCron || (exports.XCron = XCron = {}));
+let XServer = exports.XServer = void 0;
+let XHandler = exports.XHandler = void 0;
+let XTask = exports.XTask = void 0;
+let XCron = exports.XCron = void 0;

package/lib/_cjs/x.js

@@ -10,7 +10,7 @@ var _dispose = require("./services/dispose");
 var _emoji = require("./services/emoji");
 var _log = require("./services/log");
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
-const x = {
+const x = exports.x = {
   appId: env.APP_ID,
   env: env,
   dataDir: _path.default.join(_os.default.homedir(), `.xs/${env.APP_ID}`),
@@ -21,7 +21,6 @@ const x = {
     }
   }
 };
-exports.x = x;
 _fsExtra.default.ensureDirSync(x.dataDir);
 x.register(new _dispose.DisposeService({
   disposeOnExit: true

package/lib/cli/build_util.js

@@ -23,7 +23,9 @@ export class BuildUtil {
     await fs.ensureDir(tempDir);
 
     // 处理 external
-    const external = uniq(options.external || []);
+    const external = uniq([...(options.external || []),
+    // bull 始终作为外部依赖
+    'bull']);
     const externalWithVersions = (await Promise.all(external.map(async item => {
       try {
         // 为何不用 require.resolve:
@@ -85,17 +87,23 @@ export class BuildUtil {
               loader: 'js'
             };
           });
-          build.onLoad({
-            filter: /\/bull\/lib\/commands\/index\.js$/
-          }, async args => {
-            let js = await fs.readFile(args.path, 'utf-8');
-            js = js.replace(/__dirname/g, '"./assets/bull/commands"');
-            await fs.copy(path.dirname(require.resolve('bull/lib/commands/index.js')), path.join(distDir, 'assets/bull/commands'));
-            return {
-              contents: js,
-              loader: 'js'
-            };
-          });
+
+          // build.onLoad(
+          //   { filter: /\/bull\/lib\/commands\/index\.js$/ },
+          //   async args => {
+          //     let js = await fs.readFile(args.path, 'utf-8');
+          //     js = js.replace(/__dirname/g, '"./assets/bull/commands"');
+          //     await fs.copy(
+          //       path.dirname(require.resolve('bull/lib/commands/index.js')),
+          //       path.join(distDir, 'assets/bull/commands'),
+          //     );
+          //     return {
+          //       contents: js,
+          //       loader: 'js',
+          //     };
+          //   },
+          // );
+
           build.onLoad({
             filter: /\/vm2\/lib\/vm\.js$/
           }, async args => {

package/lib/core/define_bus.js

@@ -21,5 +21,7 @@ export function defineBus() {
 // Unfortunately, this has the result of giving a poor error message when
 // you mix up types.
 // 0: https://github.com/Microsoft/TypeScript/issues/26013)
+
 // TODO: Stash under a symbol key once TS compiler bug is fixed
+
 // EventEmitter method overrides

package/lib/core/handler.js

@@ -55,38 +55,47 @@ export class Handler {
           throw new HttpError.BadRequest(err.message);
         }
       }
-      let res = await this.options.handle(data, ctx);
-      if (res instanceof HttpRedirect) {
-        ctx.redirect(res.url, res.permanently);
-        return {};
-      }
-
-      // 设置响应的 Content-Type 头
-      if (this.options.responseContentType) {
-        ctx.setHeader('Content-Type', this.options.responseContentType);
-      }
+      try {
+        let res = await this.options.handle(data, ctx);
+        if (res instanceof HttpRedirect) {
+          ctx.redirect(res.url, res.permanently);
+          return {};
+        }
 
-      // 打包返回数据
-      if (this.options.responseDataPack) {
-        res = DataPacker.packAsRawType(res);
-      }
+        // 设置响应的 Content-Type 头
+        if (this.options.responseContentType) {
+          ctx.setHeader('Content-Type', this.options.responseContentType);
+        }
 
-      // 混淆返回数据
-      if (this.options.responseDataObfuscate) {
-        res = {
-          '_#': LZString.compress(JSON.stringify(res))
-        };
-      }
+        // 打包返回数据
+        if (this.options.responseDataPack) {
+          res = DataPacker.packAsRawType(res);
+        }
 
-      // 加密返回数据
-      if (this.options.responseDataEncrypt && Server.options.responseEncryptAlgorithm) {
-        if (Server.options.responseEncryptAlgorithm === 'simple') {
+        // 混淆返回数据
+        if (this.options.responseDataObfuscate) {
           res = {
-            _$: rot13(base64UrlEncode(`${Date.now()}${JSON.stringify(res)}`))
+            '_#': LZString.compress(JSON.stringify(res))
           };
         }
+
+        // 加密返回数据
+        if (this.options.responseDataEncrypt && Server.options.responseEncryptAlgorithm) {
+          if (Server.options.responseEncryptAlgorithm === 'simple') {
+            res = {
+              _$: rot13(base64UrlEncode(`${Date.now()}${JSON.stringify(res)}`))
+            };
+          }
+        }
+        return res == null ? {} : res;
+      } catch (err) {
+        // 业务错误
+        if (HttpError.isHttpError(err)) {
+          throw err;
+        }
+        console.log('服务器错误', err);
+        throw new HttpError.InternalServerError('服务器错误');
       }
-      return res == null ? {} : res;
     };
     this.handleWs = async (_data, ctx) => {
       const dispose = new DisposeService();

package/lib/core/server.js

@@ -72,8 +72,7 @@ export class Server {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
         const isWS = handlerMethod === 'WS';
-        const url = `${appUrl}${
-        // 结构：/test/sss?x=2
+        const url = `${appUrl}${// 结构：/test/sss?x=2
         path != null ? path : isWS ? res.url : req.url}`;
         if (isWS) {
           await item.handler.handle(undefined, {

package/lib/core/types.js

@@ -1,8 +1,4 @@
 export let XServer;
-(function (_XServer) {})(XServer || (XServer = {}));
 export let XHandler;
-(function (_XHandler) {})(XHandler || (XHandler = {}));
 export let XTask;
-(function (_XTask) {})(XTask || (XTask = {}));
-export let XCron;
-(function (_XCron) {})(XCron || (XCron = {}));
+export let XCron;

package/package.json

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