@jayfong/x-server 1.32.0 → 1.33.1

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.33.1](https://github.com/jfWorks/x-server/compare/v1.33.0...v1.33.1) (2022-06-12)
+
+## [1.33.0](https://github.com/jfWorks/x-server/compare/v1.32.1...v1.33.0) (2022-06-11)
+
+
+### Features
+
+* defineTask concurrency ([d8174aa](https://github.com/jfWorks/x-server/commit/d8174aa302e9013610d41265d937512a02412359))
+
+### [1.32.1](https://github.com/jfWorks/x-server/compare/v1.32.0...v1.32.1) (2022-06-02)
+
+
+### Bug Fixes
+
+* trustProxy: true ([b116aaa](https://github.com/jfWorks/x-server/commit/b116aaac3dd90364d5aaf939bf66e50a6911aad2))
+
 ## [1.32.0](https://github.com/jfWorks/x-server/compare/v1.31.3...v1.32.0) (2022-05-31)
 
 

package/lib/_cjs/cli/templates/models.ts

@@ -1,11 +1,11 @@
 import { x, HttpError } from '@jayfong/x-server'
 import { PrismaClient } from '@prisma/client'
 
-const prisma = new PrismaClient({
+export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
 })
 
-x.dispose.add(() => prisma.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect())
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
@@ -14,7 +14,7 @@ type ModelName =
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prisma[name]
+    public query = prismaClient[name]
   }
 }
 

package/lib/_cjs/core/define_task.js

@@ -18,7 +18,7 @@ function defineTask(options) {
     },
     prefix: `${_x.x.appId}_task`
   });
-  queue.process(async job => {
+  queue.process(options.concurrency || 1, async job => {
     return options.handle(job.data);
   });
   return queue;

package/lib/_cjs/core/server.js

@@ -46,6 +46,9 @@ class Server {
       logger: process.env.NODE_ENV === 'development' ? {
         prettyPrint: true
       } : false,
+      // 信任 X-Forwarded-For 头以获取正确的 IP，
+      // 否则通过 nginx 代理后 remoteAddr 将始终为 127.0.0.1
+      trustProxy: true,
       ...this.options.fastifyOptions
     });
   }

package/lib/cli/templates/models.ts

@@ -1,11 +1,11 @@
 import { x, HttpError } from '@jayfong/x-server'
 import { PrismaClient } from '@prisma/client'
 
-const prisma = new PrismaClient({
+export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
 })
 
-x.dispose.add(() => prisma.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect())
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
@@ -14,7 +14,7 @@ type ModelName =
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prisma[name]
+    public query = prismaClient[name]
   }
 }
 

package/lib/core/define_task.js

@@ -9,7 +9,7 @@ export function defineTask(options) {
     },
     prefix: `${x.appId}_task`
   });
-  queue.process(async job => {
+  queue.process(options.concurrency || 1, async job => {
     return options.handle(job.data);
   });
   return queue;

package/lib/core/server.js

@@ -33,6 +33,9 @@ export class Server {
       logger: process.env.NODE_ENV === 'development' ? {
         prettyPrint: true
       } : false,
+      // 信任 X-Forwarded-For 头以获取正确的 IP，
+      // 否则通过 nginx 代理后 remoteAddr 将始终为 127.0.0.1
+      trustProxy: true,
       ...this.options.fastifyOptions
     });
   }

package/lib/core/types.d.ts

@@ -139,6 +139,12 @@ export declare namespace XTask {
          * 任务名称
          */
         name: string;
+        /**
+         * 并发数量
+         *
+         * @default 1
+         */
+        concurrency?: number;
         /**
          * 处理器
          */

package/package.json

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