Merge branch 'main' into support_v3_logger

.github/workflows/benchmark.yml

@@ -22,9 +22,9 @@ jobs:
         node-version: ['lts/*']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Cache

.github/workflows/nodejs.yml

@@ -82,10 +82,10 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 

.github/workflows/precheck.yml

@@ -73,10 +73,10 @@ jobs:
 
     steps:
     - name: Git checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/presite.yml

@@ -19,9 +19,9 @@ jobs:
       matrix:
         node-version: [ 16.x ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

.github/workflows/site.yml

@@ -19,9 +19,9 @@ jobs:
         node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

CHANGELOG.md

@@ -1,6 +1,55 @@
 # Change Log
 
 
+## v3.12.10 (2023-11-05)
+
+#### :package: Dependencies
+* `axios`, `http-proxy`
+  * [#3400](https://github.com/midwayjs/midway/pull/3400) fix(deps): update dependency axios to v1.6.0 ([@renovate[bot]](https://github.com/apps/renovate))
+* Other
+  * [#3398](https://github.com/midwayjs/midway/pull/3398) chore(deps): update actions/checkout action to v4 ([@renovate[bot]](https://github.com/apps/renovate))
+  * [#3399](https://github.com/midwayjs/midway/pull/3399) chore(deps): update actions/setup-node action to v4 ([@renovate[bot]](https://github.com/apps/renovate))
+* `bull-board`, `bull`
+  * [#3397](https://github.com/midwayjs/midway/pull/3397) fix(deps): update bull monorepo ([@renovate[bot]](https://github.com/apps/renovate))
+* `mock`, `ws`
+  * [#3395](https://github.com/midwayjs/midway/pull/3395) fix(deps): update dependency ws to v8.14.2 ([@renovate[bot]](https://github.com/apps/renovate))
+* `casbin-redis-adapter`, `casbin-typeorm-adapter`, `casbin`
+  * [#3392](https://github.com/midwayjs/midway/pull/3392) fix(deps): update dependency casbin to v5.27.1 ([@renovate[bot]](https://github.com/apps/renovate))
+* `leoric`
+  * [#3396](https://github.com/midwayjs/midway/pull/3396) fix(deps): update dependency leoric to v2.11.5 ([@renovate[bot]](https://github.com/apps/renovate))
+* `cron`
+  * [#3393](https://github.com/midwayjs/midway/pull/3393) fix(deps): update dependency cron to v2.4.4 ([@renovate[bot]](https://github.com/apps/renovate))
+* `validate`
+  * [#3394](https://github.com/midwayjs/midway/pull/3394) fix(deps): update dependency joi to v17.11.0 ([@renovate[bot]](https://github.com/apps/renovate))
+* `jwt`
+  * [#3384](https://github.com/midwayjs/midway/pull/3384) fix(deps): update dependency @types/jsonwebtoken to v9.0.4 ([@renovate[bot]](https://github.com/apps/renovate))
+* `cos`
+  * [#3385](https://github.com/midwayjs/midway/pull/3385) fix(deps): update dependency cos-nodejs-sdk-v5 to v2.12.5 ([@renovate[bot]](https://github.com/apps/renovate))
+
+#### Committers: 1
+- Harry Chen ([@czy88840616](https://github.com/czy88840616))
+
+
+
+## v3.12.9 (2023-11-02)
+
+#### :bug: Bug Fix
+* `swagger`
+  * [#3382](https://github.com/midwayjs/midway/pull/3382) fix(swagger): api property should support $ref ([@odex21](https://github.com/odex21))
+
+#### :package: Dependencies
+* `axios`, `consul`
+  * [#3373](https://github.com/midwayjs/midway/pull/3373) chore(deps): update dependency nock to v13.3.7 ([@renovate[bot]](https://github.com/apps/renovate))
+* `mongoose`, `typegoose`
+  * [#3375](https://github.com/midwayjs/midway/pull/3375) chore(deps): update dependency mongoose to v7.6.4 ([@renovate[bot]](https://github.com/apps/renovate))
+* `oss`
+  * [#3364](https://github.com/midwayjs/midway/pull/3364) fix(deps): update dependency @types/ali-oss to v6.16.10 ([@renovate[bot]](https://github.com/apps/renovate))
+
+#### Committers: 1
+- [@odex21](https://github.com/odex21)
+
+
+
 ## v3.12.8 (2023-10-25)
 
 #### :bug: Bug Fix

lerna.json

@@ -47,5 +47,5 @@
     "cacheDir": ".changelog"
   },
   "npmClient": "npm",
-  "version": "3.12.8"
+  "version": "3.12.10"
 }

package.json

@@ -4,12 +4,12 @@
   "version": "1.0.0",
   "devDependencies": {
     "@nrwl/tao": "16.10.0",
-    "@types/jest": "29.5.6",
-    "@types/node": "18.18.7",
+    "@types/jest": "29.5.8",
+    "@types/node": "18.18.9",
     "@vercel/ncc": "0.38.1",
     "autocannon": "7.12.0",
     "jest": "29.7.0",
-    "lerna": "7.4.1",
+    "lerna": "7.4.2",
     "lerna-changelog": "2.2.0",
     "madge": "6.1.0",
     "mwts": "1.3.0",

packages-legacy/egg-layer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/egg-layer",
   "private": true,
-  "version": "3.12.8",
+  "version": "3.12.10",
   "main": "index.js",
   "scripts": {
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit"
@@ -17,7 +17,7 @@
     "@midwayjs/serverless-fc-trigger": "^3.12.5",
     "@midwayjs/serverless-scf-starter": "^3.12.5",
     "@midwayjs/serverless-scf-trigger": "^3.12.5",
-    "@midwayjs/web": "^3.12.8",
+    "@midwayjs/web": "^3.12.10",
     "egg": "^2.28.0",
     "supertest": "6.3.3"
   },

packages-legacy/koa-layer/package.json

@@ -16,7 +16,7 @@
     "@midwayjs/serverless-fc-trigger": "^3.12.5",
     "@midwayjs/serverless-scf-starter": "^3.12.5",
     "@midwayjs/serverless-scf-trigger": "^3.12.5",
-    "koa": "2.14.1",
+    "koa": "2.14.2",
     "koa-bodyparser": "4.4.1",
     "koa-router": "11.0.2",
     "supertest": "6.3.3"

packages-legacy/orm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/orm",
   "private": true,
-  "version": "3.12.8",
+  "version": "3.12.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,7 +11,7 @@
   ],
   "devDependencies": {
     "@midwayjs/core": "^3.12.3",
-    "@midwayjs/mock": "^3.12.8",
+    "@midwayjs/mock": "^3.12.10",
     "sqlite3": "5.1.6",
     "typeorm": "0.3.17"
   },

packages-legacy/serverless-app/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@midwayjs/serverless-app",
   "private": true,
-  "version": "3.12.8",
+  "version": "3.12.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "dependencies": {
     "@midwayjs/bootstrap": "^3.12.5",
-    "@midwayjs/faas": "^3.12.8",
+    "@midwayjs/faas": "^3.12.10",
     "@midwayjs/faas-typings": "^3.10.13",
     "@midwayjs/gateway-common-http": "^1.2.41",
     "@midwayjs/serverless-spec-builder": "^1.2.41",
@@ -17,7 +17,7 @@
     "@midwayjs/core": "^3.12.3",
     "@midwayjs/decorator": "^3.12.3",
     "@midwayjs/faas-middleware-upload": "0.0.7",
-    "@midwayjs/mock": "^3.12.8",
+    "@midwayjs/mock": "^3.12.10",
     "@midwayjs/serverless-fc-starter": "^3.12.5",
     "@midwayjs/serverless-fc-trigger": "^3.12.5",
     "@midwayjs/serverless-scf-starter": "^3.12.5",

packages-legacy/static-layer/package.json

@@ -14,7 +14,7 @@
     "@midwayjs/serverless-fc-trigger": "^3.12.5",
     "@midwayjs/serverless-scf-starter": "^3.12.5",
     "@midwayjs/serverless-scf-trigger": "^3.12.5",
-    "koa": "2.14.1",
+    "koa": "2.14.2",
     "koa-static-cache": "5.1.4",
     "path-to-regexp": "6.2.1",
     "request": "2.88.2",

packages-legacy/task/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/task",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "private": true,
   "description": "midway component for task and schedule",
   "main": "dist/index.js",
@@ -24,14 +24,14 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.12.3",
-    "@midwayjs/koa": "^3.12.8",
-    "@midwayjs/mock": "^3.12.8",
+    "@midwayjs/koa": "^3.12.10",
+    "@midwayjs/mock": "^3.12.10",
     "@types/bull": "3.15.9",
     "@types/cron": "2.0.1"
   },
   "dependencies": {
-    "bull": "4.11.3",
-    "cron": "2.3.1"
+    "bull": "4.11.4",
+    "cron": "2.4.4"
   },
   "engines": {
     "node": ">=12"

packages-serverless/midway-fc-starter/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@midwayjs/fc-starter",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "dependencies": {
     "@midwayjs/async-hooks-context-manager": "^3.12.3",
-    "@midwayjs/faas": "^3.12.8",
+    "@midwayjs/faas": "^3.12.10",
     "raw-body": "2.5.2"
   },
   "devDependencies": {

packages/axios/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/axios",
   "description": "midway http client with axios",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,11 +11,11 @@
   ],
   "devDependencies": {
     "@midwayjs/core": "^3.12.3",
-    "@midwayjs/mock": "^3.12.8",
-    "nock": "13.3.6"
+    "@midwayjs/mock": "^3.12.10",
+    "nock": "13.3.8"
   },
   "dependencies": {
-    "axios": "1.5.1"
+    "axios": "1.6.1"
   },
   "keywords": [
     "http client",

packages/bull-board/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull-board",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -25,14 +25,14 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.12.3",
-    "@midwayjs/express": "^3.12.8",
-    "@midwayjs/koa": "^3.12.8",
-    "@midwayjs/mock": "^3.12.8"
+    "@midwayjs/express": "^3.12.10",
+    "@midwayjs/koa": "^3.12.10",
+    "@midwayjs/mock": "^3.12.10"
   },
   "dependencies": {
-    "@bull-board/api": "5.8.4",
-    "@bull-board/ui": "5.8.4",
-    "@midwayjs/bull": "^3.12.8",
+    "@bull-board/api": "5.9.1",
+    "@bull-board/ui": "5.9.1",
+    "@midwayjs/bull": "^3.12.10",
     "ejs": "3.1.9"
   },
   "engines": {

packages/bull/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -25,10 +25,10 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.12.3",
-    "@midwayjs/mock": "^3.12.8"
+    "@midwayjs/mock": "^3.12.10"
   },
   "dependencies": {
-    "bull": "4.11.3"
+    "bull": "4.11.4"
   },
   "engines": {
     "node": ">=12"

packages/bull/src/framework.ts

@@ -110,6 +110,9 @@ export class BullFramework
       extend(true, {}, this.bullDefaultQueueConfig, queueOptions)
     );
     this.queueMap.set(name, queue);
+    queue.on('error', err => {
+      this.app.getCoreLogger().error(err);
+    });
     return queue;
   }
 
@@ -143,26 +146,25 @@ export class BullFramework
         from: processor,
       });
 
-      ctx.logger.info(`start process job ${job.id} from ${processor.name}`);
+      try {
+        ctx.logger.info(`start process job ${job.id} from ${processor.name}`);
 
-      const isPassed = await this.app
-        .getFramework()
-        .runGuard(ctx, processor, 'execute');
-      if (!isPassed) {
-        throw new MidwayInvokeForbiddenError('execute', processor);
-      }
+        const isPassed = await this.app
+          .getFramework()
+          .runGuard(ctx, processor, 'execute');
+        if (!isPassed) {
+          throw new MidwayInvokeForbiddenError('execute', processor);
+        }
 
-      const service = await ctx.requestContext.getAsync<IProcessor>(
-        processor as any
-      );
-      const fn = await this.applyMiddleware(async ctx => {
-        return await Utils.toAsyncFunction(service.execute.bind(service))(
-          job.data,
-          job
+        const service = await ctx.requestContext.getAsync<IProcessor>(
+          processor as any
         );
-      });
-
-      try {
+        const fn = await this.applyMiddleware(async ctx => {
+          return await Utils.toAsyncFunction(service.execute.bind(service))(
+            job.data,
+            job
+          );
+        });
         const result = await Promise.resolve(await fn(ctx));
         ctx.logger.info(
           `complete process job ${job.id} from ${processor.name}`

packages/bull/test/fixtures/base-app-error-out-of-job/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "ali-demo"
+}