@jayfong/x-server 2.58.1 → 2.59.0

package/lib/_cjs/core/handler.js

@@ -26,11 +26,15 @@ class Handler {
       if (Handler.hooks.length) {
         await Promise.all(Handler.hooks.map(hook => hook(this.options, data, ctx)));
       }
+      let useAsyncContext = _server.Server.options.useAsyncContext !== false;
+      if (this.options.useAsyncContext != null) {
+        useAsyncContext = this.options.useAsyncContext;
+      }
       ctx.setHeader('x-trace-id', ctx.traceId);
       if (this.options.requestMethod === 'WS') {
-        return _ctx_storage.ctxStorage.run(ctx, () => this.handleWs(data, ctx));
+        return useAsyncContext ? _ctx_storage.ctxStorage.run(ctx, () => this.handleWs(data, ctx)) : this.handleWs(data, ctx);
       }
-      return _ctx_storage.ctxStorage.run(ctx, () => this.handleHttp(data, ctx));
+      return useAsyncContext ? _ctx_storage.ctxStorage.run(ctx, () => this.handleHttp(data, ctx)) : this.handleHttp(data, ctx);
     };
     this.handleHttp = async (data, ctx) => {
       // 请求数据解析

package/lib/_cjs/core/server.js

@@ -16,6 +16,9 @@ class Server {
     this.options = options;
     this.fastify = void 0;
     this.routes = [];
+    if (options.useAsyncContext == null) {
+      options.useAsyncContext = true;
+    }
     Server.options = options;
     _nodeProcess.default.on('unhandledRejection', (reason, promise) => {
       console.error('未捕获的错误', reason, promise);

package/lib/core/handler.js

@@ -20,11 +20,15 @@ export class Handler {
       if (Handler.hooks.length) {
         await Promise.all(Handler.hooks.map(hook => hook(this.options, data, ctx)));
       }
+      let useAsyncContext = Server.options.useAsyncContext !== false;
+      if (this.options.useAsyncContext != null) {
+        useAsyncContext = this.options.useAsyncContext;
+      }
       ctx.setHeader('x-trace-id', ctx.traceId);
       if (this.options.requestMethod === 'WS') {
-        return ctxStorage.run(ctx, () => this.handleWs(data, ctx));
+        return useAsyncContext ? ctxStorage.run(ctx, () => this.handleWs(data, ctx)) : this.handleWs(data, ctx);
       }
-      return ctxStorage.run(ctx, () => this.handleHttp(data, ctx));
+      return useAsyncContext ? ctxStorage.run(ctx, () => this.handleHttp(data, ctx)) : this.handleHttp(data, ctx);
     };
     this.handleHttp = async (data, ctx) => {
       // 请求数据解析

package/lib/core/server.js

@@ -10,6 +10,9 @@ export class Server {
     this.options = options;
     this.fastify = void 0;
     this.routes = [];
+    if (options.useAsyncContext == null) {
+      options.useAsyncContext = true;
+    }
     Server.options = options;
     process.on('unhandledRejection', (reason, promise) => {
       console.error('未捕获的错误', reason, promise);

package/lib/core/types.d.ts

@@ -44,6 +44,12 @@ export declare namespace XServer {
          * 响应加密密钥
          */
         responseEncryptKey?: string;
+        /**
+         * 是否使用异步上下文
+         *
+         * @default true
+         */
+        useAsyncContext?: boolean;
         /**
          * 透传给 Fastify 的选项
          */
@@ -158,6 +164,12 @@ export declare namespace XHandler {
          * 请求数据验证结构(vae)
          */
         requestDataSchemaVae?: vae.VaeSchemaOf<TReqData> | ((_: vae.VaeSchemaBuilder<TReqData>) => vae.VaeSchemaOf<TReqData> | vae.VaeObjectSchemaShapeOf<TReqData>);
+        /**
+         * 是否使用异步上下文
+         *
+         * @default 默认为服务的设置
+         */
+        useAsyncContext?: boolean;
         /**
          * 处理器
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.58.1",
+  "version": "2.59.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,7 +9,9 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": ["lib"],
+  "files": [
+    "lib"
+  ],
   "scripts": {
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -24,7 +26,7 @@
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
-    "@prisma/client": "^5.8.0",
+    "@prisma/client": "^6.0.1",
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^1.8.2",
     "@types/jsonwebtoken": "^8.5.8",
@@ -58,7 +60,7 @@
     "nodemailer": "^6.7.3",
     "pino-pretty": "^10.0.1",
     "pirates": "^4.0.6",
-    "prisma": "^5.8.0",
+    "prisma": "^6.0.1",
     "select-run": "^1.1.2",
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",