From ab16db1dc68f2fac89c38994947c71b871d07ae6 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sat, 5 Oct 2024 21:32:15 +0800 Subject: [PATCH 01/18] chore: update test cmd --- packages-legacy/cache/package.json | 4 ++-- packages-legacy/egg-layer/package.json | 2 +- packages-legacy/express-layer/package.json | 2 +- packages-legacy/koa-layer/package.json | 2 +- packages-legacy/orm/package.json | 2 +- packages-legacy/runtime-engine/package.json | 2 +- packages-legacy/runtime-mock/package.json | 2 +- packages-legacy/serverless-app/package.json | 2 +- packages-legacy/serverless-aws-starter/package.json | 2 +- packages-legacy/serverless-fc-starter/package.json | 2 +- packages-legacy/serverless-fc-trigger/package.json | 2 +- packages-legacy/serverless-scf-starter/package.json | 2 +- packages-legacy/serverless-scf-trigger/package.json | 2 +- packages-legacy/serverless-vercel-starter/package.json | 2 +- packages-legacy/serverless-vercel-trigger/package.json | 2 +- packages-legacy/serverless-worker-starter/package.json | 2 +- packages-legacy/static-layer/package.json | 2 +- packages-legacy/task/package.json | 2 +- packages-serverless/midway-fc-starter/package.json | 4 ++-- packages-serverless/serverless-http-parser/package.json | 4 ++-- packages/async-hooks-context-manager/package.json | 4 ++-- packages/axios/package.json | 4 ++-- packages/bootstrap/package.json | 4 ++-- packages/bull-board/package.json | 4 ++-- packages/bull/package.json | 4 ++-- packages/busboy/package.json | 4 ++-- packages/cache-manager/package.json | 4 ++-- packages/captcha/package.json | 4 ++-- packages/casbin-redis-adapter/package.json | 4 ++-- packages/casbin-typeorm-adapter/package.json | 4 ++-- packages/casbin/package.json | 4 ++-- packages/code-dye/package.json | 4 ++-- packages/consul/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/cos/package.json | 4 ++-- packages/cron/package.json | 4 ++-- packages/cross-domain/package.json | 4 ++-- packages/etcd/package.json | 4 ++-- packages/express-session/package.json | 4 ++-- packages/faas/package.json | 4 ++-- packages/grpc/package.json | 4 ++-- packages/http-proxy/package.json | 4 ++-- packages/i18n/package.json | 4 ++-- packages/info/package.json | 4 ++-- packages/jwt/package.json | 2 +- packages/kafka/package.json | 4 ++-- packages/leoric/package.json | 4 ++-- packages/mikro/package.json | 4 ++-- packages/mock/package.json | 4 ++-- packages/mongoose/package.json | 4 ++-- packages/mqtt/package.json | 4 ++-- packages/oss/package.json | 4 ++-- packages/otel/package.json | 4 ++-- packages/passport/package.json | 2 +- packages/processAgent/package.json | 4 ++-- packages/prometheus-socket-io/package.json | 4 ++-- packages/prometheus/package.json | 4 ++-- packages/rabbitmq/package.json | 4 ++-- packages/redis/package.json | 4 ++-- packages/security/package.json | 4 ++-- packages/sequelize/package.json | 4 ++-- packages/session/package.json | 4 ++-- packages/socketio/package.json | 4 ++-- packages/static-file/package.json | 4 ++-- packages/tablestore/package.json | 4 ++-- packages/tags/package.json | 4 ++-- packages/tenant/package.json | 4 ++-- packages/typegoose/package.json | 4 ++-- packages/typeorm/package.json | 4 ++-- packages/upload/package.json | 4 ++-- packages/validate/package.json | 4 ++-- packages/view-ejs/package.json | 4 ++-- packages/view-nunjucks/package.json | 4 ++-- packages/view/package.json | 4 ++-- packages/web-express/package.json | 4 ++-- packages/web-koa/package.json | 4 ++-- packages/web-koa/src/framework.ts | 2 +- packages/web/package.json | 4 ++-- packages/ws/package.json | 4 ++-- 79 files changed, 138 insertions(+), 138 deletions(-) diff --git a/packages-legacy/cache/package.json b/packages-legacy/cache/package.json index e96e79da7dda..63f32ec724c8 100644 --- a/packages-legacy/cache/package.json +++ b/packages-legacy/cache/package.json @@ -7,8 +7,8 @@ "private": true, "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "author": "", "files": [ diff --git a/packages-legacy/egg-layer/package.json b/packages-legacy/egg-layer/package.json index a2d532889bab..3be3004c5aad 100644 --- a/packages-legacy/egg-layer/package.json +++ b/packages-legacy/egg-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/express-layer/package.json b/packages-legacy/express-layer/package.json index dfb58a673386..c36882ec20c9 100644 --- a/packages-legacy/express-layer/package.json +++ b/packages-legacy/express-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/koa-layer/package.json b/packages-legacy/koa-layer/package.json index 60f57390fb50..ca53f206f6c0 100644 --- a/packages-legacy/koa-layer/package.json +++ b/packages-legacy/koa-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/orm/package.json b/packages-legacy/orm/package.json index dcec82893dd5..a0afd86e5017 100644 --- a/packages-legacy/orm/package.json +++ b/packages-legacy/orm/package.json @@ -25,7 +25,7 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/runtime-engine/package.json b/packages-legacy/runtime-engine/package.json index b2e7ef8530e6..c435e224e28c 100644 --- a/packages-legacy/runtime-engine/package.json +++ b/packages-legacy/runtime-engine/package.json @@ -6,7 +6,7 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "engines": { "node": ">=12" diff --git a/packages-legacy/runtime-mock/package.json b/packages-legacy/runtime-mock/package.json index 15e0a2809b55..a33a23682335 100644 --- a/packages-legacy/runtime-mock/package.json +++ b/packages-legacy/runtime-mock/package.json @@ -16,7 +16,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-app/package.json b/packages-legacy/serverless-app/package.json index 5552d99d3ea0..80494ca4fb88 100644 --- a/packages-legacy/serverless-app/package.json +++ b/packages-legacy/serverless-app/package.json @@ -35,7 +35,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-aws-starter/package.json b/packages-legacy/serverless-aws-starter/package.json index 51d8d105d77d..529fec23cce9 100644 --- a/packages-legacy/serverless-aws-starter/package.json +++ b/packages-legacy/serverless-aws-starter/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-fc-starter/package.json b/packages-legacy/serverless-fc-starter/package.json index 7290429b50fc..01fb00cd4ae9 100644 --- a/packages-legacy/serverless-fc-starter/package.json +++ b/packages-legacy/serverless-fc-starter/package.json @@ -22,7 +22,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-fc-trigger/package.json b/packages-legacy/serverless-fc-trigger/package.json index 4ce9e41b7e62..dcdc21d8ee0b 100644 --- a/packages-legacy/serverless-fc-trigger/package.json +++ b/packages-legacy/serverless-fc-trigger/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-scf-starter/package.json b/packages-legacy/serverless-scf-starter/package.json index 5d427180e319..5b23f827288d 100644 --- a/packages-legacy/serverless-scf-starter/package.json +++ b/packages-legacy/serverless-scf-starter/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-scf-trigger/package.json b/packages-legacy/serverless-scf-trigger/package.json index 22f7d1ae3b71..6c7265190ca6 100644 --- a/packages-legacy/serverless-scf-trigger/package.json +++ b/packages-legacy/serverless-scf-trigger/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-vercel-starter/package.json b/packages-legacy/serverless-vercel-starter/package.json index 1b33878d1326..c19e7f713559 100644 --- a/packages-legacy/serverless-vercel-starter/package.json +++ b/packages-legacy/serverless-vercel-starter/package.json @@ -23,7 +23,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-vercel-trigger/package.json b/packages-legacy/serverless-vercel-trigger/package.json index a59ded6ee212..1a77735451f7 100644 --- a/packages-legacy/serverless-vercel-trigger/package.json +++ b/packages-legacy/serverless-vercel-trigger/package.json @@ -16,7 +16,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-worker-starter/package.json b/packages-legacy/serverless-worker-starter/package.json index fe938098ac87..8ba44b870764 100644 --- a/packages-legacy/serverless-worker-starter/package.json +++ b/packages-legacy/serverless-worker-starter/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/static-layer/package.json b/packages-legacy/static-layer/package.json index 60dad814ace0..f3311046fac6 100644 --- a/packages-legacy/static-layer/package.json +++ b/packages-legacy/static-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "dist/index.js", "scripts": { - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit", + "test": "jest --runInBand --forceExit", "build": "ncc build index.js -o dist" }, "devDependencies": { diff --git a/packages-legacy/task/package.json b/packages-legacy/task/package.json index 484dd6157c39..d063c0e70522 100644 --- a/packages-legacy/task/package.json +++ b/packages-legacy/task/package.json @@ -7,7 +7,7 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --forceExit" + "test": "jest --runInBand --forceExit" }, "keywords": [ "midway", diff --git a/packages-serverless/midway-fc-starter/package.json b/packages-serverless/midway-fc-starter/package.json index 12fe6dc09971..3b2d0692d2da 100644 --- a/packages-serverless/midway-fc-starter/package.json +++ b/packages-serverless/midway-fc-starter/package.json @@ -21,8 +21,8 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages-serverless/serverless-http-parser/package.json b/packages-serverless/serverless-http-parser/package.json index ecb742120bd5..5264323b98ca 100644 --- a/packages-serverless/serverless-http-parser/package.json +++ b/packages-serverless/serverless-http-parser/package.json @@ -28,8 +28,8 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/async-hooks-context-manager/package.json b/packages/async-hooks-context-manager/package.json index 9d9549373e43..6c007851b413 100644 --- a/packages/async-hooks-context-manager/package.json +++ b/packages/async-hooks-context-manager/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/axios/package.json b/packages/axios/package.json index 91e078729727..9cc7f270a499 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json index b45be45d1534..89fdb09d150e 100644 --- a/packages/bootstrap/package.json +++ b/packages/bootstrap/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ diff --git a/packages/bull-board/package.json b/packages/bull-board/package.json index 85c4f2f1d703..a74ea6c6e2cb 100644 --- a/packages/bull-board/package.json +++ b/packages/bull-board/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/bull/package.json b/packages/bull/package.json index d8083eebb698..2a9c70d4fad3 100644 --- a/packages/bull/package.json +++ b/packages/bull/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/busboy/package.json b/packages/busboy/package.json index 16156a1b8046..d1eae9e0bdd7 100644 --- a/packages/busboy/package.json +++ b/packages/busboy/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/cache-manager/package.json b/packages/cache-manager/package.json index f2ecad95911c..1451806f3b59 100644 --- a/packages/cache-manager/package.json +++ b/packages/cache-manager/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "author": "", "files": [ diff --git a/packages/captcha/package.json b/packages/captcha/package.json index 0996ccead8de..b3e715299ce8 100644 --- a/packages/captcha/package.json +++ b/packages/captcha/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/casbin-redis-adapter/package.json b/packages/casbin-redis-adapter/package.json index 7411913e14bd..47a7dc38867e 100644 --- a/packages/casbin-redis-adapter/package.json +++ b/packages/casbin-redis-adapter/package.json @@ -30,8 +30,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/casbin-typeorm-adapter/package.json b/packages/casbin-typeorm-adapter/package.json index 62ecaba76eac..50a97dfa4483 100644 --- a/packages/casbin-typeorm-adapter/package.json +++ b/packages/casbin-typeorm-adapter/package.json @@ -31,8 +31,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/casbin/package.json b/packages/casbin/package.json index 004c8d61b821..4437be3be110 100644 --- a/packages/casbin/package.json +++ b/packages/casbin/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/code-dye/package.json b/packages/code-dye/package.json index a915f2c6c326..0314e3fa529e 100644 --- a/packages/code-dye/package.json +++ b/packages/code-dye/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/consul/package.json b/packages/consul/package.json index 1077950cfe1a..bd3600b35e7f 100644 --- a/packages/consul/package.json +++ b/packages/consul/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/core/package.json b/packages/core/package.json index 962f4f24fc53..d7021c9cdf6e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "link": "npm link", "madge": "madge --circular --extensions ts,tsx --exclude 'node_modules|test|dist' src" }, diff --git a/packages/cos/package.json b/packages/cos/package.json index 0ec588702597..acbcce963ce4 100644 --- a/packages/cos/package.json +++ b/packages/cos/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/cron/package.json b/packages/cron/package.json index 49fb24c88ee0..bf01b65c099b 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/cross-domain/package.json b/packages/cross-domain/package.json index ca2b00190c55..f034c0d755ce 100644 --- a/packages/cross-domain/package.json +++ b/packages/cross-domain/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/etcd/package.json b/packages/etcd/package.json index 36b673e088dc..990c0a949514 100644 --- a/packages/etcd/package.json +++ b/packages/etcd/package.json @@ -24,8 +24,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/express-session/package.json b/packages/express-session/package.json index 73fc2d350192..5531afa16b1d 100644 --- a/packages/express-session/package.json +++ b/packages/express-session/package.json @@ -29,8 +29,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/faas/package.json b/packages/faas/package.json index a9c490020466..1ae757caa240 100644 --- a/packages/faas/package.json +++ b/packages/faas/package.json @@ -35,8 +35,8 @@ ], "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/grpc/package.json b/packages/grpc/package.json index 7b4859befa28..7862a601bfbd 100644 --- a/packages/grpc/package.json +++ b/packages/grpc/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/http-proxy/package.json b/packages/http-proxy/package.json index 976c09cddfe2..cdeaa602dcee 100644 --- a/packages/http-proxy/package.json +++ b/packages/http-proxy/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 1736f8169310..a6b29b6cdabd 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/info/package.json b/packages/info/package.json index 5ceacd3c5b82..784fef751ab9 100644 --- a/packages/info/package.json +++ b/packages/info/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/jwt/package.json b/packages/jwt/package.json index fb4e0a83b1cb..b466b78d5a53 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "test": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/kafka/package.json b/packages/kafka/package.json index 5e3b82a5816f..2ab2a793c222 100644 --- a/packages/kafka/package.json +++ b/packages/kafka/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/leoric/package.json b/packages/leoric/package.json index 4ecdf97c81d3..51c453dae540 100644 --- a/packages/leoric/package.json +++ b/packages/leoric/package.json @@ -28,8 +28,8 @@ }, "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "repository": { diff --git a/packages/mikro/package.json b/packages/mikro/package.json index 15fbbdeed726..49c0ffdeb14e 100644 --- a/packages/mikro/package.json +++ b/packages/mikro/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/mock/package.json b/packages/mock/package.json index 6e755e1d0d2b..e24fe8f9b29c 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ diff --git a/packages/mongoose/package.json b/packages/mongoose/package.json index 79cf174988ab..3d42cc67bdae 100644 --- a/packages/mongoose/package.json +++ b/packages/mongoose/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/mqtt/package.json b/packages/mqtt/package.json index 4b7885c384f2..81aca9aa8d55 100644 --- a/packages/mqtt/package.json +++ b/packages/mqtt/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/oss/package.json b/packages/oss/package.json index a544494b0873..3d0dc117da2a 100644 --- a/packages/oss/package.json +++ b/packages/oss/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/otel/package.json b/packages/otel/package.json index a335d050c880..7e2bf01063f8 100644 --- a/packages/otel/package.json +++ b/packages/otel/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/passport/package.json b/packages/passport/package.json index 8fe41e5b81aa..ac43f72857a6 100644 --- a/packages/passport/package.json +++ b/packages/passport/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "test": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/processAgent/package.json b/packages/processAgent/package.json index 6773ffcc51e7..ef91f02d10eb 100644 --- a/packages/processAgent/package.json +++ b/packages/processAgent/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/prometheus-socket-io/package.json b/packages/prometheus-socket-io/package.json index ebdbb73af958..7172a30e0af4 100644 --- a/packages/prometheus-socket-io/package.json +++ b/packages/prometheus-socket-io/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run cov --ts" }, "keywords": [ diff --git a/packages/prometheus/package.json b/packages/prometheus/package.json index 1378932be38e..965262c29742 100644 --- a/packages/prometheus/package.json +++ b/packages/prometheus/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run cov --ts" }, "keywords": [ diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 2c0e065e79f8..3a55eb2eabbe 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/redis/package.json b/packages/redis/package.json index 1ce0a48c4318..00a3436a3329 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -23,8 +23,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/security/package.json b/packages/security/package.json index 8d5e9aae7715..4ce53b17a097 100644 --- a/packages/security/package.json +++ b/packages/security/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/sequelize/package.json b/packages/sequelize/package.json index 73ebe41d60bb..e59c66775cc7 100644 --- a/packages/sequelize/package.json +++ b/packages/sequelize/package.json @@ -28,8 +28,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "NODE_ENV=development node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "NODE_ENV=development jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "engines": { "node": ">=12" diff --git a/packages/session/package.json b/packages/session/package.json index 9a66830863c2..beb6e5757a23 100644 --- a/packages/session/package.json +++ b/packages/session/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/socketio/package.json b/packages/socketio/package.json index 7c53b93e3162..aa53e0c82069 100644 --- a/packages/socketio/package.json +++ b/packages/socketio/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/static-file/package.json b/packages/static-file/package.json index 5d3d72038ca8..457c6801d644 100644 --- a/packages/static-file/package.json +++ b/packages/static-file/package.json @@ -30,8 +30,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/tablestore/package.json b/packages/tablestore/package.json index 793127b8a87d..a6e2979ba572 100644 --- a/packages/tablestore/package.json +++ b/packages/tablestore/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/tags/package.json b/packages/tags/package.json index 292818e318e4..0f154f2746f9 100644 --- a/packages/tags/package.json +++ b/packages/tags/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/tenant/package.json b/packages/tenant/package.json index 840b8e9e71e4..2c70cb6ba7b0 100644 --- a/packages/tenant/package.json +++ b/packages/tenant/package.json @@ -21,8 +21,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/typegoose/package.json b/packages/typegoose/package.json index 22a6b50bfb91..f5b64d3158e2 100644 --- a/packages/typegoose/package.json +++ b/packages/typegoose/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/typeorm/package.json b/packages/typeorm/package.json index f0c800ee9d2a..dbf0cb33c22d 100644 --- a/packages/typeorm/package.json +++ b/packages/typeorm/package.json @@ -28,8 +28,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/upload/package.json b/packages/upload/package.json index 0ce8dda34221..b64503d9e81c 100644 --- a/packages/upload/package.json +++ b/packages/upload/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/validate/package.json b/packages/validate/package.json index 4175064d4c5c..dadc06cd0748 100644 --- a/packages/validate/package.json +++ b/packages/validate/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/view-ejs/package.json b/packages/view-ejs/package.json index 6b1eabbfd70a..9d52ade2db7a 100644 --- a/packages/view-ejs/package.json +++ b/packages/view-ejs/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/view-nunjucks/package.json b/packages/view-nunjucks/package.json index 5adbf385a600..9e34c0ca49f2 100644 --- a/packages/view-nunjucks/package.json +++ b/packages/view-nunjucks/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/view/package.json b/packages/view/package.json index 57bc2983ef40..679d2f20a6db 100644 --- a/packages/view/package.json +++ b/packages/view/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-express/package.json b/packages/web-express/package.json index 7b550fc84cb9..4350b94bb723 100644 --- a/packages/web-express/package.json +++ b/packages/web-express/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-koa/package.json b/packages/web-koa/package.json index 0d6ef34c092c..0c7541a389d3 100644 --- a/packages/web-koa/package.json +++ b/packages/web-koa/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts index 0216680c9b03..dad48799c63d 100644 --- a/packages/web-koa/src/framework.ts +++ b/packages/web-koa/src/framework.ts @@ -24,7 +24,7 @@ import { } from './interface'; import * as Router from '@koa/router'; import type { DefaultState, Middleware, Next } from 'koa'; -import koa from 'koa'; +import * as koa from 'koa'; import { Server } from 'http'; import { setupOnError } from './onerror'; import * as qs from 'qs'; diff --git a/packages/web/package.json b/packages/web/package.json index d7b8bb0b328f..ded209b3c56c 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ diff --git a/packages/ws/package.json b/packages/ws/package.json index bb7127738831..cb32fdcc45a5 100644 --- a/packages/ws/package.json +++ b/packages/ws/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand", - "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit", + "test": "jest --runInBand", + "cov": "jest --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ From b79d7915e4e2f81f749ede4e16b37bfcdd137f00 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sun, 6 Oct 2024 00:13:30 +0800 Subject: [PATCH 02/18] chore: add github action --- package.json | 2 +- packages-legacy/cache/package.json | 4 +- packages-legacy/egg-layer/package.json | 2 +- packages-legacy/express-layer/package.json | 2 +- packages-legacy/koa-layer/package.json | 2 +- packages-legacy/orm/package.json | 2 +- packages-legacy/runtime-engine/package.json | 2 +- packages-legacy/runtime-mock/package.json | 2 +- packages-legacy/serverless-app/package.json | 2 +- .../serverless-aws-starter/package.json | 2 +- .../serverless-fc-starter/package.json | 2 +- .../serverless-fc-trigger/package.json | 2 +- .../serverless-scf-starter/package.json | 2 +- .../serverless-scf-trigger/package.json | 2 +- .../serverless-vercel-starter/package.json | 2 +- .../serverless-vercel-trigger/package.json | 2 +- .../serverless-worker-starter/package.json | 2 +- packages-legacy/static-layer/package.json | 2 +- packages-legacy/task/package.json | 2 +- .../midway-fc-starter/package.json | 4 +- .../serverless-http-parser/package.json | 4 +- .../async-hooks-context-manager/package.json | 4 +- packages/axios/package.json | 4 +- packages/bootstrap/package.json | 4 +- packages/bull-board/package.json | 4 +- packages/bull/package.json | 4 +- packages/busboy/package.json | 4 +- packages/cache-manager/package.json | 4 +- packages/captcha/package.json | 4 +- packages/casbin-redis-adapter/package.json | 4 +- packages/casbin-typeorm-adapter/package.json | 4 +- packages/casbin/package.json | 4 +- packages/code-dye/package.json | 4 +- packages/consul/package.json | 4 +- packages/core/package.json | 4 +- packages/core/src/service/aspectService.ts | 2 +- packages/cos/package.json | 4 +- packages/cron/package.json | 4 +- packages/cross-domain/package.json | 4 +- packages/etcd/package.json | 4 +- packages/express-session/package.json | 4 +- .../express-session/src/middleware/session.ts | 4 +- packages/faas/package.json | 4 +- packages/grpc/package.json | 4 +- packages/http-proxy/package.json | 4 +- packages/i18n/package.json | 4 +- packages/info/package.json | 4 +- packages/jwt/package.json | 2 +- packages/kafka/package.json | 4 +- packages/leoric/package.json | 4 +- packages/mikro/package.json | 4 +- packages/mock/package.json | 4 +- packages/mongoose/package.json | 4 +- packages/mqtt/package.json | 4 +- packages/oss/package.json | 4 +- packages/otel/package.json | 4 +- packages/passport/package.json | 2 +- packages/processAgent/package.json | 4 +- packages/prometheus-socket-io/package.json | 4 +- packages/prometheus/package.json | 4 +- packages/rabbitmq/package.json | 4 +- packages/redis/package.json | 4 +- packages/security/package.json | 4 +- packages/sequelize/package.json | 4 +- packages/session/package.json | 4 +- packages/socketio/package.json | 4 +- packages/static-file/package.json | 4 +- packages/swagger/package.json | 4 +- packages/tablestore/package.json | 4 +- packages/tags/package.json | 4 +- packages/tenant/package.json | 4 +- packages/typegoose/package.json | 4 +- packages/typeorm/package.json | 4 +- packages/upload/package.json | 4 +- packages/validate/package.json | 4 +- packages/view-ejs/package.json | 4 +- packages/view-nunjucks/package.json | 4 +- packages/view/package.json | 4 +- packages/web-express/package.json | 4 +- packages/web-express/src/configuration.ts | 2 +- packages/web-express/src/framework.ts | 2 +- .../src/controller/api.ts | 2 +- .../base-app-middleware/src/controller/api.ts | 2 +- packages/web-koa/package.json | 4 +- packages/web-koa/src/framework.ts | 2 +- packages/web/package.json | 10 +- packages/web/src/logger.ts | 2 +- packages/web/test/custom.test.ts | 2 +- .../src/app/controller/param.ts | 2 +- .../base-app-function/src/lib/factory.ts | 4 +- packages/web/test/logger.test.ts | 2 +- packages/web/test/utils.test.ts | 2 +- packages/web/tsconfig.json | 3 +- packages/ws/package.json | 4 +- pnpm-lock.yaml | 579 +++++++++--------- tsconfig.json | 5 +- 96 files changed, 462 insertions(+), 441 deletions(-) diff --git a/package.json b/package.json index 18e04a316783..49a7adb71bc8 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "tree-kill": "1.2.2", "ts-jest": "29.2.5", "ts-node": "10.9.2", - "typedoc": "^0.26.7", + "typedoc": "^0.26.8", "typescript": "5.3.3", "why-is-node-running": "2.3.0", "zx": "7.2.3" diff --git a/packages-legacy/cache/package.json b/packages-legacy/cache/package.json index 63f32ec724c8..996b23b3d701 100644 --- a/packages-legacy/cache/package.json +++ b/packages-legacy/cache/package.json @@ -7,8 +7,8 @@ "private": true, "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "author": "", "files": [ diff --git a/packages-legacy/egg-layer/package.json b/packages-legacy/egg-layer/package.json index 3be3004c5aad..ffced3c558e3 100644 --- a/packages-legacy/egg-layer/package.json +++ b/packages-legacy/egg-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/express-layer/package.json b/packages-legacy/express-layer/package.json index c36882ec20c9..9815e4e2ecf6 100644 --- a/packages-legacy/express-layer/package.json +++ b/packages-legacy/express-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/koa-layer/package.json b/packages-legacy/koa-layer/package.json index ca53f206f6c0..9ba1f81a8389 100644 --- a/packages-legacy/koa-layer/package.json +++ b/packages-legacy/koa-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "index.js", "scripts": { - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "dependencies": { "request": "2.88.2" diff --git a/packages-legacy/orm/package.json b/packages-legacy/orm/package.json index a0afd86e5017..5f5a726ed3c3 100644 --- a/packages-legacy/orm/package.json +++ b/packages-legacy/orm/package.json @@ -25,7 +25,7 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/runtime-engine/package.json b/packages-legacy/runtime-engine/package.json index c435e224e28c..668edf2a5a41 100644 --- a/packages-legacy/runtime-engine/package.json +++ b/packages-legacy/runtime-engine/package.json @@ -6,7 +6,7 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "engines": { "node": ">=12" diff --git a/packages-legacy/runtime-mock/package.json b/packages-legacy/runtime-mock/package.json index a33a23682335..12f0708a3773 100644 --- a/packages-legacy/runtime-mock/package.json +++ b/packages-legacy/runtime-mock/package.json @@ -16,7 +16,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-app/package.json b/packages-legacy/serverless-app/package.json index 80494ca4fb88..3277821a38e8 100644 --- a/packages-legacy/serverless-app/package.json +++ b/packages-legacy/serverless-app/package.json @@ -35,7 +35,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-aws-starter/package.json b/packages-legacy/serverless-aws-starter/package.json index 529fec23cce9..c55a54c8e6df 100644 --- a/packages-legacy/serverless-aws-starter/package.json +++ b/packages-legacy/serverless-aws-starter/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-fc-starter/package.json b/packages-legacy/serverless-fc-starter/package.json index 01fb00cd4ae9..6bf7a6d1d806 100644 --- a/packages-legacy/serverless-fc-starter/package.json +++ b/packages-legacy/serverless-fc-starter/package.json @@ -22,7 +22,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-fc-trigger/package.json b/packages-legacy/serverless-fc-trigger/package.json index dcdc21d8ee0b..87c8b40d94e1 100644 --- a/packages-legacy/serverless-fc-trigger/package.json +++ b/packages-legacy/serverless-fc-trigger/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-scf-starter/package.json b/packages-legacy/serverless-scf-starter/package.json index 5b23f827288d..ccde87f7115e 100644 --- a/packages-legacy/serverless-scf-starter/package.json +++ b/packages-legacy/serverless-scf-starter/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-scf-trigger/package.json b/packages-legacy/serverless-scf-trigger/package.json index 6c7265190ca6..affa6afc9aab 100644 --- a/packages-legacy/serverless-scf-trigger/package.json +++ b/packages-legacy/serverless-scf-trigger/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-vercel-starter/package.json b/packages-legacy/serverless-vercel-starter/package.json index c19e7f713559..5162dc06c201 100644 --- a/packages-legacy/serverless-vercel-starter/package.json +++ b/packages-legacy/serverless-vercel-starter/package.json @@ -23,7 +23,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-vercel-trigger/package.json b/packages-legacy/serverless-vercel-trigger/package.json index 1a77735451f7..089203da2f85 100644 --- a/packages-legacy/serverless-vercel-trigger/package.json +++ b/packages-legacy/serverless-vercel-trigger/package.json @@ -16,7 +16,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/serverless-worker-starter/package.json b/packages-legacy/serverless-worker-starter/package.json index 8ba44b870764..3336c5e313dd 100644 --- a/packages-legacy/serverless-worker-starter/package.json +++ b/packages-legacy/serverless-worker-starter/package.json @@ -24,7 +24,7 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "repository": { "type": "git", diff --git a/packages-legacy/static-layer/package.json b/packages-legacy/static-layer/package.json index f3311046fac6..77a635b20b0e 100644 --- a/packages-legacy/static-layer/package.json +++ b/packages-legacy/static-layer/package.json @@ -4,7 +4,7 @@ "version": "3.18.0", "main": "dist/index.js", "scripts": { - "test": "jest --runInBand --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit", "build": "ncc build index.js -o dist" }, "devDependencies": { diff --git a/packages-legacy/task/package.json b/packages-legacy/task/package.json index d063c0e70522..18999cce53ad 100644 --- a/packages-legacy/task/package.json +++ b/packages-legacy/task/package.json @@ -7,7 +7,7 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" }, "keywords": [ "midway", diff --git a/packages-serverless/midway-fc-starter/package.json b/packages-serverless/midway-fc-starter/package.json index 3b2d0692d2da..768a304abeb7 100644 --- a/packages-serverless/midway-fc-starter/package.json +++ b/packages-serverless/midway-fc-starter/package.json @@ -21,8 +21,8 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages-serverless/serverless-http-parser/package.json b/packages-serverless/serverless-http-parser/package.json index 5264323b98ca..a58d981b11b5 100644 --- a/packages-serverless/serverless-http-parser/package.json +++ b/packages-serverless/serverless-http-parser/package.json @@ -28,8 +28,8 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/async-hooks-context-manager/package.json b/packages/async-hooks-context-manager/package.json index 6c007851b413..e96f17ba435f 100644 --- a/packages/async-hooks-context-manager/package.json +++ b/packages/async-hooks-context-manager/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/axios/package.json b/packages/axios/package.json index 9cc7f270a499..f00fe4d70aa5 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json index 89fdb09d150e..8c7a53afb31f 100644 --- a/packages/bootstrap/package.json +++ b/packages/bootstrap/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ diff --git a/packages/bull-board/package.json b/packages/bull-board/package.json index a74ea6c6e2cb..dea9e9318718 100644 --- a/packages/bull-board/package.json +++ b/packages/bull-board/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/bull/package.json b/packages/bull/package.json index 2a9c70d4fad3..b1b74a64502e 100644 --- a/packages/bull/package.json +++ b/packages/bull/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/busboy/package.json b/packages/busboy/package.json index d1eae9e0bdd7..a123e204bf71 100644 --- a/packages/busboy/package.json +++ b/packages/busboy/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/cache-manager/package.json b/packages/cache-manager/package.json index 1451806f3b59..8e1d1430ef41 100644 --- a/packages/cache-manager/package.json +++ b/packages/cache-manager/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "author": "", "files": [ diff --git a/packages/captcha/package.json b/packages/captcha/package.json index b3e715299ce8..dc7fc27f11d0 100644 --- a/packages/captcha/package.json +++ b/packages/captcha/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/casbin-redis-adapter/package.json b/packages/casbin-redis-adapter/package.json index 47a7dc38867e..b2eb7df3e197 100644 --- a/packages/casbin-redis-adapter/package.json +++ b/packages/casbin-redis-adapter/package.json @@ -30,8 +30,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/casbin-typeorm-adapter/package.json b/packages/casbin-typeorm-adapter/package.json index 50a97dfa4483..c2f46ec0bba3 100644 --- a/packages/casbin-typeorm-adapter/package.json +++ b/packages/casbin-typeorm-adapter/package.json @@ -31,8 +31,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/casbin/package.json b/packages/casbin/package.json index 4437be3be110..e925ac4e4bca 100644 --- a/packages/casbin/package.json +++ b/packages/casbin/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/code-dye/package.json b/packages/code-dye/package.json index 0314e3fa529e..2855201c8f56 100644 --- a/packages/code-dye/package.json +++ b/packages/code-dye/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/consul/package.json b/packages/consul/package.json index bd3600b35e7f..5ce107142383 100644 --- a/packages/consul/package.json +++ b/packages/consul/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/core/package.json b/packages/core/package.json index d7021c9cdf6e..d4e763df2d7c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "link": "npm link", "madge": "madge --circular --extensions ts,tsx --exclude 'node_modules|test|dist' src" }, diff --git a/packages/core/src/service/aspectService.ts b/packages/core/src/service/aspectService.ts index 1e70ce26d0d9..e5f61b4efccd 100644 --- a/packages/core/src/service/aspectService.ts +++ b/packages/core/src/service/aspectService.ts @@ -1,4 +1,4 @@ -import * as pm from 'picomatch'; +import pm from 'picomatch'; import { IMidwayContainer, AspectMetadata, diff --git a/packages/cos/package.json b/packages/cos/package.json index acbcce963ce4..ad640030d299 100644 --- a/packages/cos/package.json +++ b/packages/cos/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/cron/package.json b/packages/cron/package.json index bf01b65c099b..b1cb8e77e373 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/cross-domain/package.json b/packages/cross-domain/package.json index f034c0d755ce..9adaad4569d6 100644 --- a/packages/cross-domain/package.json +++ b/packages/cross-domain/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/etcd/package.json b/packages/etcd/package.json index 990c0a949514..830ad553b996 100644 --- a/packages/etcd/package.json +++ b/packages/etcd/package.json @@ -24,8 +24,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/express-session/package.json b/packages/express-session/package.json index 5531afa16b1d..46b69ac1f2e9 100644 --- a/packages/express-session/package.json +++ b/packages/express-session/package.json @@ -29,8 +29,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/express-session/src/middleware/session.ts b/packages/express-session/src/middleware/session.ts index c840f545cf70..1d0ee3b5b9df 100644 --- a/packages/express-session/src/middleware/session.ts +++ b/packages/express-session/src/middleware/session.ts @@ -7,8 +7,8 @@ import { MidwayConfigMissingError, MidwayConfigService, } from '@midwayjs/core'; -import session from 'express-session'; -import * as cookieSession from 'cookie-session'; +import session = require('express-session'); +import cookieSession = require('cookie-session'); import { SessionStoreManager } from '../store'; @Middleware() diff --git a/packages/faas/package.json b/packages/faas/package.json index 1ae757caa240..6e7ba469351b 100644 --- a/packages/faas/package.json +++ b/packages/faas/package.json @@ -35,8 +35,8 @@ ], "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/grpc/package.json b/packages/grpc/package.json index 7862a601bfbd..76b55fb9dabd 100644 --- a/packages/grpc/package.json +++ b/packages/grpc/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/http-proxy/package.json b/packages/http-proxy/package.json index cdeaa602dcee..92a01bf0f5be 100644 --- a/packages/http-proxy/package.json +++ b/packages/http-proxy/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/i18n/package.json b/packages/i18n/package.json index a6b29b6cdabd..c2ed6d712e64 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/info/package.json b/packages/info/package.json index 784fef751ab9..c76470688c3a 100644 --- a/packages/info/package.json +++ b/packages/info/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/jwt/package.json b/packages/jwt/package.json index b466b78d5a53..2addaf99af39 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "test": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js", - "cov": "jest --runInBand --coverage --forceExit" + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/kafka/package.json b/packages/kafka/package.json index 2ab2a793c222..02178d5bd337 100644 --- a/packages/kafka/package.json +++ b/packages/kafka/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/leoric/package.json b/packages/leoric/package.json index 51c453dae540..c08329e09e27 100644 --- a/packages/leoric/package.json +++ b/packages/leoric/package.json @@ -28,8 +28,8 @@ }, "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "repository": { diff --git a/packages/mikro/package.json b/packages/mikro/package.json index 49c0ffdeb14e..dfcca3e06283 100644 --- a/packages/mikro/package.json +++ b/packages/mikro/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/mock/package.json b/packages/mock/package.json index e24fe8f9b29c..1f61dafab422 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ diff --git a/packages/mongoose/package.json b/packages/mongoose/package.json index 3d42cc67bdae..5bcdb7ffa798 100644 --- a/packages/mongoose/package.json +++ b/packages/mongoose/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/mqtt/package.json b/packages/mqtt/package.json index 81aca9aa8d55..3885856d44f3 100644 --- a/packages/mqtt/package.json +++ b/packages/mqtt/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/oss/package.json b/packages/oss/package.json index 3d0dc117da2a..fcf36d96613f 100644 --- a/packages/oss/package.json +++ b/packages/oss/package.json @@ -26,8 +26,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/otel/package.json b/packages/otel/package.json index 7e2bf01063f8..2084603116c4 100644 --- a/packages/otel/package.json +++ b/packages/otel/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/passport/package.json b/packages/passport/package.json index ac43f72857a6..b69d7c04cb51 100644 --- a/packages/passport/package.json +++ b/packages/passport/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "test": "node --require=ts-node/register ../../node_modules/jest/bin/jest.js", - "cov": "jest --runInBand --coverage --forceExit" + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/processAgent/package.json b/packages/processAgent/package.json index ef91f02d10eb..e6112677a752 100644 --- a/packages/processAgent/package.json +++ b/packages/processAgent/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "keywords": [ "midway", diff --git a/packages/prometheus-socket-io/package.json b/packages/prometheus-socket-io/package.json index 7172a30e0af4..c58d4403c4f3 100644 --- a/packages/prometheus-socket-io/package.json +++ b/packages/prometheus-socket-io/package.json @@ -6,8 +6,8 @@ "typings": "dist/index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run cov --ts" }, "keywords": [ diff --git a/packages/prometheus/package.json b/packages/prometheus/package.json index 965262c29742..268be66af9b4 100644 --- a/packages/prometheus/package.json +++ b/packages/prometheus/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run cov --ts" }, "keywords": [ diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 3a55eb2eabbe..ea781991e200 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "lint:fix": "../../node_modules/.bin/mwts fix" }, "keywords": [ diff --git a/packages/redis/package.json b/packages/redis/package.json index 00a3436a3329..c1d56a0e78b8 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -23,8 +23,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/security/package.json b/packages/security/package.json index 4ce53b17a097..a392080fc787 100644 --- a/packages/security/package.json +++ b/packages/security/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/sequelize/package.json b/packages/sequelize/package.json index e59c66775cc7..4e80b85b4fdf 100644 --- a/packages/sequelize/package.json +++ b/packages/sequelize/package.json @@ -28,8 +28,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "NODE_ENV=development jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "NODE_ENV=development node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "engines": { "node": ">=12" diff --git a/packages/session/package.json b/packages/session/package.json index beb6e5757a23..2fa72313829d 100644 --- a/packages/session/package.json +++ b/packages/session/package.json @@ -27,8 +27,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/socketio/package.json b/packages/socketio/package.json index aa53e0c82069..3b55b9d073c8 100644 --- a/packages/socketio/package.json +++ b/packages/socketio/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/static-file/package.json b/packages/static-file/package.json index 457c6801d644..5f2630f7313b 100644 --- a/packages/static-file/package.json +++ b/packages/static-file/package.json @@ -30,8 +30,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/swagger/package.json b/packages/swagger/package.json index 42252b2cb3fb..3cdcf127d5b8 100644 --- a/packages/swagger/package.json +++ b/packages/swagger/package.json @@ -20,8 +20,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "../../node_modules/.bin/jest --runInBand", - "cov": "../../node_modules/.bin/jest --runInBand --coverage --forceExit" + "test": "../../node_modules/.bin/node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "../../node_modules/.bin/node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/tablestore/package.json b/packages/tablestore/package.json index a6e2979ba572..2274d747aeac 100644 --- a/packages/tablestore/package.json +++ b/packages/tablestore/package.json @@ -25,8 +25,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/tags/package.json b/packages/tags/package.json index 0f154f2746f9..10cbd1625511 100644 --- a/packages/tags/package.json +++ b/packages/tags/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/tenant/package.json b/packages/tenant/package.json index 2c70cb6ba7b0..86a9d462cd2a 100644 --- a/packages/tenant/package.json +++ b/packages/tenant/package.json @@ -21,8 +21,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test", "lint": "mwts check" }, diff --git a/packages/typegoose/package.json b/packages/typegoose/package.json index f5b64d3158e2..054b6a831860 100644 --- a/packages/typegoose/package.json +++ b/packages/typegoose/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/typeorm/package.json b/packages/typeorm/package.json index dbf0cb33c22d..fd07165acc66 100644 --- a/packages/typeorm/package.json +++ b/packages/typeorm/package.json @@ -28,8 +28,8 @@ "license": "MIT", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit" + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" }, "repository": { "type": "git", diff --git a/packages/upload/package.json b/packages/upload/package.json index b64503d9e81c..d5952a721a40 100644 --- a/packages/upload/package.json +++ b/packages/upload/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/validate/package.json b/packages/validate/package.json index dadc06cd0748..84cc37298805 100644 --- a/packages/validate/package.json +++ b/packages/validate/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [], diff --git a/packages/view-ejs/package.json b/packages/view-ejs/package.json index 9d52ade2db7a..538f43a3ab6f 100644 --- a/packages/view-ejs/package.json +++ b/packages/view-ejs/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/view-nunjucks/package.json b/packages/view-nunjucks/package.json index 9e34c0ca49f2..3079204d1e99 100644 --- a/packages/view-nunjucks/package.json +++ b/packages/view-nunjucks/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/view/package.json b/packages/view/package.json index 679d2f20a6db..9354f9180037 100644 --- a/packages/view/package.json +++ b/packages/view/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-express/package.json b/packages/web-express/package.json index 4350b94bb723..de06ef20ca87 100644 --- a/packages/web-express/package.json +++ b/packages/web-express/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-express/src/configuration.ts b/packages/web-express/src/configuration.ts index ab2525ade859..7b4789ecdee9 100644 --- a/packages/web-express/src/configuration.ts +++ b/packages/web-express/src/configuration.ts @@ -9,7 +9,7 @@ import { } from '@midwayjs/core'; import * as session from '@midwayjs/express-session'; import * as bodyParser from 'body-parser'; -import * as cookieParser from 'cookie-parser'; +import cookieParser = require('cookie-parser'); import * as DefaultConfig from './config/config.default'; import { MidwayExpressFramework } from './framework'; diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts index 10c978ab1ab9..b520d16131f2 100644 --- a/packages/web-express/src/framework.ts +++ b/packages/web-express/src/framework.ts @@ -22,7 +22,7 @@ import { Context, } from './interface'; import type { IRouter, IRouterHandler, Response, NextFunction } from 'express'; -import express from 'express'; +import express = require('express'); import { Server } from 'net'; import { wrapAsyncHandler, diff --git a/packages/web-express/test/fixtures/base-app-middleware-names/src/controller/api.ts b/packages/web-express/test/fixtures/base-app-middleware-names/src/controller/api.ts index ec012bf18f19..391ce6d73851 100644 --- a/packages/web-express/test/fixtures/base-app-middleware-names/src/controller/api.ts +++ b/packages/web-express/test/fixtures/base-app-middleware-names/src/controller/api.ts @@ -15,7 +15,7 @@ export class APIController { ctx: IMidwayExpressContext; @Inject() - req: IMidwayExpressRequest; + req: IMidwayExpressRequest & { user: string }; @Get('/', { middleware: []}) async home() { diff --git a/packages/web-express/test/fixtures/base-app-middleware/src/controller/api.ts b/packages/web-express/test/fixtures/base-app-middleware/src/controller/api.ts index 4a6103573d18..773d2e47334d 100644 --- a/packages/web-express/test/fixtures/base-app-middleware/src/controller/api.ts +++ b/packages/web-express/test/fixtures/base-app-middleware/src/controller/api.ts @@ -15,7 +15,7 @@ export class APIController { ctx: Context; @Inject() - req: IMidwayExpressRequest; + req: IMidwayExpressRequest & { user: string }; @Get('/', { middleware: []}) async home() { diff --git a/packages/web-koa/package.json b/packages/web-koa/package.json index 0c7541a389d3..b4212df10bbd 100644 --- a/packages/web-koa/package.json +++ b/packages/web-koa/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts index dad48799c63d..0216680c9b03 100644 --- a/packages/web-koa/src/framework.ts +++ b/packages/web-koa/src/framework.ts @@ -24,7 +24,7 @@ import { } from './interface'; import * as Router from '@koa/router'; import type { DefaultState, Middleware, Next } from 'koa'; -import * as koa from 'koa'; +import koa from 'koa'; import { Server } from 'http'; import { setupOnError } from './onerror'; import * as qs from 'qs'; diff --git a/packages/web/package.json b/packages/web/package.json index ded209b3c56c..c404e140b89b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "link": "npm link" }, "keywords": [ @@ -39,16 +39,20 @@ "egg-view-nunjucks": "2.3.0", "fake-egg": "1.0.0", "fs-extra": "11.2.0", + "is-type-of": "^2.1.0", "mm": "3.4.0", + "mz-modules": "^2.1.0", "pedding": "1.1.0", "react": "17.0.2", - "react-dom": "17.0.2" + "react-dom": "17.0.2", + "supertest": "6.3.3" }, "dependencies": { "@eggjs/router": "^2.0.0", "@midwayjs/core": "^3.18.0", "egg": "^2.28.0", "egg-cluster": "^1.27.1", + "egg-path-matching": "^2.1.0", "find-up": "5.0.0", "mkdirp": "1.0.4", "qs": "6.13.0" diff --git a/packages/web/src/logger.ts b/packages/web/src/logger.ts index f144dfae2ef6..8a5db330f02b 100644 --- a/packages/web/src/logger.ts +++ b/packages/web/src/logger.ts @@ -177,7 +177,7 @@ class MidwayLoggers extends Map { // v3 // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - (value as any).get('console')?.level = 'none'; + value.get('console') && (value.get('console').level = 'none'); } } } diff --git a/packages/web/test/custom.test.ts b/packages/web/test/custom.test.ts index 515f754c9878..dd92c72d885d 100644 --- a/packages/web/test/custom.test.ts +++ b/packages/web/test/custom.test.ts @@ -1,4 +1,4 @@ -import * as mm from 'mm'; +import mm from 'mm'; import { join } from 'path'; mm(process.env, 'MIDWAY_PROJECT_APPDIR', join(__dirname, './fixtures/feature/base-app-use-custom-egg')); import { closeApp, creatApp, createHttpRequest } from './utils'; diff --git a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts index e1915ba83df4..fcb1048914de 100644 --- a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts +++ b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts @@ -19,7 +19,7 @@ import { import * as path from 'path'; import * as fs from 'fs'; -import * as pump from 'mz-modules/pump'; +import pump from 'mz-modules/pump'; @Provide() @Controller('/param') diff --git a/packages/web/test/fixtures/enhance/base-app-function/src/lib/factory.ts b/packages/web/test/fixtures/enhance/base-app-function/src/lib/factory.ts index b00cdc1dd4a1..8af556fb4cc2 100644 --- a/packages/web/test/fixtures/enhance/base-app-function/src/lib/factory.ts +++ b/packages/web/test/fixtures/enhance/base-app-function/src/lib/factory.ts @@ -1,6 +1,6 @@ -import { providerWrapper, IApplicationContext } from '@midwayjs/core'; +import { providerWrapper, IMidwayContainer } from '@midwayjs/core'; -export function adapterFactory(context: IApplicationContext) { +export function adapterFactory(context: IMidwayContainer) { return async (adapterName: string) => { if (adapterName === 'google') { return context.getAsync('googleAdapter'); diff --git a/packages/web/test/logger.test.ts b/packages/web/test/logger.test.ts index 0d4350ea1742..aa0c010de18f 100644 --- a/packages/web/test/logger.test.ts +++ b/packages/web/test/logger.test.ts @@ -1,5 +1,5 @@ import { creatApp, closeApp, getFilepath, sleep, matchContentTimes } from './utils'; -import * as mm from 'mm'; +import mm = require('mm'); import { join } from 'path'; import { existsSync, readFileSync, writeFileSync, ensureDir, remove } from 'fs-extra'; import { lstatSync } from 'fs'; diff --git a/packages/web/test/utils.test.ts b/packages/web/test/utils.test.ts index 884ae5fefb15..be64763dca11 100644 --- a/packages/web/test/utils.test.ts +++ b/packages/web/test/utils.test.ts @@ -1,5 +1,5 @@ import { getCurrentDateString } from '../src/utils'; -import * as dayjs from 'dayjs'; +import dayjs from 'dayjs'; describe('test/utils.test.ts', function () { diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index b1a4a0c8633f..87c59d3a281a 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -4,7 +4,8 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "jsx": "react" + "jsx": "react", + "esModuleInterop": true }, "include": [ "./src/**/*.ts" diff --git a/packages/ws/package.json b/packages/ws/package.json index cb32fdcc45a5..a480e047fdcc 100644 --- a/packages/ws/package.json +++ b/packages/ws/package.json @@ -6,8 +6,8 @@ "typings": "index.d.ts", "scripts": { "build": "tsc", - "test": "jest --runInBand", - "cov": "jest --runInBand --coverage --forceExit", + "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", + "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit", "ci": "npm run test" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eef2179a145e..0ff6718a6584 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@babel/plugin-proposal-decorators': specifier: 7.24.7 - version: 7.24.7(@babel/core@7.25.2) + version: 7.24.7(@babel/core@7.25.7) '@nrwl/tao': specifier: 16.10.0 version: 16.10.0 @@ -46,13 +46,13 @@ importers: version: 1.2.2 ts-jest: specifier: 29.2.5 - version: 29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)))(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.7)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.7))(jest@29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)))(typescript@5.3.3) ts-node: specifier: 10.9.2 version: 10.9.2(@types/node@20.16.10)(typescript@5.3.3) typedoc: - specifier: ^0.26.7 - version: 0.26.7(typescript@5.3.3) + specifier: ^0.26.8 + version: 0.26.8(typescript@5.3.3) typescript: specifier: 5.3.3 version: 5.3.3 @@ -506,16 +506,6 @@ importers: specifier: ^3.18.0 version: link:../web - packages/decorator: - dependencies: - '@midwayjs/core': - specifier: ^3.18.0 - version: link:../core - devDependencies: - mm: - specifier: 3.4.0 - version: 3.4.0 - packages/etcd: dependencies: etcd3: @@ -1313,6 +1303,9 @@ importers: egg-cluster: specifier: ^1.27.1 version: 1.27.1 + egg-path-matching: + specifier: ^2.1.0 + version: 2.1.0 find-up: specifier: 5.0.0 version: 5.0.0 @@ -1356,9 +1349,15 @@ importers: fs-extra: specifier: 11.2.0 version: 11.2.0 + is-type-of: + specifier: ^2.1.0 + version: 2.1.0 mm: specifier: 3.4.0 version: 3.4.0 + mz-modules: + specifier: ^2.1.0 + version: 2.1.0 pedding: specifier: 1.1.0 version: 1.1.0 @@ -1368,6 +1367,9 @@ importers: react-dom: specifier: 17.0.2 version: 17.0.2(react@17.0.2) + supertest: + specifier: 6.3.3 + version: 6.3.3 packages/web-express: dependencies: @@ -1475,94 +1477,94 @@ packages: '@babel/code-frame@7.12.11': resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==} - '@babel/code-frame@7.24.7': - resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} + '@babel/code-frame@7.25.7': + resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.25.4': - resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==} + '@babel/compat-data@7.25.7': + resolution: {integrity: sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==} engines: {node: '>=6.9.0'} - '@babel/core@7.25.2': - resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} + '@babel/core@7.25.7': + resolution: {integrity: sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==} engines: {node: '>=6.9.0'} - '@babel/generator@7.25.6': - resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==} + '@babel/generator@7.25.7': + resolution: {integrity: sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==} engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.24.7': - resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} + '@babel/helper-annotate-as-pure@7.25.7': + resolution: {integrity: sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==} engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.25.2': - resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} + '@babel/helper-compilation-targets@7.25.7': + resolution: {integrity: sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==} engines: {node: '>=6.9.0'} - '@babel/helper-create-class-features-plugin@7.25.4': - resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==} + '@babel/helper-create-class-features-plugin@7.25.7': + resolution: {integrity: sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-member-expression-to-functions@7.24.8': - resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} + '@babel/helper-member-expression-to-functions@7.25.7': + resolution: {integrity: sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==} engines: {node: '>=6.9.0'} - '@babel/helper-module-imports@7.24.7': - resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} + '@babel/helper-module-imports@7.25.7': + resolution: {integrity: sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.25.2': - resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} + '@babel/helper-module-transforms@7.25.7': + resolution: {integrity: sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-optimise-call-expression@7.24.7': - resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==} + '@babel/helper-optimise-call-expression@7.25.7': + resolution: {integrity: sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==} engines: {node: '>=6.9.0'} - '@babel/helper-plugin-utils@7.24.8': - resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==} + '@babel/helper-plugin-utils@7.25.7': + resolution: {integrity: sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==} engines: {node: '>=6.9.0'} - '@babel/helper-replace-supers@7.25.0': - resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==} + '@babel/helper-replace-supers@7.25.7': + resolution: {integrity: sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-simple-access@7.24.7': - resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} + '@babel/helper-simple-access@7.25.7': + resolution: {integrity: sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==} engines: {node: '>=6.9.0'} - '@babel/helper-skip-transparent-expression-wrappers@7.24.7': - resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==} + '@babel/helper-skip-transparent-expression-wrappers@7.25.7': + resolution: {integrity: sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==} engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.24.8': - resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} + '@babel/helper-string-parser@7.25.7': + resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.24.7': - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + '@babel/helper-validator-identifier@7.25.7': + resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-option@7.24.8': - resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==} + '@babel/helper-validator-option@7.25.7': + resolution: {integrity: sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==} engines: {node: '>=6.9.0'} - '@babel/helpers@7.25.6': - resolution: {integrity: sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==} + '@babel/helpers@7.25.7': + resolution: {integrity: sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==} engines: {node: '>=6.9.0'} - '@babel/highlight@7.24.7': - resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} + '@babel/highlight@7.25.7': + resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==} engines: {node: '>=6.9.0'} - '@babel/parser@7.25.6': - resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} + '@babel/parser@7.25.7': + resolution: {integrity: sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==} engines: {node: '>=6.0.0'} hasBin: true @@ -1593,14 +1595,14 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-decorators@7.24.7': - resolution: {integrity: sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==} + '@babel/plugin-syntax-decorators@7.25.7': + resolution: {integrity: sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-import-attributes@7.25.6': - resolution: {integrity: sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==} + '@babel/plugin-syntax-import-attributes@7.25.7': + resolution: {integrity: sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1615,8 +1617,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-jsx@7.24.7': - resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==} + '@babel/plugin-syntax-jsx@7.25.7': + resolution: {integrity: sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1663,8 +1665,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-typescript@7.25.4': - resolution: {integrity: sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==} + '@babel/plugin-syntax-typescript@7.25.7': + resolution: {integrity: sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1673,16 +1675,16 @@ packages: resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==} engines: {node: '>=6.9.0'} - '@babel/template@7.25.0': - resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} + '@babel/template@7.25.7': + resolution: {integrity: sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.6': - resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==} + '@babel/traverse@7.25.7': + resolution: {integrity: sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==} engines: {node: '>=6.9.0'} - '@babel/types@7.25.6': - resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} + '@babel/types@7.25.7': + resolution: {integrity: sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==} engines: {node: '>=6.9.0'} '@bcoe/v8-coverage@0.2.3': @@ -3431,8 +3433,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - caniuse-lite@1.0.30001664: - resolution: {integrity: sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==} + caniuse-lite@1.0.30001667: + resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==} capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} @@ -4323,6 +4325,9 @@ packages: egg-path-matching@1.1.0: resolution: {integrity: sha512-pHdz/q8v843jSEpLksXmJEZ8dzDNiCfTgQtgoSTT9bsLa1QFCzsdeZLag+CKTaCHsDhy3id/WjjTRF94X91y6w==} + egg-path-matching@2.1.0: + resolution: {integrity: sha512-g2V2ohTSf/WN1UNtUdeUAhu/xbA97uAJHgqRpRInR2KT77MRxrG4XtcsjbZudQmB5XRPvYSbnny/1m/57+UadA==} + egg-schedule@3.7.0: resolution: {integrity: sha512-kXnqOOk+IpXpov9gpy4Bv1977iiwlk4kRNHPcp2O/Lp934tw9Lx1A2CDxv9lDrazhY7BqQFY7Nq+j8x74yog0w==} engines: {node: '>=8.0.0'} @@ -4372,8 +4377,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true - electron-to-chromium@1.5.29: - resolution: {integrity: sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==} + electron-to-chromium@1.5.32: + resolution: {integrity: sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==} emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -4571,6 +4576,7 @@ packages: eslint@7.32.0: resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==} engines: {node: ^10.12.0 || >=12.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true esm@3.2.25: @@ -5664,6 +5670,9 @@ packages: is-type-of@1.4.0: resolution: {integrity: sha512-EddYllaovi5ysMLMEN7yzHEKh8A850cZ7pykrY1aNRQGn/CDjRDE9qEWbIdt7xGEVJmjBXzU/fNnC4ABTm8tEQ==} + is-type-of@2.1.0: + resolution: {integrity: sha512-hpTq+/nL0hPfmbMyee2mUmvAWoOhQz3s61E1gEAMq3spmJfYky2hwYDRkdZBfeGHB69RrH6sH+e4XB8pyqd6CA==} + is-typed-array@1.1.13: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} @@ -5925,9 +5934,9 @@ packages: resolution: {integrity: sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA==} engines: {node: '>= 6.0.0'} - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} + jsesc@3.0.2: + resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + engines: {node: '>=6'} hasBin: true json-buffer@3.0.0: @@ -7786,8 +7795,8 @@ packages: resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==} engines: {node: '>=0.10.0'} - regex@4.3.2: - resolution: {integrity: sha512-kK/AA3A9K6q2js89+VMymcboLOlF5lZRCYJv3gzszXFHBr6kO6qLGzbm+UIugBEV8SMMKCTR59txoY6ctRHYVw==} + regex@4.3.3: + resolution: {integrity: sha512-r/AadFO7owAq1QJVeZ/nq9jNS1vyZt+6t1p/E59B56Rn2GCya+gr1KSyOzNL/er+r+B7phv5jG2xU2Nz1YkmJg==} regexp.prototype.flags@1.5.2: resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} @@ -8865,8 +8874,8 @@ packages: typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - typedoc@0.26.7: - resolution: {integrity: sha512-gUeI/Wk99vjXXMi8kanwzyhmeFEGv1LTdTQsiyIsmSYsBebvFxhbcyAx7Zjo4cMbpLGxM4Uz3jVIjksu/I2v6Q==} + typedoc@0.26.8: + resolution: {integrity: sha512-QBF0BMbnNeUc6U7pRHY7Jb8pjhmiNWZNQT8LU6uk9qP9t3goP9bJptdlNqMC0wBB2w9sQrxjZt835bpRSSq1LA==} engines: {node: '>= 18'} hasBin: true peerDependencies: @@ -9452,27 +9461,27 @@ snapshots: '@babel/code-frame@7.12.11': dependencies: - '@babel/highlight': 7.24.7 + '@babel/highlight': 7.25.7 - '@babel/code-frame@7.24.7': + '@babel/code-frame@7.25.7': dependencies: - '@babel/highlight': 7.24.7 + '@babel/highlight': 7.25.7 picocolors: 1.1.0 - '@babel/compat-data@7.25.4': {} + '@babel/compat-data@7.25.7': {} - '@babel/core@7.25.2': + '@babel/core@7.25.7': dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.6 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helpers': 7.25.6 - '@babel/parser': 7.25.6 - '@babel/template': 7.25.0 - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 + '@babel/code-frame': 7.25.7 + '@babel/generator': 7.25.7 + '@babel/helper-compilation-targets': 7.25.7 + '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) + '@babel/helpers': 7.25.7 + '@babel/parser': 7.25.7 + '@babel/template': 7.25.7 + '@babel/traverse': 7.25.7 + '@babel/types': 7.25.7 convert-source-map: 2.0.0 debug: 4.3.7 gensync: 1.0.0-beta.2 @@ -9481,238 +9490,238 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.25.6': + '@babel/generator@7.25.7': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 + jsesc: 3.0.2 - '@babel/helper-annotate-as-pure@7.24.7': + '@babel/helper-annotate-as-pure@7.25.7': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 - '@babel/helper-compilation-targets@7.25.2': + '@babel/helper-compilation-targets@7.25.7': dependencies: - '@babel/compat-data': 7.25.4 - '@babel/helper-validator-option': 7.24.8 + '@babel/compat-data': 7.25.7 + '@babel/helper-validator-option': 7.25.7 browserslist: 4.24.0 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)': + '@babel/helper-create-class-features-plugin@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.7 + '@babel/helper-annotate-as-pure': 7.25.7 + '@babel/helper-member-expression-to-functions': 7.25.7 + '@babel/helper-optimise-call-expression': 7.25.7 + '@babel/helper-replace-supers': 7.25.7(@babel/core@7.25.7) + '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 + '@babel/traverse': 7.25.7 semver: 6.3.1 transitivePeerDependencies: - supports-color - '@babel/helper-member-expression-to-functions@7.24.8': + '@babel/helper-member-expression-to-functions@7.25.7': dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 + '@babel/traverse': 7.25.7 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-module-imports@7.24.7': + '@babel/helper-module-imports@7.25.7': dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 + '@babel/traverse': 7.25.7 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': + '@babel/helper-module-transforms@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-simple-access': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.7 + '@babel/helper-module-imports': 7.25.7 + '@babel/helper-simple-access': 7.25.7 + '@babel/helper-validator-identifier': 7.25.7 + '@babel/traverse': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-optimise-call-expression@7.24.7': + '@babel/helper-optimise-call-expression@7.25.7': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 - '@babel/helper-plugin-utils@7.24.8': {} + '@babel/helper-plugin-utils@7.25.7': {} - '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': + '@babel/helper-replace-supers@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.7 + '@babel/helper-member-expression-to-functions': 7.25.7 + '@babel/helper-optimise-call-expression': 7.25.7 + '@babel/traverse': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-simple-access@7.24.7': + '@babel/helper-simple-access@7.25.7': dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 + '@babel/traverse': 7.25.7 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-skip-transparent-expression-wrappers@7.24.7': + '@babel/helper-skip-transparent-expression-wrappers@7.25.7': dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 + '@babel/traverse': 7.25.7 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-string-parser@7.24.8': {} + '@babel/helper-string-parser@7.25.7': {} - '@babel/helper-validator-identifier@7.24.7': {} + '@babel/helper-validator-identifier@7.25.7': {} - '@babel/helper-validator-option@7.24.8': {} + '@babel/helper-validator-option@7.25.7': {} - '@babel/helpers@7.25.6': + '@babel/helpers@7.25.7': dependencies: - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 + '@babel/template': 7.25.7 + '@babel/types': 7.25.7 - '@babel/highlight@7.24.7': + '@babel/highlight@7.25.7': dependencies: - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.7 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.0 - '@babel/parser@7.25.6': + '@babel/parser@7.25.7': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 - '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.25.2) + '@babel/core': 7.25.7 + '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) + '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-decorators': 7.25.7(@babel/core@7.25.7) transitivePeerDependencies: - supports-color - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.2)': + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.2)': + '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-syntax-decorators@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-import-attributes@7.25.6(@babel/core@7.25.2)': + '@babel/plugin-syntax-import-attributes@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-syntax-jsx@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.2)': + '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.2)': + '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.2)': + '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-typescript@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-typescript@7.25.7(@babel/core@7.25.7)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.7 + '@babel/helper-plugin-utils': 7.25.7 '@babel/runtime@7.25.6': dependencies: regenerator-runtime: 0.14.1 - '@babel/template@7.25.0': + '@babel/template@7.25.7': dependencies: - '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 + '@babel/code-frame': 7.25.7 + '@babel/parser': 7.25.7 + '@babel/types': 7.25.7 - '@babel/traverse@7.25.6': + '@babel/traverse@7.25.7': dependencies: - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.6 - '@babel/parser': 7.25.6 - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 + '@babel/code-frame': 7.25.7 + '@babel/generator': 7.25.7 + '@babel/parser': 7.25.7 + '@babel/template': 7.25.7 + '@babel/types': 7.25.7 debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.25.6': + '@babel/types@7.25.7': dependencies: - '@babel/helper-string-parser': 7.24.8 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-string-parser': 7.25.7 + '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 '@bcoe/v8-coverage@0.2.3': {} @@ -9965,7 +9974,7 @@ snapshots: '@jest/transform@29.7.0': dependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.7 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 @@ -10852,24 +10861,24 @@ snapshots: '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 + '@babel/parser': 7.25.7 + '@babel/types': 7.25.7 '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.6 '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 '@types/babel__template@7.4.4': dependencies: - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 + '@babel/parser': 7.25.7 + '@babel/types': 7.25.7 '@types/babel__traverse@7.20.6': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.25.7 '@types/body-parser@1.19.5': dependencies: @@ -11600,13 +11609,13 @@ snapshots: transitivePeerDependencies: - debug - babel-jest@29.7.0(@babel/core@7.25.2): + babel-jest@29.7.0(@babel/core@7.25.7): dependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.7 '@jest/transform': 29.7.0 '@types/babel__core': 7.20.5 babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 29.6.3(@babel/core@7.25.2) + babel-preset-jest: 29.6.3(@babel/core@7.25.7) chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -11615,7 +11624,7 @@ snapshots: babel-plugin-istanbul@6.1.1: dependencies: - '@babel/helper-plugin-utils': 7.24.8 + '@babel/helper-plugin-utils': 7.25.7 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.2.1 @@ -11625,35 +11634,35 @@ snapshots: babel-plugin-jest-hoist@29.6.3: dependencies: - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 + '@babel/template': 7.25.7 + '@babel/types': 7.25.7 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.6 - babel-preset-current-node-syntax@1.1.0(@babel/core@7.25.2): - dependencies: - '@babel/core': 7.25.2 - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2) - '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.2) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2) - '@babel/plugin-syntax-import-attributes': 7.25.6(@babel/core@7.25.2) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.2) - - babel-preset-jest@29.6.3(@babel/core@7.25.2): - dependencies: - '@babel/core': 7.25.2 + babel-preset-current-node-syntax@1.1.0(@babel/core@7.25.7): + dependencies: + '@babel/core': 7.25.7 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.7) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.7) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.7) + '@babel/plugin-syntax-import-attributes': 7.25.7(@babel/core@7.25.7) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.7) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.7) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.7) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.7) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.7) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.7) + + babel-preset-jest@29.6.3(@babel/core@7.25.7): + dependencies: + '@babel/core': 7.25.7 babel-plugin-jest-hoist: 29.6.3 - babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.2) + babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.7) backo2@1.0.2: {} @@ -11766,8 +11775,8 @@ snapshots: browserslist@4.24.0: dependencies: - caniuse-lite: 1.0.30001664 - electron-to-chromium: 1.5.29 + caniuse-lite: 1.0.30001667 + electron-to-chromium: 1.5.32 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.0) @@ -11967,7 +11976,7 @@ snapshots: camelcase@6.3.0: {} - caniuse-lite@1.0.30001664: {} + caniuse-lite@1.0.30001667: {} capital-case@1.0.4: dependencies: @@ -12995,6 +13004,10 @@ snapshots: dependencies: path-to-regexp: 1.9.0 + egg-path-matching@2.1.0: + dependencies: + path-to-regexp: 6.3.0 + egg-schedule@3.7.0: dependencies: cron-parser: 2.18.0 @@ -13143,7 +13156,7 @@ snapshots: dependencies: jake: 10.9.2 - electron-to-chromium@1.5.29: {} + electron-to-chromium@1.5.32: {} emittery@0.13.1: {} @@ -14730,6 +14743,8 @@ snapshots: is-class-hotfix: 0.0.6 isstream: 0.1.2 + is-type-of@2.1.0: {} + is-typed-array@1.1.13: dependencies: which-typed-array: 1.1.15 @@ -14785,8 +14800,8 @@ snapshots: istanbul-lib-instrument@5.2.1: dependencies: - '@babel/core': 7.25.2 - '@babel/parser': 7.25.6 + '@babel/core': 7.25.7 + '@babel/parser': 7.25.7 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 6.3.1 @@ -14795,8 +14810,8 @@ snapshots: istanbul-lib-instrument@6.0.3: dependencies: - '@babel/core': 7.25.2 - '@babel/parser': 7.25.6 + '@babel/core': 7.25.7 + '@babel/parser': 7.25.7 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 7.6.3 @@ -14888,10 +14903,10 @@ snapshots: jest-config@29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)): dependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.7 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.25.2) + babel-jest: 29.7.0(@babel/core@7.25.7) chalk: 4.1.2 ci-info: 3.9.0 deepmerge: 4.3.1 @@ -14977,7 +14992,7 @@ snapshots: jest-message-util@29.7.0: dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.7 '@jest/types': 29.6.3 '@types/stack-utils': 2.0.3 chalk: 4.1.2 @@ -15073,15 +15088,15 @@ snapshots: jest-snapshot@29.7.0: dependencies: - '@babel/core': 7.25.2 - '@babel/generator': 7.25.6 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-syntax-typescript': 7.25.4(@babel/core@7.25.2) - '@babel/types': 7.25.6 + '@babel/core': 7.25.7 + '@babel/generator': 7.25.7 + '@babel/plugin-syntax-jsx': 7.25.7(@babel/core@7.25.7) + '@babel/plugin-syntax-typescript': 7.25.7(@babel/core@7.25.7) + '@babel/types': 7.25.7 '@jest/expect-utils': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.2) + babel-preset-current-node-syntax: 1.1.0(@babel/core@7.25.7) chalk: 4.1.2 expect: 29.7.0 graceful-fs: 4.2.11 @@ -15173,7 +15188,7 @@ snapshots: jsep@0.3.5: {} - jsesc@2.5.2: {} + jsesc@3.0.2: {} json-buffer@3.0.0: {} @@ -16406,11 +16421,11 @@ snapshots: node-source-walk@4.3.0: dependencies: - '@babel/parser': 7.25.6 + '@babel/parser': 7.25.7 node-source-walk@5.0.2: dependencies: - '@babel/parser': 7.25.6 + '@babel/parser': 7.25.7 nopt@5.0.0: dependencies: @@ -16713,7 +16728,7 @@ snapshots: oniguruma-to-js@0.4.3: dependencies: - regex: 4.3.2 + regex: 4.3.3 only@0.0.2: {} @@ -16888,7 +16903,7 @@ snapshots: parse-json@5.2.0: dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.7 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -17481,7 +17496,7 @@ snapshots: extend-shallow: 3.0.2 safe-regex: 1.1.0 - regex@4.3.2: {} + regex@4.3.3: {} regexp.prototype.flags@1.5.2: dependencies: @@ -18596,7 +18611,7 @@ snapshots: ts-graphviz@1.8.2: {} - ts-jest@29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)))(typescript@5.3.3): + ts-jest@29.2.5(@babel/core@7.25.7)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.7))(jest@29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)))(typescript@5.3.3): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 @@ -18610,10 +18625,10 @@ snapshots: typescript: 5.3.3 yargs-parser: 21.1.1 optionalDependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.7 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.25.2) + babel-jest: 29.7.0(@babel/core@7.25.7) ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3): dependencies: @@ -18763,7 +18778,7 @@ snapshots: typedarray@0.0.6: {} - typedoc@0.26.7(typescript@5.3.3): + typedoc@0.26.8(typescript@5.3.3): dependencies: lunr: 2.3.9 markdown-it: 14.1.0 diff --git a/tsconfig.json b/tsconfig.json index 4774f1838605..05bdd03aec19 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,10 +11,11 @@ "strict": false, "noEmitOnError": false, "skipLibCheck": true, - "module": "Node16", + "module": "NodeNext", "moduleResolution": "NodeNext", "target": "ES2021", - "lib": ["ES2021"] + "lib": ["ES2021"], + "allowSyntheticDefaultImports": true }, "exclude": [ "dist", From bf7aa55c820c22f5719f0e3c4185c9aadf46d204 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sun, 6 Oct 2024 00:29:55 +0800 Subject: [PATCH 03/18] chore: add idea run dir --- .../All Tests in async-hooks-context-manager.run.xml | 11 +++++++++++ .run/All Tests in axios.run.xml | 11 +++++++++++ .run/All Tests in egg.run.xml | 12 ++++++++++++ .run/All Tests in express-session.run.xml | 11 +++++++++++ .run/All Tests in express.run.xml | 11 +++++++++++ .run/All Tests in koa.run.xml | 11 +++++++++++ .run/All Tests in ws.run.xml | 12 ++++++++++++ 7 files changed, 79 insertions(+) create mode 100644 .run/All Tests in async-hooks-context-manager.run.xml create mode 100644 .run/All Tests in axios.run.xml create mode 100644 .run/All Tests in egg.run.xml create mode 100644 .run/All Tests in express-session.run.xml create mode 100644 .run/All Tests in express.run.xml create mode 100644 .run/All Tests in koa.run.xml create mode 100644 .run/All Tests in ws.run.xml diff --git a/.run/All Tests in async-hooks-context-manager.run.xml b/.run/All Tests in async-hooks-context-manager.run.xml new file mode 100644 index 000000000000..04ab73ed6e5e --- /dev/null +++ b/.run/All Tests in async-hooks-context-manager.run.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in axios.run.xml b/.run/All Tests in axios.run.xml new file mode 100644 index 000000000000..4dced5cd307f --- /dev/null +++ b/.run/All Tests in axios.run.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in egg.run.xml b/.run/All Tests in egg.run.xml new file mode 100644 index 000000000000..5d80d5f4b363 --- /dev/null +++ b/.run/All Tests in egg.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in express-session.run.xml b/.run/All Tests in express-session.run.xml new file mode 100644 index 000000000000..441c8c1654bf --- /dev/null +++ b/.run/All Tests in express-session.run.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in express.run.xml b/.run/All Tests in express.run.xml new file mode 100644 index 000000000000..46fa4cb4cc5d --- /dev/null +++ b/.run/All Tests in express.run.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in koa.run.xml b/.run/All Tests in koa.run.xml new file mode 100644 index 000000000000..c0ae528ed394 --- /dev/null +++ b/.run/All Tests in koa.run.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in ws.run.xml b/.run/All Tests in ws.run.xml new file mode 100644 index 000000000000..5c81726b1f2b --- /dev/null +++ b/.run/All Tests in ws.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file From 2791a2e15c780989ea14e987f88c4efd142a034f Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sun, 6 Oct 2024 01:00:06 +0800 Subject: [PATCH 04/18] chore: add idea run dir --- .run/All Tests in async-hooks-context-manager.run.xml | 1 + .run/All Tests in axios.run.xml | 1 + .run/All Tests in egg.run.xml | 4 ++-- .run/All Tests in express-session.run.xml | 1 + .run/All Tests in koa.run.xml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.run/All Tests in async-hooks-context-manager.run.xml b/.run/All Tests in async-hooks-context-manager.run.xml index 04ab73ed6e5e..c32cbb874b75 100644 --- a/.run/All Tests in async-hooks-context-manager.run.xml +++ b/.run/All Tests in async-hooks-context-manager.run.xml @@ -2,6 +2,7 @@ + diff --git a/.run/All Tests in axios.run.xml b/.run/All Tests in axios.run.xml index 4dced5cd307f..3b0c29157813 100644 --- a/.run/All Tests in axios.run.xml +++ b/.run/All Tests in axios.run.xml @@ -2,6 +2,7 @@ + diff --git a/.run/All Tests in egg.run.xml b/.run/All Tests in egg.run.xml index 5d80d5f4b363..143fcbecec7f 100644 --- a/.run/All Tests in egg.run.xml +++ b/.run/All Tests in egg.run.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.run/All Tests in express-session.run.xml b/.run/All Tests in express-session.run.xml index 441c8c1654bf..d0507c7de4d4 100644 --- a/.run/All Tests in express-session.run.xml +++ b/.run/All Tests in express-session.run.xml @@ -2,6 +2,7 @@ + diff --git a/.run/All Tests in koa.run.xml b/.run/All Tests in koa.run.xml index c0ae528ed394..716de077de89 100644 --- a/.run/All Tests in koa.run.xml +++ b/.run/All Tests in koa.run.xml @@ -2,6 +2,7 @@ + From 20d441f5be2035529a902de11ad9584604f72612 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 00:09:26 +0800 Subject: [PATCH 05/18] fix: esModuleInterop default value --- packages-serverless/midway-fc-starter/src/index.ts | 2 +- packages/axios/src/index.ts | 2 +- packages/axios/src/serviceManager.ts | 2 +- packages/busboy/src/middleware.ts | 2 +- packages/cache-manager/src/base/store.ts | 2 +- packages/captcha/src/service.ts | 2 +- packages/consul/src/lib/provider.ts | 2 +- packages/core/src/service/aspectService.ts | 2 +- packages/cos/src/manager.ts | 2 +- packages/express-session/src/middleware/session.ts | 4 ++-- packages/mock/src/client/http.ts | 2 +- packages/mock/src/creator.ts | 2 +- packages/prometheus/src/decorator/master.ts | 2 +- packages/security/src/middleware/csrf.middleware.ts | 2 +- packages/static-file/src/middleware/static.middleware.ts | 2 +- packages/upload/src/middleware.ts | 2 +- packages/web-express/src/configuration.ts | 2 +- packages/web-express/src/framework.ts | 2 +- packages/web-koa/src/framework.ts | 2 +- packages/web/test/custom.test.ts | 2 +- .../enhance/base-app-decorator/src/app/controller/param.ts | 2 +- packages/web/test/logger.test.ts | 2 +- packages/web/test/utils.test.ts | 2 +- packages/web/tsconfig.json | 3 +-- tsconfig.json | 2 +- 25 files changed, 26 insertions(+), 27 deletions(-) diff --git a/packages-serverless/midway-fc-starter/src/index.ts b/packages-serverless/midway-fc-starter/src/index.ts index 1de0381d6b37..84f46b976982 100644 --- a/packages-serverless/midway-fc-starter/src/index.ts +++ b/packages-serverless/midway-fc-starter/src/index.ts @@ -3,7 +3,7 @@ import { AbstractBootstrapStarter, IFaaSConfigurationOptions, } from '@midwayjs/faas'; -import getRawBody from 'raw-body'; +import * as getRawBody from 'raw-body'; import { IncomingMessage } from 'http'; import { createContextManager } from '@midwayjs/async-hooks-context-manager'; import { mockContext } from './mock'; diff --git a/packages/axios/src/index.ts b/packages/axios/src/index.ts index 7b6e737e8b55..e34e283cb5ca 100644 --- a/packages/axios/src/index.ts +++ b/packages/axios/src/index.ts @@ -1,4 +1,4 @@ -import axios from 'axios'; +import * as axios from 'axios'; import * as Axios from 'axios'; export { AxiosConfiguration as Configuration } from './configuration'; diff --git a/packages/axios/src/serviceManager.ts b/packages/axios/src/serviceManager.ts index af1daaab4313..7b506421585c 100644 --- a/packages/axios/src/serviceManager.ts +++ b/packages/axios/src/serviceManager.ts @@ -4,7 +4,7 @@ import type { AxiosResponse, CreateAxiosDefaults, } from 'axios'; -import axios from 'axios'; +import * as axios from 'axios'; import { Config, Init, diff --git a/packages/busboy/src/middleware.ts b/packages/busboy/src/middleware.ts index 33613fd1b089..091b2fe319e1 100644 --- a/packages/busboy/src/middleware.ts +++ b/packages/busboy/src/middleware.ts @@ -31,7 +31,7 @@ import { import { parseMultipart } from './parse'; import { fromBuffer } from 'file-type'; import { formatExt, streamToAsyncIterator } from './utils'; -import busboy from 'busboy'; +import * as busboy from 'busboy'; import { BusboyConfig } from 'busboy'; import { EXT_KEY } from './constants'; diff --git a/packages/cache-manager/src/base/store.ts b/packages/cache-manager/src/base/store.ts index 829734d27a09..d8366bf528c0 100644 --- a/packages/cache-manager/src/base/store.ts +++ b/packages/cache-manager/src/base/store.ts @@ -1,4 +1,4 @@ -import LRUCache from 'lru-cache'; +import * as LRUCache from 'lru-cache'; import * as cloneDeep from 'lodash.clonedeep'; import { MemoryConfig, MemoryStore, LRU } from './types'; diff --git a/packages/captcha/src/service.ts b/packages/captcha/src/service.ts index 398a611845d4..64b6bc8b502f 100644 --- a/packages/captcha/src/service.ts +++ b/packages/captcha/src/service.ts @@ -7,7 +7,7 @@ import { } from '@midwayjs/core'; import { CachingFactory, MidwayCache } from '@midwayjs/cache-manager'; import * as svgCaptcha from 'svg-captcha'; -import svgBase64 from 'mini-svg-data-uri'; +import * as svgBase64 from 'mini-svg-data-uri'; import { nanoid } from 'nanoid'; import { FormulaCaptchaOptions, diff --git a/packages/consul/src/lib/provider.ts b/packages/consul/src/lib/provider.ts index b1068718dfe8..5f650d93f156 100644 --- a/packages/consul/src/lib/provider.ts +++ b/packages/consul/src/lib/provider.ts @@ -2,7 +2,7 @@ import { IConsulProviderInfoOptions, IConsulRegisterInfoOptions, } from '../interface'; -import Consul from 'consul'; +import * as Consul from 'consul'; export class ConsulProvider { private readonly consul: Consul.Consul; diff --git a/packages/core/src/service/aspectService.ts b/packages/core/src/service/aspectService.ts index e5f61b4efccd..1e70ce26d0d9 100644 --- a/packages/core/src/service/aspectService.ts +++ b/packages/core/src/service/aspectService.ts @@ -1,4 +1,4 @@ -import pm from 'picomatch'; +import * as pm from 'picomatch'; import { IMidwayContainer, AspectMetadata, diff --git a/packages/cos/src/manager.ts b/packages/cos/src/manager.ts index 88fd7a871bb0..1808684c8743 100644 --- a/packages/cos/src/manager.ts +++ b/packages/cos/src/manager.ts @@ -11,7 +11,7 @@ import { MidwayCommonError, } from '@midwayjs/core'; import * as assert from 'assert'; -import COS from 'cos-nodejs-sdk-v5'; +import * as COS from 'cos-nodejs-sdk-v5'; @Provide() @Scope(ScopeEnum.Singleton) diff --git a/packages/express-session/src/middleware/session.ts b/packages/express-session/src/middleware/session.ts index 1d0ee3b5b9df..2283163271fa 100644 --- a/packages/express-session/src/middleware/session.ts +++ b/packages/express-session/src/middleware/session.ts @@ -7,8 +7,8 @@ import { MidwayConfigMissingError, MidwayConfigService, } from '@midwayjs/core'; -import session = require('express-session'); -import cookieSession = require('cookie-session'); +import * as session from 'express-session'; +import * as cookieSession from 'cookie-session'; import { SessionStoreManager } from '../store'; @Middleware() diff --git a/packages/mock/src/client/http.ts b/packages/mock/src/client/http.ts index 9603b69b42ee..86046cf52e32 100644 --- a/packages/mock/src/client/http.ts +++ b/packages/mock/src/client/http.ts @@ -1,5 +1,5 @@ import { IMidwayApplication } from '@midwayjs/core'; -import request from 'supertest'; +import * as request from 'supertest'; export function createHttpRequest>( app: T diff --git a/packages/mock/src/creator.ts b/packages/mock/src/creator.ts index 33ca719880d6..7f30e8bea59e 100644 --- a/packages/mock/src/creator.ts +++ b/packages/mock/src/creator.ts @@ -41,7 +41,7 @@ import { existsSync, readFileSync } from 'fs'; import * as http from 'http'; import * as https from 'https'; import * as yaml from 'js-yaml'; -import getRawBody from 'raw-body'; +import * as getRawBody from 'raw-body'; import { createContextManager } from '@midwayjs/async-hooks-context-manager'; const debug = debuglog('midway:debug'); diff --git a/packages/prometheus/src/decorator/master.ts b/packages/prometheus/src/decorator/master.ts index b5ebffb664cf..daaa643b85dd 100644 --- a/packages/prometheus/src/decorator/master.ts +++ b/packages/prometheus/src/decorator/master.ts @@ -1,5 +1,5 @@ import { saveModule, attachClassMetadata } from '@midwayjs/core'; -import request from 'request'; +import * as request from 'request'; import * as path from 'path'; import * as os from 'os'; import { isMaster } from '../utils/utils'; diff --git a/packages/security/src/middleware/csrf.middleware.ts b/packages/security/src/middleware/csrf.middleware.ts index b0ad10ef95fd..9dea97838f74 100644 --- a/packages/security/src/middleware/csrf.middleware.ts +++ b/packages/security/src/middleware/csrf.middleware.ts @@ -1,6 +1,6 @@ import { Middleware } from '@midwayjs/core'; import { CSRFError } from '../error'; -import CsrfTokens from 'csrf'; +import * as CsrfTokens from 'csrf'; import { isSafeDomain, parseUrl } from '../utils'; import { BaseMiddleware } from './base'; diff --git a/packages/static-file/src/middleware/static.middleware.ts b/packages/static-file/src/middleware/static.middleware.ts index 5e1f8845c70e..d79f0bc9df72 100644 --- a/packages/static-file/src/middleware/static.middleware.ts +++ b/packages/static-file/src/middleware/static.middleware.ts @@ -9,7 +9,7 @@ import { } from '@midwayjs/core'; import * as assert from 'assert'; import * as staticCache from 'koa-static-cache'; -import LRU from 'ylru'; +import * as LRU from 'ylru'; import * as range from 'koa-range'; import { DirectoryNotFoundError } from '../error'; diff --git a/packages/upload/src/middleware.ts b/packages/upload/src/middleware.ts index 24f4c434ef4e..3efe5307bda9 100644 --- a/packages/upload/src/middleware.ts +++ b/packages/upload/src/middleware.ts @@ -19,7 +19,7 @@ import { UploadOptions, } from '.'; import { parseFromReadableStream, parseMultipart } from './parse'; -import getRawBody from 'raw-body'; +import * as getRawBody from 'raw-body'; import { fromBuffer } from 'file-type'; import { formatExt } from './utils'; diff --git a/packages/web-express/src/configuration.ts b/packages/web-express/src/configuration.ts index 7b4789ecdee9..ab2525ade859 100644 --- a/packages/web-express/src/configuration.ts +++ b/packages/web-express/src/configuration.ts @@ -9,7 +9,7 @@ import { } from '@midwayjs/core'; import * as session from '@midwayjs/express-session'; import * as bodyParser from 'body-parser'; -import cookieParser = require('cookie-parser'); +import * as cookieParser from 'cookie-parser'; import * as DefaultConfig from './config/config.default'; import { MidwayExpressFramework } from './framework'; diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts index b520d16131f2..358d14d6aff1 100644 --- a/packages/web-express/src/framework.ts +++ b/packages/web-express/src/framework.ts @@ -22,7 +22,7 @@ import { Context, } from './interface'; import type { IRouter, IRouterHandler, Response, NextFunction } from 'express'; -import express = require('express'); +import * as express from 'express'; import { Server } from 'net'; import { wrapAsyncHandler, diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts index 0216680c9b03..dad48799c63d 100644 --- a/packages/web-koa/src/framework.ts +++ b/packages/web-koa/src/framework.ts @@ -24,7 +24,7 @@ import { } from './interface'; import * as Router from '@koa/router'; import type { DefaultState, Middleware, Next } from 'koa'; -import koa from 'koa'; +import * as koa from 'koa'; import { Server } from 'http'; import { setupOnError } from './onerror'; import * as qs from 'qs'; diff --git a/packages/web/test/custom.test.ts b/packages/web/test/custom.test.ts index dd92c72d885d..515f754c9878 100644 --- a/packages/web/test/custom.test.ts +++ b/packages/web/test/custom.test.ts @@ -1,4 +1,4 @@ -import mm from 'mm'; +import * as mm from 'mm'; import { join } from 'path'; mm(process.env, 'MIDWAY_PROJECT_APPDIR', join(__dirname, './fixtures/feature/base-app-use-custom-egg')); import { closeApp, creatApp, createHttpRequest } from './utils'; diff --git a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts index fcb1048914de..e1915ba83df4 100644 --- a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts +++ b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/param.ts @@ -19,7 +19,7 @@ import { import * as path from 'path'; import * as fs from 'fs'; -import pump from 'mz-modules/pump'; +import * as pump from 'mz-modules/pump'; @Provide() @Controller('/param') diff --git a/packages/web/test/logger.test.ts b/packages/web/test/logger.test.ts index aa0c010de18f..0d4350ea1742 100644 --- a/packages/web/test/logger.test.ts +++ b/packages/web/test/logger.test.ts @@ -1,5 +1,5 @@ import { creatApp, closeApp, getFilepath, sleep, matchContentTimes } from './utils'; -import mm = require('mm'); +import * as mm from 'mm'; import { join } from 'path'; import { existsSync, readFileSync, writeFileSync, ensureDir, remove } from 'fs-extra'; import { lstatSync } from 'fs'; diff --git a/packages/web/test/utils.test.ts b/packages/web/test/utils.test.ts index be64763dca11..884ae5fefb15 100644 --- a/packages/web/test/utils.test.ts +++ b/packages/web/test/utils.test.ts @@ -1,5 +1,5 @@ import { getCurrentDateString } from '../src/utils'; -import dayjs from 'dayjs'; +import * as dayjs from 'dayjs'; describe('test/utils.test.ts', function () { diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 87c59d3a281a..b1a4a0c8633f 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -4,8 +4,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "jsx": "react", - "esModuleInterop": true + "jsx": "react" }, "include": [ "./src/**/*.ts" diff --git a/tsconfig.json b/tsconfig.json index 05bdd03aec19..40cf1eaecad5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "moduleResolution": "NodeNext", "target": "ES2021", "lib": ["ES2021"], - "allowSyntheticDefaultImports": true + "esModuleInterop": false }, "exclude": [ "dist", From 469627c1b9b514bae81f4d5e0612f9afb5aa56a6 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 12:37:14 +0800 Subject: [PATCH 06/18] chore: remove legacy code --- .github/workflows/precheck.yml | 86 +- package.json | 1 - packages-legacy/cache/CHANGELOG.md | 408 -------- packages-legacy/cache/README.md | 12 - packages-legacy/cache/index.d.ts | 9 - packages-legacy/cache/jest.config.js | 8 - packages-legacy/cache/jest.setup.js | 2 - packages-legacy/cache/package.json | 38 - .../cache/src/config/config.default.ts | 7 - packages-legacy/cache/src/configuration.ts | 13 - .../cache/src/decorator/cacheKey.ts | 0 packages-legacy/cache/src/index.ts | 2 - packages-legacy/cache/src/service/cache.ts | 47 - packages-legacy/cache/test/cache.test.ts | 19 - .../test/fixtures/cache-manager/package.json | 3 - .../cache-manager/src/configuration.ts | 10 - .../cache-manager/src/service/user.service.ts | 22 - packages-legacy/cache/tsconfig.json | 11 - packages-legacy/cache/typedoc.json | 4 - packages-legacy/egg-layer/CHANGELOG.md | 935 ----------------- .../framework/config/config.default.js | 26 - .../egg-layer/framework/config/plugin.js | 8 - packages-legacy/egg-layer/framework/index.js | 17 - packages-legacy/egg-layer/index.js | 148 --- packages-legacy/egg-layer/jest.config.js | 8 - packages-legacy/egg-layer/jest.setup.js | 5 - packages-legacy/egg-layer/package.json | 37 - .../egg-layer/test/fixtures/eaas-fc/README.md | 33 - .../egg-layer/test/fixtures/eaas-fc/agent.js | 11 - .../egg-layer/test/fixtures/eaas-fc/app.js | 7 - .../fixtures/eaas-fc/app/controller/home.js | 51 - .../test/fixtures/eaas-fc/app/public/news.css | 6 - .../test/fixtures/eaas-fc/app/router.js | 17 - .../fixtures/eaas-fc/config/config.default.js | 36 - .../test/fixtures/eaas-fc/config/plugin.js | 10 - .../egg-layer/test/fixtures/eaas-fc/f.yml | 11 - .../egg-layer/test/fixtures/eaas-fc/index.js | 27 - .../test/fixtures/eaas-fc/package.json | 47 - .../test/fixtures/eaas-scf/README.md | 33 - .../egg-layer/test/fixtures/eaas-scf/agent.js | 11 - .../egg-layer/test/fixtures/eaas-scf/app.js | 7 - .../fixtures/eaas-scf/app/controller/home.js | 39 - .../fixtures/eaas-scf/app/public/news.css | 6 - .../test/fixtures/eaas-scf/app/router.js | 15 - .../eaas-scf/config/config.default.js | 36 - .../test/fixtures/eaas-scf/config/plugin.js | 10 - .../egg-layer/test/fixtures/eaas-scf/f.yml | 11 - .../egg-layer/test/fixtures/eaas-scf/index.js | 27 - .../test/fixtures/eaas-scf/package.json | 47 - .../test/fixtures/midway-fc/bootstrap.js | 18 - .../egg-layer/test/fixtures/midway-fc/f.yml | 11 - .../test/fixtures/midway-fc/index.js | 27 - .../test/fixtures/midway-fc/package.json | 6 - .../midway-fc/src/config/config.default.ts | 17 - .../midway-fc/src/config/config.unittest.ts | 5 - .../fixtures/midway-fc/src/configuration.ts | 14 - .../fixtures/midway-fc/src/controller/api.ts | 33 - .../fixtures/midway-fc/src/service/user.ts | 10 - packages-legacy/egg-layer/test/index.test.js | 339 ------- packages-legacy/express-layer/CHANGELOG.md | 595 ----------- packages-legacy/express-layer/index.js | 82 -- packages-legacy/express-layer/jest.config.js | 8 - packages-legacy/express-layer/jest.setup.js | 2 - packages-legacy/express-layer/package.json | 35 - .../test/fixtures/app-fc/README.md | 33 - .../express-layer/test/fixtures/app-fc/app.js | 39 - .../express-layer/test/fixtures/app-fc/f.yml | 13 - .../test/fixtures/app-fc/index.js | 27 - .../test/fixtures/app-fc/package.json | 21 - .../test/fixtures/app-scf/README.md | 33 - .../test/fixtures/app-scf/app.js | 36 - .../express-layer/test/fixtures/app-scf/f.yml | 13 - .../test/fixtures/app-scf/index.js | 27 - .../test/fixtures/app-scf/package.json | 21 - .../express-layer/test/index.test.js | 208 ---- packages-legacy/koa-layer/CHANGELOG.md | 585 ----------- packages-legacy/koa-layer/index.js | 82 -- packages-legacy/koa-layer/jest.config.js | 8 - packages-legacy/koa-layer/jest.setup.js | 2 - packages-legacy/koa-layer/package.json | 36 - .../koa-layer/test/fixtures/app-fc/README.md | 33 - .../koa-layer/test/fixtures/app-fc/app.js | 46 - .../koa-layer/test/fixtures/app-fc/f.yml | 6 - .../koa-layer/test/fixtures/app-fc/index.js | 27 - .../test/fixtures/app-fc/package.json | 21 - .../koa-layer/test/fixtures/app-scf/README.md | 33 - .../koa-layer/test/fixtures/app-scf/app.js | 38 - .../koa-layer/test/fixtures/app-scf/f.yml | 13 - .../koa-layer/test/fixtures/app-scf/index.js | 27 - .../test/fixtures/app-scf/package.json | 21 - packages-legacy/koa-layer/test/index.test.js | 207 ---- packages-legacy/orm/CHANGELOG.md | 374 ------- packages-legacy/orm/README.md | 101 -- packages-legacy/orm/index.d.ts | 13 - packages-legacy/orm/jest.config.js | 8 - packages-legacy/orm/jest.setup.js | 7 - packages-legacy/orm/package.json | 34 - packages-legacy/orm/src/configuration.ts | 253 ----- packages-legacy/orm/src/decorator.ts | 152 --- packages-legacy/orm/src/hook.ts | 25 - packages-legacy/orm/src/index.ts | 61 -- packages-legacy/orm/src/interface.ts | 3 - packages-legacy/orm/src/repository.ts | 54 - .../fixtures/base-fn-multiple-db/package.json | 7 - .../src/config/config.default.ts | 20 - .../base-fn-multiple-db/src/configuration.ts | 60 -- .../fixtures/base-fn-multiple-db/src/event.ts | 58 -- .../fixtures/base-fn-multiple-db/src/hook.ts | 34 - .../base-fn-multiple-db/src/model/message.ts | 16 - .../src/model/onlyTestLoadLog.ts | 13 - .../base-fn-multiple-db/src/model/user.ts | 15 - .../base-fn-multiple-db/tsconfig.json | 22 - .../orm/test/fixtures/base-fn/package.json | 6 - .../base-fn/src/config/config.default.ts | 12 - .../fixtures/base-fn/src/configuration.ts | 74 -- .../orm/test/fixtures/base-fn/src/event.ts | 58 -- .../orm/test/fixtures/base-fn/src/hook.ts | 33 - .../fixtures/base-fn/src/model/message.ts | 16 - .../test/fixtures/base-fn/src/model/user.ts | 15 - .../orm/test/fixtures/base-fn/tsconfig.json | 22 - packages-legacy/orm/test/index.test.ts | 36 - packages-legacy/orm/tsconfig.json | 11 - packages-legacy/runtime-engine/CHANGELOG.md | 489 --------- packages-legacy/runtime-engine/jest.config.js | 8 - packages-legacy/runtime-engine/jest.setup.js | 2 - packages-legacy/runtime-engine/package.json | 24 - .../runtime-engine/src/bootstrap.ts | 47 - packages-legacy/runtime-engine/src/engine.ts | 110 -- packages-legacy/runtime-engine/src/error.ts | 18 - packages-legacy/runtime-engine/src/index.ts | 9 - .../runtime-engine/src/interface.ts | 113 --- .../runtime-engine/src/lib/debug.ts | 42 - .../runtime-engine/src/lib/parser.ts | 84 -- .../runtime-engine/src/lib/performance.ts | 20 - .../runtime-engine/src/lightRuntime.ts | 40 - packages-legacy/runtime-engine/src/runtime.ts | 241 ----- packages-legacy/runtime-engine/src/util.ts | 106 -- .../runtime-engine/test/TestRuntime.ts | 102 -- .../runtime-engine/test/fixtures/base.ts | 29 - .../test/fixtures/common/index.ts | 5 - .../test/fixtures/crash/index.ts | 1 - .../test/fixtures/error/index.ts | 7 - .../test/fixtures/extension/httpEvent.ts | 21 - .../test/fixtures/extension/index.ts | 10 - .../runtime-engine/test/fixtures/js/index.ts | 7 - .../runtime-engine/test/index.test.ts | 395 -------- .../runtime-engine/test/layer.test.ts | 4 - .../runtime-engine/test/lib/parser.test.ts | 41 - .../runtime-engine/test/perf-events.test.ts | 45 - .../runtime-engine/test/runtime-error.test.ts | 23 - .../test/runtime-events.test.ts | 46 - .../runtime-engine/test/runtime.test.ts | 13 - .../runtime-engine/test/util.test.ts | 34 - packages-legacy/runtime-engine/tsconfig.json | 11 - packages-legacy/runtime-mock/CHANGELOG.md | 468 --------- packages-legacy/runtime-mock/jest.config.js | 8 - packages-legacy/runtime-mock/jest.setup.js | 2 - packages-legacy/runtime-mock/package.json | 27 - packages-legacy/runtime-mock/src/event.ts | 22 - packages-legacy/runtime-mock/src/index.ts | 3 - packages-legacy/runtime-mock/src/runtime.ts | 148 --- packages-legacy/runtime-mock/src/trigger.ts | 32 - .../runtime-mock/test/code/index.ts | 5 - .../runtime-mock/test/code/spec.yml | 21 - .../runtime-mock/test/index.test.ts | 19 - packages-legacy/runtime-mock/tsconfig.json | 11 - packages-legacy/serverless-app/CHANGELOG.md | 562 ----------- packages-legacy/serverless-app/index.d.ts | 2 - packages-legacy/serverless-app/jest.config.js | 8 - packages-legacy/serverless-app/jest.setup.js | 4 - packages-legacy/serverless-app/package.json | 46 - .../serverless-app/src/configuration.ts | 17 - .../serverless-app/src/framework.ts | 375 ------- packages-legacy/serverless-app/src/index.ts | 3 - .../serverless-app/src/interface.ts | 19 - .../serverless-app/src/platform.ts | 15 - packages-legacy/serverless-app/src/start.ts | 44 - packages-legacy/serverless-app/src/utils.ts | 158 --- packages-legacy/serverless-app/ssl/ssl.key | 27 - packages-legacy/serverless-app/ssl/ssl.pem | 23 - .../test/faas-start-end.test.ts | 31 - .../serverless-app/test/faas-v2.test.ts | 123 --- .../test/fixtures/faas-start-end/f.yml | 5 - .../test/fixtures/faas-start-end/package.json | 5 - .../faas-start-end/src/configuration.ts | 16 - .../test/fixtures/faas-start-end/src/event.ts | 16 - .../fixtures/faas-start-end/tsconfig.json | 23 - .../test/fixtures/faas-v2/1.jpg | Bin 16424 -> 0 bytes .../test/fixtures/faas-v2/f.yml | 14 - .../test/fixtures/faas-v2/package.json | 6 - .../faas-v2/src/config/config.default.ts | 5 - .../fixtures/faas-v2/src/configuration.ts | 15 - .../test/fixtures/faas-v2/src/controller.ts | 19 - .../test/fixtures/faas-v2/src/event.ts | 23 - .../test/fixtures/faas-v2/src/func.ts | 38 - .../test/fixtures/faas-v2/src/index.ts | 41 - .../test/fixtures/faas-v2/src/interface.ts | 0 .../test/fixtures/faas-v2/tsconfig.json | 23 - .../test/fixtures/integration-v2/f.yml | 5 - .../test/fixtures/integration-v2/package.json | 5 - .../src/apis/config/config.default.ts | 3 - .../integration-v2/src/apis/configuration.ts | 14 - .../fixtures/integration-v2/src/apis/index.ts | 23 - .../integration-v2/src/pages/index.js | 1 - .../fixtures/integration-v2/tsconfig.json | 23 - .../test/intergration-v2.test.ts | 31 - packages-legacy/serverless-app/test/util.ts | 18 - packages-legacy/serverless-app/tsconfig.json | 11 - .../serverless-aws-starter/CHANGELOG.md | 533 ---------- .../serverless-aws-starter/README.md | 27 - .../serverless-aws-starter/jest.config.js | 8 - .../serverless-aws-starter/jest.setup.js | 2 - .../serverless-aws-starter/package.json | 31 - .../resource/event.json | 123 --- .../serverless-aws-starter/src/context.ts | 156 --- .../serverless-aws-starter/src/index.ts | 17 - .../serverless-aws-starter/src/interface.ts | 81 -- .../serverless-aws-starter/src/runtime.ts | 142 --- .../test/__snapshots__/index.test.ts.snap | 19 - .../serverless-aws-starter/test/index.test.ts | 403 -------- .../serverless-aws-starter/tsconfig.json | 11 - .../serverless-fc-starter/CHANGELOG.md | 950 ------------------ .../serverless-fc-starter/README.md | 29 - .../serverless-fc-starter/jest.config.js | 8 - .../serverless-fc-starter/jest.setup.js | 2 - .../serverless-fc-starter/package.json | 33 - .../resource/event_req.json | 20 - .../serverless-fc-starter/src/index.ts | 34 - .../serverless-fc-starter/src/runtime.ts | 287 ------ .../test/fixtures/apigw/index.ts | 29 - .../test/fixtures/event/index.ts | 12 - .../test/fixtures/http-302/index.ts | 15 - .../test/fixtures/http-json/index.ts | 16 - .../test/fixtures/http/index.ts | 14 - .../serverless-fc-starter/test/index.test.ts | 573 ----------- .../serverless-fc-starter/tsconfig.json | 11 - .../serverless-fc-trigger/CHANGELOG.md | 874 ---------------- .../serverless-fc-trigger/jest.config.js | 8 - .../serverless-fc-trigger/jest.setup.js | 2 - .../serverless-fc-trigger/package.json | 35 - .../serverless-fc-trigger/src/apiGateway.ts | 74 -- .../serverless-fc-trigger/src/base.ts | 52 - .../serverless-fc-trigger/src/cdn.ts | 41 - .../serverless-fc-trigger/src/http.ts | 197 ---- .../serverless-fc-trigger/src/index.ts | 8 - .../serverless-fc-trigger/src/interface.ts | 194 ---- .../serverless-fc-trigger/src/mns.ts | 26 - .../serverless-fc-trigger/src/oss.ts | 54 - .../serverless-fc-trigger/src/sls.ts | 29 - .../serverless-fc-trigger/src/tableStore.ts | 40 - .../serverless-fc-trigger/src/timer.ts | 20 - .../test/fixtures/apiGateway/index.ts | 14 - .../test/fixtures/cdn/index.ts | 9 - .../test/fixtures/event/index.ts | 9 - .../test/fixtures/http/index.ts | 9 - .../test/fixtures/oss/index.ts | 9 - .../test/fixtures/sls/index.ts | 9 - .../test/fixtures/timer/index.ts | 9 - .../serverless-fc-trigger/test/index.test.ts | 133 --- .../serverless-fc-trigger/tsconfig.json | 11 - .../serverless-scf-starter/CHANGELOG.md | 639 ------------ .../serverless-scf-starter/README.md | 29 - .../serverless-scf-starter/jest.config.js | 8 - .../serverless-scf-starter/jest.setup.js | 2 - .../serverless-scf-starter/package.json | 31 - .../resource/event.json | 38 - .../serverless-scf-starter/src/index.ts | 27 - .../serverless-scf-starter/src/runtime.ts | 169 ---- .../serverless-scf-starter/test/index.test.ts | 483 --------- .../serverless-scf-starter/tsconfig.json | 11 - .../serverless-scf-trigger/CHANGELOG.md | 838 --------------- .../serverless-scf-trigger/jest.config.js | 8 - .../serverless-scf-trigger/jest.setup.js | 2 - .../serverless-scf-trigger/package.json | 35 - .../serverless-scf-trigger/src/apiGateway.ts | 97 -- .../serverless-scf-trigger/src/base.ts | 31 - .../serverless-scf-trigger/src/ckafka.ts | 38 - .../serverless-scf-trigger/src/cmq.ts | 34 - .../serverless-scf-trigger/src/cos.ts | 59 -- .../serverless-scf-trigger/src/index.ts | 5 - .../serverless-scf-trigger/src/timer.ts | 21 - .../test/fixtures/apiGateway/index.ts | 8 - .../test/fixtures/ckafka/index.ts | 3 - .../test/fixtures/cmq/index.ts | 3 - .../test/fixtures/cos/index.ts | 3 - .../test/fixtures/timer/index.ts | 3 - .../serverless-scf-trigger/test/index.test.ts | 59 -- .../serverless-scf-trigger/tsconfig.json | 11 - .../serverless-vercel-starter/CHANGELOG.md | 290 ------ .../serverless-vercel-starter/README.md | 1 - .../serverless-vercel-starter/jest.config.js | 8 - .../serverless-vercel-starter/jest.setup.js | 2 - .../serverless-vercel-starter/package.json | 34 - .../serverless-vercel-starter/src/index.ts | 28 - .../serverless-vercel-starter/src/runtime.ts | 130 --- .../test/fixtures/http/index.ts | 35 - .../test/index.test.ts | 104 -- .../serverless-vercel-starter/tsconfig.json | 11 - .../serverless-vercel-trigger/CHANGELOG.md | 150 --- .../serverless-vercel-trigger/jest.config.js | 8 - .../serverless-vercel-trigger/jest.setup.js | 2 - .../serverless-vercel-trigger/package.json | 27 - .../serverless-vercel-trigger/src/http.ts | 106 -- .../serverless-vercel-trigger/src/index.ts | 1 - .../test/fixtures/http/index.ts | 27 - .../test/index.test.ts | 57 -- .../serverless-vercel-trigger/tsconfig.json | 11 - .../serverless-worker-starter/CHANGELOG.md | 303 ------ .../serverless-worker-starter/README.md | 20 - .../serverless-worker-starter/jest.config.js | 8 - .../serverless-worker-starter/jest.setup.js | 2 - .../serverless-worker-starter/package.json | 34 - .../src/http-request.ts | 109 -- .../serverless-worker-starter/src/index.ts | 50 - .../src/interface.ts | 59 -- .../serverless-worker-starter/src/runtime.ts | 316 ------ .../serverless-worker-starter/src/util.ts | 31 - .../test/helper/request_response.ts | 124 --- .../test/node-worker.test.ts | 334 ------ .../test/service-worker.test.ts | 276 ----- .../serverless-worker-starter/tsconfig.json | 12 - packages-legacy/static-layer/CHANGELOG.md | 586 ----------- packages-legacy/static-layer/index.js | 112 --- packages-legacy/static-layer/jest.config.js | 8 - packages-legacy/static-layer/jest.setup.js | 2 - packages-legacy/static-layer/package.json | 35 - packages-legacy/static-layer/rewrite.js | 66 -- .../test/fixtures/app-fc-404/README.md | 33 - .../test/fixtures/app-fc-404/build/404.html | 10 - .../test/fixtures/app-fc-404/build/index.html | 12 - .../test/fixtures/app-fc-404/build/index.js | 1 - .../test/fixtures/app-fc-404/build/main.css | 0 .../test/fixtures/app-fc-404/f.yml | 11 - .../test/fixtures/app-fc-404/index.js | 35 - .../test/fixtures/app-fc-404/package.json | 21 - .../fixtures/app-fc-rewrite/build/api.html | 1 - .../fixtures/app-fc-rewrite/build/index.html | 1 - .../app-fc-rewrite/build/static/index.html | 1 - .../test/fixtures/app-fc-rewrite/f.yml | 21 - .../test/fixtures/app-fc-rewrite/index.js | 37 - .../test/fixtures/app-fc-rewrite/package.json | 21 - .../test/fixtures/app-fc/README.md | 33 - .../test/fixtures/app-fc/build/index.html | 12 - .../test/fixtures/app-fc/build/index.js | 1 - .../test/fixtures/app-fc/build/main.css | 0 .../static-layer/test/fixtures/app-fc/f.yml | 11 - .../test/fixtures/app-fc/index.js | 35 - .../test/fixtures/app-fc/package.json | 21 - .../test/fixtures/app-scf/README.md | 33 - .../static-layer/test/fixtures/app-scf/app.js | 34 - .../static-layer/test/fixtures/app-scf/f.yml | 6 - .../test/fixtures/app-scf/index.js | 27 - .../test/fixtures/app-scf/package.json | 21 - .../static-layer/test/index.test.js | 149 --- packages-legacy/task/CHANGELOG.md | 431 -------- packages-legacy/task/README.md | 146 --- packages-legacy/task/index.d.ts | 13 - packages-legacy/task/jest.config.js | 8 - packages-legacy/task/jest.setup.js | 2 - packages-legacy/task/package.json | 39 - .../task/src/config/config.default.ts | 24 - packages-legacy/task/src/configuration.ts | 22 - packages-legacy/task/src/framework.ts | 216 ---- packages-legacy/task/src/index.ts | 4 - packages-legacy/task/src/interface.ts | 17 - .../task/src/service/queueService.ts | 43 - .../package.json | 3 - .../src/config/config.default.ts | 10 - .../src/configuration.ts | 14 - .../src/task/another.task.ts | 14 - .../src/task/hello.task.ts | 14 - .../base-app-duplicate-task/package.json | 3 - .../src/config/config.default.ts | 10 - .../src/configuration.ts | 14 - .../src/task/another.task.ts | 16 - .../src/task/hello.task.ts | 16 - .../task/test/fixtures/base-app/package.json | 3 - .../base-app/src/config/config.default.ts | 10 - .../fixtures/base-app/src/configuration.ts | 14 - .../fixtures/base-app/src/task/hello.task.ts | 22 - .../fixtures/base-app/src/task/queue.task.ts | 18 - packages-legacy/task/test/index.test.ts | 69 -- packages-legacy/task/tsconfig.json | 11 - packages/faas/test/index.test.ts | 123 --- 384 files changed, 12 insertions(+), 25199 deletions(-) delete mode 100644 packages-legacy/cache/CHANGELOG.md delete mode 100644 packages-legacy/cache/README.md delete mode 100644 packages-legacy/cache/index.d.ts delete mode 100644 packages-legacy/cache/jest.config.js delete mode 100644 packages-legacy/cache/jest.setup.js delete mode 100644 packages-legacy/cache/package.json delete mode 100644 packages-legacy/cache/src/config/config.default.ts delete mode 100644 packages-legacy/cache/src/configuration.ts delete mode 100644 packages-legacy/cache/src/decorator/cacheKey.ts delete mode 100644 packages-legacy/cache/src/index.ts delete mode 100644 packages-legacy/cache/src/service/cache.ts delete mode 100644 packages-legacy/cache/test/cache.test.ts delete mode 100644 packages-legacy/cache/test/fixtures/cache-manager/package.json delete mode 100644 packages-legacy/cache/test/fixtures/cache-manager/src/configuration.ts delete mode 100644 packages-legacy/cache/test/fixtures/cache-manager/src/service/user.service.ts delete mode 100644 packages-legacy/cache/tsconfig.json delete mode 100644 packages-legacy/cache/typedoc.json delete mode 100644 packages-legacy/egg-layer/CHANGELOG.md delete mode 100644 packages-legacy/egg-layer/framework/config/config.default.js delete mode 100644 packages-legacy/egg-layer/framework/config/plugin.js delete mode 100644 packages-legacy/egg-layer/framework/index.js delete mode 100644 packages-legacy/egg-layer/index.js delete mode 100644 packages-legacy/egg-layer/jest.config.js delete mode 100644 packages-legacy/egg-layer/jest.setup.js delete mode 100644 packages-legacy/egg-layer/package.json delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/README.md delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/agent.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/app.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/app/controller/home.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/app/public/news.css delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/app/router.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/config/config.default.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/config/plugin.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/f.yml delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/index.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-fc/package.json delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/README.md delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/agent.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/app.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/app/controller/home.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/app/public/news.css delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/app/router.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/config/config.default.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/config/plugin.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/f.yml delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/index.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/eaas-scf/package.json delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/bootstrap.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/f.yml delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/index.js delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/package.json delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.default.ts delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.unittest.ts delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/src/configuration.ts delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/src/controller/api.ts delete mode 100644 packages-legacy/egg-layer/test/fixtures/midway-fc/src/service/user.ts delete mode 100644 packages-legacy/egg-layer/test/index.test.js delete mode 100644 packages-legacy/express-layer/CHANGELOG.md delete mode 100644 packages-legacy/express-layer/index.js delete mode 100644 packages-legacy/express-layer/jest.config.js delete mode 100644 packages-legacy/express-layer/jest.setup.js delete mode 100644 packages-legacy/express-layer/package.json delete mode 100644 packages-legacy/express-layer/test/fixtures/app-fc/README.md delete mode 100644 packages-legacy/express-layer/test/fixtures/app-fc/app.js delete mode 100644 packages-legacy/express-layer/test/fixtures/app-fc/f.yml delete mode 100644 packages-legacy/express-layer/test/fixtures/app-fc/index.js delete mode 100644 packages-legacy/express-layer/test/fixtures/app-fc/package.json delete mode 100644 packages-legacy/express-layer/test/fixtures/app-scf/README.md delete mode 100644 packages-legacy/express-layer/test/fixtures/app-scf/app.js delete mode 100644 packages-legacy/express-layer/test/fixtures/app-scf/f.yml delete mode 100644 packages-legacy/express-layer/test/fixtures/app-scf/index.js delete mode 100644 packages-legacy/express-layer/test/fixtures/app-scf/package.json delete mode 100644 packages-legacy/express-layer/test/index.test.js delete mode 100644 packages-legacy/koa-layer/CHANGELOG.md delete mode 100644 packages-legacy/koa-layer/index.js delete mode 100644 packages-legacy/koa-layer/jest.config.js delete mode 100644 packages-legacy/koa-layer/jest.setup.js delete mode 100644 packages-legacy/koa-layer/package.json delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-fc/README.md delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-fc/app.js delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-fc/f.yml delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-fc/index.js delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-fc/package.json delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-scf/README.md delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-scf/app.js delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-scf/f.yml delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-scf/index.js delete mode 100644 packages-legacy/koa-layer/test/fixtures/app-scf/package.json delete mode 100644 packages-legacy/koa-layer/test/index.test.js delete mode 100644 packages-legacy/orm/CHANGELOG.md delete mode 100644 packages-legacy/orm/README.md delete mode 100644 packages-legacy/orm/index.d.ts delete mode 100644 packages-legacy/orm/jest.config.js delete mode 100644 packages-legacy/orm/jest.setup.js delete mode 100644 packages-legacy/orm/package.json delete mode 100644 packages-legacy/orm/src/configuration.ts delete mode 100644 packages-legacy/orm/src/decorator.ts delete mode 100644 packages-legacy/orm/src/hook.ts delete mode 100644 packages-legacy/orm/src/index.ts delete mode 100644 packages-legacy/orm/src/interface.ts delete mode 100644 packages-legacy/orm/src/repository.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/package.json delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/config/config.default.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/configuration.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/event.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/hook.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/message.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/onlyTestLoadLog.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/user.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn-multiple-db/tsconfig.json delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/package.json delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/config/config.default.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/configuration.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/event.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/hook.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/model/message.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/src/model/user.ts delete mode 100644 packages-legacy/orm/test/fixtures/base-fn/tsconfig.json delete mode 100644 packages-legacy/orm/test/index.test.ts delete mode 100644 packages-legacy/orm/tsconfig.json delete mode 100644 packages-legacy/runtime-engine/CHANGELOG.md delete mode 100644 packages-legacy/runtime-engine/jest.config.js delete mode 100644 packages-legacy/runtime-engine/jest.setup.js delete mode 100644 packages-legacy/runtime-engine/package.json delete mode 100644 packages-legacy/runtime-engine/src/bootstrap.ts delete mode 100644 packages-legacy/runtime-engine/src/engine.ts delete mode 100644 packages-legacy/runtime-engine/src/error.ts delete mode 100644 packages-legacy/runtime-engine/src/index.ts delete mode 100644 packages-legacy/runtime-engine/src/interface.ts delete mode 100644 packages-legacy/runtime-engine/src/lib/debug.ts delete mode 100644 packages-legacy/runtime-engine/src/lib/parser.ts delete mode 100644 packages-legacy/runtime-engine/src/lib/performance.ts delete mode 100644 packages-legacy/runtime-engine/src/lightRuntime.ts delete mode 100644 packages-legacy/runtime-engine/src/runtime.ts delete mode 100644 packages-legacy/runtime-engine/src/util.ts delete mode 100644 packages-legacy/runtime-engine/test/TestRuntime.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/base.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/common/index.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/crash/index.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/error/index.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/extension/httpEvent.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/extension/index.ts delete mode 100644 packages-legacy/runtime-engine/test/fixtures/js/index.ts delete mode 100644 packages-legacy/runtime-engine/test/index.test.ts delete mode 100644 packages-legacy/runtime-engine/test/layer.test.ts delete mode 100644 packages-legacy/runtime-engine/test/lib/parser.test.ts delete mode 100644 packages-legacy/runtime-engine/test/perf-events.test.ts delete mode 100644 packages-legacy/runtime-engine/test/runtime-error.test.ts delete mode 100644 packages-legacy/runtime-engine/test/runtime-events.test.ts delete mode 100644 packages-legacy/runtime-engine/test/runtime.test.ts delete mode 100644 packages-legacy/runtime-engine/test/util.test.ts delete mode 100644 packages-legacy/runtime-engine/tsconfig.json delete mode 100644 packages-legacy/runtime-mock/CHANGELOG.md delete mode 100644 packages-legacy/runtime-mock/jest.config.js delete mode 100644 packages-legacy/runtime-mock/jest.setup.js delete mode 100644 packages-legacy/runtime-mock/package.json delete mode 100644 packages-legacy/runtime-mock/src/event.ts delete mode 100644 packages-legacy/runtime-mock/src/index.ts delete mode 100644 packages-legacy/runtime-mock/src/runtime.ts delete mode 100644 packages-legacy/runtime-mock/src/trigger.ts delete mode 100644 packages-legacy/runtime-mock/test/code/index.ts delete mode 100644 packages-legacy/runtime-mock/test/code/spec.yml delete mode 100644 packages-legacy/runtime-mock/test/index.test.ts delete mode 100644 packages-legacy/runtime-mock/tsconfig.json delete mode 100644 packages-legacy/serverless-app/CHANGELOG.md delete mode 100644 packages-legacy/serverless-app/index.d.ts delete mode 100644 packages-legacy/serverless-app/jest.config.js delete mode 100644 packages-legacy/serverless-app/jest.setup.js delete mode 100644 packages-legacy/serverless-app/package.json delete mode 100644 packages-legacy/serverless-app/src/configuration.ts delete mode 100644 packages-legacy/serverless-app/src/framework.ts delete mode 100644 packages-legacy/serverless-app/src/index.ts delete mode 100644 packages-legacy/serverless-app/src/interface.ts delete mode 100644 packages-legacy/serverless-app/src/platform.ts delete mode 100644 packages-legacy/serverless-app/src/start.ts delete mode 100644 packages-legacy/serverless-app/src/utils.ts delete mode 100644 packages-legacy/serverless-app/ssl/ssl.key delete mode 100644 packages-legacy/serverless-app/ssl/ssl.pem delete mode 100644 packages-legacy/serverless-app/test/faas-start-end.test.ts delete mode 100644 packages-legacy/serverless-app/test/faas-v2.test.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-start-end/f.yml delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-start-end/package.json delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-start-end/src/configuration.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-start-end/src/event.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-start-end/tsconfig.json delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/1.jpg delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/f.yml delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/package.json delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/config/config.default.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/configuration.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/controller.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/event.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/func.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/index.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/src/interface.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/faas-v2/tsconfig.json delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/f.yml delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/package.json delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/config/config.default.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/configuration.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/index.ts delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/src/pages/index.js delete mode 100644 packages-legacy/serverless-app/test/fixtures/integration-v2/tsconfig.json delete mode 100644 packages-legacy/serverless-app/test/intergration-v2.test.ts delete mode 100644 packages-legacy/serverless-app/test/util.ts delete mode 100644 packages-legacy/serverless-app/tsconfig.json delete mode 100644 packages-legacy/serverless-aws-starter/CHANGELOG.md delete mode 100644 packages-legacy/serverless-aws-starter/README.md delete mode 100644 packages-legacy/serverless-aws-starter/jest.config.js delete mode 100644 packages-legacy/serverless-aws-starter/jest.setup.js delete mode 100644 packages-legacy/serverless-aws-starter/package.json delete mode 100644 packages-legacy/serverless-aws-starter/resource/event.json delete mode 100644 packages-legacy/serverless-aws-starter/src/context.ts delete mode 100644 packages-legacy/serverless-aws-starter/src/index.ts delete mode 100644 packages-legacy/serverless-aws-starter/src/interface.ts delete mode 100644 packages-legacy/serverless-aws-starter/src/runtime.ts delete mode 100644 packages-legacy/serverless-aws-starter/test/__snapshots__/index.test.ts.snap delete mode 100644 packages-legacy/serverless-aws-starter/test/index.test.ts delete mode 100644 packages-legacy/serverless-aws-starter/tsconfig.json delete mode 100644 packages-legacy/serverless-fc-starter/CHANGELOG.md delete mode 100644 packages-legacy/serverless-fc-starter/README.md delete mode 100644 packages-legacy/serverless-fc-starter/jest.config.js delete mode 100644 packages-legacy/serverless-fc-starter/jest.setup.js delete mode 100644 packages-legacy/serverless-fc-starter/package.json delete mode 100644 packages-legacy/serverless-fc-starter/resource/event_req.json delete mode 100644 packages-legacy/serverless-fc-starter/src/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/src/runtime.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/fixtures/apigw/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/fixtures/event/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/fixtures/http-302/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/fixtures/http-json/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/fixtures/http/index.ts delete mode 100644 packages-legacy/serverless-fc-starter/test/index.test.ts delete mode 100644 packages-legacy/serverless-fc-starter/tsconfig.json delete mode 100644 packages-legacy/serverless-fc-trigger/CHANGELOG.md delete mode 100644 packages-legacy/serverless-fc-trigger/jest.config.js delete mode 100644 packages-legacy/serverless-fc-trigger/jest.setup.js delete mode 100644 packages-legacy/serverless-fc-trigger/package.json delete mode 100644 packages-legacy/serverless-fc-trigger/src/apiGateway.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/base.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/cdn.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/http.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/interface.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/mns.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/oss.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/sls.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/tableStore.ts delete mode 100644 packages-legacy/serverless-fc-trigger/src/timer.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/apiGateway/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/cdn/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/event/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/http/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/oss/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/sls/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/fixtures/timer/index.ts delete mode 100644 packages-legacy/serverless-fc-trigger/test/index.test.ts delete mode 100644 packages-legacy/serverless-fc-trigger/tsconfig.json delete mode 100644 packages-legacy/serverless-scf-starter/CHANGELOG.md delete mode 100644 packages-legacy/serverless-scf-starter/README.md delete mode 100644 packages-legacy/serverless-scf-starter/jest.config.js delete mode 100644 packages-legacy/serverless-scf-starter/jest.setup.js delete mode 100644 packages-legacy/serverless-scf-starter/package.json delete mode 100644 packages-legacy/serverless-scf-starter/resource/event.json delete mode 100644 packages-legacy/serverless-scf-starter/src/index.ts delete mode 100644 packages-legacy/serverless-scf-starter/src/runtime.ts delete mode 100644 packages-legacy/serverless-scf-starter/test/index.test.ts delete mode 100644 packages-legacy/serverless-scf-starter/tsconfig.json delete mode 100644 packages-legacy/serverless-scf-trigger/CHANGELOG.md delete mode 100644 packages-legacy/serverless-scf-trigger/jest.config.js delete mode 100644 packages-legacy/serverless-scf-trigger/jest.setup.js delete mode 100644 packages-legacy/serverless-scf-trigger/package.json delete mode 100644 packages-legacy/serverless-scf-trigger/src/apiGateway.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/base.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/ckafka.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/cmq.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/cos.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/src/timer.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/fixtures/apiGateway/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/fixtures/ckafka/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/fixtures/cmq/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/fixtures/cos/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/fixtures/timer/index.ts delete mode 100644 packages-legacy/serverless-scf-trigger/test/index.test.ts delete mode 100644 packages-legacy/serverless-scf-trigger/tsconfig.json delete mode 100644 packages-legacy/serverless-vercel-starter/CHANGELOG.md delete mode 100644 packages-legacy/serverless-vercel-starter/README.md delete mode 100644 packages-legacy/serverless-vercel-starter/jest.config.js delete mode 100644 packages-legacy/serverless-vercel-starter/jest.setup.js delete mode 100644 packages-legacy/serverless-vercel-starter/package.json delete mode 100644 packages-legacy/serverless-vercel-starter/src/index.ts delete mode 100644 packages-legacy/serverless-vercel-starter/src/runtime.ts delete mode 100644 packages-legacy/serverless-vercel-starter/test/fixtures/http/index.ts delete mode 100644 packages-legacy/serverless-vercel-starter/test/index.test.ts delete mode 100644 packages-legacy/serverless-vercel-starter/tsconfig.json delete mode 100644 packages-legacy/serverless-vercel-trigger/CHANGELOG.md delete mode 100644 packages-legacy/serverless-vercel-trigger/jest.config.js delete mode 100644 packages-legacy/serverless-vercel-trigger/jest.setup.js delete mode 100644 packages-legacy/serverless-vercel-trigger/package.json delete mode 100644 packages-legacy/serverless-vercel-trigger/src/http.ts delete mode 100644 packages-legacy/serverless-vercel-trigger/src/index.ts delete mode 100644 packages-legacy/serverless-vercel-trigger/test/fixtures/http/index.ts delete mode 100644 packages-legacy/serverless-vercel-trigger/test/index.test.ts delete mode 100644 packages-legacy/serverless-vercel-trigger/tsconfig.json delete mode 100644 packages-legacy/serverless-worker-starter/CHANGELOG.md delete mode 100644 packages-legacy/serverless-worker-starter/README.md delete mode 100644 packages-legacy/serverless-worker-starter/jest.config.js delete mode 100644 packages-legacy/serverless-worker-starter/jest.setup.js delete mode 100644 packages-legacy/serverless-worker-starter/package.json delete mode 100644 packages-legacy/serverless-worker-starter/src/http-request.ts delete mode 100644 packages-legacy/serverless-worker-starter/src/index.ts delete mode 100644 packages-legacy/serverless-worker-starter/src/interface.ts delete mode 100644 packages-legacy/serverless-worker-starter/src/runtime.ts delete mode 100644 packages-legacy/serverless-worker-starter/src/util.ts delete mode 100644 packages-legacy/serverless-worker-starter/test/helper/request_response.ts delete mode 100644 packages-legacy/serverless-worker-starter/test/node-worker.test.ts delete mode 100644 packages-legacy/serverless-worker-starter/test/service-worker.test.ts delete mode 100644 packages-legacy/serverless-worker-starter/tsconfig.json delete mode 100644 packages-legacy/static-layer/CHANGELOG.md delete mode 100644 packages-legacy/static-layer/index.js delete mode 100644 packages-legacy/static-layer/jest.config.js delete mode 100644 packages-legacy/static-layer/jest.setup.js delete mode 100644 packages-legacy/static-layer/package.json delete mode 100644 packages-legacy/static-layer/rewrite.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/README.md delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/build/404.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/build/main.css delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/f.yml delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-404/package.json delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/api.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/index.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/static/index.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/f.yml delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc-rewrite/package.json delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/README.md delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/build/index.html delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/build/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/build/main.css delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/f.yml delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-fc/package.json delete mode 100644 packages-legacy/static-layer/test/fixtures/app-scf/README.md delete mode 100644 packages-legacy/static-layer/test/fixtures/app-scf/app.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-scf/f.yml delete mode 100644 packages-legacy/static-layer/test/fixtures/app-scf/index.js delete mode 100644 packages-legacy/static-layer/test/fixtures/app-scf/package.json delete mode 100644 packages-legacy/static-layer/test/index.test.js delete mode 100644 packages-legacy/task/CHANGELOG.md delete mode 100644 packages-legacy/task/README.md delete mode 100644 packages-legacy/task/index.d.ts delete mode 100644 packages-legacy/task/jest.config.js delete mode 100644 packages-legacy/task/jest.setup.js delete mode 100644 packages-legacy/task/package.json delete mode 100644 packages-legacy/task/src/config/config.default.ts delete mode 100644 packages-legacy/task/src/configuration.ts delete mode 100644 packages-legacy/task/src/framework.ts delete mode 100644 packages-legacy/task/src/index.ts delete mode 100644 packages-legacy/task/src/interface.ts delete mode 100644 packages-legacy/task/src/service/queueService.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-local-task/package.json delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/config/config.default.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/configuration.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/another.task.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/hello.task.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-task/package.json delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-task/src/config/config.default.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-task/src/configuration.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/another.task.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/hello.task.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app/package.json delete mode 100644 packages-legacy/task/test/fixtures/base-app/src/config/config.default.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app/src/configuration.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app/src/task/hello.task.ts delete mode 100644 packages-legacy/task/test/fixtures/base-app/src/task/queue.task.ts delete mode 100644 packages-legacy/task/test/index.test.ts delete mode 100644 packages-legacy/task/tsconfig.json diff --git a/.github/workflows/precheck.yml b/.github/workflows/precheck.yml index 00f5ade5f5d4..6f0a9cc24611 100644 --- a/.github/workflows/precheck.yml +++ b/.github/workflows/precheck.yml @@ -2,7 +2,7 @@ name: Pre Check on: push: - branches: [main] + branches: [v4-next] paths-ignore: - 'site/**' - '*.md' @@ -19,85 +19,23 @@ jobs: node-version: ['lts/*'] os: [ubuntu-latest] runs-on: ${{ matrix.os }} - services: - redis: - image: redis - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - - 6379:6379 - rabbitmq: - image: rabbitmq:latest - ports: - - 5672/tcp - options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5 - zookeeper: - image: wurstmeister/zookeeper - ports: - - 2181:2181 - env: - ALLOW_ANONYMOUS_LOGIN: yes - options: >- - --health-cmd "echo mntr | nc -w 2 -q 2 localhost 2181" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - kafka: - image: wurstmeister/kafka - ports: - - 9092:9092 - options: >- - --health-cmd "kafka-broker-api-versions.sh --version" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - env: - KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092 - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092 ## 修改:宿主机IP - KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181" - KAFKA_ADVERTISED_PORT: 9092 - -# postgres: -# image: postgres:alpine -# ports: -# - 5432:5432 -# env: -# POSTGRES_DB: db_ci_test -# POSTGRES_USER: postgres -# POSTGRES_PASSWORD: postgres -# # needed because the postgres container does not provide a healthcheck -# options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - steps: - name: Git checkout uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v4 + with: + version: 9 + run_install: false + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + cache: 'pnpm' - - name: Start MongoDB - uses: supercharge/mongodb-github-action@1.11.0 - with: - mongodb-version: 4.2 - - - run: npm install - - run: npm run build --if-present - - run: npm run lint - - run: npm run lint:cycle -# - run: npm run test_legacy - env: - RABBITMQ_URL: amqp://localhost:${{ job.services.rabbitmq.ports[5672] }} - ALI_SDK_OSS_REGION: ${{ secrets.ALI_SDK_OSS_REGION }} - ALI_SDK_OSS_ENDPOINT: ${{ secrets.ALI_SDK_OSS_ENDPOINT }} - ALI_SDK_OSS_ID: ${{ secrets.ALI_SDK_OSS_ID }} - ALI_SDK_OSS_SECRET: ${{ secrets.ALI_SDK_OSS_SECRET }} - ALI_SDK_OSS_BUCKET: ${{ secrets.ALI_SDK_OSS_BUCKET }} - ALI_SDK_STS_ID: ${{ secrets.ALI_SDK_STS_ID }} - ALI_SDK_STS_SECRET: ${{ secrets.ALI_SDK_STS_SECRET }} - ALI_SDK_STS_BUCKET: ${{ secrets.ALI_SDK_STS_BUCKET }} - ALI_SDK_STS_ROLE: ${{ secrets.ALI_SDK_STS_ROLE }} + - run: pnpm install + - run: pnpm build --if-present + - run: pnpm lint + - run: pnpm lint:cycle diff --git a/package.json b/package.json index 49a7adb71bc8..7e97e3b02185 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "test": "lerna run test", "link": "lerna run link", "cov": "lerna run cov --concurrency 2 --stream", - "test_legacy": "lerna run test --concurrency 2 --stream --scope={$(lerna list --all --parseable --toposort --long | grep packages-legacy | sed -E \"s/[^:]+:([^:]+).+/\\1/\" | paste -d , -s -)}", "ci": "npm run build && npm run cov", "purge": "npm run clean && rm -rf node_modules && rm -rf pnpm-lock.yaml", "reset": "npm run purge && npm i && npm run ci", diff --git a/packages-legacy/cache/CHANGELOG.md b/packages-legacy/cache/CHANGELOG.md deleted file mode 100644 index 72fa280ac482..000000000000 --- a/packages-legacy/cache/CHANGELOG.md +++ /dev/null @@ -1,408 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.3.12](https://github.com/midwayjs/midway/compare/v3.3.11...v3.3.12) (2022-06-02) - -### Bug Fixes - -- cache typings ([#2018](https://github.com/midwayjs/midway/issues/2018)) ([8db4e69](https://github.com/midwayjs/midway/commit/8db4e698e534da3eb7b4a37eeb7485b4fe34b977)) - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27) - -### Bug Fixes - -- swagger ui replace json path ([#1860](https://github.com/midwayjs/midway/issues/1860)) ([0f3728d](https://github.com/midwayjs/midway/commit/0f3728daccba12923f23f5b498c7dda13ced36d7)) - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10) - -**Note:** Version bump only for package @midwayjs/cache - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -### Bug Fixes - -- express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd)) - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -### Features - -- add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3)) - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/cache - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Features - -- add redis component ([#1270](https://github.com/midwayjs/midway/issues/1270)) ([09c993a](https://github.com/midwayjs/midway/commit/09c993ac308d26fa9c742a659471c3f4cf5c5782)) - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.12.1](https://github.com/midwayjs/midway/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/cache - -# [2.12.0](https://github.com/midwayjs/midway/compare/v2.11.7...v2.12.0) (2021-07-30) - -### Features - -- enhance cache for [#1103](https://github.com/midwayjs/midway/issues/1103) ([#1189](https://github.com/midwayjs/midway/issues/1189)) ([562236c](https://github.com/midwayjs/midway/commit/562236cfa5970d47454f26d92c350165d73a63cd)) - -## [2.11.6](https://github.com/midwayjs/midway/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.11.5](https://github.com/midwayjs/midway/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.11.4](https://github.com/midwayjs/midway/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.11.3](https://github.com/midwayjs/midway/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.11.2](https://github.com/midwayjs/midway/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.11.1](https://github.com/midwayjs/midway/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/cache - -# [2.11.0](https://github.com/midwayjs/midway/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.18](https://github.com/midwayjs/midway/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.14](https://github.com/midwayjs/midway/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.13](https://github.com/midwayjs/midway/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.12](https://github.com/midwayjs/midway/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.11](https://github.com/midwayjs/midway/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.10](https://github.com/midwayjs/midway/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.9](https://github.com/midwayjs/midway/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.8](https://github.com/midwayjs/midway/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.7](https://github.com/midwayjs/midway/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway/issues/986)) ([bfd8232](https://github.com/midwayjs/midway/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway/issues/997)) ([456cc14](https://github.com/midwayjs/midway/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.5](https://github.com/midwayjs/midway/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.4](https://github.com/midwayjs/midway/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.3](https://github.com/midwayjs/midway/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.10.2](https://github.com/midwayjs/midway/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/cache - -# [2.10.0](https://github.com/midwayjs/midway/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.9.2](https://github.com/midwayjs/midway/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/cache - -## [2.9.1](https://github.com/midwayjs/midway/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/cache - -# [2.9.0](https://github.com/midwayjs/midway/compare/v2.8.13...v2.9.0) (2021-03-22) - -### Features - -- add midway cache ([#911](https://github.com/midwayjs/midway/issues/911)) ([cc49eee](https://github.com/midwayjs/midway/commit/cc49eee739ba6d2c37b9270b6cf5239afde4a912)) -- support bootstrap load config first ([#931](https://github.com/midwayjs/midway/issues/931)) ([ae9ed26](https://github.com/midwayjs/midway/commit/ae9ed261aacdb483d3a9a612be79fff384503bcc)) diff --git a/packages-legacy/cache/README.md b/packages-legacy/cache/README.md deleted file mode 100644 index e5cde96b0382..000000000000 --- a/packages-legacy/cache/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# midway-cache - -[![Package Quality](http://npm.packagequality.com/shield/midway-core.svg)](http://packagequality.com/#?package=midway-core) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/midwayjs/midway/pulls) - -this is a sub package for midway. - -Document: [https://midwayjs.org](https://midwayjs.org) - -## License - -[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE)) diff --git a/packages-legacy/cache/index.d.ts b/packages-legacy/cache/index.d.ts deleted file mode 100644 index bf430aecb786..000000000000 --- a/packages-legacy/cache/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CacheOptions, StoreConfig } from 'cache-manager'; - -export * from './dist/index'; - -declare module '@midwayjs/core/dist/interface' { - interface MidwayConfig { - cache?: Partial; - } -} diff --git a/packages-legacy/cache/jest.config.js b/packages-legacy/cache/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/cache/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/cache/jest.setup.js b/packages-legacy/cache/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/cache/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/cache/package.json b/packages-legacy/cache/package.json deleted file mode 100644 index 996b23b3d701..000000000000 --- a/packages-legacy/cache/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "@midwayjs/cache", - "version": "3.18.1", - "description": "midway cache manager", - "main": "dist/index.js", - "typings": "index.d.ts", - "private": true, - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand", - "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit" - }, - "author": "", - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts", - "index.d.ts" - ], - "license": "MIT", - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "keywords": [ - "midway", - "cache" - ], - "engines": { - "node": ">=12" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/mock": "^3.18.0" - }, - "dependencies": { - "cache-manager": "3.6.3" - } -} diff --git a/packages-legacy/cache/src/config/config.default.ts b/packages-legacy/cache/src/config/config.default.ts deleted file mode 100644 index c0ea75716619..000000000000 --- a/packages-legacy/cache/src/config/config.default.ts +++ /dev/null @@ -1,7 +0,0 @@ -export const cache = { - store: 'memory', - options: { - max: 100, - ttl: 10, - }, -}; diff --git a/packages-legacy/cache/src/configuration.ts b/packages-legacy/cache/src/configuration.ts deleted file mode 100644 index 01dd5f25559f..000000000000 --- a/packages-legacy/cache/src/configuration.ts +++ /dev/null @@ -1,13 +0,0 @@ -// src/configuration.ts -import { Configuration } from '@midwayjs/core'; -import * as DefaultConfig from './config/config.default'; - -@Configuration({ - namespace: 'cache', - importConfigs: [ - { - default: DefaultConfig, - }, - ], -}) -export class CacheConfiguration {} diff --git a/packages-legacy/cache/src/decorator/cacheKey.ts b/packages-legacy/cache/src/decorator/cacheKey.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages-legacy/cache/src/index.ts b/packages-legacy/cache/src/index.ts deleted file mode 100644 index a59c032ccf37..000000000000 --- a/packages-legacy/cache/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { CacheConfiguration as Configuration } from './configuration'; -export * from './service/cache'; diff --git a/packages-legacy/cache/src/service/cache.ts b/packages-legacy/cache/src/service/cache.ts deleted file mode 100644 index 6480a70af88c..000000000000 --- a/packages-legacy/cache/src/service/cache.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Config, Init, Provide, Scope, ScopeEnum } from '@midwayjs/core'; -const cacheManager = require('cache-manager'); - -@Provide() -@Scope(ScopeEnum.Singleton) -export class CacheManager { - cache; - - @Config('cache') - cacheConfig; - - @Init() - async init() { - this.cache = cacheManager.caching({ - store: this.cacheConfig.store, - ...this.cacheConfig.options, - }); - } - - // 获取key - async get(key: string): Promise { - return new Promise((resolve, reject) => { - this.cache.get(key, (err, result) => { - if (err) { - reject(err); - return; - } - resolve(result); - }); - }); - } - - // 设置cache - async set(key: string, value: T, options?: any): Promise { - return await this.cache.set(key, value, options); - } - - // 删除key - async del(key: string) { - return await this.cache.del(key); - } - - // 清空cache - async reset() { - return await this.cache.reset(); - } -} diff --git a/packages-legacy/cache/test/cache.test.ts b/packages-legacy/cache/test/cache.test.ts deleted file mode 100644 index 07c971cebeb9..000000000000 --- a/packages-legacy/cache/test/cache.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as path from 'path'; -import * as assert from 'assert'; -import { createLightApp } from '@midwayjs/mock'; - -describe(`test.cache`, ()=>{ - it(`test cache`, async ()=>{ - const app = await createLightApp(path.join(__dirname, './fixtures/cache-manager')); - const appCtx = app.getApplicationContext(); - - const userService: any = await appCtx.getAsync('userService'); - assert((await userService.getUser(`name`)) === undefined) - await userService.setUser('name', 'stone-jin') - assert((await userService.getUser(`name`)) === 'stone-jin') - await userService.setUser('name', {name: '123'}); - assert(JSON.stringify(await userService.getUser('name'))===JSON.stringify({name: '123'})) - await userService.reset(); - assert((await userService.getUser(`name`)) === undefined) - }) -}) diff --git a/packages-legacy/cache/test/fixtures/cache-manager/package.json b/packages-legacy/cache/test/fixtures/cache-manager/package.json deleted file mode 100644 index 0c6d96230994..000000000000 --- a/packages-legacy/cache/test/fixtures/cache-manager/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "my-midway-project" -} diff --git a/packages-legacy/cache/test/fixtures/cache-manager/src/configuration.ts b/packages-legacy/cache/test/fixtures/cache-manager/src/configuration.ts deleted file mode 100644 index 0d7a75cbd004..000000000000 --- a/packages-legacy/cache/test/fixtures/cache-manager/src/configuration.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import * as cacheComponent from '../../../../src/index'; - -@Configuration({ - imports: [ - cacheComponent - ] -}) -export class ContainerLifeCycle { -} diff --git a/packages-legacy/cache/test/fixtures/cache-manager/src/service/user.service.ts b/packages-legacy/cache/test/fixtures/cache-manager/src/service/user.service.ts deleted file mode 100644 index 03b3e938a3c9..000000000000 --- a/packages-legacy/cache/test/fixtures/cache-manager/src/service/user.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Inject, Provide } from '@midwayjs/core'; -import { CacheManager } from '../../../../../src/index'; - -@Provide() -export class UserService { - - @Inject(`cache:cacheManager`) - cache: CacheManager; - - async setUser(name: string, value: string){ - await this.cache.set(name, value); - } - - async getUser(name: string){ - let result = await this.cache.get(name); - return result; - } - - async reset(){ - await this.cache.reset(); - } -} diff --git a/packages-legacy/cache/tsconfig.json b/packages-legacy/cache/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/cache/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/cache/typedoc.json b/packages-legacy/cache/typedoc.json deleted file mode 100644 index f593f276c273..000000000000 --- a/packages-legacy/cache/typedoc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": ["../../typedoc.base.json"], - "entryPoints": ["src/index.ts"] -} diff --git a/packages-legacy/egg-layer/CHANGELOG.md b/packages-legacy/egg-layer/CHANGELOG.md deleted file mode 100644 index c94d1227c1bb..000000000000 --- a/packages-legacy/egg-layer/CHANGELOG.md +++ /dev/null @@ -1,935 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.3.0 ([#2435](https://github.com/midwayjs/midway/issues/2435)) ([6342e1d](https://github.com/midwayjs/midway/commit/6342e1d2a5301f3bd512d7c58b90482bca390898)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.5](https://github.com/midwayjs/midway/compare/v3.4.4...v3.4.5) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.9](https://github.com/midwayjs/midway/compare/v3.3.8...v3.3.9) (2022-05-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.6](https://github.com/midwayjs/midway/compare/v3.3.5...v3.3.6) (2022-05-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.3](https://github.com/midwayjs/midway/compare/v3.3.2...v3.3.3) (2022-04-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.4](https://github.com/midwayjs/midway/compare/v3.1.3...v3.1.4) (2022-03-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.3](https://github.com/midwayjs/midway/compare/v3.1.2...v3.1.3) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.2 ([#1599](https://github.com/midwayjs/midway/issues/1599)) ([982d888](https://github.com/midwayjs/midway/commit/982d88816e90e43785f4c429608ce8eafed4da81)) - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.1 ([#1561](https://github.com/midwayjs/midway/issues/1561)) ([0bcde23](https://github.com/midwayjs/midway/commit/0bcde231d562d2daedcbefcdaaa8ddcf5bb9ad58)) - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.0 ([#1555](https://github.com/midwayjs/midway/issues/1555)) ([4ff0e03](https://github.com/midwayjs/midway/commit/4ff0e03e833825b7a79c530665b4ab27b5d25294)) - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -### Bug Fixes - -- faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639)) - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- component env filter ([#1234](https://github.com/midwayjs/midway/issues/1234)) ([1ad365f](https://github.com/midwayjs/midway/commit/1ad365fd8ef5e0e7dae3d08a2427a2300038290a)) -- encode request path in serverless ([#1230](https://github.com/midwayjs/midway/issues/1230)) ([c826e68](https://github.com/midwayjs/midway/commit/c826e6899c884af9f3365ab77b95449a68889afe)) -- form-data for egg-layer ([#1097](https://github.com/midwayjs/midway/issues/1097)) ([66057e8](https://github.com/midwayjs/midway/commit/66057e8910c00db0ae2b2ea801cdd94aa063fe84)) - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.7](https://github.com/midwayjs/midway-faas/compare/v2.11.6...v2.11.7) (2021-07-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -### Bug Fixes - -- remove egg dep ([#1118](https://github.com/midwayjs/midway-faas/issues/1118)) ([633cb17](https://github.com/midwayjs/midway-faas/commit/633cb1773dd2133811fe8b500502cabbd3ef0375)) - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.19](https://github.com/midwayjs/midway-faas/compare/v2.10.18...v2.10.19) (2021-05-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- add midway case for egg-layer and add warn for DecoratorManager ([#994](https://github.com/midwayjs/midway-faas/issues/994)) ([3d601aa](https://github.com/midwayjs/midway-faas/commit/3d601aa19104081870eb32ba09170357a9da4d03)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.9.3](https://github.com/midwayjs/midway-faas/compare/v2.9.2...v2.9.3) (2021-03-30) - -### Bug Fixes - -- client ip proxy to real server ([#956](https://github.com/midwayjs/midway-faas/issues/956)) ([fa6d53c](https://github.com/midwayjs/midway-faas/commit/fa6d53cde0f8bcbca875cf69faa08a708746c0bc)) - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -### Bug Fixes - -- delete method parse body and form body ([#891](https://github.com/midwayjs/midway-faas/issues/891)) ([f5c1e70](https://github.com/midwayjs/midway-faas/commit/f5c1e7042ed85656e323563421391a719999979e)) - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -### Bug Fixes - -- load custom framework in midwayjs/web ([#883](https://github.com/midwayjs/midway-faas/issues/883)) ([7a11cac](https://github.com/midwayjs/midway-faas/commit/7a11cac1cea753e781ac358a75277400f8aa87bf)) - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -### Bug Fixes - -- definition fix for getLogger and getCoreLogger ([#783](https://github.com/midwayjs/midway-faas/issues/783)) ([264b481](https://github.com/midwayjs/midway-faas/commit/264b4819f8f96dccabd1e5cd6ad2c7b3b8277136)) - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -### Bug Fixes - -- egg layer x forwarded for ([#768](https://github.com/midwayjs/midway-faas/issues/768)) ([568379f](https://github.com/midwayjs/midway-faas/commit/568379fca58744410b273cc6fdb40cec83700d08)) -- ouput console in serverless environment ([#759](https://github.com/midwayjs/midway-faas/issues/759)) ([bad20d7](https://github.com/midwayjs/midway-faas/commit/bad20d7950d1ed96a0448aedfac5ae8f909a7960)) - -### Features - -- add midway logger ([#743](https://github.com/midwayjs/midway-faas/issues/743)) ([13e8cc7](https://github.com/midwayjs/midway-faas/commit/13e8cc753d994e6f9f073688e22527f75d39984a)) - -## [2.5.5](https://github.com/midwayjs/midway-faas/compare/v2.5.4...v2.5.5) (2020-12-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.10](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.9...serverless-v1.2.10) (2020-08-30) - -### Bug Fixes - -- add lock init for egg app ([#622](https://github.com/midwayjs/midway-faas/issues/622)) ([ccb5fe5](https://github.com/midwayjs/midway-faas/commit/ccb5fe52778f19b3e66dc1d727cc38e09f2c3ed6)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -### Bug Fixes - -- add default env for egg module ([#618](https://github.com/midwayjs/midway-faas/issues/618)) ([41272d0](https://github.com/midwayjs/midway-faas/commit/41272d02c9184cb3fc1d8b457ebac8228b16f116)) - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.2.4](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.3...serverless-v1.2.4) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.2.3](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.2...serverless-v1.2.3) (2020-08-18) - -### Bug Fixes - -- fix options for midway v1 ([#606](https://github.com/midwayjs/midway-faas/issues/606)) ([e90883a](https://github.com/midwayjs/midway-faas/commit/e90883a789c2dc7a452fbfdd92cb75a037f4aced)) - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -### Bug Fixes - -- application return 301 and buffer case ([#596](https://github.com/midwayjs/midway-faas/issues/596)) ([a31c022](https://github.com/midwayjs/midway-faas/commit/a31c022409d234e001030d81ce1e414159039a0b)) - -## [1.1.16](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.15...serverless-v1.1.16) (2020-08-05) - -### Bug Fixes - -- remove layer console ([#586](https://github.com/midwayjs/midway-faas/issues/586)) ([51b144b](https://github.com/midwayjs/midway-faas/commit/51b144b8d18b15cc31b31d8a2eacf7b16c12cdd1)) - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- egg-layer fix logger directory ([#13](https://github.com/midwayjs/midway-faas/issues/13)) ([3443378](https://github.com/midwayjs/midway-faas/commit/34433784245cb6ae0d12fa81df5381bbc75e3b1d)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix egg dep ([32b1a58](https://github.com/midwayjs/midway-faas/commit/32b1a581df07371ba82d00e4669d8a02a602e2f7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- egg-layer fix logger directory ([#13](https://github.com/midwayjs/midway-faas/issues/13)) ([3443378](https://github.com/midwayjs/midway-faas/commit/34433784245cb6ae0d12fa81df5381bbc75e3b1d)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix egg dep ([32b1a58](https://github.com/midwayjs/midway-faas/commit/32b1a581df07371ba82d00e4669d8a02a602e2f7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- egg-layer fix logger directory ([#13](https://github.com/midwayjs/midway-faas/issues/13)) ([3443378](https://github.com/midwayjs/midway-faas/commit/34433784245cb6ae0d12fa81df5381bbc75e3b1d)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix egg dep ([32b1a58](https://github.com/midwayjs/midway-faas/commit/32b1a581df07371ba82d00e4669d8a02a602e2f7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## [0.3.7](https://github.com/midwayjs/midway-faas/compare/v0.3.6...v0.3.7) (2020-07-02) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.3.5](https://github.com/midwayjs/midway-faas/compare/v0.3.4...v0.3.5) (2020-06-28) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.3.2](https://github.com/midwayjs/midway-faas/compare/v0.3.1...v0.3.2) (2020-06-12) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.3.1](https://github.com/midwayjs/midway-faas/compare/v0.3.0...v0.3.1) (2020-05-31) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.99](https://github.com/midwayjs/midway-faas/compare/v0.2.98...v0.2.99) (2020-05-21) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.93](https://github.com/midwayjs/midway-faas/compare/v0.2.92...v0.2.93) (2020-05-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.92](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92) (2020-05-05) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) - -## [0.2.92-beta.1](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92-beta.1) (2020-05-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.90](https://github.com/midwayjs/midway-faas/compare/v0.2.89...v0.2.90) (2020-04-29) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.86](https://github.com/midwayjs/midway-faas/compare/v0.2.85...v0.2.86) (2020-04-24) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.85](https://github.com/midwayjs/midway-faas/compare/v0.2.84...v0.2.85) (2020-04-23) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.81](https://github.com/midwayjs/midway-faas/compare/v0.2.80...v0.2.81) (2020-04-22) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.78](https://github.com/midwayjs/midway-faas/compare/v0.2.77...v0.2.78) (2020-04-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.77](https://github.com/midwayjs/midway-faas/compare/v0.2.76...v0.2.77) (2020-04-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.73-alpha.0](https://github.com/midwayjs/midway-faas/compare/v0.2.72...v0.2.73-alpha.0) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.10](https://github.com/midwayjs/midway-faas/compare/v0.2.9...v0.2.10) (2020-01-16) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.7](https://github.com/midwayjs/midway-faas/compare/v0.2.6...v0.2.7) (2020-01-14) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.2.6](https://github.com/midwayjs/midway-faas/compare/v0.2.5...v0.2.6) (2020-01-14) - -### Bug Fixes - -- egg-layer fix logger directory ([#13](https://github.com/midwayjs/midway-faas/issues/13)) ([3443378](https://github.com/midwayjs/midway-faas/commit/34433784245cb6ae0d12fa81df5381bbc75e3b1d)) - -## [0.2.4](https://github.com/midwayjs/midway-faas/compare/v0.2.3...v0.2.4) (2020-01-09) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/egg-layer - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/egg-layer diff --git a/packages-legacy/egg-layer/framework/config/config.default.js b/packages-legacy/egg-layer/framework/config/config.default.js deleted file mode 100644 index 154bc5dc4b9b..000000000000 --- a/packages-legacy/egg-layer/framework/config/config.default.js +++ /dev/null @@ -1,26 +0,0 @@ -const os = require('os'); - -exports.midwayLogger = { - default: { - dir: os.tmpdir(), - disableFile: true, - disableError: true, - }, -}; - -exports.egg = { - dumpConfig: false, -}; - -exports.logger = { - dir: os.tmpdir(), - disableConsoleAfterReady: false, -}; - -exports.rundir = os.tmpdir(); - -exports.static = { - buffer: true, -}; - -exports.proxy = true; diff --git a/packages-legacy/egg-layer/framework/config/plugin.js b/packages-legacy/egg-layer/framework/config/plugin.js deleted file mode 100644 index 9e1869aba383..000000000000 --- a/packages-legacy/egg-layer/framework/config/plugin.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -exports.i18n = false; -exports.watcher = false; -exports.development = false; -exports.logrotator = false; -exports.schedule = false; -exports.static = false; diff --git a/packages-legacy/egg-layer/framework/index.js b/packages-legacy/egg-layer/framework/index.js deleted file mode 100644 index 3d4d2a76f33a..000000000000 --- a/packages-legacy/egg-layer/framework/index.js +++ /dev/null @@ -1,17 +0,0 @@ -/* eslint-disable node/no-unpublished-require */ -const egg = require('egg'); - -const EGG_PATH = Symbol.for('egg#eggPath'); - -exports.getFramework = framework => { - const customerEgg = framework ? require(framework) : egg; - function extendsBase(BaseClass) { - return class LayerWrapper extends BaseClass { - get [EGG_PATH]() { - return __dirname; - } - }; - } - exports.Agent = extendsBase(customerEgg.Agent); - exports.Application = extendsBase(customerEgg.Application); -}; diff --git a/packages-legacy/egg-layer/index.js b/packages-legacy/egg-layer/index.js deleted file mode 100644 index 399b8dca349f..000000000000 --- a/packages-legacy/egg-layer/index.js +++ /dev/null @@ -1,148 +0,0 @@ -const { resolve, join } = require('path'); -/* eslint-disable node/no-unpublished-require */ -const { start } = require('egg'); -const os = require('os'); -const fs = require('fs'); -const request = require('request'); - -const socketPath = join(os.tmpdir(), `server-${Date.now()}.sock`); - -module.exports = engine => { - let eggApp; - - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime) { - const baseDir = runtime.getPropertyParser().getEntryDir(); - let isMidway3 = false; - try { - const midwayFrameworkPkg = require('@midwayjs/web/package.json'); - if ( - process.env.FRAMEWORK_EGG_MODE !== 'true' && - /^3/.test(midwayFrameworkPkg.version) - ) { - isMidway3 = true; - } - } catch (e) { - // ignore - } - - if (isMidway3) { - try { - const bootstrap = require(join(baseDir, 'bootstrap')); - eggApp = await bootstrap({ - globalConfig: [ - { - default: require('./framework/config/config.default'), - }, - ], - }); - } catch (e) { - console.error(e); - } - } else { - let framework = ''; - // 从 package.json 中获取 egg 框架 - const packageJSON = require(resolve(baseDir, 'package.json')); - framework = packageJSON.egg && packageJSON.egg.framework; - // 支持自定义框架 - if ( - packageJSON['dependencies'] && - packageJSON['dependencies']['@midwayjs/web'] && - framework !== '@midwayjs/web' - ) { - framework = '@midwayjs/web'; - } - const localFrameWorkPath = resolve(__dirname, 'framework'); - require(localFrameWorkPath).getFramework( - process.env.EGG_FRAMEWORK_DIR || - (framework && resolve(baseDir, 'node_modules', framework)) - ); - eggApp = await start({ - baseDir, - framework: localFrameWorkPath, - ignoreWarning: true, - runtime, - typescript: - framework && framework.includes('midway') ? true : undefined, - }); - } - - if (fs.existsSync(socketPath)) { - fs.unlinkSync(socketPath); - } - await new Promise(resolve => { - eggApp.listen(socketPath, () => { - resolve(); - }); - }); - }, - async beforeClose() { - await eggApp.close(); - eggApp = null; - }, - async defaultInvokeHandler(context) { - return new Promise((resolve, reject) => { - delete context.headers['content-length']; - if (eggApp.config.proxy && !context.headers['X-Forwarded-For']) { - context.headers['X-Forwarded-For'] = context.ip; - } - // fix path for special characters, eg chinese. - const path = encodeURI(context.path); - const requestOption = { - uri: `http://unix:${socketPath}:${path}`, - qs: context.query, - method: context.method, - headers: context.headers, - followRedirect: false, - }; - if (context.method === 'GET') { - // get 统一使用 buffer 返回，避免静态资源无法展示 - requestOption.encoding = null; - } - if ( - (context.headers['content-type'] || '').indexOf('application/json') >= - 0 - ) { - // post json - if (typeof context.request.body !== 'string') { - requestOption.body = JSON.stringify(context.request.body); - } else { - requestOption.body = context.request.body; - } - } else if ( - (context.headers['content-type'] || '').indexOf('multipart/') >= 0 - ) { - // use buffer from context.req.body - requestOption.body = context.req.body; - } else if ( - (context.headers['content-type'] || '').indexOf('form-urlencoded') >= - 0 - ) { - // post formdata - requestOption.form = context.request.body; - } else if (context.request.body) { - console.warn( - '[egg-layer] unknown content-type:', - context.headers['content-type'] - ); - if (typeof context.request.body !== 'string') { - requestOption.form = context.request.body; - } else { - requestOption.body = context.request.body; - } - } - request(requestOption, (error, response, body) => { - if (error) { - context.status = 500; - console.error('[egg-layer]' + error); - resolve('Internal Server Error'); - } else { - context.res = response; - context.status = response.statusCode; - resolve(body); - } - }); - }); - }, - }); -}; diff --git a/packages-legacy/egg-layer/jest.config.js b/packages-legacy/egg-layer/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/egg-layer/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/egg-layer/jest.setup.js b/packages-legacy/egg-layer/jest.setup.js deleted file mode 100644 index 382bdf8894ec..000000000000 --- a/packages-legacy/egg-layer/jest.setup.js +++ /dev/null @@ -1,5 +0,0 @@ -jest.setTimeout(30000); -const { join } = require('path'); -process.env.MIDWAY_TS_MODE = 'true'; -process.env.EGG_FRAMEWORK_DIR = join(__dirname, '../../node_modules/egg'); -process.chdir(join(__dirname, '../../')); diff --git a/packages-legacy/egg-layer/package.json b/packages-legacy/egg-layer/package.json deleted file mode 100644 index ffced3c558e3..000000000000 --- a/packages-legacy/egg-layer/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "@midwayjs/egg-layer", - "private": true, - "version": "3.18.0", - "main": "index.js", - "scripts": { - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "dependencies": { - "request": "2.88.2" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-fc-trigger": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "@midwayjs/serverless-scf-trigger": "^3.18.0", - "@midwayjs/web": "^3.18.0", - "egg": "^2.28.0", - "supertest": "6.3.3" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "framework", - "index.js" - ], - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/README.md b/packages-legacy/egg-layer/test/fixtures/eaas-fc/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/agent.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/agent.js deleted file mode 100644 index 4a1bd77c9c07..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/agent.js +++ /dev/null @@ -1,11 +0,0 @@ -// agent.js -module.exports = agent => { - // 在这里写你的初始化逻辑 - - // 也可以通过 messenger 对象发送消息给 App Worker - // 但需要等待 App Worker 启动成功后才能发送，不然很可能丢失 - agent.messenger.on('egg-ready', () => { - const data = { value: 'agent messenger works' }; - agent.messenger.sendToApp('xxx_action', data); - }); -}; \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/app.js deleted file mode 100644 index e8016ece564a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app.js +++ /dev/null @@ -1,7 +0,0 @@ -// app.js -module.exports = app => { - app.messenger.on('xxx_action', data => { - console.log(data); - // ... - }); -}; \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/controller/home.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/controller/home.js deleted file mode 100644 index c617be49b9c1..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/controller/home.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; - -const Controller = require('egg').Controller; - -class HomeController extends Controller { - async getMethod() { - const { ctx } = this; - ctx.set('x-bbbb', 'ccccccc'); - ctx.type = 'html'; - ctx.body = 'Hello World'; - } - async getQueryMethod() { - const { ctx } = this; - ctx.body = { - query: ctx.query, - }; - } - async postMethod() { - const { ctx } = this; - ctx.body = 'Hello World, post'; - } - async postBodyMethod() { - const { ctx } = this; - ctx.body = { - body: ctx.request.body, - }; - } - async postFormBodyMethod() { - const { ctx } = this; - ctx.body = { - body: ctx.request.body - }; - } - async buffer() { - const { ctx } = this; - ctx.setHeader('x-res', 'buffer'); - // assert - ctx.body = Buffer.from('hi, egg'); - } - - async gotError() { - throw new Error('custom error'); - } - - async gotIP() { - const { ctx } = this; - ctx.body = 'ip=' + ctx.ip; - } -} - -module.exports = HomeController; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/public/news.css b/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/public/news.css deleted file mode 100644 index 53a6c24f3e5f..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/public/news.css +++ /dev/null @@ -1,6 +0,0 @@ -body, -html { - font-family: Verdana; - font-size: 13px; - height: 100% -} \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/router.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/router.js deleted file mode 100644 index 801aa51d248a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/app/router.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -/** - * @param {Egg.Application} app - egg application - */ -module.exports = app => { - const { router, controller } = app; - router.redirect('/', '/get'); - router.get('/get', controller.home.getMethod); - router.get('/get/query', controller.home.getQueryMethod); - router.post('/post', controller.home.postMethod); - router.post('/post/body', controller.home.postBodyMethod); - router.post('/post/formBody', controller.home.postFormBodyMethod); - router.get('/buffer', controller.home.buffer); - router.get('/error', controller.home.gotError); - router.get('/got_ip', controller.home.gotIP); -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/config.default.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/config.default.js deleted file mode 100644 index 43d616684d60..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/config.default.js +++ /dev/null @@ -1,36 +0,0 @@ -/* eslint valid-jsdoc: "off" */ - -'use strict'; - -/** - * @param {Egg.EggAppInfo} appInfo app info - */ -module.exports = appInfo => { - /** - * built-in config - * @type {Egg.EggAppConfig} - **/ - const config = (exports = {}); - - // use for cookie sign key, should change to your own and keep security - config.keys = appInfo.name + '_1574154057813_8098'; - - // add your middleware config here - config.middleware = []; - - // add your user config here - const userConfig = { - // myAppName: 'egg', - }; - - config.security = { - csrf: { - enable: false, - }, - }; - - return { - ...config, - ...userConfig, - }; -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/plugin.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/plugin.js deleted file mode 100644 index 8b883ce4e67a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/config/plugin.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -/** @type Egg.EggPlugin */ -module.exports = { - static: true, - // had enabled by egg - // static: { - // enable: true, - // } -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/f.yml b/packages-legacy/egg-layer/test/fixtures/eaas-fc/f.yml deleted file mode 100644 index c7f6177457d5..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/f.yml +++ /dev/null @@ -1,11 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/index.js b/packages-legacy/egg-layer/test/fixtures/eaas-fc/index.js deleted file mode 100644 index 5b1a465da0b1..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const eggLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [eggLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-fc/package.json b/packages-legacy/egg-layer/test/fixtures/eaas-fc/package.json deleted file mode 100644 index ab75758d8f55..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-fc/package.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "test-eaas", - "version": "1.0.0", - "description": "test-eaas", - "private": true, - "egg": { - "declarations": true , - "framework": "egg" - }, - "dependencies": { - "egg": "^2.15.1", - "egg-scripts": "^2.11.0" - }, - "devDependencies": { - "autod": "^3.0.1", - "autod-egg": "^1.1.0", - "egg-bin": "^4.11.0", - "egg-ci": "^1.11.0", - "egg-mock": "^3.21.0", - "eslint": "^5.13.0", - "eslint-config-egg": "^7.1.0" - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "start": "egg-scripts start --daemon --title=egg-server-test-eaas", - "stop": "egg-scripts stop --title=egg-server-test-eaas", - "dev": "egg-bin dev", - "debug": "egg-bin debug", - "test": "npm run lint -- --fix && npm run test-local", - "test-local": "egg-bin test", - "cov": "egg-bin cov", - "lint": "eslint .", - "ci": "npm run lint && npm run cov", - "autod": "autod" - }, - "ci": { - "version": "10" - }, - "repository": { - "type": "git", - "url": "" - }, - "author": "mingbo.zmb", - "license": "MIT" -} diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/README.md b/packages-legacy/egg-layer/test/fixtures/eaas-scf/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/agent.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/agent.js deleted file mode 100644 index 4a1bd77c9c07..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/agent.js +++ /dev/null @@ -1,11 +0,0 @@ -// agent.js -module.exports = agent => { - // 在这里写你的初始化逻辑 - - // 也可以通过 messenger 对象发送消息给 App Worker - // 但需要等待 App Worker 启动成功后才能发送，不然很可能丢失 - agent.messenger.on('egg-ready', () => { - const data = { value: 'agent messenger works' }; - agent.messenger.sendToApp('xxx_action', data); - }); -}; \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/app.js deleted file mode 100644 index e8016ece564a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app.js +++ /dev/null @@ -1,7 +0,0 @@ -// app.js -module.exports = app => { - app.messenger.on('xxx_action', data => { - console.log(data); - // ... - }); -}; \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/controller/home.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/controller/home.js deleted file mode 100644 index bd40b4da48c8..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/controller/home.js +++ /dev/null @@ -1,39 +0,0 @@ -'use strict'; - -const Controller = require('egg').Controller; - -class HomeController extends Controller { - async getMethod() { - const { ctx } = this; - ctx.type = 'html'; - ctx.body = 'Hello World'; - } - async getQueryMethod() { - const { ctx } = this; - ctx.body = { - query: ctx.query - }; - } - async postMethod() { - const { ctx } = this; - ctx.body = 'Hello World, post'; - } - async postBodyMethod() { - const { ctx } = this; - ctx.body = { - body: ctx.request.body - }; - } - async buffer() { - const { ctx } = this; - ctx.setHeader('x-res', 'buffer'); - // assert - ctx.body = Buffer.from('hi, egg'); - } - async gotIP() { - const { ctx } = this; - ctx.body = 'ip=' + ctx.ip; - } -} - -module.exports = HomeController; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/public/news.css b/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/public/news.css deleted file mode 100644 index 53a6c24f3e5f..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/public/news.css +++ /dev/null @@ -1,6 +0,0 @@ -body, -html { - font-family: Verdana; - font-size: 13px; - height: 100% -} \ No newline at end of file diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/router.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/router.js deleted file mode 100644 index 97d944708edb..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/app/router.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -/** - * @param {Egg.Application} app - egg application - */ -module.exports = app => { - const { router, controller } = app; - router.redirect('/', '/get'); - router.get('/get', controller.home.getMethod); - router.get('/get/query', controller.home.getQueryMethod); - router.post('/post', controller.home.postMethod); - router.post('/post/body', controller.home.postBodyMethod); - router.get('/buffer', controller.home.buffer); - router.get('/got_ip', controller.home.gotIP); -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/config.default.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/config.default.js deleted file mode 100644 index 43d616684d60..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/config.default.js +++ /dev/null @@ -1,36 +0,0 @@ -/* eslint valid-jsdoc: "off" */ - -'use strict'; - -/** - * @param {Egg.EggAppInfo} appInfo app info - */ -module.exports = appInfo => { - /** - * built-in config - * @type {Egg.EggAppConfig} - **/ - const config = (exports = {}); - - // use for cookie sign key, should change to your own and keep security - config.keys = appInfo.name + '_1574154057813_8098'; - - // add your middleware config here - config.middleware = []; - - // add your user config here - const userConfig = { - // myAppName: 'egg', - }; - - config.security = { - csrf: { - enable: false, - }, - }; - - return { - ...config, - ...userConfig, - }; -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/plugin.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/plugin.js deleted file mode 100644 index 8b883ce4e67a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/config/plugin.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -/** @type Egg.EggPlugin */ -module.exports = { - static: true, - // had enabled by egg - // static: { - // enable: true, - // } -}; diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/f.yml b/packages-legacy/egg-layer/test/fixtures/eaas-scf/f.yml deleted file mode 100644 index c7f6177457d5..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/f.yml +++ /dev/null @@ -1,11 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/index.js b/packages-legacy/egg-layer/test/fixtures/eaas-scf/index.js deleted file mode 100644 index eb16eefbc20a..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-scf-starter'); -const eggLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [eggLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/egg-layer/test/fixtures/eaas-scf/package.json b/packages-legacy/egg-layer/test/fixtures/eaas-scf/package.json deleted file mode 100644 index ab75758d8f55..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/eaas-scf/package.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "test-eaas", - "version": "1.0.0", - "description": "test-eaas", - "private": true, - "egg": { - "declarations": true , - "framework": "egg" - }, - "dependencies": { - "egg": "^2.15.1", - "egg-scripts": "^2.11.0" - }, - "devDependencies": { - "autod": "^3.0.1", - "autod-egg": "^1.1.0", - "egg-bin": "^4.11.0", - "egg-ci": "^1.11.0", - "egg-mock": "^3.21.0", - "eslint": "^5.13.0", - "eslint-config-egg": "^7.1.0" - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "start": "egg-scripts start --daemon --title=egg-server-test-eaas", - "stop": "egg-scripts stop --title=egg-server-test-eaas", - "dev": "egg-bin dev", - "debug": "egg-bin debug", - "test": "npm run lint -- --fix && npm run test-local", - "test-local": "egg-bin test", - "cov": "egg-bin cov", - "lint": "eslint .", - "ci": "npm run lint && npm run cov", - "autod": "autod" - }, - "ci": { - "version": "10" - }, - "repository": { - "type": "git", - "url": "" - }, - "author": "mingbo.zmb", - "license": "MIT" -} diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/bootstrap.js b/packages-legacy/egg-layer/test/fixtures/midway-fc/bootstrap.js deleted file mode 100644 index b3b06b7a1282..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/bootstrap.js +++ /dev/null @@ -1,18 +0,0 @@ -const { Bootstrap } = require('../../../../../packages/bootstrap'); -const { MidwayFrameworkService } = require('../../../../../packages/core'); -const { join } = require('path'); - -module.exports = async (options) => { - // 加载框架并执行 - await Bootstrap - .configure({ - appDir: __dirname, - baseDir: join(__dirname, './src'), - ...options - }) - .run(); - const applicationContext = Bootstrap.getApplicationContext(); - const frameworkService = applicationContext.get(MidwayFrameworkService); - // 返回 app 对象 - return frameworkService.getMainApp(); -}; diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/f.yml b/packages-legacy/egg-layer/test/fixtures/midway-fc/f.yml deleted file mode 100644 index c7f6177457d5..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/f.yml +++ /dev/null @@ -1,11 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/index.js b/packages-legacy/egg-layer/test/fixtures/midway-fc/index.js deleted file mode 100644 index 5b1a465da0b1..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const eggLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [eggLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/package.json b/packages-legacy/egg-layer/test/fixtures/midway-fc/package.json deleted file mode 100644 index 25ac1b9460f3..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "ali-demo", - "dependencies": { - "@midwayjs/web": "*" - } -} diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.default.ts b/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.default.ts deleted file mode 100644 index 93907a451c63..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.default.ts +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -export const keys = 'key'; - -export const hello = { - a: 1, - b: 2, - d: [1, 2, 3], -}; - -export const midwayFeature = { - replaceEggLogger: true, -} - -export const security = { - csrf: false, -} diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.unittest.ts b/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.unittest.ts deleted file mode 100644 index 764021a2a8b6..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/config/config.unittest.ts +++ /dev/null @@ -1,5 +0,0 @@ - -exports.hello = { - b: 4, - c: 3, -}; diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/configuration.ts b/packages-legacy/egg-layer/test/fixtures/midway-fc/src/configuration.ts deleted file mode 100644 index 58275e3344d5..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/configuration.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as Web from '../../../../../../packages/web'; - -@Configuration({ - importConfigs: [ - join(__dirname, './config') - ], - imports: [ - Web - ] -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/controller/api.ts b/packages-legacy/egg-layer/test/fixtures/midway-fc/src/controller/api.ts deleted file mode 100644 index 94d195bc8ca0..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/controller/api.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { - Controller, - Post, - Provide, - Inject, - Body, - ContentType, - Param, - Get, -} from '@midwayjs/core'; -import { UserService } from '../service/user'; - -@Provide() -@Controller('/') -export class APIController { - @Inject() - ctx: any; - - @Inject() - userService: UserService; - - @Post('/api') - @ContentType('html') - async postData(@Body('bbbbb') bbbb) { - return 'data' + bbbb; - } - - @Get('/echo/:param') - async echoParam(@Param('param') param: string) { - console.log('[echo param]', param); - return param; - } -} diff --git a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/service/user.ts b/packages-legacy/egg-layer/test/fixtures/midway-fc/src/service/user.ts deleted file mode 100644 index 131f949a5b04..000000000000 --- a/packages-legacy/egg-layer/test/fixtures/midway-fc/src/service/user.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Provide } from '@midwayjs/core'; - -@Provide() -export class UserService { - async hello(name) { - return { - name, - }; - } -} diff --git a/packages-legacy/egg-layer/test/index.test.js b/packages-legacy/egg-layer/test/index.test.js deleted file mode 100644 index fbf429fc2592..000000000000 --- a/packages-legacy/egg-layer/test/index.test.js +++ /dev/null @@ -1,339 +0,0 @@ -const { createRuntime } = require('@midwayjs/runtime-mock'); -const { HTTPTrigger } = require('@midwayjs/serverless-fc-trigger'); -const FCApiGatewayTrigger = - require('@midwayjs/serverless-fc-trigger').ApiGatewayTrigger; -const { ApiGatewayTrigger } = require('@midwayjs/serverless-scf-trigger'); -const { join } = require('path'); -const request = require('supertest'); -const { existsSync, remove } = require('fs-extra'); - -describe('/test/index.test.ts', () => { - describe('FC test with http trigger', () => { - let runtime; - let app; - - beforeAll(async () => { - process.env.FRAMEWORK_EGG_MODE = 'true'; - const entryDir = join(__dirname, './fixtures/eaas-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - afterEach(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - process.env.FRAMEWORK_EGG_MODE = undefined; - // delete require.cache[require.resolve('./fixtures/eaas/index.js')]; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect('x-bbbb', 'ccccccc') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test with post form body', done => { - request(app) - .post('/post/formBody') - .send('b=1') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test static file', done => { - request(app) - .get('/public/news.css') - .expect('Content-Type', 'text/css; charset=utf-8') - .expect(/font-size/) - .expect(200, done); - }); - - it('should test redirect router', done => { - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(301, done); - }); - - it('should test throw error', done => { - request(app) - .get('/error') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(500, (err, res) => { - expect(res.statusCode).toEqual(500); - expect(res.text).toMatch('custom error'); - done(); - }); - }); - - it('should test got ip', done => { - request(app) - .get('/got_ip') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('ip=127.0.0.1') - .expect(200, done); - }); - }); - - describe('FC test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - process.env.FRAMEWORK_EGG_MODE = 'true'; - const entryDir = join(__dirname, './fixtures/eaas-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - process.env.FRAMEWORK_EGG_MODE = undefined; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test static file', done => { - request(app) - .get('/public/news.css') - .expect('Content-Type', 'text/css; charset=utf-8') - .expect(/font-size/) - .expect(200, done); - }); - - it('should test redirect router', done => { - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(301, done); - }); - - it('should test got ip in api gateway', done => { - request(app) - .get('/got_ip') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('ip=undefined') - .expect(200, done); - }); - }); - - describe('SCF test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - process.env.FRAMEWORK_EGG_MODE = 'true'; - const entryDir = join(__dirname, './fixtures/eaas-scf'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new ApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - process.env.FRAMEWORK_EGG_MODE = undefined; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test static file', done => { - request(app) - .get('/public/news.css') - .expect('Content-Type', 'text/css; charset=utf-8') - .expect(/font-size/) - .expect(200, done); - }); - - it('should test redirect router', done => { - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(301, done); - }); - - it('should test got ip in scf', done => { - request(app) - .get('/got_ip') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('ip=42.120.74.90') - .expect(200, done); - }); - }); - - describe('FC test with midway app use http trigger', () => { - let runtime; - let app; - jest.setTimeout(100 * 60 * 1000); - - beforeAll(async () => { - // set midway framework dir - const entryDir = join(__dirname, './fixtures/midway-fc'); - await remove(join(entryDir, 'logs')); - await remove(join(entryDir, 'run')); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - afterEach(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test payload with post', done => { - request(app) - .post('/api') - .send({ - bbbbb: 'ccc', - }) - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/dataccc/) - .expect(200, done); - }); - - it('should test param with get', done => { - request(app) - .get('/echo/' + encodeURI('测试')) - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('%E6%B5%8B%E8%AF%95') - .expect(200, done); - }); - - it('logs will be not exists', async () => { - const logsDir = join(__dirname, './fixtures/midway-fc', 'logs'); - const runDir = join(__dirname, './fixtures/midway-fc', 'run'); - expect(existsSync(logsDir)).toBeFalsy(); - expect(existsSync(runDir)).toBeFalsy(); - }); - }); -}); diff --git a/packages-legacy/express-layer/CHANGELOG.md b/packages-legacy/express-layer/CHANGELOG.md deleted file mode 100644 index 95e36ea37308..000000000000 --- a/packages-legacy/express-layer/CHANGELOG.md +++ /dev/null @@ -1,595 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency express to v4.18.2 ([#2413](https://github.com/midwayjs/midway/issues/2413)) ([ace153b](https://github.com/midwayjs/midway/commit/ace153b796a8b962d307ee1568634869f727431a)) -- **deps:** update dependency supertest to v6.3.0 ([#2435](https://github.com/midwayjs/midway/issues/2435)) ([6342e1d](https://github.com/midwayjs/midway/commit/6342e1d2a5301f3bd512d7c58b90482bca390898)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.20.1 ([#2355](https://github.com/midwayjs/midway/issues/2355)) ([4cf6bda](https://github.com/midwayjs/midway/commit/4cf6bdaa8b10b4ae40598305e1df9ad29dd701ed)) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.5](https://github.com/midwayjs/midway/compare/v3.4.4...v3.4.5) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.19.2 ([#1708](https://github.com/midwayjs/midway/issues/1708)) ([01626e8](https://github.com/midwayjs/midway/commit/01626e882710108cc9bede8c6f2adcfd142f72f0)) -- **deps:** update dependency express to v4.17.3 ([#1713](https://github.com/midwayjs/midway/issues/1713)) ([c781eca](https://github.com/midwayjs/midway/commit/c781eca27586b1d07cf672e71776ad9a521e149f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.2 ([#1599](https://github.com/midwayjs/midway/issues/1599)) ([982d888](https://github.com/midwayjs/midway/commit/982d88816e90e43785f4c429608ce8eafed4da81)) - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.1 ([#1561](https://github.com/midwayjs/midway/issues/1561)) ([0bcde23](https://github.com/midwayjs/midway/commit/0bcde231d562d2daedcbefcdaaa8ddcf5bb9ad58)) - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.0 ([#1555](https://github.com/midwayjs/midway/issues/1555)) ([4ff0e03](https://github.com/midwayjs/midway/commit/4ff0e03e833825b7a79c530665b4ab27b5d25294)) - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- empty options in default ([#1241](https://github.com/midwayjs/midway/issues/1241)) ([802109d](https://github.com/midwayjs/midway/commit/802109ddd098afb04d6d540bff509e0aee85b806)) - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.9.3](https://github.com/midwayjs/midway-faas/compare/v2.9.2...v2.9.3) (2021-03-30) - -### Bug Fixes - -- client ip proxy to real server ([#956](https://github.com/midwayjs/midway-faas/issues/956)) ([fa6d53c](https://github.com/midwayjs/midway-faas/commit/fa6d53cde0f8bcbca875cf69faa08a708746c0bc)) - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -### Bug Fixes - -- create log dir in serverless environment ([#935](https://github.com/midwayjs/midway-faas/issues/935)) ([8a15f69](https://github.com/midwayjs/midway-faas/commit/8a15f694a19a6274bce5172f1dce716ef3d8c0a8)) - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -### Bug Fixes - -- delete method parse body and form body ([#891](https://github.com/midwayjs/midway-faas/issues/891)) ([f5c1e70](https://github.com/midwayjs/midway-faas/commit/f5c1e7042ed85656e323563421391a719999979e)) - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/express-layer - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.13](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.12...serverless-v1.2.13) (2020-09-07) - -### Bug Fixes - -- update header after gizp ([#629](https://github.com/midwayjs/midway-faas/issues/629)) ([9f91985](https://github.com/midwayjs/midway-faas/commit/9f919850af334f0c463947b2730dfafabba43f1d)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -### Bug Fixes - -- support async entry for koa/express ([#621](https://github.com/midwayjs/midway-faas/issues/621)) ([19bb466](https://github.com/midwayjs/midway-faas/commit/19bb466e99f3c7e7cb5b755e9fb4bb89f0a65256)) - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.2.4](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.3...serverless-v1.2.4) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -### Bug Fixes - -- application return 301 and buffer case ([#596](https://github.com/midwayjs/midway-faas/issues/596)) ([a31c022](https://github.com/midwayjs/midway-faas/commit/a31c022409d234e001030d81ce1e414159039a0b)) - -## [1.1.16](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.15...serverless-v1.1.16) (2020-08-05) - -### Bug Fixes - -- remove layer console ([#586](https://github.com/midwayjs/midway-faas/issues/586)) ([51b144b](https://github.com/midwayjs/midway-faas/commit/51b144b8d18b15cc31b31d8a2eacf7b16c12cdd1)) - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/express-layer - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) diff --git a/packages-legacy/express-layer/index.js b/packages-legacy/express-layer/index.js deleted file mode 100644 index 1f05329eedb1..000000000000 --- a/packages-legacy/express-layer/index.js +++ /dev/null @@ -1,82 +0,0 @@ -const { join } = require('path'); -const os = require('os'); -const fs = require('fs'); -const request = require('request'); - -const socketPath = join(os.tmpdir(), `server-${Date.now()}.sock`); -const logDir = join(os.tmpdir(), `app-${Date.now()}`); - -process.env.MIDWAY_LOGGER_WRITEABLE_DIR = logDir; - -module.exports = engine => { - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime) { - const baseDir = runtime.getPropertyParser().getEntryDir(); - let app = require(join(baseDir, 'app')); - if (typeof app === 'function' && !app['emit']) { - app = await app(); - } - app.set('trust proxy', true); - if (fs.existsSync(socketPath)) { - fs.unlinkSync(socketPath); - } - app.listen(socketPath); - }, - - async defaultInvokeHandler(context) { - return new Promise((resolve, reject) => { - delete context.headers['content-length']; - delete context.headers['accept-encoding']; - if (!context.headers['X-Forwarded-For']) { - context.headers['X-Forwarded-For'] = context.ip; - } - - const requestOption = { - uri: `http://unix:${socketPath}:${encodeURI(context.path)}`, - qs: context.query, - method: context.method, - headers: context.headers, - followRedirect: false, - }; - if (context.method === 'GET') { - // get 统一使用 buffer 返回，避免静态资源无法展示 - requestOption.encoding = null; - } - if ( - (context.headers['content-type'] || '').indexOf('application/json') >= - 0 - ) { - // post json - if (typeof context.request.body !== 'string') { - requestOption.body = JSON.stringify(context.request.body); - } else { - requestOption.body = context.request.body; - } - } else if ( - (context.headers['content-type'] || '').indexOf('form-urlencoded') >= - 0 - ) { - // post formdata - requestOption.form = context.request.body; - } else if (context.request.body) { - if (typeof context.request.body !== 'string') { - requestOption.form = context.request.body; - } else { - requestOption.body = context.request.body; - } - } - request(requestOption, (error, response, body) => { - if (error) { - context.status = 500; - console.error('[express-layer]' + error); - resolve('Internal Server Error'); - } else { - context.res = response; - context.status = response.statusCode; - resolve(body); - } - }); - }); - }, - }); -}; diff --git a/packages-legacy/express-layer/jest.config.js b/packages-legacy/express-layer/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/express-layer/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/express-layer/jest.setup.js b/packages-legacy/express-layer/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/express-layer/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/express-layer/package.json b/packages-legacy/express-layer/package.json deleted file mode 100644 index 9815e4e2ecf6..000000000000 --- a/packages-legacy/express-layer/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@midwayjs/express-layer", - "private": true, - "version": "3.18.0", - "main": "index.js", - "scripts": { - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "dependencies": { - "request": "2.88.2" - }, - "devDependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-fc-trigger": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "@midwayjs/serverless-scf-trigger": "^3.18.0", - "body-parser": "1.20.3", - "express": "4.20.0", - "supertest": "6.3.3" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "index.js" - ], - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/express-layer/test/fixtures/app-fc/README.md b/packages-legacy/express-layer/test/fixtures/app-fc/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-fc/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/express-layer/test/fixtures/app-fc/app.js b/packages-legacy/express-layer/test/fixtures/app-fc/app.js deleted file mode 100644 index 76dd5f6c825d..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-fc/app.js +++ /dev/null @@ -1,39 +0,0 @@ -const express = require('express'); -const app = express(); -const bodyParser = require('body-parser'); - -app.use(bodyParser.json()); -app.use(bodyParser.urlencoded({ extended: true })); - -app.get('/get', (req, res) => { - res.type('html'); - res.send('Hello World'); -}); - -app.get('/get/query', (req, res) => { - res.send({ - query: req.query, - }); -}); - -app.post('/post', (req, res) => { - res.send('Hello World, post'); -}); - -app.post('/post/body', (req, res) => { - res.send({ - body: req.body, - }); -}); - -app.post('/post/formBody', (req, res) => { - res.send({ - body: req.body, - }); -}); - -// app.listen(3000); - -module.exports = async () => { - return app; -}; diff --git a/packages-legacy/express-layer/test/fixtures/app-fc/f.yml b/packages-legacy/express-layer/test/fixtures/app-fc/f.yml deleted file mode 100644 index 7d34d1491949..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-fc/f.yml +++ /dev/null @@ -1,13 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* - -deployType: koa diff --git a/packages-legacy/express-layer/test/fixtures/app-fc/index.js b/packages-legacy/express-layer/test/fixtures/app-fc/index.js deleted file mode 100644 index d9c13b3362a9..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-fc/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const ExpressLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [ExpressLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/express-layer/test/fixtures/app-fc/package.json b/packages-legacy/express-layer/test/fixtures/app-fc/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-fc/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/express-layer/test/fixtures/app-scf/README.md b/packages-legacy/express-layer/test/fixtures/app-scf/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-scf/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/express-layer/test/fixtures/app-scf/app.js b/packages-legacy/express-layer/test/fixtures/app-scf/app.js deleted file mode 100644 index 92b83c7d5f51..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-scf/app.js +++ /dev/null @@ -1,36 +0,0 @@ -const express = require('express'); -const app = express(); -const bodyParser = require('body-parser'); - -app.use(bodyParser.json()) -app.use(bodyParser.urlencoded({ extended: true })) - -app.get('/get', (req, res) => { - res.type('html') - res.send('Hello World'); -}); - -app.get('/get/query', (req, res) => { - res.send({ - query: req.query - }); -}); - -app.post('/post', (req, res) => { - res.send('Hello World, post'); -}); - -app.post('/post/body', (req, res) => { - res.send({ - body: req.body - }); -}); - -app.get('/get_ip', (req, res) => { - res.type('text') - res.send('ip=' + req.ip); -}); - -// app.listen(3000); - -module.exports = app; diff --git a/packages-legacy/express-layer/test/fixtures/app-scf/f.yml b/packages-legacy/express-layer/test/fixtures/app-scf/f.yml deleted file mode 100644 index 7d34d1491949..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-scf/f.yml +++ /dev/null @@ -1,13 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* - -deployType: koa diff --git a/packages-legacy/express-layer/test/fixtures/app-scf/index.js b/packages-legacy/express-layer/test/fixtures/app-scf/index.js deleted file mode 100644 index c81827808dc6..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-scf/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-scf-starter'); -const ExpressLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [ExpressLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/express-layer/test/fixtures/app-scf/package.json b/packages-legacy/express-layer/test/fixtures/app-scf/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/express-layer/test/fixtures/app-scf/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/express-layer/test/index.test.js b/packages-legacy/express-layer/test/index.test.js deleted file mode 100644 index 7ce55ffcc144..000000000000 --- a/packages-legacy/express-layer/test/index.test.js +++ /dev/null @@ -1,208 +0,0 @@ -const { createRuntime } = require('@midwayjs/runtime-mock'); -const { HTTPTrigger } = require('@midwayjs/serverless-fc-trigger'); -const FCApiGatewayTrigger = require('@midwayjs/serverless-fc-trigger') - .ApiGatewayTrigger; -const { ApiGatewayTrigger } = require('@midwayjs/serverless-scf-trigger'); -const { join } = require('path'); -const request = require('supertest'); - -describe('/test/index.test.ts', () => { - describe('FC test with http trigger', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - // delete require.cache[require.resolve('./fixtures/app-fc/index.js')]; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - // express 当返回内容为字符串并且没有返回头的时候，返回 text/html - request(app) - .post('/post') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test with post form body', (done) => { - request(app) - .post('/post/formBody') - .send('b=1') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":"1"}}/) - .expect(200, done); - }); - }); - - describe('FC test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - }); - - describe('SCF test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-scf'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new ApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test got ip', done => { - request(app) - .get('/get_ip') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('ip=42.120.74.90') - .expect(200, done); - }); - }); -}); diff --git a/packages-legacy/koa-layer/CHANGELOG.md b/packages-legacy/koa-layer/CHANGELOG.md deleted file mode 100644 index 8ae7be961386..000000000000 --- a/packages-legacy/koa-layer/CHANGELOG.md +++ /dev/null @@ -1,585 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.3.0 ([#2435](https://github.com/midwayjs/midway/issues/2435)) ([6342e1d](https://github.com/midwayjs/midway/commit/6342e1d2a5301f3bd512d7c58b90482bca390898)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.5](https://github.com/midwayjs/midway/compare/v3.4.4...v3.4.5) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -### Bug Fixes - -- **deps:** update dependency @koa/router to v11 ([#2111](https://github.com/midwayjs/midway/issues/2111)) ([0f6b34e](https://github.com/midwayjs/midway/commit/0f6b34e964a1bfc98ddf020878b43af99557291d)) - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.2 ([#1599](https://github.com/midwayjs/midway/issues/1599)) ([982d888](https://github.com/midwayjs/midway/commit/982d88816e90e43785f4c429608ce8eafed4da81)) - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.1 ([#1561](https://github.com/midwayjs/midway/issues/1561)) ([0bcde23](https://github.com/midwayjs/midway/commit/0bcde231d562d2daedcbefcdaaa8ddcf5bb9ad58)) - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.0 ([#1555](https://github.com/midwayjs/midway/issues/1555)) ([4ff0e03](https://github.com/midwayjs/midway/commit/4ff0e03e833825b7a79c530665b4ab27b5d25294)) - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -### Features - -- default add session & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf)) - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- empty options in default ([#1241](https://github.com/midwayjs/midway/issues/1241)) ([802109d](https://github.com/midwayjs/midway/commit/802109ddd098afb04d6d540bff509e0aee85b806)) - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.9.3](https://github.com/midwayjs/midway-faas/compare/v2.9.2...v2.9.3) (2021-03-30) - -### Bug Fixes - -- client ip proxy to real server ([#956](https://github.com/midwayjs/midway-faas/issues/956)) ([fa6d53c](https://github.com/midwayjs/midway-faas/commit/fa6d53cde0f8bcbca875cf69faa08a708746c0bc)) - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -### Bug Fixes - -- create log dir in serverless environment ([#935](https://github.com/midwayjs/midway-faas/issues/935)) ([8a15f69](https://github.com/midwayjs/midway-faas/commit/8a15f694a19a6274bce5172f1dce716ef3d8c0a8)) - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -### Bug Fixes - -- delete method parse body and form body ([#891](https://github.com/midwayjs/midway-faas/issues/891)) ([f5c1e70](https://github.com/midwayjs/midway-faas/commit/f5c1e7042ed85656e323563421391a719999979e)) - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -### Bug Fixes - -- support async entry for koa/express ([#621](https://github.com/midwayjs/midway-faas/issues/621)) ([19bb466](https://github.com/midwayjs/midway-faas/commit/19bb466e99f3c7e7cb5b755e9fb4bb89f0a65256)) - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.4](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.3...serverless-v1.2.4) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -### Bug Fixes - -- application return 301 and buffer case ([#596](https://github.com/midwayjs/midway-faas/issues/596)) ([a31c022](https://github.com/midwayjs/midway-faas/commit/a31c022409d234e001030d81ce1e414159039a0b)) - -## [1.1.16](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.15...serverless-v1.1.16) (2020-08-05) - -### Bug Fixes - -- remove layer console ([#586](https://github.com/midwayjs/midway-faas/issues/586)) ([51b144b](https://github.com/midwayjs/midway-faas/commit/51b144b8d18b15cc31b31d8a2eacf7b16c12cdd1)) - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) diff --git a/packages-legacy/koa-layer/index.js b/packages-legacy/koa-layer/index.js deleted file mode 100644 index 80b42cb28807..000000000000 --- a/packages-legacy/koa-layer/index.js +++ /dev/null @@ -1,82 +0,0 @@ -const { join } = require('path'); -const os = require('os'); -const fs = require('fs'); -const request = require('request'); - -const socketPath = join(os.tmpdir(), `server-${Date.now()}.sock`); -const logDir = join(os.tmpdir(), `app-${Date.now()}`); - -process.env.MIDWAY_LOGGER_WRITEABLE_DIR = logDir; - -module.exports = engine => { - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime) { - const baseDir = runtime.getPropertyParser().getEntryDir(); - let app = require(join(baseDir, 'app')); - if (typeof app === 'function') { - app = await app(); - } - app.proxy = true; - // handleRequest = koaApp.callback(); - if (fs.existsSync(socketPath)) { - fs.unlinkSync(socketPath); - } - app.listen(socketPath); - }, - - async defaultInvokeHandler(context) { - return new Promise((resolve, reject) => { - delete context.headers['content-length']; - - if (!context.headers['X-Forwarded-For']) { - context.headers['X-Forwarded-For'] = context.ip; - } - const requestOption = { - uri: `http://unix:${socketPath}:${encodeURI(context.path)}`, - qs: context.query, - method: context.method, - headers: context.headers, - followRedirect: false, - }; - if (context.method === 'GET') { - // get 统一使用 buffer 返回，避免静态资源无法展示 - requestOption.encoding = null; - } - if ( - (context.headers['content-type'] || '').indexOf('application/json') >= - 0 - ) { - // post json - if (typeof context.request.body !== 'string') { - requestOption.body = JSON.stringify(context.request.body); - } else { - requestOption.body = context.request.body; - } - } else if ( - (context.headers['content-type'] || '').indexOf('form-urlencoded') >= - 0 - ) { - // post formdata - requestOption.form = context.request.body; - } else if (context.request.body) { - if (typeof context.request.body !== 'string') { - requestOption.form = context.request.body; - } else { - requestOption.body = context.request.body; - } - } - request(requestOption, (error, response, body) => { - if (error) { - context.status = response.statusCode; - console.error('[koa-layer]' + error); - resolve('Internal Server Error'); - } else { - context.res = response; - context.status = response.statusCode; - resolve(body); - } - }); - }); - }, - }); -}; diff --git a/packages-legacy/koa-layer/jest.config.js b/packages-legacy/koa-layer/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/koa-layer/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/koa-layer/jest.setup.js b/packages-legacy/koa-layer/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/koa-layer/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/koa-layer/package.json b/packages-legacy/koa-layer/package.json deleted file mode 100644 index 9ba1f81a8389..000000000000 --- a/packages-legacy/koa-layer/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@midwayjs/koa-layer", - "private": true, - "version": "3.18.0", - "main": "index.js", - "scripts": { - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "dependencies": { - "request": "2.88.2" - }, - "devDependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-fc-trigger": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "@midwayjs/serverless-scf-trigger": "^3.18.0", - "koa": "2.15.3", - "koa-bodyparser": "4.4.1", - "koa-router": "12.0.1", - "supertest": "6.3.3" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "index.js" - ], - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/koa-layer/test/fixtures/app-fc/README.md b/packages-legacy/koa-layer/test/fixtures/app-fc/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-fc/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/koa-layer/test/fixtures/app-fc/app.js b/packages-legacy/koa-layer/test/fixtures/app-fc/app.js deleted file mode 100644 index ac87518d689f..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-fc/app.js +++ /dev/null @@ -1,46 +0,0 @@ -const Koa = require('koa'); -const Router = require('koa-router'); -const app = new Koa(); -const assert = require('assert'); -const router = new Router(); -const bodyParser = require('koa-bodyparser'); - -router.get('/get', (ctx, next) => { - ctx.type = 'html'; - ctx.body = 'Hello World'; -}); - -router.get('/get/query', (ctx, next) => { - ctx.body = { - query: ctx.query, - }; -}); - -router.post('/post', (ctx, next) => { - ctx.body = 'Hello World, post'; -}); - -router.post('/post/body', (ctx, next) => { - ctx.body = { - body: ctx.request.body, - }; -}); - -router.post('/post/formBody', (ctx, next) => { - ctx.body = { - body: ctx.request.body, - }; -}); - -router.get('/get_ip', (ctx, next) => { - ctx.body = 'ip=' + ctx.request.ip; -}); - -app.use(bodyParser()); -app.use(router.routes()).use(router.allowedMethods()); - -// app.listen(3000); - -module.exports = async () => { - return app; -}; diff --git a/packages-legacy/koa-layer/test/fixtures/app-fc/f.yml b/packages-legacy/koa-layer/test/fixtures/app-fc/f.yml deleted file mode 100644 index 8a3d985ca82b..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-fc/f.yml +++ /dev/null @@ -1,6 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -deployType: koa diff --git a/packages-legacy/koa-layer/test/fixtures/app-fc/index.js b/packages-legacy/koa-layer/test/fixtures/app-fc/index.js deleted file mode 100644 index 3e795f110555..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-fc/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const KoaLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [KoaLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/koa-layer/test/fixtures/app-fc/package.json b/packages-legacy/koa-layer/test/fixtures/app-fc/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-fc/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/koa-layer/test/fixtures/app-scf/README.md b/packages-legacy/koa-layer/test/fixtures/app-scf/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-scf/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/koa-layer/test/fixtures/app-scf/app.js b/packages-legacy/koa-layer/test/fixtures/app-scf/app.js deleted file mode 100644 index 2d8dd49fa980..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-scf/app.js +++ /dev/null @@ -1,38 +0,0 @@ -const Koa = require('koa'); -const Router = require('koa-router'); -const app = new Koa(); -const assert = require('assert'); -const router = new Router(); -const bodyParser = require('koa-bodyparser'); - -router.get('/get', (ctx, next) => { - ctx.type = 'html'; - ctx.body = 'Hello World'; -}); - -router.get('/get/query', (ctx, next) => { - ctx.body = { - query: ctx.query - }; -}); - -router.post('/post', (ctx, next) => { - ctx.body = 'Hello World, post'; -}); - -router.post('/post/body', (ctx, next) => { - ctx.body = { - body: ctx.request.body - }; -}); - -router.get('/get_ip', (ctx, next) => { - ctx.body = 'ip=' + ctx.request.ip; -}); - -app.use(bodyParser()); -app.use(router.routes()).use(router.allowedMethods()); - -// app.listen(3000); - -module.exports = app; diff --git a/packages-legacy/koa-layer/test/fixtures/app-scf/f.yml b/packages-legacy/koa-layer/test/fixtures/app-scf/f.yml deleted file mode 100644 index 7d34d1491949..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-scf/f.yml +++ /dev/null @@ -1,13 +0,0 @@ -service: my-egg-demo - -provider: - name: aliyun - -functions: - index: - handler: index.handler - events: - - http: - path: /* - -deployType: koa diff --git a/packages-legacy/koa-layer/test/fixtures/app-scf/index.js b/packages-legacy/koa-layer/test/fixtures/app-scf/index.js deleted file mode 100644 index 621a0a0ecdef..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-scf/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-scf-starter'); -const KoaLayer = require('../../../'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [KoaLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/koa-layer/test/fixtures/app-scf/package.json b/packages-legacy/koa-layer/test/fixtures/app-scf/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/koa-layer/test/fixtures/app-scf/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/koa-layer/test/index.test.js b/packages-legacy/koa-layer/test/index.test.js deleted file mode 100644 index 8c3251b01302..000000000000 --- a/packages-legacy/koa-layer/test/index.test.js +++ /dev/null @@ -1,207 +0,0 @@ -const { createRuntime } = require('@midwayjs/runtime-mock'); -const { HTTPTrigger } = require('@midwayjs/serverless-fc-trigger'); -const FCApiGatewayTrigger = require('@midwayjs/serverless-fc-trigger') - .ApiGatewayTrigger; -const { ApiGatewayTrigger } = require('@midwayjs/serverless-scf-trigger'); -const { join } = require('path'); -const request = require('supertest'); - -describe('/test/index.test.ts', () => { - describe('FC test with http trigger', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - // delete require.cache[require.resolve('./fixtures/app-fc/index.js')]; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test with post form body', (done) => { - request(app) - .post('/post/formBody') - .send('b=1') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":"1"}}/) - .expect(200, done); - }); - }); - - describe('FC test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - }); - - describe('SCF test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-scf'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new ApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/get') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/Hello World/) - .expect(200, done); - }); - - it('should test with get and query', done => { - request(app) - .get('/get/query') - .query({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"query":{"b":"1"}}/) - .expect(200, done); - }); - - it('should test with post', done => { - request(app) - .post('/post') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(/Hello World, post/) - .expect(200, done); - }); - - it('should test with post and body', done => { - request(app) - .post('/post/body') - .send({ - b: 1, - }) - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(/{"body":{"b":1}}/) - .expect(200, done); - }); - - it('should test got ip', done => { - request(app) - .get('/get_ip') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('ip=42.120.74.90') - .expect(200, done); - }); - }); -}); diff --git a/packages-legacy/orm/CHANGELOG.md b/packages-legacy/orm/CHANGELOG.md deleted file mode 100644 index 97544c3c24a0..000000000000 --- a/packages-legacy/orm/CHANGELOG.md +++ /dev/null @@ -1,374 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.3.6](https://github.com/midwayjs/midway/compare/v3.3.5...v3.3.6) (2022-05-11) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27) - -### Bug Fixes - -- swagger ui replace json path ([#1860](https://github.com/midwayjs/midway/issues/1860)) ([0f3728d](https://github.com/midwayjs/midway/commit/0f3728daccba12923f23f5b498c7dda13ced36d7)) - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -### Bug Fixes - -- fix ts build error (orm) ([#1859](https://github.com/midwayjs/midway/issues/1859)) ([c44e18d](https://github.com/midwayjs/midway/commit/c44e18d00f966792e46238c7d8807d5b3c543873)) - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10) - -**Note:** Version bump only for package @midwayjs/orm - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -### Bug Fixes - -- typeorm EntityView missing connectionName ([#1403](https://github.com/midwayjs/midway/issues/1403)) ([30b2b37](https://github.com/midwayjs/midway/commit/30b2b3711db485cb85d825d56aeabf53b1374cae)) - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -### Features - -- add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3)) - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/orm - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- getCustomRepository bug ([#1309](https://github.com/midwayjs/midway/issues/1309)) ([04487a8](https://github.com/midwayjs/midway/commit/04487a8029ac42ed8001ed11a13eb29b846460d8)) -- static prefix ([#1321](https://github.com/midwayjs/midway/issues/1321)) ([31fe961](https://github.com/midwayjs/midway/commit/31fe961931fed7656a144b1682ee4c4bb25fdff5)) - -### Features - -- add mongoose component and support multi-instance for typegoose ([#1334](https://github.com/midwayjs/midway/issues/1334)) ([ca0b73f](https://github.com/midwayjs/midway/commit/ca0b73fec77e8871e4001b4c9d3e45397ce32450)) - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -### Features - -- support object config load and async config ([#1212](https://github.com/midwayjs/midway/issues/1212)) ([a035ccb](https://github.com/midwayjs/midway/commit/a035ccbb513b0ba423bd2b48bc228b5e916c89e8)) - -## [2.12.1](https://github.com/midwayjs/midway/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/orm - -# [2.12.0](https://github.com/midwayjs/midway/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/orm - -## [2.11.6](https://github.com/midwayjs/midway/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/orm - -## [2.11.5](https://github.com/midwayjs/midway/compare/v2.11.4...v2.11.5) (2021-07-15) - -### Features - -- Optimize typeorm to initialize loading entities ([#1150](https://github.com/midwayjs/midway/issues/1150)) ([f0faf2f](https://github.com/midwayjs/midway/commit/f0faf2f1fbdb14f26f157eb554520377c06e6ef8)) - -## [2.11.4](https://github.com/midwayjs/midway/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/orm - -## [2.11.3](https://github.com/midwayjs/midway/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/orm - -## [2.11.2](https://github.com/midwayjs/midway/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/orm - -## [2.11.1](https://github.com/midwayjs/midway/compare/v2.11.0...v2.11.1) (2021-06-19) - -### Features - -- support EventSubscriberModel with provide ([#1095](https://github.com/midwayjs/midway/issues/1095)) ([05431d2](https://github.com/midwayjs/midway/commit/05431d28b9812cf6f658945b3fe7f69801224559)) - -# [1.3.0](https://github.com/midwayjs/midway-component/compare/@midwayjs/orm@1.2.1...@midwayjs/orm@1.3.0) (2020-11-10) - -### Bug Fixes - -- npe and header render in swagger ([#15](https://github.com/midwayjs/midway-component/issues/15)) ([7b6b674](https://github.com/midwayjs/midway-component/commit/7b6b6743942897905cce91f657bebce989a646dc)) - -### Features - -- support ViewEntity ([#14](https://github.com/midwayjs/midway-component/issues/14)) ([3723749](https://github.com/midwayjs/midway-component/commit/3723749490945b99fb2dbb635e4f6935fbaba5e5)) - -## [1.2.1](https://github.com/midwayjs/midway-component/compare/@midwayjs/orm@1.2.0...@midwayjs/orm@1.2.1) (2020-10-27) - -**Note:** Version bump only for package @midwayjs/orm - -# [1.2.0](https://github.com/midwayjs/midway-component/compare/@midwayjs/orm@1.1.1...@midwayjs/orm@1.2.0) (2020-10-23) - -### Features - -- add swagger ([#11](https://github.com/midwayjs/midway-component/issues/11)) ([7c8daa5](https://github.com/midwayjs/midway-component/commit/7c8daa5b23eaf688b967f5199b6353a69f482e9f)) - -## [1.1.1](https://github.com/midwayjs/midway-component/compare/@midwayjs/orm@1.1.0...@midwayjs/orm@1.1.1) (2020-10-16) - -### Bug Fixes - -- support multi thread ([#12](https://github.com/midwayjs/midway-component/issues/12)) ([0436d23](https://github.com/midwayjs/midway-component/commit/0436d239746867588822b1dcae7edebf45303755)) - -### Features - -- orm hook ([#10](https://github.com/midwayjs/midway-component/issues/10)) ([0c50503](https://github.com/midwayjs/midway-component/commit/0c505039e27734ffd38a82e695bb26dc28909c18)) - -# 1.1.0 (2020-08-21) - -### Features - -- add inject decorator ([#9](https://github.com/midwayjs/midway-component/issues/9)) ([aabd187](https://github.com/midwayjs/midway-component/commit/aabd187ecf59cf4d610c8ac70500b75166ecfd57)) -- add orm component ([#8](https://github.com/midwayjs/midway-component/issues/8)) ([4fbfa94](https://github.com/midwayjs/midway-component/commit/4fbfa94b5d4dd7391a7f90b6daae9e5994437dac)) diff --git a/packages-legacy/orm/README.md b/packages-legacy/orm/README.md deleted file mode 100644 index 2da8ff6c10ba..000000000000 --- a/packages-legacy/orm/README.md +++ /dev/null @@ -1,101 +0,0 @@ -# midway orm component - -## How to use - -in Configuration.ts file - -```ts -import * as orm from '@midwayjs/orm'; -import { join } from 'path'; - -@Configuration({ - imports: [ - orm, - ], - importConfigs: [ - join(__dirname, './config') - ] -}) -export class ContainerConfiguration { -} - -``` - -## Configuration - -in config files - -```ts -export default { - orm: { - type: 'mysql', - host: '', - port: 3306, - username: '', - password: '', - database: undefined, - synchronize: true, - logging: false, - } -}; -``` - -or - -```ts -export const orm = { - type: 'sqlite', // or use mysql see typeorm docs - database: join(__dirname, './test.sqlite'), - logging: true, -} -``` - -## Define EntityModel - -```ts -// model/user.ts -import { EntityModel } from '@midwayjs/orm'; -import { PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; - -@EntityModel('test_user') -export class Photo { - @PrimaryGeneratedColumn({ name: "id" }) - id: number; - - @Column({ name: "name" }) - name: string; - - @OneToMany(type => Message, message => message.sender) - messages: Message[]; -} -``` - - -## Use Model - -in code files - -```ts -import { InjectEntityModel } from '@midwayjs/orm'; -import { User } from './model/user'; -import { Repository } from 'typeorm'; - -@Provide() -export class UserService { - - @InjectEntityModel(User) - userModel: Repository; - - async testUser() { - const u = new User(); - u.name = 'oneuser1'; - const uu = await this.userModel.save(u); - console.log('user one id = ', uu.id); - - const user = new User(); - user.id = 1; - const users = await this.userModel.findAndCount(user); - return 'hello world' + JSON.stringify(users); - } -} -``` diff --git a/packages-legacy/orm/index.d.ts b/packages-legacy/orm/index.d.ts deleted file mode 100644 index ea6dd4b7f87d..000000000000 --- a/packages-legacy/orm/index.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ConnectionOptions } from './dist/index'; - -export * from './dist/index'; - -declare module '@midwayjs/core/dist/interface' { - interface MidwayConfig { - orm?: - | Partial - | { - [key: string]: Partial; - }; - } -} diff --git a/packages-legacy/orm/jest.config.js b/packages-legacy/orm/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/orm/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/orm/jest.setup.js b/packages-legacy/orm/jest.setup.js deleted file mode 100644 index 483ebf34a574..000000000000 --- a/packages-legacy/orm/jest.setup.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path'); -// set plugin dir -process.env.MIDWAY_EGG_PLUGIN_PATH = path.join(__dirname, '../../'); -process.env.MIDWAY_FRAMEWORK_PATH = path.join(__dirname, '../web'); -process.env.MIDWAY_FAAS_PATH = path.join(__dirname, '../faas'); -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/orm/package.json b/packages-legacy/orm/package.json deleted file mode 100644 index 5f5a726ed3c3..000000000000 --- a/packages-legacy/orm/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@midwayjs/orm", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "index.d.ts", - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts", - "index.d.ts" - ], - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/mock": "^3.18.0", - "sqlite3": "5.1.7", - "typeorm": "0.3.20" - }, - "author": { - "name": "Kurten Chan", - "email": "chinkurten@gmail.com" - }, - "engines": { - "node": ">=12" - }, - "license": "MIT", - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "https://github.com/midwayjs/midway.git" - } -} diff --git a/packages-legacy/orm/src/configuration.ts b/packages-legacy/orm/src/configuration.ts deleted file mode 100644 index 02989d108123..000000000000 --- a/packages-legacy/orm/src/configuration.ts +++ /dev/null @@ -1,253 +0,0 @@ -import { - ILifeCycle, - IMidwayApplication, - IMidwayContainer, - MidwayDecoratorService, -} from '@midwayjs/core'; -import { - App, - Config, - Configuration, - getClassMetadata, - Init, - Inject, - listModule, -} from '@midwayjs/core'; -import { - Connection, - createConnection, - getConnection, - getRepository, -} from 'typeorm'; -import { - CONNECTION_KEY, - ENTITY_MODEL_KEY, - EVENT_SUBSCRIBER_KEY, - ORM_MODEL_KEY, -} from '.'; -import { OrmConnectionHook, ORM_HOOK_KEY } from './hook'; -import { ConnectionOptions } from './interface'; - -@Configuration({ - importConfigs: [ - { - default: { - orm: {}, - }, - }, - ], - namespace: 'orm', -}) -export class OrmConfiguration implements ILifeCycle { - @Config('orm') - private ormConfig: any; - - @App() - app: IMidwayApplication; - - private connectionNames: string[] = []; - - @Inject() - decoratorService: MidwayDecoratorService; - - @Init() - async init() { - this.decoratorService.registerPropertyHandler( - ORM_MODEL_KEY, - ( - propertyName, - meta: { - modelKey: string; - connectionName: string; - } - ) => { - // return getConnection(key.connectionName).getRepository(key.modelKey); - return getRepository(meta.modelKey, meta.connectionName); - } - ); - } - - async onReady(container: IMidwayContainer) { - const entities = listModule(ENTITY_MODEL_KEY); - const eventSubs = listModule(EVENT_SUBSCRIBER_KEY); - - const connectionNameMap = { ALL: [] }; - for (const entity of entities) { - const _connectionName = getClassMetadata( - ENTITY_MODEL_KEY, - entity - ).connectionName; - if (!connectionNameMap[_connectionName]) { - connectionNameMap[_connectionName] = []; - } - connectionNameMap[_connectionName].push(entity); - } - - const opts = this.formatConfig(); - - for (const connectionOption of opts) { - const name = connectionOption.name || 'default'; - const connectionEntities = [ - ...connectionNameMap['ALL'], - ...(connectionNameMap[name] || []), - ]; - - connectionOption.entities = connectionOption.entities - ? connectionOption.entities - : connectionEntities || []; - - connectionOption.subscribers = eventSubs || []; - this.connectionNames.push(name); - let isConnected = false; - try { - const conn = getConnection(name); - if (conn.isConnected) { - isConnected = true; - } - } catch { - /* ignore */ - } - if (!isConnected) { - const rtOpt = await this.beforeCreate(container, connectionOption); - const con = await createConnection(rtOpt); - await this.afterCreate(container, rtOpt, con); - } - } - - container.registerObject(CONNECTION_KEY, instanceName => { - if (!instanceName) { - instanceName = 'default'; - } - return getConnection(instanceName); - }); - - // get event model - const eventModules = listModule(EVENT_SUBSCRIBER_KEY); - for (const eventModule of eventModules) { - const eventModuleMetadata = getClassMetadata( - EVENT_SUBSCRIBER_KEY, - eventModule - ); - const module = await container.getAsync(eventModule); - getConnection( - eventModuleMetadata.connectionName || 'default' - ).subscribers.push(module); - } - } - - async onStop(container: IMidwayContainer) { - await Promise.all( - Object.values(this.connectionNames).map(async connectionName => { - const conn = getConnection(connectionName); - - await this.beforeClose(container, conn, connectionName); - - if (conn.isConnected) { - await conn.close(); - } - - await this.afterClose(container, conn); - }) - ); - - this.connectionNames.length = 0; - } - - formatConfig(): any[] { - const originConfig = this.ormConfig; - if (originConfig?.type) { - originConfig.name = 'default'; - return [originConfig]; - } else { - const newArr = []; - - for (const [key, value] of Object.entries(originConfig)) { - (value as any).name = key; - newArr.push(value); - } - - return newArr; - } - } - - /** - * 创建 connection 之前 - * @param container - * @param opts - */ - private async beforeCreate( - container: IMidwayContainer, - opts: ConnectionOptions - ): Promise { - let rt = opts; - const clzzs = listModule(ORM_HOOK_KEY); - for (const clzz of clzzs) { - const inst: OrmConnectionHook = await container.getAsync(clzz); - if (inst.beforeCreate && typeof inst.beforeCreate === 'function') { - rt = await inst.beforeCreate(rt); - } - } - return rt; - } - - /** - * 创建 connection 之后 - * @param container - * @param opts - * @param con - */ - private async afterCreate( - container: IMidwayContainer, - opts: ConnectionOptions, - con: Connection - ): Promise { - let rtCon: Connection = con; - const clzzs = listModule(ORM_HOOK_KEY); - for (const clzz of clzzs) { - const inst: OrmConnectionHook = await container.getAsync(clzz); - if (inst.afterCreate && typeof inst.afterCreate === 'function') { - rtCon = await inst.afterCreate(con, opts); - } - } - return rtCon; - } - - /** - * 关闭连接之前 - * @param container - * @param con - * @param connectionName - */ - private async beforeClose( - container: IMidwayContainer, - con: Connection, - connectionName: string - ) { - let rt = con; - const clzzs = listModule(ORM_HOOK_KEY); - for (const clzz of clzzs) { - const inst: OrmConnectionHook = await container.getAsync(clzz); - if (inst.beforeClose && typeof inst.beforeClose === 'function') { - rt = await inst.beforeClose(rt, connectionName); - } - } - return rt; - } - - /** - * 关闭连接之后 - * @param container - * @param con - */ - private async afterClose(container: IMidwayContainer, con: Connection) { - let rt = con; - const clzzs = listModule(ORM_HOOK_KEY); - for (const clzz of clzzs) { - const inst: OrmConnectionHook = await container.getAsync(clzz); - if (inst.afterClose && typeof inst.afterClose === 'function') { - rt = await inst.afterClose(rt); - } - } - return rt; - } -} diff --git a/packages-legacy/orm/src/decorator.ts b/packages-legacy/orm/src/decorator.ts deleted file mode 100644 index 4d28579139bd..000000000000 --- a/packages-legacy/orm/src/decorator.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { EntityOptions as BaseEntityOptions } from 'typeorm/decorator/options/EntityOptions'; -import { - createCustomPropertyDecorator, - saveClassMetadata, - saveModule, -} from '@midwayjs/core'; -import { getMetadataArgsStorage } from 'typeorm'; -import { ViewEntityOptions as BaseViewEntityOptions } from 'typeorm/decorator/options/ViewEntityOptions'; - -export const ENTITY_MODEL_KEY = 'entity_model_key'; -export const EVENT_SUBSCRIBER_KEY = 'event_subscriber_key'; -export const ORM_MODEL_KEY = '__orm_model_key__'; - -export interface EntityOptions extends BaseEntityOptions { - connectionName?: string; -} - -export interface ViewEntityOptions extends BaseViewEntityOptions { - connectionName?: string; -} - -/** - * Entity - typeorm - * @param options EntityOptions - */ -export function EntityModel(options?: EntityOptions): ClassDecorator; -/** - * Entity - typeorm - * @param name string - * @param options EntityOptions & connectionName - */ -export function EntityModel( - name?: string, - options?: EntityOptions -): ClassDecorator; -/** - * Entity - typeorm - * @param nameOrOptions string|EntityOptions - * @param maybeOptions EntityOptions - */ -export function EntityModel( - nameOrOptions?: string | EntityOptions, - maybeOptions?: EntityOptions -): ClassDecorator { - const options = - (typeof nameOrOptions === 'object' - ? (nameOrOptions as EntityOptions) - : maybeOptions) || ({} as any); - const name = typeof nameOrOptions === 'string' ? nameOrOptions : options.name; - const connectionName = options?.connectionName || 'ALL'; - return function (target) { - if (typeof target === 'function') { - saveModule(ENTITY_MODEL_KEY, target); - saveClassMetadata(ENTITY_MODEL_KEY, { connectionName }, target); - } else { - saveModule(ENTITY_MODEL_KEY, (target as any).constructor); - saveClassMetadata( - ENTITY_MODEL_KEY, - { connectionName }, - (target as any).constructor - ); - } - - getMetadataArgsStorage().tables.push({ - target: target, - name: name, - type: 'regular', - orderBy: options.orderBy ? options.orderBy : undefined, - engine: options.engine ? options.engine : undefined, - database: options.database ? options.database : undefined, - schema: options.schema ? options.schema : undefined, - synchronize: options.synchronize, - withoutRowid: options.withoutRowid, - }); - }; -} - -/** - * ViewEntity - typeorm - * @param options ViewEntityOptions - */ -export function EntityView(options?: ViewEntityOptions): ClassDecorator; -/** - * Entity - ViewEntity - * @param name string - * @param options ViewEntityOptions - */ -export function EntityView( - name?: string, - options?: ViewEntityOptions -): ClassDecorator; -/** - * Entity - typeorm - * @param nameOrOptions string|ViewEntityOptions - * @param maybeOptions ViewEntityOptions - */ -export function EntityView( - nameOrOptions?: string | ViewEntityOptions, - maybeOptions?: ViewEntityOptions -): ClassDecorator { - const options = - (typeof nameOrOptions === 'object' - ? (nameOrOptions as ViewEntityOptions) - : maybeOptions) || {}; - const name = typeof nameOrOptions === 'string' ? nameOrOptions : options.name; - const connectionName = options?.connectionName || 'ALL'; - - return function (target) { - if (typeof target === 'function') { - saveModule(ENTITY_MODEL_KEY, target); - saveClassMetadata(ENTITY_MODEL_KEY, { connectionName }, target); - } else { - saveModule(ENTITY_MODEL_KEY, (target as any).constructor); - saveClassMetadata( - ENTITY_MODEL_KEY, - { connectionName }, - (target as any).constructor - ); - } - - getMetadataArgsStorage().tables.push({ - target: target, - name: name, - type: 'view', - database: options.database ? options.database : undefined, - schema: options.schema ? options.schema : undefined, - expression: options.expression ? options.expression : undefined, - materialized: options.materialized ? options.materialized : undefined, - synchronize: options.synchronize, - }); - }; -} - -export function InjectEntityModel(modelKey?: any, connectionName = 'default') { - return createCustomPropertyDecorator(ORM_MODEL_KEY, { - modelKey, - connectionName, - }); -} - -/** - * EventSubscriber - typeorm - * implements EntitySubscriberInterface - */ -export function EventSubscriberModel( - options: { connectionName?: string } = {} -): ClassDecorator { - return function (target) { - saveModule(EVENT_SUBSCRIBER_KEY, target); - saveClassMetadata(EVENT_SUBSCRIBER_KEY, options, target); - }; -} diff --git a/packages-legacy/orm/src/hook.ts b/packages-legacy/orm/src/hook.ts deleted file mode 100644 index bf8dac7ca1a0..000000000000 --- a/packages-legacy/orm/src/hook.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { saveModule } from '@midwayjs/core'; -import { Connection } from 'typeorm'; -import { ConnectionOptions } from './interface'; - -export const ORM_HOOK_KEY = '__orm_hook_for_configuration__'; - -export interface OrmConnectionHook { - beforeCreate?(opts?: ConnectionOptions): Promise; - afterCreate?( - conn?: Connection, - opts?: ConnectionOptions - ): Promise; - beforeClose?(conn?: Connection, connectionName?: string): Promise; - afterClose?(conn?: Connection): Promise; -} - -export function OrmHook(): ClassDecorator { - return function (target) { - if (typeof target === 'function') { - saveModule(ORM_HOOK_KEY, target); - } else { - saveModule(ORM_HOOK_KEY, (target as any).constructor); - } - }; -} diff --git a/packages-legacy/orm/src/index.ts b/packages-legacy/orm/src/index.ts deleted file mode 100644 index 306e9d0363b6..000000000000 --- a/packages-legacy/orm/src/index.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { - Connection, - EntitySchema, - getRepository, - MongoRepository, - ObjectType, - Repository, - TreeRepository, -} from 'typeorm'; - -export const CONNECTION_KEY = 'orm:getConnection'; -export { - ENTITY_MODEL_KEY, - EVENT_SUBSCRIBER_KEY, - ORM_MODEL_KEY, -} from './decorator'; - -/** - * Gets repository for the given entity. - */ -export type getRepository = ( - target: ObjectType | EntitySchema | string -) => Repository; -/** - * Gets tree repository for the given entity class or name. - * Only tree-type entities can have a TreeRepository, like ones decorated with @Tree decorator. - */ -export type getTreeRepository = ( - target: ObjectType | EntitySchema | string -) => TreeRepository; -/** - * Gets mongodb-specific repository for the given entity class or name. - * Works only if connection is mongodb-specific. - */ -export type getMongoRepository = ( - target: ObjectType | EntitySchema | string -) => MongoRepository; -/** - * Gets custom entity repository marked with @EntityRepository decorator. - */ -export type getCustomRepository = (customRepository: ObjectType) => T; - -export { OrmConfiguration as Configuration } from './configuration'; -export * from './hook'; -export * from './repository'; -export * from './decorator'; -export type GetConnection = (instanceName?: string) => Connection; - -/** - * for hooks useEntityModel method - * @param clz - * @param connectionName - */ -export function useEntityModel( - clz: ObjectType, - connectionName?: string -): Repository { - return getRepository(clz, connectionName); -} - -export * from './interface'; diff --git a/packages-legacy/orm/src/interface.ts b/packages-legacy/orm/src/interface.ts deleted file mode 100644 index 6f86c702f0c0..000000000000 --- a/packages-legacy/orm/src/interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createConnection } from 'typeorm'; - -export type ConnectionOptions = Parameters[0]; diff --git a/packages-legacy/orm/src/repository.ts b/packages-legacy/orm/src/repository.ts deleted file mode 100644 index 357f3705d380..000000000000 --- a/packages-legacy/orm/src/repository.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { IMidwayContainer, providerWrapper } from '@midwayjs/core'; -import { CONNECTION_KEY, GetConnection } from '.'; -import { ScopeEnum } from '@midwayjs/core'; - -export function getRepository(context: IMidwayContainer, args?: any) { - return clzz => { - const getConnection = context.get(CONNECTION_KEY); - return getConnection().getRepository(clzz); - }; -} - -export function getTreeRepository(context: IMidwayContainer, args?: any) { - return clzz => { - const getConnection = context.get(CONNECTION_KEY); - return getConnection().getTreeRepository(clzz); - }; -} - -export function getMongoRepository(context: IMidwayContainer, args?: any) { - return clzz => { - const getConnection = context.get(CONNECTION_KEY); - return getConnection().getMongoRepository(clzz); - }; -} - -export function getCustomRepository(context: IMidwayContainer, args?: any) { - return clzz => { - const getConnection = context.get(CONNECTION_KEY); - return getConnection().getCustomRepository(clzz); - }; -} - -providerWrapper([ - { - id: 'orm:getRepository', - provider: getRepository, - scope: ScopeEnum.Singleton, - }, - { - id: 'orm:getTreeRepository', - provider: getTreeRepository, - scope: ScopeEnum.Singleton, - }, - { - id: 'orm:getMongoRepository', - provider: getMongoRepository, - scope: ScopeEnum.Singleton, - }, - { - id: 'orm:getCustomRepository', - provider: getCustomRepository, - scope: ScopeEnum.Singleton, - }, -]); diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/package.json b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/package.json deleted file mode 100644 index 160854555849..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "base-fn", - "version": "1.0.0", - "dependencies": { - "@ali/midway-faas": "*" - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/config/config.default.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/config/config.default.ts deleted file mode 100644 index 9bf60394cf21..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/config/config.default.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {join} from 'path'; - -export default () => { - return { - orm: { - default: { - type: 'sqlite', - database: join(__dirname, '../../default.sqlite'), - logging: true, - synchronize: true, - }, - test: { - type: 'sqlite', - database: join(__dirname, '../../test.sqlite'), - logging: true, - synchronize: true - } - } - } -} \ No newline at end of file diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/configuration.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/configuration.ts deleted file mode 100644 index 5ac54f67ee78..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/configuration.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { IMidwayApplication } from '@midwayjs/core'; -import { App, Configuration, Inject } from '@midwayjs/core'; -import * as assert from 'assert'; -import { join } from 'path'; -import { getConnection, Repository } from 'typeorm'; -import * as orm from '../../../../src'; -import { getRepository, InjectEntityModel } from '../../../../src'; -import { OnlyTestLoadLog } from './model/onlyTestLoadLog'; -import { User } from './model/user'; - -@Configuration({ - imports: [orm], - importConfigs: [join(__dirname, './config')], -}) -export class ContainerConfiguration { - @Inject('orm:getRepository') - getRepo: getRepository; - - @InjectEntityModel(User, 'test') - testUserModel: Repository; - - @InjectEntityModel(User) - defaultUserModel: Repository; - - @App() - app: IMidwayApplication; - - async onReady(container) { - const u = new User(); - u.name = 'oneuser1'; - - const uu = await this.defaultUserModel.save(u); - - console.log('user one id = ', uu.id); - const user = new User(); - user.id = 1; - - const users = await this.defaultUserModel.findAndCount({ - where: user - }); - assert(users[0][0]['name'] === 'oneuser1'); - - const result = await this.testUserModel.findOne({ - where: user - }); - assert(!result); - - const aa = await container.getAsync('baseFnMultipleHook'); - assert.equal(aa.bcreate, 1); - assert.equal(aa.acreate, 1); - - const defaultConn = getConnection('default'); - const testConn = getConnection('test'); - - assert((defaultConn.options.entities as any).includes(OnlyTestLoadLog) === false); - assert((testConn.options.entities as any).includes(OnlyTestLoadLog) === true); - - this.app.setAttr('result', 'hello world' + JSON.stringify(users)); - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/event.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/event.ts deleted file mode 100644 index a51550eef9b4..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/event.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { EventSubscriberModel } from '../../../../src'; -import { EntitySubscriberInterface, InsertEvent, UpdateEvent, RemoveEvent } from 'typeorm'; -import { Provide } from '@midwayjs/core'; - -@Provide() -@EventSubscriberModel({connectionName: 'test'}) -export class EverythingSubscriber implements EntitySubscriberInterface { - - /** - * Called before entity insertion. - */ - beforeInsert(event: InsertEvent) { - console.log(`BEFORE ENTITY INSERTED: `, event.entity); - } - - /** - * Called before entity insertion. - */ - beforeUpdate(event: UpdateEvent) { - console.log(`BEFORE ENTITY UPDATED: `, event.entity); - } - - /** - * Called before entity insertion. - */ - beforeRemove(event: RemoveEvent) { - console.log(`BEFORE ENTITY WITH ID ${event.entityId} REMOVED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterInsert(event: InsertEvent) { - console.log(`AFTER ENTITY INSERTED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterUpdate(event: UpdateEvent) { - console.log(`AFTER ENTITY UPDATED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterRemove(event: RemoveEvent) { - console.log(`AFTER ENTITY WITH ID ${event.entityId} REMOVED: `, event.entity); - } - - /** - * Called after entity is loaded. - */ - afterLoad(entity: any) { - console.log(`AFTER ENTITY LOADED: `, entity); - } - -} diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/hook.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/hook.ts deleted file mode 100644 index 9cba21a2a108..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/hook.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Connection, DataSourceOptions } from 'typeorm'; -import { OrmConnectionHook, OrmHook } from '../../../../src'; -import { Provide, Scope, ScopeEnum } from '@midwayjs/core'; - - -@OrmHook() -@Provide('baseFnMultipleHook') -@Scope(ScopeEnum.Singleton) -export class BaseFnMultipleHook implements OrmConnectionHook { - public bcreate = 0; - public bclose = 0; - public acreate = 0; - public aclose = 0; - - async beforeCreate?(opts?: DataSourceOptions): Promise { - this.bcreate = 1; - return opts; - } - - async afterCreate?(conn?: Connection, opts?: DataSourceOptions): Promise{ - this.acreate = 1; - return conn; - } - - async beforeClose?(conn?: Connection, connectionName?: string): Promise{ - this.bclose = 1; - return conn; - } - - async afterClose?(conn?: Connection): Promise{ - this.aclose = 1; - return conn; - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/message.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/message.ts deleted file mode 100644 index 9bbdf3fef8d8..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/message.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { EntityModel } from '../../../../../src'; -import { PrimaryGeneratedColumn, ManyToOne, JoinColumn, Column } from 'typeorm' -import { User } from './user'; - -@EntityModel('test_msg') -export class Message { - @PrimaryGeneratedColumn({ name: "id" }) - id!: number; - - @ManyToOne(type => User) - @JoinColumn({ name: "test_user", referencedColumnName: "id" }) - sender?: User; - - @Column({ name: "msg_text" }) - text?: string; -} \ No newline at end of file diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/onlyTestLoadLog.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/onlyTestLoadLog.ts deleted file mode 100644 index 97b5613b7e61..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/onlyTestLoadLog.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Column, PrimaryGeneratedColumn } from 'typeorm'; -import { EntityModel } from '../../../../../src'; - -@EntityModel({ - connectionName: 'test', -}) -export class OnlyTestLoadLog { - @PrimaryGeneratedColumn({ name: 'id' }) - id: number; - - @Column({ name: 'content' }) - content: string; -} diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/user.ts b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/user.ts deleted file mode 100644 index d349fce47d3d..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/src/model/user.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EntityModel } from '../../../../../src'; -import { PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; -import { Message } from './message'; - -@EntityModel('test_user') -export class User { - @PrimaryGeneratedColumn({ name: "id" }) - id: number; - - @Column({ name: "name" }) - name: string; - - @OneToMany(type => Message, message => message.sender) - messages: Message[]; -} \ No newline at end of file diff --git a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/tsconfig.json b/packages-legacy/orm/test/fixtures/base-fn-multiple-db/tsconfig.json deleted file mode 100644 index 42bafaf0bbca..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn-multiple-db/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "inlineSourceMap":true, - "noImplicitThis": true, - "noUnusedLocals": true, - "stripInternal": true, - "pretty": true, - "declaration": true, - "outDir": "dist" - }, - "exclude": [ - "dist", - "node_modules", - "test" - ] -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/package.json b/packages-legacy/orm/test/fixtures/base-fn/package.json deleted file mode 100644 index 7b782234f56d..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "base-fn", - "version": "1.0.0", - "dependencies": { - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/config/config.default.ts b/packages-legacy/orm/test/fixtures/base-fn/src/config/config.default.ts deleted file mode 100644 index 0ff8dd932fc4..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/config/config.default.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {join} from 'path'; - -export default (appInfo) => { - return { - orm: { - type: 'sqlite', - synchronize: true, - database: join(__dirname, '../../test.sqlite'), - logging: true, - } - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/configuration.ts b/packages-legacy/orm/test/fixtures/base-fn/src/configuration.ts deleted file mode 100644 index 3ff5e44bc2b7..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/configuration.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { App, Configuration, Inject } from '@midwayjs/core'; -import * as orm from '../../../../src'; -import { join } from 'path'; -import { getRepository, getCustomRepository, InjectEntityModel, useEntityModel } from '../../../../src'; -import { User } from './model/user'; -import { EntityRepository, Repository } from 'typeorm'; -import * as assert from 'assert'; -import { IMidwayApplication } from '@midwayjs/core'; - -@EntityRepository(User) -class UserRepository extends Repository { - findMyPost() { - return this.findOne(); - } - - createSave(u: any) { - return this.manager.save(u); - } -} - -@Configuration({ - imports: [ - orm - ], - importConfigs: [ - join(__dirname, './config') - ] -}) -export class ContainerConfiguration { - - @Inject('orm:getRepository') - getRepo: getRepository; - - @Inject('orm:getCustomRepository') - getCustomRepo: getCustomRepository; - - @InjectEntityModel(User) - userModel: Repository; - - @App() - app: IMidwayApplication; - - async onReady(container) { - const repo: Repository = this.getRepo(User); - const u = new User(); - u.name = 'oneuser1'; - const uu = await repo.save(u); - console.log('user one id = ', uu.id); - const user = new User(); - user.id = 1; - - const users = await this.userModel.findAndCount(user); - - const userModel = useEntityModel(User); - const newUsers = await userModel.findAndCount(user); - - assert.deepStrictEqual(users, newUsers); - - const newUser = this.getCustomRepo(UserRepository); - const ttu = (newUser as any).create(); - ttu.name = 'ttt' + Date.now(); - await (newUser as any).createSave(ttu); - const ret = await newUser.find({ name: ttu.name}); - assert.ok(ret.length > 0); - - const aa = await container.getAsync('baseFnHook'); - assert.equal(aa.bcreate, 1); - assert.equal(aa.acreate, 1); - // assert.equal(aa.bclose, 1); - // assert.equal(aa.aclose, 1); - - this.app.setAttr('result', 'hello world' + JSON.stringify(users)); - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/event.ts b/packages-legacy/orm/test/fixtures/base-fn/src/event.ts deleted file mode 100644 index 64648d38f112..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/event.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { EventSubscriberModel } from '../../../../src'; -import { EntitySubscriberInterface, InsertEvent, UpdateEvent, RemoveEvent } from 'typeorm'; -import { Provide } from '@midwayjs/core'; - -@Provide() -@EventSubscriberModel() -export class EverythingSubscriber implements EntitySubscriberInterface { - - /** - * Called before entity insertion. - */ - beforeInsert(event: InsertEvent) { - console.log(`BEFORE ENTITY INSERTED: `, event.entity); - } - - /** - * Called before entity insertion. - */ - beforeUpdate(event: UpdateEvent) { - console.log(`BEFORE ENTITY UPDATED: `, event.entity); - } - - /** - * Called before entity insertion. - */ - beforeRemove(event: RemoveEvent) { - console.log(`BEFORE ENTITY WITH ID ${event.entityId} REMOVED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterInsert(event: InsertEvent) { - console.log(`AFTER ENTITY INSERTED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterUpdate(event: UpdateEvent) { - console.log(`AFTER ENTITY UPDATED: `, event.entity); - } - - /** - * Called after entity insertion. - */ - afterRemove(event: RemoveEvent) { - console.log(`AFTER ENTITY WITH ID ${event.entityId} REMOVED: `, event.entity); - } - - /** - * Called after entity is loaded. - */ - afterLoad(entity: any) { - console.log(`AFTER ENTITY LOADED: `, entity); - } - -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/hook.ts b/packages-legacy/orm/test/fixtures/base-fn/src/hook.ts deleted file mode 100644 index 96488cdbdce3..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/hook.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Connection, ConnectionOptions } from 'typeorm'; -import { OrmConnectionHook, OrmHook } from '../../../../src'; -import { Provide, Scope, ScopeEnum } from '@midwayjs/core'; - -@OrmHook() -@Provide('baseFnHook') -@Scope(ScopeEnum.Singleton) -export class BaseFnHook implements OrmConnectionHook { - public bcreate = 0; - public bclose = 0; - public acreate = 0; - public aclose = 0; - - async beforeCreate?(opts?: ConnectionOptions): Promise { - this.bcreate = 1; - return opts; - } - - async afterCreate?(conn?: Connection, opts?: ConnectionOptions): Promise{ - this.acreate = 1; - return conn; - } - - async beforeClose?(conn?: Connection, connectionName?: string): Promise{ - this.bclose = 1; - return conn; - } - - async afterClose?(conn?: Connection): Promise{ - this.aclose = 1; - return conn; - } -} diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/model/message.ts b/packages-legacy/orm/test/fixtures/base-fn/src/model/message.ts deleted file mode 100644 index 9bbdf3fef8d8..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/model/message.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { EntityModel } from '../../../../../src'; -import { PrimaryGeneratedColumn, ManyToOne, JoinColumn, Column } from 'typeorm' -import { User } from './user'; - -@EntityModel('test_msg') -export class Message { - @PrimaryGeneratedColumn({ name: "id" }) - id!: number; - - @ManyToOne(type => User) - @JoinColumn({ name: "test_user", referencedColumnName: "id" }) - sender?: User; - - @Column({ name: "msg_text" }) - text?: string; -} \ No newline at end of file diff --git a/packages-legacy/orm/test/fixtures/base-fn/src/model/user.ts b/packages-legacy/orm/test/fixtures/base-fn/src/model/user.ts deleted file mode 100644 index d349fce47d3d..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/src/model/user.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EntityModel } from '../../../../../src'; -import { PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'; -import { Message } from './message'; - -@EntityModel('test_user') -export class User { - @PrimaryGeneratedColumn({ name: "id" }) - id: number; - - @Column({ name: "name" }) - name: string; - - @OneToMany(type => Message, message => message.sender) - messages: Message[]; -} \ No newline at end of file diff --git a/packages-legacy/orm/test/fixtures/base-fn/tsconfig.json b/packages-legacy/orm/test/fixtures/base-fn/tsconfig.json deleted file mode 100644 index 42bafaf0bbca..000000000000 --- a/packages-legacy/orm/test/fixtures/base-fn/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "inlineSourceMap":true, - "noImplicitThis": true, - "noUnusedLocals": true, - "stripInternal": true, - "pretty": true, - "declaration": true, - "outDir": "dist" - }, - "exclude": [ - "dist", - "node_modules", - "test" - ] -} diff --git a/packages-legacy/orm/test/index.test.ts b/packages-legacy/orm/test/index.test.ts deleted file mode 100644 index f8b707e350cf..000000000000 --- a/packages-legacy/orm/test/index.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { join } from 'path'; -import { existsSync, unlinkSync } from 'fs'; -import { close, createLightApp } from '@midwayjs/mock'; -import { IMidwayApplication } from '@midwayjs/core'; - -describe('/test/index.test.ts', () => { - it.skip('should use one db', async () => { - cleanFile(join(__dirname, 'fixtures/base-fn', 'default.sqlite')); - - const app: IMidwayApplication = await createLightApp(join(__dirname, 'fixtures/base-fn'), {}); - const result = app.getAttr('result'); - - expect(result.includes('hello world')).toBeTruthy(); - expect(result).toEqual('hello world[[{"id":1,"name":"oneuser1"}],1]'); - - await close(app); - }); - - it('use two db in one config', async () => { - cleanFile(join(__dirname, 'fixtures/base-fn-multiple-db', 'default.sqlite')); - cleanFile(join(__dirname, 'fixtures/base-fn-multiple-db', 'test.sqlite')); - - const app: IMidwayApplication = await createLightApp(join(__dirname, 'fixtures/base-fn-multiple-db'), {}); - const result = app.getAttr('result'); - - expect(result.includes('hello world')).toBeTruthy(); - expect(result).toEqual('hello world[[{"id":1,"name":"oneuser1"}],1]'); - }); -}); - -function cleanFile(file) { - if (existsSync(file)) { - unlinkSync(file); - } -} - diff --git a/packages-legacy/orm/tsconfig.json b/packages-legacy/orm/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/orm/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/runtime-engine/CHANGELOG.md b/packages-legacy/runtime-engine/CHANGELOG.md deleted file mode 100644 index 3c20839e0c53..000000000000 --- a/packages-legacy/runtime-engine/CHANGELOG.md +++ /dev/null @@ -1,489 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- disable performance marking for invoke handlers ([#1299](https://github.com/midwayjs/midway/issues/1299)) ([2de9221](https://github.com/midwayjs/midway/commit/2de92214542b8df3abb57b618befde5e161de79e)) -- node v16 typings ([#1269](https://github.com/midwayjs/midway/issues/1269)) ([e3443b5](https://github.com/midwayjs/midway/commit/e3443b58fc1faddadf1e95dd03a2f319410941bb)) - -# [3.0.0-alpha.2](https://github.com/midwayjs/midway-faas/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [3.0.0-alpha.1](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04) - -### Bug Fixes - -- remove check ([6a52e19](https://github.com/midwayjs/midway-faas/commit/6a52e197bd3ae2274b7ced3f1704972f5f4058f2)) - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -### Bug Fixes - -- logger parameter join output ([#1104](https://github.com/midwayjs/midway-faas/issues/1104)) ([e85e5f1](https://github.com/midwayjs/midway-faas/commit/e85e5f1184e69b0a9aceaabf7f22a4a3df6f0b8f)) - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -### Bug Fixes - -- serverless app more method ([#1034](https://github.com/midwayjs/midway-faas/issues/1034)) ([9c44c3f](https://github.com/midwayjs/midway-faas/commit/9c44c3f58930d0c12464d00eceee93cb9e7aaa62)) - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -### Bug Fixes - -- serverless logger close when runtime stop ([#1022](https://github.com/midwayjs/midway-faas/issues/1022)) ([28548da](https://github.com/midwayjs/midway-faas/commit/28548da888005047123523066ca47207f02eb1c8)) - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- serverless logger rotator error ([#992](https://github.com/midwayjs/midway-faas/issues/992)) ([df681b3](https://github.com/midwayjs/midway-faas/commit/df681b34136e66c8bed0f85711163bc4ffb27867)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -### Bug Fixes - -- add missing typings ([#924](https://github.com/midwayjs/midway-faas/issues/924)) ([a17c8d8](https://github.com/midwayjs/midway-faas/commit/a17c8d8655d3f7a93469b922529b7a1aba212c10)) - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -### Features - -- add getFunctionName() and functionSerivceName() method to runtime and faas framework ([#734](https://github.com/midwayjs/midway-faas/issues/734)) ([f0bc5aa](https://github.com/midwayjs/midway-faas/commit/f0bc5aadd224e6ec85691b9c82cc7993cbc32cdb)) - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -### Bug Fixes - -- support async entry for koa/express ([#621](https://github.com/midwayjs/midway-faas/issues/621)) ([19bb466](https://github.com/midwayjs/midway-faas/commit/19bb466e99f3c7e7cb5b755e9fb4bb89f0a65256)) - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -### Bug Fixes - -- log rotate failed ([#615](https://github.com/midwayjs/midway-faas/issues/615)) ([425f888](https://github.com/midwayjs/midway-faas/commit/425f888de0c81094c9aacb150d129729e37609ce)) - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -### Bug Fixes - -- createLogger & commond-core support multi provider ([#604](https://github.com/midwayjs/midway-faas/issues/604)) ([c1748f0](https://github.com/midwayjs/midway-faas/commit/c1748f00516a86624fab3cd64d2a61052513cbf3)) - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- format ([99edaef](https://github.com/midwayjs/midway-faas/commit/99edaef97a5c4b21b1223e089a9d39dbe8694d97)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- measure handler performance with perf_hooks ([0d372e8](https://github.com/midwayjs/midway-faas/commit/0d372e85f1792c212cdc0b586d00df0a7b6684c9)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- format ([99edaef](https://github.com/midwayjs/midway-faas/commit/99edaef97a5c4b21b1223e089a9d39dbe8694d97)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- measure handler performance with perf_hooks ([0d372e8](https://github.com/midwayjs/midway-faas/commit/0d372e85f1792c212cdc0b586d00df0a7b6684c9)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- format ([99edaef](https://github.com/midwayjs/midway-faas/commit/99edaef97a5c4b21b1223e089a9d39dbe8694d97)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- measure handler performance with perf_hooks ([0d372e8](https://github.com/midwayjs/midway-faas/commit/0d372e85f1792c212cdc0b586d00df0a7b6684c9)) - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -### Bug Fixes - -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -### Features - -- measure handler performance with perf_hooks ([0d372e8](https://github.com/midwayjs/midway-faas/commit/0d372e85f1792c212cdc0b586d00df0a7b6684c9)) - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -### Bug Fixes - -- format ([99edaef](https://github.com/midwayjs/midway-faas/commit/99edaef97a5c4b21b1223e089a9d39dbe8694d97)) - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-engine - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-engine diff --git a/packages-legacy/runtime-engine/jest.config.js b/packages-legacy/runtime-engine/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/runtime-engine/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/runtime-engine/jest.setup.js b/packages-legacy/runtime-engine/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/runtime-engine/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/runtime-engine/package.json b/packages-legacy/runtime-engine/package.json deleted file mode 100644 index 668edf2a5a41..000000000000 --- a/packages-legacy/runtime-engine/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@midwayjs/runtime-engine", - "private": true, - "version": "3.7.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/runtime-engine/src/bootstrap.ts b/packages-legacy/runtime-engine/src/bootstrap.ts deleted file mode 100644 index 01a503a51354..000000000000 --- a/packages-legacy/runtime-engine/src/bootstrap.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { BaseRuntimeEngine } from './engine'; -import { - Bootstrap, - Runtime, - RuntimeEngine, - BootstrapOptions, -} from './interface'; - -export class BaseBootstrap implements Bootstrap { - runtimeEngine: RuntimeEngine; - options: BootstrapOptions; - runtime: Runtime; - layers; - - constructor(options: BootstrapOptions = {}) { - this.options = options; - this.runtime = this.options.runtime; - this.runtimeEngine = new BaseRuntimeEngine(); - this.runtimeEngine.add(engine => { - engine.addBaseRuntime(options.runtime); - }); - // set options - if (this.runtime) { - this.runtime.setOptions(this.options); - } - } - - public async start(): Promise { - if (this.options.layers && this.options.layers.length) { - this.options.layers.map(mod => this.runtimeEngine.add(mod)); - } - await this.runtimeEngine.ready(); - return this.runtimeEngine.getCurrentRuntime() as Runtime; - } - - public async close(): Promise { - await this.runtimeEngine.close(); - } - - public getRuntime(): Runtime { - return this.runtimeEngine.getCurrentRuntime(); - } - - public getRuntimeEngine(): RuntimeEngine { - return this.runtimeEngine; - } -} diff --git a/packages-legacy/runtime-engine/src/engine.ts b/packages-legacy/runtime-engine/src/engine.ts deleted file mode 100644 index ad63b44fb660..000000000000 --- a/packages-legacy/runtime-engine/src/engine.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { - ContextExtensionHandler, - EventExtensionHandler, - HealthExtensionHandler, - Runtime, - RuntimeEngine, - RuntimeExtension, -} from './interface'; -import { ServerlessBaseRuntime } from './runtime'; -import { completeAssign } from './util'; -import performance from './lib/performance'; - -export class BaseRuntimeEngine implements RuntimeEngine { - public runtimeExtensions: RuntimeExtension[] = []; - public contextExtensions: ContextExtensionHandler[] = []; - public eventExtensions: EventExtensionHandler[] = []; - public healthExtensions: HealthExtensionHandler[] = []; - public runtime: Runtime; - public baseRuntime; - - public add(extensionHandler: (engine: RuntimeEngine) => void) { - extensionHandler(this); - } - - public addBaseRuntime(baseRuntime: Runtime) { - this.baseRuntime = baseRuntime; - } - - public addRuntimeExtension(ext: RuntimeExtension): RuntimeEngine { - // - // This is for compatibility legacy layers - // And this logic will be removed soon - // - const legacyExt: any = ext; - if (legacyExt.beforeStart) { - ext.beforeRuntimeStart = legacyExt.beforeStart; - } - if (legacyExt.beforeReady) { - ext.afterFunctionStart = legacyExt.beforeReady; - } - this.runtimeExtensions.push(ext); - return this; - } - - public addHealthExtension( - healthExtensionHandler: HealthExtensionHandler - ): RuntimeEngine { - this.healthExtensions.push(healthExtensionHandler); - return this; - } - - public addEventExtension( - eventExtensionHandler: EventExtensionHandler - ): RuntimeEngine { - this.eventExtensions.push(eventExtensionHandler); - return this; - } - - public addContextExtension( - contextExtensionHandler: ContextExtensionHandler - ): RuntimeEngine { - this.contextExtensions.push(contextExtensionHandler); - return this; - } - - public async ready(): Promise { - if (!this.baseRuntime) { - this.addBaseRuntime(new ServerlessBaseRuntime()); - } - this.runtime = completeAssign.apply( - this, - [this.baseRuntime].concat(this.runtimeExtensions) - ); - await this.getCurrentRuntime().init(this.contextExtensions); - performance.mark('midway-faas:runtimeStart:start'); - await this.getCurrentRuntime().runtimeStart(this.eventExtensions); - performance.mark('midway-faas:runtimeStart:end'); - performance.mark('midway-faas:functionStart:start'); - await this.getCurrentRuntime().functionStart(); - performance.mark('midway-faas:functionStart:end'); - this.measureMarksOnReady(); - } - - public async close(): Promise { - await this.runtime.close(); - } - - public getCurrentRuntime(): Runtime { - return this.runtime; - } - - private measureMarksOnReady() { - [ - 'runtimeStart', - 'beforeRuntimeStartHandler', - 'afterRuntimeStartHandler', - 'functionStart', - 'beforeFunctionStartHandler', - 'afterFunctionStartHandler', - ].forEach(it => { - performance.measure( - `midway-faas:${it}:measure`, - `midway-faas:${it}:start`, - `midway-faas:${it}:end` - ); - }); - // Disable midway performance marks. - performance.disable(); - } -} diff --git a/packages-legacy/runtime-engine/src/error.ts b/packages-legacy/runtime-engine/src/error.ts deleted file mode 100644 index 3eb46bf409e3..000000000000 --- a/packages-legacy/runtime-engine/src/error.ts +++ /dev/null @@ -1,18 +0,0 @@ -export class RuntimeError extends Error { - name = 'RuntimeError'; - code = 1; - - constructor(message: string, errName?: string, code?: number) { - super(message); - this.name = errName || this.constructor.name; - this.code = code || 1; - } - - static create(errorObject: { name?: string; code: number; message: string }) { - let errName = errorObject.name || 'RuntimeError'; - if (!/Error$/.test(errName)) { - errName += 'Error'; - } - return new RuntimeError(errorObject.message, errName, errorObject.code); - } -} diff --git a/packages-legacy/runtime-engine/src/index.ts b/packages-legacy/runtime-engine/src/index.ts deleted file mode 100644 index 07efca317150..000000000000 --- a/packages-legacy/runtime-engine/src/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -export * from './interface'; -export * from './runtime'; -export * from './engine'; -export * from './lib/parser'; -export * from './lib/debug'; -export * from './lightRuntime'; -export * from './error'; -export * from './bootstrap'; -export * from './util'; diff --git a/packages-legacy/runtime-engine/src/interface.ts b/packages-legacy/runtime-engine/src/interface.ts deleted file mode 100644 index ba6d3bb4579f..000000000000 --- a/packages-legacy/runtime-engine/src/interface.ts +++ /dev/null @@ -1,113 +0,0 @@ -export type ContextExtensionHandler = (ctx, runtime: Runtime) => Promise; -export type HealthExtensionHandler = (ctx, runtime: Runtime) => Promise; -export type EventExtensionHandler = ( - runtime: Runtime -) => Promise; -export type handlerWrapper = (...args) => any; - -export const FAAS_ARGS_KEY = 'FAAS_ARGS'; - -export interface RuntimeEngine { - add(engineHandler: (engine: RuntimeEngine) => void); - addBaseRuntime(baseRuntime: Runtime); - addRuntimeExtension(ext: RuntimeExtension): RuntimeEngine; - addContextExtension(contextExtensionHandler: ContextExtensionHandler): RuntimeEngine; - addHealthExtension(healthExtensionHandler: HealthExtensionHandler): RuntimeEngine; - addEventExtension(eventExtensionHandler: EventExtensionHandler): RuntimeEngine; - ready(): Promise; - close(): Promise; - getCurrentRuntime(): Runtime; -} - -export interface RuntimeExtension { - beforeRuntimeStart?(runtime: Runtime); - afterRuntimeStart?(runtime: Runtime); - beforeFunctionStart?(runtime: Runtime); - afterFunctionStart?(runtime: Runtime); - beforeClose?(runtime: Runtime); - createLogger?(filename?, options?); - createEnvParser?(): PropertyParser; - beforeInvoke?(functionContext: any, args?: any, meta?: any); - afterInvoke?(err: Error, result: any, context?: any); - defaultInvokeHandler?(...args); -} - -export interface Runtime extends RuntimeExtension { - debugLogger: any; - logger: any; - eventHandlers: FunctionEvent[]; - isAppMode: boolean; - init(contextExtensions: ContextExtensionHandler[]): Promise; - runtimeStart(eventExtensions: EventExtensionHandler[]): Promise; - functionStart(): Promise; - close(): Promise; - getProperty(propertyKey: string); - getPropertyParser(): PropertyParser; - invokeInitHandler(...args); - invokeDataHandler(...args); - invoke(...payload): Promise; - triggerRoute(...payload): Promise; - getContextExtensions(): ContextExtensionHandler[]; - setOptions(RuntimeOptions): void; - getFunctionName(): string; - getFunctionServiceName(): string; - getRuntimeConfig(): any; -} - -export interface LightRuntime extends Runtime { - invokeHandlerWrapper(context, invokeHandler); - asyncEvent(handler: handlerWrapper): (...args) => void; - getApplication(): any; -} - -export interface IServerlessLogger { - log?(msg: any, ...args: any[]): void; - info(msg: any, ...args: any[]): void; - debug(msg: any, ...args: any[]): void; - error(msg: any, ...args: any[]): void; - warn(msg: any, ...args: any[]): void; - write?(msg: string): void; -} - -export interface PropertyParser { - setProperty(key: string, value); - getProperty(key: string, defaultValue?); - getInitTimeout(): T; - getInitHandler(): T; - getFuncTimeout(): T; - getFunctionHandler(): T; - getFunctionRuntime(): T; - getEntryDir(): T; - getTriggerType(): T; - getFunctionLayer(): T; - getLoggerLevel(): T; -} - -export interface LoggerFactory { - createLogger(...args); - close(); -} - -export interface FunctionEvent { - type: string; - meta: object; - match(...args): boolean; - run?(...args): Promise; - getContext?(...args): Promise; - transformInvokeArgs?(...args): any[]; -} - -export interface Bootstrap { - start(): Promise; - close(): Promise; - getRuntime(): Runtime; - getRuntimeEngine(): RuntimeEngine; -} - -export interface BootstrapOptions { - layers?: any[]; - runtime?: Runtime; - initContext?: any; - isAppMode?: boolean; - runtimeConfig?: any; -} diff --git a/packages-legacy/runtime-engine/src/lib/debug.ts b/packages-legacy/runtime-engine/src/lib/debug.ts deleted file mode 100644 index ab18b20bfff4..000000000000 --- a/packages-legacy/runtime-engine/src/lib/debug.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* istanbul ignore file */ -import { isDebug } from '../util'; - -export class DebugLogger { - prefix; - isDebugEnv; - - constructor(prefix?) { - this.prefix = prefix || ''; - this.isDebugEnv = isDebug(); - } - - log(...args) { - if (this.isDebugEnv) { - if (this.prefix) { - console.log(`[faas_debug:${this.prefix}]`, args); - } else { - console.log('[faas_debug]', args); - } - } - } - - write(...args) { - this.log(...args); - } - - warn(...args) { - this.log(...args); - } - - info(...args) { - this.log(...args); - } - - error(...args) { - this.log(...args); - } - - debug(...args) { - this.log(...args); - } -} diff --git a/packages-legacy/runtime-engine/src/lib/parser.ts b/packages-legacy/runtime-engine/src/lib/parser.ts deleted file mode 100644 index f36e59cc49f7..000000000000 --- a/packages-legacy/runtime-engine/src/lib/parser.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { PropertyParser } from '../interface'; - -export enum EnvPropertyKey { - INIT_TIMEOUT = 'INIT_TIMEOUT', // 初始化函数 - INIT_HANDLER = 'INIT_HANDLER', // 初始化函数 - FUNC_TIMEOUT = 'FUNC_TIMEOUT', // 初始化函数 - FUNC_HANDLER = 'FUNC_HANDLER', // 执行函数 - FUNC_RUNTIME = 'FUNC_RUNTIME', // 函数运行时名字 - ENTRY_DIR = 'ENTRY_DIR', // 入口目录 - TRIGGER_TYPE = 'TRIGGER_TYPE', // 触发器类型 - FUNC_LAYER = 'FUNC_LAYER', // layer - LOGER_LEVEL = 'LOGGER_LEVEL', // layer - EAGLEEYE_FLAG = 'EAGLE_FLAG', // layer -} - -export class EnvPropertyParser - extends Map - implements PropertyParser -{ - setProperty(propertyKey: string, value) { - process.env[propertyKey] = value; - } - - getProperty(propertyKey: string, defaultValue?): T { - if (!this.has(propertyKey)) { - if (process.env[propertyKey]) { - this.set(propertyKey, process.env[propertyKey] as any); - } else if (process.env[propertyKey.toUpperCase()]) { - this.set(propertyKey, process.env[propertyKey.toUpperCase()] as any); - } else if (process.env[propertyKey.toLowerCase()]) { - this.set(propertyKey, process.env[propertyKey.toLowerCase()] as any); - } else { - this.set(propertyKey, defaultValue || ''); - } - } - - return this.get(propertyKey); - } - - getInitTimeout() { - return this.getProperty(EnvPropertyKey.INIT_TIMEOUT, 3 * 60 * 1000); // 3min - } - - getFuncTimeout() { - return this.getProperty(EnvPropertyKey.FUNC_TIMEOUT, 3 * 60 * 1000); // 3min - } - - getInitHandler() { - const funcHandler: any = this.getFunctionHandler(); - const [entryFile] = funcHandler.split('.'); - return this.getProperty( - EnvPropertyKey.INIT_HANDLER, - `${entryFile}.initialize` - ); - } - - getFunctionHandler() { - return this.getProperty(EnvPropertyKey.FUNC_HANDLER, 'index.handler'); - } - - getFunctionRuntime() { - return this.getProperty(EnvPropertyKey.FUNC_RUNTIME, 'function_runtime'); - } - - getEntryDir() { - return this.getProperty(EnvPropertyKey.ENTRY_DIR, process.cwd()); - } - - getTriggerType() { - return this.getProperty(EnvPropertyKey.TRIGGER_TYPE, 'default_trigger'); - } - - getFunctionLayer() { - return this.getProperty(EnvPropertyKey.FUNC_LAYER, ''); - } - - getLoggerLevel() { - return this.getProperty(EnvPropertyKey.LOGER_LEVEL, 'WARN'); - } - - getTraceFlag() { - return this.getProperty(EnvPropertyKey.EAGLEEYE_FLAG, 'on'); - } -} diff --git a/packages-legacy/runtime-engine/src/lib/performance.ts b/packages-legacy/runtime-engine/src/lib/performance.ts deleted file mode 100644 index 6d542a3fcd05..000000000000 --- a/packages-legacy/runtime-engine/src/lib/performance.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { performance } from 'perf_hooks'; - -let enabled = true; - -export function mark(name: string) { - if (!enabled) { - return; - } - performance.mark(name); -} - -export function disable() { - enabled = false; -} - -export default { - mark, - measure: performance.measure.bind(performance), - disable, -}; diff --git a/packages-legacy/runtime-engine/src/lightRuntime.ts b/packages-legacy/runtime-engine/src/lightRuntime.ts deleted file mode 100644 index 788cab825521..000000000000 --- a/packages-legacy/runtime-engine/src/lightRuntime.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* istanbul ignore file */ -import { ServerlessBaseRuntime } from './runtime'; -import { LightRuntime } from './interface'; - -/** - * A lightweight runtime implementation for a platform like aliyun fc that does not provide a custom runtime - * So you can wrapper invoke handler use asyncEvent method - */ -export abstract class ServerlessLightRuntime - extends ServerlessBaseRuntime - implements LightRuntime -{ - async invokeHandlerWrapper(context, invokeHandler) { - const contextExtensions = this.getContextExtensions() || []; - // load context extension - for (const contextExtension of contextExtensions) { - await contextExtension(context, this); - } - try { - await this.handlerInvokerWrapper('beforeInvokeHandler', [context]); - const result = await invokeHandler(); - await this.handlerInvokerWrapper('afterInvokeHandler', [ - null, - result, - context, - ]); - return result; - } catch (err) { - await this.handlerInvokerWrapper('afterInvokeHandler', [ - err, - null, - context, - ]); - throw err; - } - } - - abstract asyncEvent(handler): (...args) => void; - abstract getApplication(): any; -} diff --git a/packages-legacy/runtime-engine/src/runtime.ts b/packages-legacy/runtime-engine/src/runtime.ts deleted file mode 100644 index 0262d4974290..000000000000 --- a/packages-legacy/runtime-engine/src/runtime.ts +++ /dev/null @@ -1,241 +0,0 @@ -import { EventEmitter } from 'events'; -import { - ContextExtensionHandler, - EventExtensionHandler, - IServerlessLogger, - LoggerFactory, - PropertyParser, - Runtime, - FunctionEvent, - BootstrapOptions, -} from './interface'; -import { EnvPropertyParser } from './lib/parser'; -import { DebugLogger } from './lib/debug'; -import { getHandlerMeta } from './util'; -import performance from './lib/performance'; - -export class BaseLoggerFactory implements LoggerFactory { - createLogger(...args) { - return console; - } - - close() {} -} - -export abstract class ServerlessAbstractRuntime - extends EventEmitter - implements Runtime -{ - propertyParser: PropertyParser; - debugLogger = new DebugLogger('base_runtime'); - loggerFactory: LoggerFactory; - contextExtensions: ContextExtensionHandler[]; - eventHandlers: FunctionEvent[] = []; - handlerStore = new Map(); - logger = null; - protected options: BootstrapOptions = {}; - - constructor() { - super(); - this.propertyParser = this.createEnvParser(); - this.loggerFactory = this.createLoggerFactory(); - this.logger = this.loggerFactory.createLogger(); - } - - public async init( - contextExtensions: ContextExtensionHandler[] - ): Promise { - this.contextExtensions = contextExtensions; - } - - public async runtimeStart( - eventExtensions: EventExtensionHandler[] - ): Promise { - await this.handlerInvokerWrapper('beforeRuntimeStartHandler', [this]); - - for (const eventExtension of eventExtensions) { - const funEvent = await eventExtension(this); - if (funEvent) { - this.eventHandlers.push(funEvent); - } - } - - await this.handlerInvokerWrapper('afterRuntimeStartHandler', [this]); - } - - public async functionStart(): Promise { - await this.handlerInvokerWrapper('beforeFunctionStartHandler', [this]); - // invoke init handler - await this.invokeInitHandler({ - baseDir: this.propertyParser.getEntryDir(), - }); - await this.handlerInvokerWrapper('afterFunctionStartHandler', [this]); - } - - public async close(): Promise { - await this.handlerInvokerWrapper('beforeCloseHandler', [this]); - this.loggerFactory.close(); - } - - public getProperty(propertyKey: string) { - return this.propertyParser.getProperty(propertyKey); - } - - public getPropertyParser(): PropertyParser { - return this.propertyParser; - } - - abstract invokeInitHandler(...args); - - abstract invokeDataHandler(...args); - - public async invoke(payload: any): Promise { - const funEvent = await this.triggerRoute(payload); - return new Promise((resolve, reject) => { - const timer = setTimeout(() => { - reject( - new Error(`function invoke timeout: ${JSON.stringify(payload)}`) - ); - }, Number(this.propertyParser.getFuncTimeout())); - this.emitHandler(funEvent, payload) - .then(res => { - clearTimeout(timer); - resolve(res); - }) - .catch(err => { - clearTimeout(timer); - reject(err); - }); - }); - } - - public async triggerRoute(payload): Promise { - for (const event of this.eventHandlers) { - if (event.match(payload)) { - return event; - } - } - throw new Error('trigger not found'); - } - - getContextExtensions(): ContextExtensionHandler[] { - return this.contextExtensions; - } - - setOptions(options) { - this.options = options; - } - - /** - * get function name in runtime - */ - getFunctionName(): string { - return process.env.MIDWAY_SERVERLESS_FUNCTION_NAME || ''; - } - - /** - * get function service/group in runtime - */ - getFunctionServiceName(): string { - return process.env.MIDWAY_SERVERLESS_SERVICE_NAME || ''; - } - - getRuntimeConfig() { - return this.options?.runtimeConfig || {}; - } - - async getContext(event: FunctionEvent, newArgs) { - return this.contextExtensions.reduce( - (promiseCtx, contextExtension) => - promiseCtx.then(ctx => { - return Promise.resolve(contextExtension(ctx, this)).then( - (realCtx: any) => realCtx || ctx - ); - }), - Promise.resolve(this.createFunctionContext(event, newArgs)) - ); - } - - async emitHandler(funEvent: FunctionEvent, args) { - let newArgs = args; - if (funEvent.transformInvokeArgs) { - newArgs = funEvent.transformInvokeArgs.call(funEvent, args) || []; - } - - const context = await this.getContext(funEvent, newArgs); - try { - await this.handlerInvokerWrapper('beforeInvokeHandler', [ - context, - args, - funEvent.meta, - ]); - const result = await this.invokeDataHandler(context, ...newArgs); - await this.handlerInvokerWrapper('afterInvokeHandler', [ - null, - result, - context, - ]); - return result; - } catch (err) { - await this.handlerInvokerWrapper('afterInvokeHandler', [ - err, - null, - context, - ]); - if (context.logger && typeof context.logger.error === 'function') { - context.logger.error(err); - } - err.message = `${err.message}, \nStack: ${err.stack}`; - throw err; - } - } - - createEnvParser(): PropertyParser { - return new EnvPropertyParser(); - } - - createLogger(options?): IServerlessLogger { - return console as IServerlessLogger; - } - - createLoggerFactory() { - return new BaseLoggerFactory(); - } - - async defaultInvokeHandler(...args) { - const { fileName, handler } = getHandlerMeta( - this.propertyParser.getFunctionHandler() - ); - throw new Error( - `handler not found: ${fileName}.${handler}, please check your f.yml` - ); - } - - createFunctionContext(event: FunctionEvent, ...args): any { - if (event.getContext) { - return event.getContext(args); - } - return {}; - } - - protected async handlerInvokerWrapper(handlerKey: string, args?) { - performance.mark(`midway-faas:${handlerKey}:start`); - if (this.handlerStore.has(handlerKey)) { - const handlers = this.handlerStore.get(handlerKey); - this.debugLogger.log(`${handlerKey} exec, task = ${handlers.length}`); - for (const handler of handlers) { - await handler.apply(this, args); - } - } - performance.mark(`midway-faas:${handlerKey}:end`); - } - - get isAppMode() { - return !!this.options.isAppMode; - } -} - -export class ServerlessBaseRuntime extends ServerlessAbstractRuntime { - async invokeDataHandler(...args) {} - async invokeInitHandler(...args) {} -} diff --git a/packages-legacy/runtime-engine/src/util.ts b/packages-legacy/runtime-engine/src/util.ts deleted file mode 100644 index 74c0fec1e1ac..000000000000 --- a/packages-legacy/runtime-engine/src/util.ts +++ /dev/null @@ -1,106 +0,0 @@ -export const asyncWrapper = handler => { - return (...args) => { - if (typeof args[args.length - 1] === 'function') { - const callback = args.pop(); - if (handler.constructor.name !== 'AsyncFunction') { - const err = new TypeError('Must be an AsyncFunction'); - return callback(err); - } - // 其他事件场景 - return handler.apply(handler, args).then( - result => { - callback(null, result); - }, - err => { - callback(err); - } - ); - } else { - return handler.apply(handler, args); - } - }; -}; - -export const isDebug = () => { - return process.env['FAAS_DEBUG'] === 'true'; -}; - -/** - * get handler function with file path and method name - * @param filePath - * @param handler - */ -export const getHandlerMethod = (filePath, handler) => { - const mod = require(filePath); - if (mod && mod[handler]) { - return mod[handler].bind(mod); - } -}; - -/** - * This is an assign function that copies full descriptors - * @param {Object} target 合并的目标对象 - * @param {Object} sources 合并的原对象 - * @return {*} 合并的结果对象 - */ -export const completeAssign = function (...sources) { - const target = sources.shift(); - - sources.forEach(source => { - const descriptors = Object.keys(source).reduce((descriptors, key) => { - if (Object.getOwnPropertyDescriptor(target, key)) { - // delete target[key]; - } - descriptors[key] = Object.getOwnPropertyDescriptor(source, key); - return descriptors; - }, {}); - // by default, Object.assign copies enumerable Symbols too - /* istanbul ignore next */ - Object.getOwnPropertySymbols(source).forEach(sym => { - const descriptor = Object.getOwnPropertyDescriptor(source, sym); - if (descriptor.enumerable) { - descriptors[sym] = descriptor; - } - }); - - // 在 copy 属性时不执行 get/set 方法 - for (const name in descriptors) { - if ( - /^(before|after)\w+/.test(name) && - typeof descriptors[name].value === 'function' - ) { - if (!target['handlerStore']) { - Object.defineProperty(target, 'handlerStore', { - value: new Map(), - }); - } - - if (!target['handlerStore'].has(name + 'Handler')) { - target['handlerStore'].set(name + 'Handler', []); - } - - target['handlerStore'] - .get(name + 'Handler') - .push(descriptors[name].value); - } else { - Object.defineProperty(target, name, descriptors[name]); - } - } - }); - return target; -}; - -/** - * parse handler file name and method name - * @param handlerName - */ -export const getHandlerMeta = ( - handlerName -): { fileName: string; handler: string } => { - if (/\./.test(handlerName)) { - const meta = handlerName.split('.'); - return { fileName: meta[0], handler: meta[1] }; - } else { - // error - } -}; diff --git a/packages-legacy/runtime-engine/test/TestRuntime.ts b/packages-legacy/runtime-engine/test/TestRuntime.ts deleted file mode 100644 index e04c74e5c082..000000000000 --- a/packages-legacy/runtime-engine/test/TestRuntime.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { ServerlessAbstractRuntime, getHandlerMeta } from '../src'; -import { join } from 'path'; -import { exists } from 'mz/fs'; - -export const isTsEnv = () => { - const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE; - if ('false' === TS_MODE_PROCESS_FLAG) { - return false; - } - // eslint-disable-next-line node/no-deprecated-api - return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts']; -}; - -export const fileExists = (entryDir, fileName) => { - const jsFile = join(entryDir, fileName + '.js'); - const tsFile = join(entryDir, fileName + '.ts'); - if (isTsEnv()) { - return exists(tsFile); - } else { - /* istanbul ignore next */ - return exists(jsFile); - } -}; - - -/** - * get handler function with file path and method name - * @param filePath - * @param handler - */ -export const getHandlerMethod = (filePath, handler) => { - const mod = require(filePath); - if (mod && mod[handler]) { - return mod[handler].bind(mod); - } -}; - -export class TestRuntime extends ServerlessAbstractRuntime { - async invokeInitHandler(...args) { - let func; - const entryDir = this.propertyParser.getEntryDir(); - const { fileName, handler } = getHandlerMeta( - this.propertyParser.getInitHandler() - ); - if (await fileExists(entryDir, fileName)) { - try { - func = getHandlerMethod(join(entryDir, fileName), handler); - this.debugLogger.log('invoke init handler'); - if (func) { - this.debugLogger.log('found handler and call'); - return await new Promise((resolve, reject) => { - const timer = setTimeout(() => { - // TODO error stack - reject(new Error('timeout')); - }, Number(this.propertyParser.getInitTimeout())); - Promise.resolve(func.call(this, this, ...args)) - .then(res => { - clearTimeout(timer); - resolve(res); - }) - .catch(err => { - clearTimeout(timer); - reject(err); - }); - }); - } - } catch (err) { - err.message = `function init error with: ${err.message}`; - throw err; - } - } else { - this.debugLogger.log('no init handler found'); - } - } - - async invokeDataHandler(...args) { - const entryDir = this.propertyParser.getEntryDir(); - const { fileName, handler } = getHandlerMeta( - this.propertyParser.getFunctionHandler() - ); - let error = new Error(`invoke handler not found: ${fileName}.${handler}`); - try { - let func; - const flag = await fileExists(entryDir, fileName); - if (flag) { - this.debugLogger.log('invoke data handler'); - func = getHandlerMethod(join(entryDir, fileName), handler); - } - if (flag && func) { - this.debugLogger.log('found handler and call'); - return func.apply(this, args); - } else { - return this.defaultInvokeHandler(...args); - } - } catch (err) { - error = err; - this.logger.error(err); - } - - return Promise.reject(error); - } -} diff --git a/packages-legacy/runtime-engine/test/fixtures/base.ts b/packages-legacy/runtime-engine/test/fixtures/base.ts deleted file mode 100644 index 0507f971393d..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/base.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Runtime } from '../../src/interface'; -import * as http from 'http'; - -let server; -export const testExtension = { - async beforeClose(runtime: Runtime) { - return new Promise(resolve => { - server.close(() => { - runtime.debugLogger.log('server closed'); - resolve(); - }); - }); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer((request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - runtime.invokeDataHandler().then(res => { - response.end(res); - }); - }) - .listen(3000, '127.0.0.1', () => { - runtime.debugLogger.log('server started'); - resolve(); - }); - }); - }, -}; diff --git a/packages-legacy/runtime-engine/test/fixtures/common/index.ts b/packages-legacy/runtime-engine/test/fixtures/common/index.ts deleted file mode 100644 index 5c178d0137d0..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/common/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const initialize = () => {}; - -export const handler = async () => { - return 'Hello, world!'; -}; diff --git a/packages-legacy/runtime-engine/test/fixtures/crash/index.ts b/packages-legacy/runtime-engine/test/fixtures/crash/index.ts deleted file mode 100644 index 80b727519537..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/crash/index.ts +++ /dev/null @@ -1 +0,0 @@ -throw new Error('empty'); diff --git a/packages-legacy/runtime-engine/test/fixtures/error/index.ts b/packages-legacy/runtime-engine/test/fixtures/error/index.ts deleted file mode 100644 index e60eb63639aa..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/error/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export const initialize = () => { - // throw new Error('initialize error...'); -}; - -export const handler = async ctx => { - throw new Error('Ops'); -}; diff --git a/packages-legacy/runtime-engine/test/fixtures/extension/httpEvent.ts b/packages-legacy/runtime-engine/test/fixtures/extension/httpEvent.ts deleted file mode 100644 index 796394c3d8a8..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/extension/httpEvent.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { FunctionEvent } from '../../../src'; - -export class HttpEvent implements FunctionEvent { - type: string; - meta: object; - logger; - - constructor(options) { - this.type = 'HTTP'; - this.meta = { domainName: 'http.test.com' }; - this.logger = options.logger; - } - - match() { - return true; - } - - transformInvokeArgs(...args): any[] { - return args; - } -} diff --git a/packages-legacy/runtime-engine/test/fixtures/extension/index.ts b/packages-legacy/runtime-engine/test/fixtures/extension/index.ts deleted file mode 100644 index 36ecd7494e7c..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/extension/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import assert = require('assert'); -import { ServerlessAbstractRuntime } from '../../../src'; - -export const initialize = (runtime) => { - assert(runtime instanceof ServerlessAbstractRuntime) -}; - -export const handler = async ctx => { - return ctx.myValue + 'Hello, world!'; -}; diff --git a/packages-legacy/runtime-engine/test/fixtures/js/index.ts b/packages-legacy/runtime-engine/test/fixtures/js/index.ts deleted file mode 100644 index 25fe91feb0d9..000000000000 --- a/packages-legacy/runtime-engine/test/fixtures/js/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export const initialize = (runtime) => { - console.log('this is runtime', runtime) -}; - -export const handler = async () => { - return 'Hello, world!'; -}; diff --git a/packages-legacy/runtime-engine/test/index.test.ts b/packages-legacy/runtime-engine/test/index.test.ts deleted file mode 100644 index c2180aeb13e8..000000000000 --- a/packages-legacy/runtime-engine/test/index.test.ts +++ /dev/null @@ -1,395 +0,0 @@ -import path = require('path'); -import { BaseRuntimeEngine, Runtime, ServerlessBaseRuntime } from '../src'; -import { exec } from 'child_process'; -import * as assert from 'assert'; -import { testExtension } from './fixtures/base'; -import { HttpEvent } from './fixtures/extension/httpEvent'; -import { TestRuntime } from './TestRuntime'; - -describe('/test/index.test.ts', () => { - describe('basic', () => { - beforeAll(() => { - // 设置函数执行目录 - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/common'); - }); - - it('start a mock runtime with a server', async () => { - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - runtimeEngine.add(engine => { - engine.addRuntimeExtension(testExtension); - }); - - await runtimeEngine.ready(); - - const result = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result === 'Hello, world!'); - await runtimeEngine.close(); - }); - - it('start a runtime and create a trigger', async () => { - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - runtimeEngine.add(engine => { - engine.addRuntimeExtension(testExtension); - }); - - await runtimeEngine.ready(); - - const result = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result === 'Hello, world!'); - await runtimeEngine.close(); - }); - - it.skip('start with timeout', async () => { - let flag = false; - const bak = process.kill; - process.kill = () => { - flag = true; - return true; - }; - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - runtimeEngine.add(engine => { - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => setImmediate(() => resolve())); - }, - }); - }); - runtimeEngine.ready(); - (runtimeEngine.getCurrentRuntime() as ServerlessBaseRuntime).emit( - 'startTimeout' - ); - assert(flag); - await runtimeEngine.close(); - process.kill = bak; - }); - - it.skip('start with error', async () => { - let flag = false; - const bak = process.kill; - process.kill = () => { - flag = true; - return true; - }; - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - runtimeEngine.add(engine => { - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => setImmediate(() => resolve())); - }, - }); - }); - runtimeEngine.ready(); - (runtimeEngine.getCurrentRuntime() as ServerlessBaseRuntime).emit( - 'error', - new Error() - ); - assert(flag); - await runtimeEngine.close(); - process.kill = bak; - }); - }); - - describe('common', () => { - it('should get propertyParser', () => { - const dir = path.join(__dirname, './fixtures/extension'); - const entryDir = path.join(__dirname, './fixtures/not-exists'); - process.env.test = dir; - process.env.ENTRY_DIR = entryDir; - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - runtimeEngine.ready(); - const runtime = runtimeEngine.getCurrentRuntime(); - runtime.getPropertyParser(); - const res = runtime.getProperty('test'); - assert.equal(res, dir); - const res2 = runtime.getPropertyParser().getEntryDir(); - assert.equal(res2, entryDir); - }); - - it('should create logger', () => { - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.ready(); - const runtime = runtimeEngine.getCurrentRuntime(); - const logger = runtime.createLogger(); - assert.equal(logger, console); - }); - - it('should try transformInvokeArgs', () => { - const runtimeEngine = new BaseRuntimeEngine(); - const fn = async (ctx, runtime) => {}; - runtimeEngine.addContextExtension(fn); - runtimeEngine.ready(); - const runtime = runtimeEngine.getCurrentRuntime(); - const res = runtime.getContextExtensions(); - assert(fn === res[0]); - }); - }); - - describe('extension', () => { - it('should test with extension', async () => { - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/extension'); - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - const httpEvent = new HttpEvent({ logger: console.log }); - runtimeEngine.add(engine => { - const http = require('http'); - let server; - engine.addRuntimeExtension({ - async beforeClose() { - return new Promise(resolve => server.close(() => resolve())); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer(async (request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - const res = await runtime.invoke(); - response.end(res); - }) - .listen(3000, '127.0.0.1', () => { - runtime.debugLogger.log('server started'); - resolve(); - }); - }); - }, - async beforeInvoke(ctx: any, args) { - ctx.myValue = ctx.myValue + ': '; - }, - }); - engine.addEventExtension(async () => httpEvent); - engine.addHealthExtension(async (ctx, runtime) => { - console.log('--- health ctx', ctx, 'runtime', runtime); - }); - engine.addContextExtension(async ctx => { - ctx.myValue = 'res'; - }); - }); - - await runtimeEngine.ready(); - - const result = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result === 'res: Hello, world!'); - await runtimeEngine.close(); - }); - - it('should test extension without args format', async () => { - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/extension'); - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - const httpEvent = new HttpEvent({ logger: console.log }); - httpEvent.transformInvokeArgs = () => null; - runtimeEngine.add(engine => { - const http = require('http'); - let server; - engine.addRuntimeExtension({ - async beforeClose() { - return new Promise(resolve => server.close(() => resolve())); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer(async (request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - const res = await runtime.invoke(); - response.end(res); - }) - .listen(3000, '127.0.0.1', () => { - runtime.debugLogger.log('server started'); - resolve(); - }); - }); - }, - async beforeInvoke(ctx: any, args) { - ctx.myValue = ctx.myValue + ': '; - }, - }); - engine.addEventExtension(async () => httpEvent); - engine.addHealthExtension(async (ctx, runtime) => { - console.log('--- health ctx', ctx, 'runtime', runtime); - }); - engine.addContextExtension(async (ctx, runtime) => { - ctx.myValue = 'res'; - }); - }); - - await runtimeEngine.ready(); - - const result = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result === 'res: Hello, world!'); - await runtimeEngine.close(); - }); - }); - - describe('invoke', () => { - it('should invoke defaultInvokeHandler handler with error', async () => { - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/no-exists'); - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - const httpEvent = new HttpEvent({ logger: console.log }); - runtimeEngine.add(engine => { - const http = require('http'); - let server; - engine.addRuntimeExtension({ - async beforeClose() { - return new Promise(resolve => server.close(() => resolve())); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer(async (request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - const res = await runtime.invoke().catch(err => err); - response.end(res.message); - }) - .listen(3000, '127.0.0.1', () => resolve()); - }); - }, - }); - engine.addEventExtension(async () => httpEvent); - }); - - await runtimeEngine.ready(); - - const result: string = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result.includes('handler not found:')); - await runtimeEngine.close(); - }); - - it('should invoke error', async () => { - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/error'); - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - let errorLogged = false; - const httpEvent = new HttpEvent({ logger: console.log }); - runtimeEngine.add(engine => { - const http = require('http'); - let server; - engine.addRuntimeExtension({ - async beforeClose() { - return new Promise(resolve => server.close(() => resolve())); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer(async (request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - const res = await runtime.invoke().catch(err => err); - response.end(res.message); - }) - .listen(3000, '127.0.0.1', () => resolve()); - }); - }, - }); - engine.addEventExtension(async () => httpEvent); - engine.addContextExtension(async ctx => { - ctx.logger = { - error: () => { - errorLogged = true; - }, - }; - }); - }); - - await runtimeEngine.ready(); - - const result: string = await new Promise((resolve, reject) => { - exec('curl 127.0.0.1:3000', (error, stdout, stderr) => { - if (error) { - reject(error); - return; - } - resolve(stdout); - }); - }); - - assert(result.includes('Ops')); - assert(errorLogged); - await runtimeEngine.close(); - }); - - it('should load function crash', async () => { - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/crash'); - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.addBaseRuntime(new TestRuntime()); - const httpEvent = new HttpEvent({ logger: console.log }); - runtimeEngine.add(engine => { - const http = require('http'); - let server; - engine.addRuntimeExtension({ - async beforeClose() { - return new Promise(resolve => server.close(() => resolve())); - }, - async beforeRuntimeStart(runtime: Runtime) { - return new Promise(resolve => { - server = http - .createServer(async (request, response) => { - response.writeHead(200, { 'Content-Type': 'text/plain' }); - const res = await runtime.invoke().catch(err => err); - response.end(res.message); - }) - .listen(3000, '127.0.0.1', () => resolve()); - }); - }, - }); - engine.addEventExtension(async () => httpEvent); - }); - - try { - await runtimeEngine.ready(); - } catch (err) { - assert.equal(err.message, 'function init error with: empty'); - } - - await runtimeEngine.close(); - }); - }); -}); diff --git a/packages-legacy/runtime-engine/test/layer.test.ts b/packages-legacy/runtime-engine/test/layer.test.ts deleted file mode 100644 index 539a69d1e0b7..000000000000 --- a/packages-legacy/runtime-engine/test/layer.test.ts +++ /dev/null @@ -1,4 +0,0 @@ -describe('/test/layer.test.ts', () => { - it('test layer', () => { - }) -}); diff --git a/packages-legacy/runtime-engine/test/lib/parser.test.ts b/packages-legacy/runtime-engine/test/lib/parser.test.ts deleted file mode 100644 index bcd32c9ab812..000000000000 --- a/packages-legacy/runtime-engine/test/lib/parser.test.ts +++ /dev/null @@ -1,41 +0,0 @@ -import assert = require('assert'); -import { EnvPropertyParser } from '../../src/lib/parser'; - -describe('parser.test.ts', () => { - it('should test getProperty', () => { - const parser = new EnvPropertyParser(); - const path = parser.getProperty('path'); - assert(path); - }); - - it('should test setProperty', () => { - const parser = new EnvPropertyParser(); - parser.setProperty('hello', 'world'); - const res = parser.getProperty('HELLO'); - assert(res, 'world'); - }); - - it('should getFunctionRuntime', () => { - const parser = new EnvPropertyParser(); - const res = parser.getFunctionRuntime(); - assert(res, 'function_runtime'); - }); - - it('should getEntryDir', () => { - const parser = new EnvPropertyParser(); - const res = parser.getEntryDir(); - assert(res, process.cwd()); - }); - - it('should getTriggerType', () => { - const parser = new EnvPropertyParser(); - const res = parser.getTriggerType(); - assert(res, 'default_trigger'); - }); - - it('should getFunctionLayer', () => { - const parser = new EnvPropertyParser(); - const res = parser.getFunctionLayer() as string; - assert(res.length === 0); - }); -}); diff --git a/packages-legacy/runtime-engine/test/perf-events.test.ts b/packages-legacy/runtime-engine/test/perf-events.test.ts deleted file mode 100644 index f56a6e58f0f9..000000000000 --- a/packages-legacy/runtime-engine/test/perf-events.test.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { BaseRuntimeEngine } from '../src'; -import * as assert from 'assert'; -import * as perfHooks from 'perf_hooks'; -import * as path from 'path'; - -describe('/test/perf-events.test.ts', () => { - beforeAll(() => { - // 设置函数执行目录 - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/common'); - }); - - it('should call all events', async () => { - const expectedMeasurementCount = 6; - const actualEventsFuture = new Promise(resolve => { - let actualEvents = []; - - const observer: any = new perfHooks.PerformanceObserver(entryList => { - actualEvents = actualEvents.concat(entryList.getEntries().map(it => it.name)); - if (actualEvents.length >= expectedMeasurementCount) { - resolve(actualEvents); - observer.disconnect(); - } - }); - observer.observe({ entryTypes: ['measure'], buffered: false }); - }); - - const runtimeEngine = new BaseRuntimeEngine(); - - await runtimeEngine.ready(); - await runtimeEngine.close(); - const actualEvents = await actualEventsFuture; - - assert.deepStrictEqual( - actualEvents, - [ - 'midway-faas:runtimeStart:measure', - 'midway-faas:beforeRuntimeStartHandler:measure', - 'midway-faas:afterRuntimeStartHandler:measure', - 'midway-faas:functionStart:measure', - 'midway-faas:beforeFunctionStartHandler:measure', - 'midway-faas:afterFunctionStartHandler:measure', - ] - ); - }); -}); diff --git a/packages-legacy/runtime-engine/test/runtime-error.test.ts b/packages-legacy/runtime-engine/test/runtime-error.test.ts deleted file mode 100644 index f34931e0b102..000000000000 --- a/packages-legacy/runtime-engine/test/runtime-error.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { RuntimeError } from '..'; -import * as assert from 'assert'; - -describe('runtime-error', () => { - it('create new error', () => { - try { - throw new RuntimeError('init fail'); - } catch (e) { - assert.equal(e.name, 'RuntimeError'); - assert.equal(e.message, 'init fail'); - } - }); - - it('create default error with code', () => { - const err = RuntimeError.create({ - code: -1, - message: 'hello world', - name: 'custom', - }); - assert(err.name === 'customError'); - assert(err.code === -1); - }); -}); diff --git a/packages-legacy/runtime-engine/test/runtime-events.test.ts b/packages-legacy/runtime-engine/test/runtime-events.test.ts deleted file mode 100644 index 51b7e394539a..000000000000 --- a/packages-legacy/runtime-engine/test/runtime-events.test.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { BaseRuntimeEngine } from '../src'; -import * as assert from 'assert'; -import * as path from 'path'; - -const events = [ - 'beforeRuntimeStart', - 'afterRuntimeStart', - 'beforeFunctionStart', - 'afterFunctionStart', - 'beforeInvoke', - 'afterInvoke', - 'beforeClose', -]; - -describe('/test/runtime-events.test.ts', () => { - beforeAll(() => { - // 设置函数执行目录 - process.env.ENTRY_DIR = path.join(__dirname, './fixtures/common'); - }); - - it('should call all events', async () => { - const actualEvents = []; - - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.add(engine => { - const ext = events.reduce((accu, key) => { - accu[key] = () => { - actualEvents.push(key); - }; - return accu; - }, {}); - engine.addRuntimeExtension(ext); - }); - - await runtimeEngine.ready(); - await runtimeEngine.close(); - - assert.deepStrictEqual(actualEvents, [ - 'beforeRuntimeStart', - 'afterRuntimeStart', - 'beforeFunctionStart', - 'afterFunctionStart', - 'beforeClose', - ]); - }); -}); diff --git a/packages-legacy/runtime-engine/test/runtime.test.ts b/packages-legacy/runtime-engine/test/runtime.test.ts deleted file mode 100644 index 9b96d0968dae..000000000000 --- a/packages-legacy/runtime-engine/test/runtime.test.ts +++ /dev/null @@ -1,13 +0,0 @@ -import * as mm from 'mm'; -import { ServerlessBaseRuntime } from '../src'; - -describe('/test/runtime.test.ts', function () { - it('should test env and get function name and service name', function () { - mm(process.env, 'MIDWAY_SERVERLESS_FUNCTION_NAME', 'ccc'); - mm(process.env, 'MIDWAY_SERVERLESS_SERVICE_NAME', 'ddd'); - const runtime = new ServerlessBaseRuntime(); - expect(runtime.getFunctionName()).toEqual('ccc'); - expect(runtime.getFunctionServiceName()).toEqual('ddd'); - mm.restore(); - }); -}); diff --git a/packages-legacy/runtime-engine/test/util.test.ts b/packages-legacy/runtime-engine/test/util.test.ts deleted file mode 100644 index 92bffcd13a93..000000000000 --- a/packages-legacy/runtime-engine/test/util.test.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { completeAssign } from '../src/util'; -import * as assert from 'assert'; - -describe('/test/util.test.ts', () => { - it('test assign', () => { - let a = 2; - - const data = completeAssign( - {}, - { - afterTest() { - a = 1; - }, - a: 1, - beforeGo: 1, - }, - { - afterTest() { - a = 3; - }, - beforeHello() {}, - } - ); - - const afterTestHandlers = data['handlerStore'].get('afterTestHandler'); - assert(afterTestHandlers.length === 2); - for (const handler of afterTestHandlers) { - handler(); - } - assert(a === 3); - assert(data.a === 1); - assert(data.beforeGo === 1); - }); -}); diff --git a/packages-legacy/runtime-engine/tsconfig.json b/packages-legacy/runtime-engine/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/runtime-engine/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/runtime-mock/CHANGELOG.md b/packages-legacy/runtime-mock/CHANGELOG.md deleted file mode 100644 index cc786f4fafd1..000000000000 --- a/packages-legacy/runtime-mock/CHANGELOG.md +++ /dev/null @@ -1,468 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-alpha.2](https://github.com/midwayjs/midway-faas/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [3.0.0-alpha.1](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -### Bug Fixes - -- serverless event test ([#967](https://github.com/midwayjs/midway-faas/issues/967)) ([e0c15e3](https://github.com/midwayjs/midway-faas/commit/e0c15e316c2813fd574f38bdf6a16a339bfede18)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -### Bug Fixes - -- runtime mock support initHandler ([#749](https://github.com/midwayjs/midway-faas/issues/749)) ([0b993be](https://github.com/midwayjs/midway-faas/commit/0b993beff72ef648dc438dda4d0214f4e3b13954)) - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- change serverless plugin ([b1be100](https://github.com/midwayjs/midway-faas/commit/b1be100a5dda0f186ec2534ff852b17ce902996d)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- change serverless plugin ([b1be100](https://github.com/midwayjs/midway-faas/commit/b1be100a5dda0f186ec2534ff852b17ce902996d)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -### Features - -- change serverless plugin ([b1be100](https://github.com/midwayjs/midway-faas/commit/b1be100a5dda0f186ec2534ff852b17ce902996d)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -### Bug Fixes - -- runtime engine refactor compatibility ([#35](https://github.com/midwayjs/midway-faas/issues/35)) ([99ed6c5](https://github.com/midwayjs/midway-faas/commit/99ed6c59a24158137e244fda3ca3adfc14eeda48)) - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-mock - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/runtime-mock diff --git a/packages-legacy/runtime-mock/jest.config.js b/packages-legacy/runtime-mock/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/runtime-mock/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/runtime-mock/jest.setup.js b/packages-legacy/runtime-mock/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/runtime-mock/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/runtime-mock/package.json b/packages-legacy/runtime-mock/package.json deleted file mode 100644 index 12f0708a3773..000000000000 --- a/packages-legacy/runtime-mock/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@midwayjs/runtime-mock", - "private": true, - "version": "3.7.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/runtime-mock/src/event.ts b/packages-legacy/runtime-mock/src/event.ts deleted file mode 100644 index 301de4b1288d..000000000000 --- a/packages-legacy/runtime-mock/src/event.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { FunctionEvent } from '@midwayjs/runtime-engine'; - -export class HTTPEvent implements FunctionEvent { - type; - meta; - - constructor() { - this.type = 'HTTP'; - this.meta = {}; - } - - match() { - return true; - } - - transformInvokeArgs(context): any[] { - if (Array.isArray(context)) { - context = context.shift(); - } - return [context, {}]; - } -} diff --git a/packages-legacy/runtime-mock/src/index.ts b/packages-legacy/runtime-mock/src/index.ts deleted file mode 100644 index 393278ab1b97..000000000000 --- a/packages-legacy/runtime-mock/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './runtime'; -export * from './trigger'; -export * from './event'; diff --git a/packages-legacy/runtime-mock/src/runtime.ts b/packages-legacy/runtime-mock/src/runtime.ts deleted file mode 100644 index 942450bcd223..000000000000 --- a/packages-legacy/runtime-mock/src/runtime.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { - BaseBootstrap, - FunctionEvent, - getHandlerMeta, - getHandlerMethod, - Runtime, -} from '@midwayjs/runtime-engine'; -import { BaseTrigger, Trigger } from './trigger'; -import { join } from 'path'; - -export function sleep(sec = 1000) { - return new Promise(done => setTimeout(done, sec)); -} - -export interface MockRuntimeOptions { - layers?: any[]; - functionDir?: string; - bootstrap?; - events?: FunctionEvent[]; - handler?: any; - initHandler?: any; - initContext?: any; - runtime?: Runtime; -} - -export class MockRuntime { - options; - runtime: Runtime; - layers; - bootstrap; - engine; - handler; - trigger: Trigger; - initHandler; - - constructor(options: MockRuntimeOptions = {}) { - this.options = options; - this.handler = options.handler; - if (this.options.bootstrap || this.options.runtime || this.options.events) { - this.bootstrap = this.options.bootstrap - ? new this.options.bootstrap() - : new BaseBootstrap({ - runtime: this.options.runtime, - layers: this.options.layers, - runtimeConfig: this.options.runtimeConfig, - }); - this.engine = this.bootstrap.getRuntimeEngine(); - } - } - - async start() { - process.env.ENTRY_DIR = this.options.functionDir; - if (this.bootstrap) { - // lightRuntime 需要调用自身逻辑 - if (this.options.events) { - for (const event of this.options.events) { - this.engine.addEventExtension(async (runtime: Runtime) => { - return event; - }); - } - } - - await this.bootstrap.start(); - await sleep(500); - this.runtime = this.bootstrap.getRuntime(); - } - if (this.options.initHandler) { - await this.options.initHandler(this.options.initContext); - } - return this.runtime; - } - - async invoke(...args) { - let newArgs; - if (args[0] && args[0] instanceof BaseTrigger) { - this.trigger = args[0]; - newArgs = await this.trigger.toArgs(); - } else { - newArgs = args; - } - - return this.invokeHandlerMethod(newArgs); - } - - async delegate(trigger: Trigger) { - this.trigger = trigger; - // TODO 普通 runtime - // 传入一个方法包裹，返回一个参数列表，然后执行方法 - return this.trigger.delegate(invokeArgs => { - return this.invokeHandlerMethod(invokeArgs); - }); - } - - private async invokeHandlerMethod(newArgs) { - if (this.runtime) { - return this.runtime.invoke(newArgs); - } else { - // for LightRuntime - let handlerMethod: any; - if (typeof this.handler === 'function') { - handlerMethod = this.handler; - } else { - const { fileName, handler } = getHandlerMeta( - this.handler || 'index.handler' - ); - handlerMethod = getHandlerMethod( - join(this.options.functionDir, fileName), - handler - ); - } - - return new Promise((resolve, reject) => { - if (this.trigger && this.trigger.useCallback) { - // 这个地方 callback 得调用 resolve - const cb = this.trigger.createCallback((err, result) => { - if (err) { - // 异步返回 - reject(err); - } else { - resolve(result); - } - }); - newArgs.push(cb); - } - - Promise.resolve(handlerMethod.apply(this, newArgs)).then( - resolve, - reject - ); - }); - } - } - - async close() { - process.env.ENTRY_DIR = ''; - if (this.trigger) { - await this.trigger.close(); - } - if (this.bootstrap) { - await this.bootstrap.close(); - } - await sleep(500); - } -} - -export const createRuntime = (options?: MockRuntimeOptions) => { - return new MockRuntime(options); -}; diff --git a/packages-legacy/runtime-mock/src/trigger.ts b/packages-legacy/runtime-mock/src/trigger.ts deleted file mode 100644 index 2defe0669c45..000000000000 --- a/packages-legacy/runtime-mock/src/trigger.ts +++ /dev/null @@ -1,32 +0,0 @@ -export interface Trigger { - useCallback: boolean; - toArgs(): any; - getEvent(): any; - delegate(invokeWrapper: (invokeArgs: any[]) => any): any; - close(); - createCallback(cb); - createContext(); -} - -export class BaseTrigger implements Trigger { - useCallback = false; - - async toArgs(): Promise { - const event = this.getEvent(); - return Promise.resolve([event, this.createContext()]); - } - - createCallback(handler) { - return (err, result) => { - handler(err, result); - }; - } - - async delegate(invokeWrapper: (invokeArgs: any[]) => any): Promise {} - - async close() {} - - getEvent() {} - - createContext() {} -} diff --git a/packages-legacy/runtime-mock/test/code/index.ts b/packages-legacy/runtime-mock/test/code/index.ts deleted file mode 100644 index e23ece5a149d..000000000000 --- a/packages-legacy/runtime-mock/test/code/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -exports.handler = (ctx, event) => { - return 'hello ' + event.query.name; -}; diff --git a/packages-legacy/runtime-mock/test/code/spec.yml b/packages-legacy/runtime-mock/test/code/spec.yml deleted file mode 100644 index 00e5b655bf7d..000000000000 --- a/packages-legacy/runtime-mock/test/code/spec.yml +++ /dev/null @@ -1,21 +0,0 @@ -group: market-fn -name: empty-hsf-1 - -runtime: nodejs10 -handler: index.handler - -timeout: 50000 - -memory: 2048MB -cpu: 0.5 - -trigger-hsf: true # enable HSF trigger - -#trigger-http: # enable HTTP trigger -#vip-server: true # whether register a VipServer domain for the function - -#trigger-queue: # enable metaq trigger -#metaq: -#consumer-group: ginkgoMidway # consumer group name -#topic: greeting # topic name -#tags: a||b # message tag names. optional, default value is '*' diff --git a/packages-legacy/runtime-mock/test/index.test.ts b/packages-legacy/runtime-mock/test/index.test.ts deleted file mode 100644 index 5507b3ac40f5..000000000000 --- a/packages-legacy/runtime-mock/test/index.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { createRuntime, HTTPEvent } from '../src'; -import { join } from 'path'; - -describe('/test/index.test.ts', () => { - it('should create runtime', async () => { - let initHandlerResult; - const runtime = createRuntime({ - functionDir: join(__dirname, './code'), - events: [new HTTPEvent()], - initHandler: arg => { - initHandlerResult = arg; - }, - initContext: 'test' - }); - await runtime.start(); - await runtime.close(); - expect(initHandlerResult).toEqual('test'); - }); -}); diff --git a/packages-legacy/runtime-mock/tsconfig.json b/packages-legacy/runtime-mock/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/runtime-mock/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-app/CHANGELOG.md b/packages-legacy/serverless-app/CHANGELOG.md deleted file mode 100644 index 9ac7152250ae..000000000000 --- a/packages-legacy/serverless-app/CHANGELOG.md +++ /dev/null @@ -1,562 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency express to v4.18.2 ([#2413](https://github.com/midwayjs/midway/issues/2413)) ([ace153b](https://github.com/midwayjs/midway/commit/ace153b796a8b962d307ee1568634869f727431a)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.20.1 ([#2355](https://github.com/midwayjs/midway/issues/2355)) ([4cf6bda](https://github.com/midwayjs/midway/commit/4cf6bdaa8b10b4ae40598305e1df9ad29dd701ed)) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.8](https://github.com/midwayjs/midway/compare/v3.4.7...v3.4.8) (2022-08-02) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.9](https://github.com/midwayjs/midway/compare/v3.3.8...v3.3.9) (2022-05-25) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.6](https://github.com/midwayjs/midway/compare/v3.3.5...v3.3.6) (2022-05-11) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.3](https://github.com/midwayjs/midway/compare/v3.3.2...v3.3.3) (2022-04-14) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.4](https://github.com/midwayjs/midway/compare/v3.1.3...v3.1.4) (2022-03-16) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.3](https://github.com/midwayjs/midway/compare/v3.1.2...v3.1.3) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.19.2 ([#1708](https://github.com/midwayjs/midway/issues/1708)) ([01626e8](https://github.com/midwayjs/midway/commit/01626e882710108cc9bede8c6f2adcfd142f72f0)) -- **deps:** update dependency express to v4.17.3 ([#1713](https://github.com/midwayjs/midway/issues/1713)) ([c781eca](https://github.com/midwayjs/midway/commit/c781eca27586b1d07cf672e71776ad9a521e149f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -### Bug Fixes - -- **serverless-app:** fix findNpmModule in pnp ([#1605](https://github.com/midwayjs/midway/issues/1605)) ([37f46e0](https://github.com/midwayjs/midway/commit/37f46e08811ae43d983e2076a33d16f5f57c795c)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -### Bug Fixes - -- serverless app run ([#1523](https://github.com/midwayjs/midway/issues/1523)) ([5a25eb7](https://github.com/midwayjs/midway/commit/5a25eb7ebb17bf9b0e2ba4feee5bc1649f70d56f)) - -### Features - -- cross domain component ([#1493](https://github.com/midwayjs/midway/issues/1493)) ([ca81b2f](https://github.com/midwayjs/midway/commit/ca81b2fa2824fbddc7870a971fa23274c86d05df)) -- support hooks 3 ([#1524](https://github.com/midwayjs/midway/issues/1524)) ([1cf446d](https://github.com/midwayjs/midway/commit/1cf446d99ac8bff252820beb7cf7dd036215a864)) - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- node v16 typings ([#1269](https://github.com/midwayjs/midway/issues/1269)) ([e3443b5](https://github.com/midwayjs/midway/commit/e3443b58fc1faddadf1e95dd03a2f319410941bb)) -- serverless app support applicationContext ([#1281](https://github.com/midwayjs/midway/issues/1281)) ([b692001](https://github.com/midwayjs/midway/commit/b692001c451b17a10d26cb6778a8566d5fa569c5)) -- serverless local dev bodyparser limit ([#1245](https://github.com/midwayjs/midway/issues/1245)) ([6bdf378](https://github.com/midwayjs/midway/commit/6bdf37841260b1f77e20d913ee85a45ae41ca559)) -- static prefix ([#1321](https://github.com/midwayjs/midway/issues/1321)) ([31fe961](https://github.com/midwayjs/midway/commit/31fe961931fed7656a144b1682ee4c4bb25fdff5)) - -## [2.12.4](https://github.com/midwayjs/midway/compare/v2.12.3...v2.12.4) (2021-08-13) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -### Features - -- vercel starter and trigger ([#1199](https://github.com/midwayjs/midway/issues/1199)) ([7d978a2](https://github.com/midwayjs/midway/commit/7d978a2bd46bf0b96c689ace2a9268e31a2e4acd)) - -## [2.12.2](https://github.com/midwayjs/midway/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.12.1](https://github.com/midwayjs/midway/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [2.12.0](https://github.com/midwayjs/midway/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.11.6](https://github.com/midwayjs/midway/compare/v2.11.5...v2.11.6) (2021-07-16) - -### Features - -- support ssl ([#1160](https://github.com/midwayjs/midway/issues/1160)) ([2e442ae](https://github.com/midwayjs/midway/commit/2e442ae0c67af93df4f8d2f82cb213744befa8d2)) - -## [2.11.5](https://github.com/midwayjs/midway/compare/v2.11.4...v2.11.5) (2021-07-15) - -### Bug Fixes - -- cors and trigger bugs in serverless ([#1156](https://github.com/midwayjs/midway/issues/1156)) ([2df53c2](https://github.com/midwayjs/midway/commit/2df53c277bb33d31b5a86cd3daa04b937caedc48)) - -## [2.11.4](https://github.com/midwayjs/midway/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.11.3](https://github.com/midwayjs/midway/compare/v2.11.2...v2.11.3) (2021-07-02) - -### Bug Fixes - -- serverless app invoke args ([#1127](https://github.com/midwayjs/midway/issues/1127)) ([3467b73](https://github.com/midwayjs/midway/commit/3467b73994f755e230e34de36d24b810a65ab854)) - -## [2.11.2](https://github.com/midwayjs/midway/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.11.1](https://github.com/midwayjs/midway/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-app - -# [2.11.0](https://github.com/midwayjs/midway/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.18](https://github.com/midwayjs/midway/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.17](https://github.com/midwayjs/midway/compare/v2.10.16...v2.10.17) (2021-05-17) - -### Bug Fixes - -- serverless app layer ([#1046](https://github.com/midwayjs/midway/issues/1046)) ([0f8dd18](https://github.com/midwayjs/midway/commit/0f8dd18da29eeb76514e203b3ec91cac0928ae15)) - -## [2.10.15](https://github.com/midwayjs/midway/compare/v2.10.14...v2.10.15) (2021-05-12) - -### Bug Fixes - -- support aliyun fc cors in local env ([#1041](https://github.com/midwayjs/midway/issues/1041)) ([245925a](https://github.com/midwayjs/midway/commit/245925aaf1a2568c3c90a7d03bc1c6df468b8950)) - -## [2.10.14](https://github.com/midwayjs/midway/compare/v2.10.13...v2.10.14) (2021-05-11) - -### Bug Fixes - -- serverless app more method ([#1034](https://github.com/midwayjs/midway/issues/1034)) ([9c44c3f](https://github.com/midwayjs/midway/commit/9c44c3f58930d0c12464d00eceee93cb9e7aaa62)) - -## [2.10.13](https://github.com/midwayjs/midway/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.12](https://github.com/midwayjs/midway/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.11](https://github.com/midwayjs/midway/compare/v2.10.10...v2.10.11) (2021-04-29) - -### Bug Fixes - -- serverless-app stop need close runtime ([#1015](https://github.com/midwayjs/midway/issues/1015)) ([1bef223](https://github.com/midwayjs/midway/commit/1bef223b5c6bf8225c5ca24f6ff0eeec957d2ac8)) - -## [2.10.10](https://github.com/midwayjs/midway/compare/v2.10.9...v2.10.10) (2021-04-24) - -### Bug Fixes - -- serverless app support serverless dev ([#1010](https://github.com/midwayjs/midway/issues/1010)) ([bbeeda5](https://github.com/midwayjs/midway/commit/bbeeda5055cfd9dd6988c484354ac701121ae9da)) - -## [2.10.9](https://github.com/midwayjs/midway/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.8](https://github.com/midwayjs/midway/compare/v2.10.7...v2.10.8) (2021-04-21) - -### Bug Fixes - -- serverless app typings missing ([#1001](https://github.com/midwayjs/midway/issues/1001)) ([2500f11](https://github.com/midwayjs/midway/commit/2500f11faf8e2308ff6d2bf55910b98e57b48001)) - -## [2.10.7](https://github.com/midwayjs/midway/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway/issues/986)) ([bfd8232](https://github.com/midwayjs/midway/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway/issues/997)) ([456cc14](https://github.com/midwayjs/midway/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.10.5](https://github.com/midwayjs/midway/compare/v2.10.4...v2.10.5) (2021-04-13) - -### Bug Fixes - -- serverless app stop ([#988](https://github.com/midwayjs/midway/issues/988)) ([279a3c5](https://github.com/midwayjs/midway/commit/279a3c5682786be8ec5ec34081c8ef700afa2ec9)) - -## [2.10.4](https://github.com/midwayjs/midway/compare/v2.10.3...v2.10.4) (2021-04-10) - -### Bug Fixes - -- clear container cache when test ([#978](https://github.com/midwayjs/midway/issues/978)) ([a202075](https://github.com/midwayjs/midway/commit/a202075b52d281e06f1ed7c6139e968fafc960f6)) - -## [2.10.3](https://github.com/midwayjs/midway/compare/v2.10.2...v2.10.3) (2021-04-07) - -### Bug Fixes - -- scf starter name error ([#972](https://github.com/midwayjs/midway/issues/972)) ([4e5de60](https://github.com/midwayjs/midway/commit/4e5de60e73eaf0722c5bc4efad776c55d73077cf)) - -## [2.10.2](https://github.com/midwayjs/midway/compare/v2.10.1...v2.10.2) (2021-04-05) - -### Bug Fixes - -- serverless event test ([#967](https://github.com/midwayjs/midway/issues/967)) ([e0c15e3](https://github.com/midwayjs/midway/commit/e0c15e316c2813fd574f38bdf6a16a339bfede18)) - -## [2.10.1](https://github.com/midwayjs/midway/compare/v2.10.0...v2.10.1) (2021-04-03) - -### Bug Fixes - -- remove MIDWAY_SERVER_ENV default value ([#966](https://github.com/midwayjs/midway/issues/966)) ([e9f7165](https://github.com/midwayjs/midway/commit/e9f71653612142204c1160efaedc909b41621c3a)) - -# [2.10.0](https://github.com/midwayjs/midway/compare/v2.9.3...v2.10.0) (2021-04-02) - -### Features - -- use @ServerlessTrigger replace functions in f.yml ([#919](https://github.com/midwayjs/midway/issues/919)) ([a85af14](https://github.com/midwayjs/midway/commit/a85af14e06231e8cd82eff8755794ffd13c3ad95)) - -## [2.9.3](https://github.com/midwayjs/midway/compare/v2.9.2...v2.9.3) (2021-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.9.2](https://github.com/midwayjs/midway/compare/v2.9.1...v2.9.2) (2021-03-27) - -### Bug Fixes - -- interface in serverless-app ([#947](https://github.com/midwayjs/midway/issues/947)) ([0b56648](https://github.com/midwayjs/midway/commit/0b566483d92d0ddac516e49dccc9218e05019220)) - -## [2.9.1](https://github.com/midwayjs/midway/compare/v2.9.0...v2.9.1) (2021-03-24) - -### Bug Fixes - -- /user/ => /user ([#941](https://github.com/midwayjs/midway/issues/941)) ([6883400](https://github.com/midwayjs/midway/commit/688340021d145c9ce07a05fdda0c1ad8788959df)) - -# [2.9.0](https://github.com/midwayjs/midway/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.13](https://github.com/midwayjs/midway/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.12](https://github.com/midwayjs/midway/compare/v2.8.11...v2.8.12) (2021-03-14) - -### Bug Fixes - -- serverless app layers ([#903](https://github.com/midwayjs/midway/issues/903)) ([73cd61a](https://github.com/midwayjs/midway/commit/73cd61aa3d847a1a61322eaf7950f01cd0c77a2d)) - -## [2.8.11](https://github.com/midwayjs/midway/compare/v2.8.10...v2.8.11) (2021-03-12) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.10](https://github.com/midwayjs/midway/compare/v2.8.9...v2.8.10) (2021-03-09) - -### Bug Fixes - -- serverless app layers support ([#892](https://github.com/midwayjs/midway/issues/892)) ([45cd7fe](https://github.com/midwayjs/midway/commit/45cd7fee07223ebb00cf5132cf5b98f372dcdf91)) - -## [2.8.9](https://github.com/midwayjs/midway/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.8](https://github.com/midwayjs/midway/compare/v2.8.7...v2.8.8) (2021-03-06) - -### Bug Fixes - -- app proxy ([#886](https://github.com/midwayjs/midway/issues/886)) ([e8fba77](https://github.com/midwayjs/midway/commit/e8fba77ea9920a9bc0b48011f85d77717cab77fd)) - -## [2.8.7](https://github.com/midwayjs/midway/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.6](https://github.com/midwayjs/midway/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.5](https://github.com/midwayjs/midway/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.4](https://github.com/midwayjs/midway/compare/v2.8.3...v2.8.4) (2021-03-03) - -### Bug Fixes - -- serverless support ts ([#879](https://github.com/midwayjs/midway/issues/879)) ([8aea51d](https://github.com/midwayjs/midway/commit/8aea51d3e5a25edb81e269c6ca67050411d4bc74)) - -## [2.8.3](https://github.com/midwayjs/midway/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-app - -## [2.8.2](https://github.com/midwayjs/midway/compare/v2.8.0...v2.8.2) (2021-02-27) - -### Features - -- support fun router ([#867](https://github.com/midwayjs/midway/issues/867)) ([01e673f](https://github.com/midwayjs/midway/commit/01e673f50d48d302e449ab88c2e419bcaeab1458)) diff --git a/packages-legacy/serverless-app/index.d.ts b/packages-legacy/serverless-app/index.d.ts deleted file mode 100644 index 96e759b46698..000000000000 --- a/packages-legacy/serverless-app/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '@midwayjs/faas-typings'; -export * from './dist/index'; diff --git a/packages-legacy/serverless-app/jest.config.js b/packages-legacy/serverless-app/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-app/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-app/jest.setup.js b/packages-legacy/serverless-app/jest.setup.js deleted file mode 100644 index 19f7381d41f9..000000000000 --- a/packages-legacy/serverless-app/jest.setup.js +++ /dev/null @@ -1,4 +0,0 @@ -const path = require('path'); -process.env.MIDWAY_TS_MODE = 'true'; -process.env.MIDWAY_EGG_PLUGIN_PATH = path.join(__dirname, '../../../'); -jest.setTimeout(500000); diff --git a/packages-legacy/serverless-app/package.json b/packages-legacy/serverless-app/package.json deleted file mode 100644 index 3277821a38e8..000000000000 --- a/packages-legacy/serverless-app/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "@midwayjs/serverless-app", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "index.d.ts", - "dependencies": { - "@midwayjs/bootstrap": "^3.18.0", - "@midwayjs/faas": "^3.18.0", - "@midwayjs/faas-typings": "^3.10.13", - "@midwayjs/gateway-common-http": "^1.2.41", - "@midwayjs/serverless-spec-builder": "^1.2.41", - "body-parser": "1.20.3", - "express": "4.20.0" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/decorator": "^3.18.0", - "@midwayjs/faas-middleware-upload": "0.0.7", - "@midwayjs/mock": "^3.18.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-fc-trigger": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "@midwayjs/serverless-scf-trigger": "^3.18.0", - "fs-extra": "11.2.0" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "ssl", - "dist/**/*.js", - "dist/**/*.d.ts", - "index.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "58706de896b8e3b50605bb29f40ff29abe43924d" -} diff --git a/packages-legacy/serverless-app/src/configuration.ts b/packages-legacy/serverless-app/src/configuration.ts deleted file mode 100644 index 00429164af89..000000000000 --- a/packages-legacy/serverless-app/src/configuration.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import * as faas from '@midwayjs/faas'; - -@Configuration({ - namespace: 'serverless-app', - imports: [faas], - importConfigs: [ - { - default: { - faas: { - developmentRun: true, - }, - }, - }, - ], -}) -export class ServerlessAppConfiguration {} diff --git a/packages-legacy/serverless-app/src/framework.ts b/packages-legacy/serverless-app/src/framework.ts deleted file mode 100644 index 48772c1fae8e..000000000000 --- a/packages-legacy/serverless-app/src/framework.ts +++ /dev/null @@ -1,375 +0,0 @@ -import { - BaseFramework, - IMidwayBootstrapOptions, - IMidwayContext, - MidwayCommonError, - MidwayFrameworkType, - PathFileUtil, -} from '@midwayjs/core'; -import { Application, IServerlessAppOptions } from './interface'; -import { Server } from 'net'; -import { StarterMap, TriggerMap } from './platform'; -import * as express from 'express'; -import { output404 } from './utils'; -import { existsSync, readFileSync } from 'fs'; -import { resolve, join } from 'path'; -import * as bodyParser from 'body-parser'; -import { - getSpecFile, - loadSpec, - parse, -} from '@midwayjs/serverless-spec-builder'; -import { createExpressGateway } from '@midwayjs/gateway-common-http'; -import { Framework as FaaSFramework, Context } from '@midwayjs/faas'; -import { Inject, Framework } from '@midwayjs/core'; -import { start3 } from './start'; - -@Framework() -export class ServerlessAppFramework extends BaseFramework< - Application, - Context, - IServerlessAppOptions -> { - @Inject() - private innerServerlessFramework: FaaSFramework; - configurationOptions: IServerlessAppOptions; - - private runtime: any; - private server: Server; - private spec; - protected bootstrapOptions; - protected invokeFun; - private httpServerApp; - private proxyApp; - - configure(options) {} - - async beforeStop() { - if (this.server?.close) { - this.server.close(); - } - if (this.runtime) { - await this.runtime.close(); - } - } - - public getFrameworkName() { - return 'midway:serverless:app'; - } - - public getFrameworkType(): MidwayFrameworkType { - return MidwayFrameworkType.SERVERLESS_APP; - } - public getApplication() { - if (!this.proxyApp) { - this.proxyApp = new Proxy(this.httpServerApp, { - get: (target, key) => { - if (key === 'callback') return; - if (target[key]) { - return target[key]; - } - if (this.app[key]) { - return this.app[key]; - } - }, - }); - } - return this.proxyApp; - } - - public getServer() { - return this.server; - } - - private getStarterName() { - const starter = this.spec?.provider?.starterModule; - if (starter) { - return require.resolve(starter); - } - const platform = this.getPlatform(); - const starterModList = StarterMap[platform]; - if (!starterModList || !starterModList.length) { - throw new MidwayCommonError( - `Current provider '${platform}' not support(no starter)` - ); - } - for (const mod of starterModList) { - try { - return require.resolve(mod); - } catch { - // continue - } - } - throw new MidwayCommonError( - `Platform starter '${ - starterModList[starterModList.length - 1] - }' not found` - ); - } - - private getTriggerMap() { - const trigger = this.spec?.provider?.triggerModule; - if (trigger) { - return require(trigger); - } - const platform = this.getPlatform(); - const triggerModList = TriggerMap[platform]; - if (!triggerModList || !triggerModList.length) { - throw new MidwayCommonError( - `Current provider '${platform}' not support(no trigger)` - ); - } - for (const mod of triggerModList) { - try { - return require(mod); - } catch { - // continue - } - } - throw new MidwayCommonError( - `Platform trigger '${ - triggerModList[triggerModList.length - 1] - }' not found` - ); - } - - async getServerlessInstance(cls: any): Promise { - // 如何传initializeContext - const context: IMidwayContext = await new Promise(resolve => { - this.runtime.asyncEvent(async ctx => { - resolve((this.innerServerlessFramework as any).getContext(ctx)); - })({}, this.configurationOptions.initContext ?? {}); - }); - - return context.requestContext.getAsync(cls); - } - - private getPlatform() { - const provider = this.spec?.provider?.name; - if (provider) { - if (provider === 'fc' || provider === 'aliyun') { - return 'aliyun'; - } else if (provider === 'scf' || provider === 'tencent') { - return 'tencent'; - } - } - return provider; - } - - async applicationInitialize(options: Partial) { - this.configurationOptions = options as IServerlessAppOptions; - this.bootstrapOptions = options; - this.getFaaSSpec(); - this.httpServerApp = express() as any; - - const { appDir } = options; - const starterName = this.getStarterName(); - - // 分析项目结构 - const layers = this.getLayers(); - const startResult = await start3({ - appDir, - framework: this.innerServerlessFramework, - layers: layers, - starter: require(starterName), - initializeContext: this.configurationOptions?.initContext, - }); - - this.app = this.innerServerlessFramework.getApplication() as Application; - this.runtime = startResult.runtime; - this.invokeFun = startResult.invoke; - const funcSpec = await startResult.getFunctionsFromDecorator(); - if (!this.spec.functions) { - this.spec.functions = {}; - } - Object.assign(this.spec.functions, funcSpec); - this.app.getServerlessInstance = this.getServerlessInstance.bind(this); - this.httpServerApp.use( - bodyParser.urlencoded({ - extended: false, - limit: this.configurationOptions.bodyParserLimit ?? '2mb', - }) - ); - this.httpServerApp.use( - bodyParser.json({ - limit: this.configurationOptions.bodyParserLimit ?? '2mb', - }) - ); - this.httpServerApp.use(this.faasInvokeMiddleware.bind(this)); - this.httpServerApp.use((req, res) => { - res.statusCode = 404; - res.send(output404(req.path, this.spec.functions)); - }); - - if (process.env.IN_CHILD_PROCESS) { - this.listenMessage(); - } - } - - protected async faasInvokeMiddleware(req, res, next) { - const { appDir } = this.bootstrapOptions; - const platform = this.getPlatform(); - const triggerMap = this.getTriggerMap(); - // for ali fc - if (platform === 'aliyun') { - if (!this.spec.experimentalFeatures?.forceFCCORS) { - const origin = req.get('origin'); - if (origin) { - res.setHeader('Access-Control-Allow-Origin', origin); - res.setHeader('Access-Control-Allow-Credentials', 'true'); - res.setHeader('Access-Control-Allow-Methods', '*'); - res.setHeader('Access-Control-Allow-Headers', '*'); - if (req.method.toLowerCase() === 'options') { - res.setHeader( - 'Access-Control-Allow-Methods', - req.get('Access-Control-Request-Method') || '*' - ); - res.setHeader( - 'Access-Control-Allow-Headers', - req.get('Access-Control-Request-Headers') || '*' - ); - res.send(''); - return; - } - } - } - } - const gateway = createExpressGateway({ - functionDir: appDir, - }); - gateway.transform(req, res, next, async () => { - return { - functionList: this.spec.functions, - invoke: async args => { - const trigger = [new triggerMap.http(...args.data)]; - let newArgs = trigger; - let callBackTrigger; - if (newArgs?.[0] && typeof newArgs[0].toArgs === 'function') { - callBackTrigger = trigger[0]; - newArgs = await trigger[0].toArgs(); - } - const result = await new Promise((resolve, reject) => { - if (callBackTrigger?.useCallback) { - // 这个地方 callback 得调用 resolve - const cb = callBackTrigger.createCallback((err, result) => { - if (err) { - return reject(err); - } - return resolve(result); - }); - newArgs.push(cb); - } - Promise.resolve(this.invokeFun(args.functionHandler, newArgs)).then( - resolve, - reject - ); - }); - if (callBackTrigger?.close) { - await callBackTrigger.close(); - } - return result; - }, - }; - }); - } - - protected getFaaSModule() { - return process.env.DEV_MIDWAY_FAAS_MODULE || '@midwayjs/faas'; - } - - protected getFaasStarterName() { - return 'FaaSStarter'; - } - - private getFaaSSpec() { - const { appDir } = this.bootstrapOptions; - - const syamlPath = resolve(appDir, 's.yaml'); - if (existsSync(syamlPath)) { - const file = parse(syamlPath, readFileSync(syamlPath).toString()); - if (file?.services) { - const allApps = Object.keys(file.services); - if (allApps.length) { - this.spec = file.services[allApps[0]].props; - } - } - } else { - const specFileInfo = getSpecFile(appDir); - this.spec = loadSpec(appDir, specFileInfo); - } - } - - public async run() { - // set port and listen server - const customPort = - process.env.MIDWAY_HTTP_PORT ?? this.configurationOptions.port; - if (customPort) { - if (this.configurationOptions.ssl) { - let key = readFileSync(join(__dirname, '../ssl/ssl.key'), 'utf8'); - let cert = readFileSync(join(__dirname, '../ssl/ssl.pem'), 'utf8'); - - if ( - this.configurationOptions.https && - this.configurationOptions.https.key && - this.configurationOptions.https.cert - ) { - key = PathFileUtil.getFileContentSync( - this.configurationOptions.https.key, - 'utf8' - ); - cert = PathFileUtil.getFileContentSync( - this.configurationOptions.https.cert, - 'utf8' - ); - } - - this.server = require('https').createServer( - { key, cert }, - this.httpServerApp - ); - } else { - this.server = require('http').createServer(this.httpServerApp); - } - - await new Promise(resolve => { - this.server.listen(customPort, () => { - resolve(); - }); - }); - } - } - - private listenMessage() { - process.on('message', async (msg: any) => { - if (!msg || !msg.type) { - return; - } - const type = msg.type; - let data; - switch (type) { - case 'functions': - data = this.spec.functions; - break; - } - process.send({ type: 'dev:' + type, data, id: msg.id }); - }); - } - - protected getLayers() { - const specLayers = []; - if (this.spec?.layers) { - Object.keys(this.spec.layers).forEach(layerName => { - const info = this.spec.layers[layerName]; - if (!info?.path) { - return; - } - const [type, path] = info.path.split(':'); - if (type === 'npm') { - const layer = require(path); - specLayers.push(layer); - } - }); - } - return specLayers; - } -} diff --git a/packages-legacy/serverless-app/src/index.ts b/packages-legacy/serverless-app/src/index.ts deleted file mode 100644 index 646a28a36e11..000000000000 --- a/packages-legacy/serverless-app/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './interface'; -export { ServerlessAppFramework as Framework } from './framework'; -export { ServerlessAppConfiguration as Configuration } from './configuration'; diff --git a/packages-legacy/serverless-app/src/interface.ts b/packages-legacy/serverless-app/src/interface.ts deleted file mode 100644 index 280a277bb679..000000000000 --- a/packages-legacy/serverless-app/src/interface.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { - IConfigurationOptions -} from '@midwayjs/core'; -import { Application as FaaSApplication, Context as FaaSContext } from '@midwayjs/faas'; - -export interface Application extends FaaSApplication { - use: any; - getServerlessInstance(cls: any): Promise; -} - -export interface IServerlessAppOptions extends IConfigurationOptions { - port?: string | number; - ssl?: boolean; - https?: { key: string; cert: string }; - initContext?: any; - bodyParserLimit?: string; -} - -export interface Context extends FaaSContext {} diff --git a/packages-legacy/serverless-app/src/platform.ts b/packages-legacy/serverless-app/src/platform.ts deleted file mode 100644 index a56b15ef9e28..000000000000 --- a/packages-legacy/serverless-app/src/platform.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const StarterMap = { - aliyun: ['@ali/serverless-fc-starter', '@midwayjs/serverless-fc-starter'], - tencent: ['@midwayjs/serverless-scf-starter'], - gaia: ['@ali/serverless-gaia-starter'], - ginkgo: ['@ali/serverless-ginkgo-starter'], - vercel: ['@ali/serverless-vercel-starter'], -}; - -export const TriggerMap = { - aliyun: ['@midwayjs/serverless-fc-trigger'], - tencent: ['@midwayjs/serverless-scf-trigger'], - gaia: ['@ali/serverless-gaia-trigger'], - ginkgo: ['@ali/serverless-ginkgo-trigger'], - vercel: ['@ali/serverless-vercel-trigger'], -}; diff --git a/packages-legacy/serverless-app/src/start.ts b/packages-legacy/serverless-app/src/start.ts deleted file mode 100644 index 9460b88f94cb..000000000000 --- a/packages-legacy/serverless-app/src/start.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { analysisDecorator } from './utils'; -export const start3 = async options => { - const { - appDir, - framework, - starter, - layers = [], - initializeContext, - preloadModules, - } = options; - const { start } = starter; - layers.unshift(engine => { - engine.addRuntimeExtension({ - async beforeFunctionStart(runtime) { - framework.configure({ - initializeContext, - preloadModules, - applicationAdapter: runtime, - }); - await framework.initialize(); - }, - }); - }); - const runtime = await start({ - layers: layers, - getApp: () => { - return framework && framework.getApplication(); - }, - initContext: initializeContext, - }); - return { - runtime, - framework, - // 分析装饰器上面的函数表 - getFunctionsFromDecorator: async () => { - return analysisDecorator(appDir); - }, - invoke: async (handlerName: string, trigger: any[]) => { - return runtime.asyncEvent(async (...args) => { - return framework.handleInvokeWrapper(handlerName)(...args); - })(...trigger); - }, - }; -}; diff --git a/packages-legacy/serverless-app/src/utils.ts b/packages-legacy/serverless-app/src/utils.ts deleted file mode 100644 index cd1ee989e828..000000000000 --- a/packages-legacy/serverless-app/src/utils.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { join, dirname } from 'path'; -import { existsSync } from 'fs'; -const findNpmModuleByResolve = (cwd, modName) => { - try { - return dirname( - require.resolve(`${modName}/package.json`, { paths: [cwd] }) - ); - } catch (e) { - return; - } -}; - -export const findNpmModule = (cwd, modName) => { - if ('pnp' in process.versions) { - return findNpmModuleByResolve(cwd, modName); - } - const modPath = join(cwd, 'node_modules', modName); - if (existsSync(modPath)) { - return modPath; - } - const parentCwd = join(cwd, '../'); - if (parentCwd !== cwd) { - return findNpmModule(parentCwd, modName); - } -}; - -export const output404 = (path, functionsMap) => { - const allPathMap = {}; - Object.keys(functionsMap || {}).forEach(functionName => { - const funcItem = functionsMap[functionName]; - if (!funcItem.events || !funcItem.events.length) { - return; - } - funcItem.events.forEach(event => { - if (!event) { - return; - } - const http = event.http || event.apigw; - if (http) { - allPathMap[http.path || '/'] = { - method: [].concat(http.method), - functionName, - }; - } - }); - }); - const allPath = Object.keys(allPathMap); - return ` -
404
-
path '${path}' not found
- ${ - process.env.NODE_ENV === 'local' && allPath.length - ? `
-
You can visit:
- ${allPath - .map(path => { - return `${path}`; - }) - .join('
')}
` - : '' - } -
© Midwayjs
- `; -}; - -// 分析装饰器上面的函数信息 -export const analysisDecorator = async (cwd: string) => { - const midwayCoreMod = findNpmModule(cwd, '@midwayjs/core'); - const coreMod = require(midwayCoreMod); - let result; - if (coreMod.ServerlessTriggerCollector) { - const collector = new coreMod.ServerlessTriggerCollector(); - result = await collector.getFunctionList(); - } else { - const collector = new coreMod.WebRouterCollector('', { - includeFunctionRouter: true, - }); - result = await collector.getFlattenRouterTable(); - } - - const allFunc = {}; - if (Array.isArray(result)) { - result.forEach(func => { - const handler = func.funcHandlerName; - if (!handler) { - return; - } - - if (!func.functionTriggerMetadata) { - func.functionTriggerMetadata = {}; - } - - const funcName = - func.functionTriggerMetadata.functionName || - func.functionName || - handler.replace(/[^\w]/g, '-'); - if (!allFunc[funcName]) { - allFunc[funcName] = { - handler, - events: [], - }; - } - - if (!allFunc[funcName].events) { - allFunc[funcName].events = []; - } - - if (!allFunc[funcName].handler) { - allFunc[funcName].handler = handler; - } - - const trigger = func.functionTriggerName; - let isAddToTrigger = false; - const { path, method } = func.functionTriggerMetadata; - func.functionTriggerMetadata.method = [].concat(method || []); - // 避免重复路径创建多个trigger - const httpTrigger = - path && - allFunc[funcName].events.find(event => { - return event.http?.path === path || event.apigw?.path === path; - }); - if (httpTrigger) { - httpTrigger.http.method = [].concat(httpTrigger.http.method || []); - if (method) { - [].concat(method).forEach(methodItem => { - if (!httpTrigger.http.method.includes(methodItem)) { - httpTrigger.http.method.push(methodItem); - } - }); - } - isAddToTrigger = true; - } - - if (!isAddToTrigger) { - const triggerIsBoolean = !Object.keys(func.functionTriggerMetadata) - .length; - allFunc[funcName].events.push({ - [trigger]: triggerIsBoolean ? true : func.functionTriggerMetadata, - }); - } - }); - } - - if (Array.isArray(global['HOOKS_ROUTER'])) { - for (const router of global['HOOKS_ROUTER']) { - allFunc[router.functionId] = { - handler: router.handler, - events: [ - { - [router.type]: router, - }, - ], - }; - } - } - - return allFunc; -}; diff --git a/packages-legacy/serverless-app/ssl/ssl.key b/packages-legacy/serverless-app/ssl/ssl.key deleted file mode 100644 index 528f5d0be0a7..000000000000 --- a/packages-legacy/serverless-app/ssl/ssl.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAwYgqylPquhc3d5E75sLxUs7jhxuIfMztx3H449KC7kT9+ukS -bdB/IqwRcLgB/n2V4+pkEjOHG2K/ErHkaOdw7L4tf8wNLMSUbCNlppYcZ6EGuSWN -V80GZREFifKu+Q3jMEX3K96lS5pmBoYQHr2iqejtb1bmN9yeeI4FuOlm+hHc6zBD -87rABjxgITybxDt+wffbfqSkjBrQCDjqeNn6m5n5OmO1lBdn6fAOJe7krp9bG4Mq -Z32Zo/anqEq60KjfuCFvp03CU8MOBbEYGxMtfUMooEQatEuiTTx03vkYbmg6ymGq -9g8YQCHcL0nel/+aCx0CU7ALo4OCX8k+Wxk76QIDAQABAoIBAAKy9XXQ6csim8Ft -Ixq6yUbQX9f4iFTFPuOzMTdsLitIhwpCyeECMWO4Zp3d0xlLgxWkpTSjx1SYcfW+ -yWK1J5wFovjPTbe8Hh3L+JT0Lv06/68BWRFKaLZsIFmmKs6KZQq9Tw8rkb6WLqoU -oJDtMCGSgA03dwp8ZzFjOa00hB0ksF8LFJtf1kDAbUu9NF6hI738pKhZ/nmdglpy -9csHopZRqmfisGAukQcTbppJ+m4+QZh7nq8tWGnkvBxfABJy9oAm18SZgDU6yUGA -Mxx4tuUDmdmKZxtKuktvJoX0sYwid2DoKPwDNr8N+CRR3zm9p1SFt031LT2GJOfx -qlns7QECgYEA/bGOOYyLGvBSGQOnq4YzQjb+4mw6DWbMfssFg9k3udzGZPQYD1fD -bL71/Xym7zct1x/ECGVejyPSrCG8mF5zmiIEK5uLmYQzBZeEcoQTQMG7nR7+pIaL -l915wct0HMY8lfXGXQ845rpRRQIvMV88KYD8SjGJselCVgZ8ZwQbeTECgYEAw0qX -fsrF4EyfM3aCbBZlroDIDqPhHbJ5damBwe9WvI6UovcBEqprK3FuHIDJKGFnekDe -LP0SRYg4tTGoVrJWncgnXxcqr5u/gwdBM6+yPOninIz22xiCiY0LiMDVOiogk6QA -Ko/0OvhzRDB2HM4VfEEDFBfujr938y+v6NHfQDkCgYEA9BnrIn6TvmjsZbs5kvX+ -zkCCgbTnKsv2Ci4o8VOJpiHDF5IysFie5jzcDnrpWRU721lqUzXOhWZPqGaRw/5l -tzHx10/ERAOK4F+JBnME33NJpYYUOJRpLsfhBtJPt/wagaRJqHMkKgWuevr+E8Bx -7/F3T6BYwEIUHRgCjVDLapECgYEAkkXJaNd6FIFvcL1f/JNd/7FHpueKUpL+NGoM -3XRl0/87R0CY1iE8+iIQplqz0IH8Xm49uxamW9wnFVgnTSBwjed/zdJtT3DppbuG -U69SYhuQd0+CCiK2i05QiFJeox0wn0TkNvzxokW7GCTwIq0dHJ8ZLjCqptK0hjp+ -mHSxsckCgYBm/UjNqszQhFr84T3KHZqHr/A/057NlzEILek4Z8QRnlsO26RYVnUI -u/a1E0ZLltD31J9gtR3TuBvbRdphHsHMDf0Jz5wh0h2WCeJ0UcjrspWS6oD0eNI3 -dRHiMGdYq3Toz8cmi1AQl63P2f3ICFSVW6d4cA6rOIwBGAB3fX8xKw== ------END RSA PRIVATE KEY----- diff --git a/packages-legacy/serverless-app/ssl/ssl.pem b/packages-legacy/serverless-app/ssl/ssl.pem deleted file mode 100644 index 05d80e983571..000000000000 --- a/packages-legacy/serverless-app/ssl/ssl.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDzDCCArSgAwIBAgIQLIM+LwmyRiGVIJqA5gR0/TANBgkqhkiG9w0BAQsFADBe -MQswCQYDVQQGEwJDTjEOMAwGA1UEChMFTXlTU0wxKzApBgNVBAsTIk15U1NMIFRl -c3QgUlNBIC0gRm9yIHRlc3QgdXNlIG9ubHkxEjAQBgNVBAMTCU15U1NMLmNvbTAe -Fw0yMTA3MTUxMDAyNDhaFw0yNjA3MTQxMDAyNDhaMBsxCzAJBgNVBAYTAkNOMQww -CgYDVQQDDAMqLiowggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBiCrK -U+q6Fzd3kTvmwvFSzuOHG4h8zO3Hcfjj0oLuRP366RJt0H8irBFwuAH+fZXj6mQS -M4cbYr8SseRo53Dsvi1/zA0sxJRsI2WmlhxnoQa5JY1XzQZlEQWJ8q75DeMwRfcr -3qVLmmYGhhAevaKp6O1vVuY33J54jgW46Wb6EdzrMEPzusAGPGAhPJvEO37B99t+ -pKSMGtAIOOp42fqbmfk6Y7WUF2fp8A4l7uSun1sbgypnfZmj9qeoSrrQqN+4IW+n -TcJTww4FsRgbEy19QyigRBq0S6JNPHTe+RhuaDrKYar2DxhAIdwvSd6X/5oLHQJT -sAujg4JfyT5bGTvpAgMBAAGjgcgwgcUwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW -MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQogSYF0TQaP8FzD7uT -zxUcPwO/fzBjBggrBgEFBQcBAQRXMFUwIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw -Lm15c3NsLmNvbTAwBggrBgEFBQcwAoYkaHR0cDovL2NhLm15c3NsLmNvbS9teXNz -bHRlc3Ryc2EuY3J0MA4GA1UdEQQHMAWCAyouKjANBgkqhkiG9w0BAQsFAAOCAQEA -czI451YuJJFtHZOsZxQieC8ptBVTPrZA8Heg/eDc8yN3wwSt3+Y7/WKoUtteh1r6 -Z+LK75+OYu4zsocyS5eXRIan9BZryuz6CW7aq/2CnsQbmISR5LsBw1pMqFXnM6Im -CJCTOB3a4rhp7BiJ7WO0dfBCugJe92dhMnXd4GW8lwwaUmz0ULLIqdcNR4gT0FRl -c9yUSkksPJLP2bSRvKDZhn+CVUnQWmWf91EqMGPlnCYsQ/0NYtKUrhH5O2TrNeLu -eBpVEQxzMkrxvDFkDQVLi3/lvfLFJzDws3wRMNT+llCQ9VpEJJ2G8halGL1nJlZN -mGVxt9xF9c18LZTCNamHGA== ------END CERTIFICATE----- diff --git a/packages-legacy/serverless-app/test/faas-start-end.test.ts b/packages-legacy/serverless-app/test/faas-start-end.test.ts deleted file mode 100644 index 864b31a64bfe..000000000000 --- a/packages-legacy/serverless-app/test/faas-start-end.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { join } from 'path'; -import * as assert from 'assert'; -import { existsSync, remove } from 'fs-extra'; -import { close } from '@midwayjs/mock'; -import { Framework } from '../src'; -import { createInitializeContext } from '../../serverless-fc-trigger'; -import { FC } from '@midwayjs/faas-typings'; -import { createFunctionApp } from './util'; - -const cwd = join(__dirname, 'fixtures/faas-start-end'); -describe('test/faas-start-end.test.ts', () => { - it('start and end', async () => { - const readyFile = join(cwd, 'src/ready.txt'); - if (existsSync(readyFile)) { - await remove(readyFile); - } - const app = await createFunctionApp(cwd, { - initContext: createInitializeContext() as FC.InitializeContext, - }); - - assert(existsSync(readyFile)); - await remove(readyFile); - const stopFile = join(cwd, 'src/stop.txt'); - if (existsSync(stopFile)) { - await remove(stopFile); - } - await close(app); - assert(existsSync(stopFile)); - await remove(stopFile); - }); -}); diff --git a/packages-legacy/serverless-app/test/faas-v2.test.ts b/packages-legacy/serverless-app/test/faas-v2.test.ts deleted file mode 100644 index f000cb71e7d3..000000000000 --- a/packages-legacy/serverless-app/test/faas-v2.test.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { join } from 'path'; -import * as assert from 'assert'; -import { close, createHttpRequest } from '@midwayjs/mock'; -import { Framework, Application } from '../src'; -import { EventService } from './fixtures/faas-v2/src/event'; -import { createInitializeContext, createTimerEvent } from '../../serverless-fc-trigger'; -import { FC } from '@midwayjs/faas-typings'; -import * as fs from 'fs'; -import { createFunctionApp } from './util'; - -describe('test/faas-v2.test.ts', () => { - let app: Application; - const appDir = join(__dirname, 'fixtures/faas-v2'); - beforeAll(async () => { - app = await createFunctionApp(appDir, { - initContext: createInitializeContext() as FC.InitializeContext, - }); - }); - afterAll(async () => { - await close(app); - }); - it('http get', done => { - createHttpRequest(app) - .get('/hello?name=test&age=123') - .expect(200) - .then(response => { - assert(response.body.path === '/hello'); - assert(response.body.method === 'GET'); - assert(response.body.headers); - assert(response.body.query.name === 'test'); - assert(response.body.query.age === '123'); - done(); - }) - .catch(err => done(err)); - }); - it('http get controller', done => { - createHttpRequest(app) - .get('/user') - .expect(200) - .then(response => { - assert(response.text === 'user'); - done(); - }) - .catch(err => done(err)); - }); - it('http get controller params', done => { - createHttpRequest(app) - .get('/user/midway') - .expect(200) - .then(response => { - assert(response.text === 'midway'); - done(); - }) - .catch(err => done(err)); - }); - it('http post', done => { - createHttpRequest(app) - .post('/hello') - .type('form') - .send({ id: '1' }) - .expect(200) - .then(response => { - assert(response.body.path === '/hello'); - assert(response.body.method === 'POST'); - assert( - /x-www-form-urlencoded/.test(response.body.headers['content-type']) - ); - assert(response.body.body.id === '1'); - done(); - }) - .catch(err => done(err)); - }); - - it.skip('http post upload', done => { - const imagePath = join(appDir, '1.jpg'); - createHttpRequest(app) - .post('/upload') - .field('name', 'form') - .attach('file', imagePath) - .expect(200) - .then(async response => { - assert(response.body.files.length === 1); - assert(response.body.files[0].filename === '1.jpg'); - assert(response.body.fields.name === 'form'); - done(); - }) - .catch(err => done(err)); - }); - - it('oth event trigger', async () => { - const instance = await app.getServerlessInstance(EventService); - - try { - const result = await instance.handler(createTimerEvent()); - console.log(result); - // expect(result.triggerName).toEqual('timer'); - } catch (e) { - console.log(e); - } - }); - - it('should use @ServerlessTrigger with http event', async () => { - const result = await createHttpRequest(app) - .get('/func/http/get') - .query({ - name: 'zhangting' - }); - expect(result.text).toEqual('user:zhangting'); - }); - - it('should use @ServerlessTrigger with http post event', async () => { - const result = await createHttpRequest(app) - .post('/func/http/post') - .send({ - name: 'zhangting' - }); - expect(result.text).toEqual('user:zhangting'); - }); - - it('test serverless logger should not write log to file', function () { - expect(fs.existsSync(join(appDir, 'logs'))).toBeFalsy(); - }); -}); diff --git a/packages-legacy/serverless-app/test/fixtures/faas-start-end/f.yml b/packages-legacy/serverless-app/test/fixtures/faas-start-end/f.yml deleted file mode 100644 index bcc7040e311d..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-start-end/f.yml +++ /dev/null @@ -1,5 +0,0 @@ -service: serverless-midway-test - -provider: - name: aliyun - runtime: nodejs12 \ No newline at end of file diff --git a/packages-legacy/serverless-app/test/fixtures/faas-start-end/package.json b/packages-legacy/serverless-app/test/fixtures/faas-start-end/package.json deleted file mode 100644 index 20a464b99a95..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-start-end/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@midwayjs/faas": "^2.8.0" - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/configuration.ts b/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/configuration.ts deleted file mode 100644 index c2d636453cab..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/configuration.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { writeFileSync } from 'fs'; -import { join } from 'path'; -import * as faas from '@midwayjs/faas'; - -@Configuration({ - imports: [faas] -}) -export class ContainerConfiguration { - async onReady() { - writeFileSync(join(__dirname, './ready.txt'), 'ready'); - } - async onStop() { - writeFileSync(join(__dirname, './stop.txt'), 'stop'); - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/event.ts b/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/event.ts deleted file mode 100644 index cc74017f5279..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-start-end/src/event.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Provide, Inject, ServerlessTrigger, ServerlessTriggerType, App } from '@midwayjs/core'; -import { Application } from '../../../../src'; - -@Provide() -export class EventService { - @Inject() - ctx; - - @App() - app: Application; - - @ServerlessTrigger(ServerlessTriggerType.HSF) - async handler() { - return 'test' - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-start-end/tsconfig.json b/packages-legacy/serverless-app/test/fixtures/faas-start-end/tsconfig.json deleted file mode 100644 index 681ce2a32495..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-start-end/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "inlineSourceMap": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "stripInternal": true, - "pretty": true, - "declaration": true, - "outDir": "dist", - "sourceRoot": "" - }, - "exclude": [ - "dist", - "node_modules", - "test" - ] -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/1.jpg b/packages-legacy/serverless-app/test/fixtures/faas-v2/1.jpg deleted file mode 100644 index bb9ca5418b2ce1a41cf056ad21c82aaec9d08dba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16424 zcmbVybx<9_*X1KPL4pN$*Wm8K-5nAnxIf$_K!Ar!aCdmPJv8XUA$V|icW3#1-_~x` z{hKA2UK}^B%|D4|b05FkYm;pzyFqD7~m@u%IFmHVTviEkv!~9nQ z{LcjQ0TvD(0TBrq<>PyS#!r9`FtD&6;9%k5;o#m&`@O#hz+u8;QLu|6V5^xRQaa;s z1jXkeQAyNxzmuV`-jK>;DQ0b{x_`m=YIqH zKX75b&DQ`6L)hwVTAH^TM0gfuvV1hy> zO(7#<{;u%^YWEsDF$gM%i%pw}!>au2X6e_Zb1ri-TxC_Ei^0~KU-W|w>Om-Z%%e(L zh7$S|)A_5F;i`VaURBBu90RQiVKiQq3N3e*xVtmHqlfYXv~16F(e>zzNwsXgrX{hi zPW9_q<;qNO`YbC(A3YT?Th2ekY|qi`7G}^ef2a%ih?)534M3QEcrFiT!+BLrm6*8~ zv{nR6PXWHl$s>VRfHO-ra-#GPBy zbK30-@w(uQIA$B3KF;fG=LeU|A~rg;QdfM=FS-bWm-e%*jt^l#Ug~s?@t)6#i0!l{ zQJwoG$D}>7 zoC7Uxsg~?b`h3Ows;%j4zc)a#GNv{kDrnW*H8#N-j@?nk+ak_zYUk8z=ScxrI{IVaypN=V zk6Xcdx9JPGaQdbq%1iTufxAkv3;RuZ&#+!TCnX3q3$h1W1@9f7PrKHF+T1nAXin08>QWbcVQOfX`#ftbp@7*v&R6BVP=xGK z1kBGS8Riu#EyL+?;(VO{=40mQ3iXw*3WyO+dIJPiS*kWZF@woe*}l3CayK&8riJRe z1VhAQl&u*UY;!j{hA3$X3S9V5(cCT#C8maOfXr=3f?GrC82oVa^qRwgs7{>Pm8_(5 z>Y53}_LQ|1=x+YSe+{b#|9Md&Q=~|g69sm5HWIFg&GUIV$#3t33k8IlPB=}m8xjXF ziq$Cuvp>}?=BaDXCXe|=?_}di)P4?7_v`3j@ZASy?f`=(=4#?vd7ghD!-qRC^q4lq zV&c0j1@(V14c^`2vZ*|F4jS-ph~NssVP=))xWoV=r8Q>X7 zt<+y9TEbWEZn4@Y({(pJ97RcO+fzeqiCE3eQ|smCN)b_Dr5kd2!fzIg^iHK3SgS+` zO=+iiJ0?90LsaB<&qs0w8R9Z#`l}ZXTAeb|iVo;4+mU1lc`>j27MFc4OqeOlsoi%a z^|A78%Y{0r{@m(Pu!~i)3nUO+X-jCwR|Xu`ukZhubslt4;X8Sp)hpbrRG}+-X5#P? zKH`*=;(VNQJtnLia#h9Q^PJEW9rY&6E9y=Q+Ltm+ zSCwYs*i_`>uZUz3Q~r1mMPCo^>%CrtFVN_8?tIX#RzEg#1oA-UC?SZH;?VJVO(=h6=pGsg!^h80zCwx zX(z@yBH_dkFYJl6PYW=ubU*Nv;Fn#0q^yb1`p`d#JulMeV*6oA5IdQwq{AyAc?Z~v zOk)-juj6IPuIo?!O92&_E6SL{}HfxF4%&?L%DslW) zJ)@&VSk9r&Rv|vjN`HktmyB@RZ)>ZMHlED7`$3lIR6Zo+*bk%8;%nf2H*H5K4gHnm zxe+h&rHaH(B!B8yy{q%p5CBUwOF)sMd2C$n5AihUsX!`*B$!4h2ADWAV=!;UNaP`^ zoSY3_-nW((DoqJsY06q~O67ZPL{%cErd`e5e$r@;j=Gyj3l$bg#zTruwjW;DOxM?q zNnqGgnP32 zMlTJ1b%>i0YX--#Z8^hlVo=CVa(W81w`*^G@4OMv3kvM7UiRnicjjMk2N zj;5jc+c9NSzIjyKkZhpHM;i%){N~x#yjyyMR(5c=ToDQGLR&4uzN&@q;KhdMZzD2k zQaY9e%}mQsWmyUF_FNmZ1xwmzj^xpv4z}5QEJK>5BB|szf8~J#3LE2s$z&ueHTf1d zisV!rVCY0es)Dyf9_TI`qv!wkpW4NIuIRc=hJo_suO9ZeOn6x87pAJ(^TI2GjJB?8 zpC7NZ#=4I%2HIpl{_aJdew1`dV~ar7Q>h9l`eJQXg|FGZW|nb&)(iG9^2joH5~0zK z9ZQqtr>eU-)7Mw&_VXS;@&8-;j|-D$XTjjh%~s@GqW;WQT5;H`7Rv~Z1Lr|xz2jDv z!&-O(0rZ7CHfPkdDb$;|yg)X|zI%?pwydZ&*UTF@P#Zu-jIF}ilZ@@Tg>i-sYY`KeXLf-&n zLzyuZ8(lbtVy4Z139eR(#9wR~*EZ%sDE9Uo{m8Ejj@|)l#}2GSwJucO4sGLRI%#b0@={hd z>c74Lgfy5%*QLSQy;IsTg)bT$eQjd~b0e?F^KXEjhI85wTh3*@{GOr4?8A*1L?@1b zWM{&T=3eUQDi*uzi1uA+%n?kp#v1n~-4}Fr!;aaN{_X4^vwihlcSSDH_dT9%wr9zg zAl+;F9pd!a(xuD4#LJKHGd9IMdWhdnw+_xM!2nTazxc8PU7vgjE2T#Dz) zc|z4m!6>^)>>LIK-f4ck=lf34tgKk7DkGo-h6#2rg611_0UaH;jW*lCBAx>C@>~~x z_1;q0>q>TxA(Pp&v&xlpwL5dYGew>Kl3EG$&h+XfMFv-! z!~_U39hQ>o+YTtoZ0yUL#njXZCyDboJEYrED`Yau#-FpdKUO%^l`)5jN%I79LJcE} z3DWnR(=mU|thd0<0NAfLE2t0S^@mz#1`}M`{O#PfAKk#h`bf-Y%)2pwcs4A4G3OcQ zn`#!DDi^x}J8K6^CLxsEQ?s_xA@b{!_%kK;%}*ynl4ky}zyxnHZ!pa;&Frxgqrj-s zPg3^Gb0%*h4fIfCD^=NV98{>5iSq|q_{&um5tS>nC}C0@@I<=2t6Qfz7Zr|QhBd5E z5&4B+_3r8)2php8LN3K)C$&y|L(p$~y3lV5NlVljG_X5%FK1>iXg1sVl~A~y+6tOc zYj(>YVu(OBV)Dy(WaT4Q~ag zBs6rS&(c6uIzl(xv85rP=Mt(I>y*1_>hgYSzvE92>EW;zwq|H|5y^d25Z?OzPU)@kB+} z)-D2{g{3S6Q~s=f{|+>koL0Ba(Fz9{@wM2IyA&q#iB9F4lAQ)t286%cXV ztVWr9Qo+81?WuCf=mtWMs9I%>_`3~O)MESY+21BH_QovI#_IeZ#i%1yN8;OK5P*?Q zzb_2^8qFA(?LRGQ@$A$I_%V$tr4}j(_pHiNU*@TY*qq=GV899=rS{4O8pDfwT@9Z9N@WcIvwPuJw(Q* zyQ${tgv5NI6)O8qL?r~<7Ib}Geer$`RlqPZE<@Czo1f=$Uc$}+{gYf_=Bb6}UPmZTcC*|sJFsU#hi6OBzdt3%E z!ovlOfjajsWU-At%28MbOWim&5)THgmtJRw0WVsfHu7L4cNuAphMETTn1p~J{}GkO z=`HrfB`6B1ayKYP<4D(^F$h~JU2Ma{YARB=E7k&1 zaWjW}#ZH#Jnq+|9>xi!VT;M*ZINZybEmyowzVA}Bq9tCq)<}EAP!cFBu0W@Q6PJ|- zv+WdW*OLd}pEiy946d#0zLus<-UA+|*3I(b$H;tSOMXK$I2?c-hn~j zVTtHmO*?~q$*S$e*HT6fjvN;J^N9sA zB)32qW{;)?a|Ma=GgR{?+U$&8I;927?>jDJ*ct2x!sDW!(Oe}gb9;#qV>YJ5rPJ=9 zl&lvK9|BVPM8#RIkN0`MWCASyAl<@H*6{y58Zr&}RlAcAAv>4Lz#Qn@nD$nhDI?sF{h6yN%jz z!vB~WZu!lNhz0gScGL|Xz&a1aXTKUeW20TOapv}}eSgV+^V)I<0 zHgYlVGKyGI$cHR^!QsPsvjNR0O^Eq+g1e8~^r;Z8{i3jh5!1(3pU|JO`~zf&qy^7R z)4nDf9kjjO%00t82|eUBLw5$$fpSp8n_WoPN9*0IO;)-lS|*n5OmhT{Koy9o%7)Q= z%(}rEf{h>z43#(qRp)eO0OMYs9HT~ZtO8pwT^|{rZf$YLw90#X@;Xx0QPP6B7E0dW#uN!XYt{eT_c9Et1*~)R})?Vm?Od6C# zq!FfC>3yOW4y{{1OZ>1kh)^(+$c;_~_UXPBOtl|gDYw_ftSV%9M6*(1^^N_Vxu&d5 z=0%&34r9%7eQ>RB9-aEzUR~R1PARtiBA`>~OYx1n@u_yuYYRkt^@r|pK91fs#L3RN z1>kjL+;N^akg@KkqwyOC?u^z?g8a3y3RfRIj=ExiI(0a|`~6_zrQ~AxR4R^Gg`>(nEv0UX5z zurg-OTUj`<`5OZV1hjNowOH5ahn+*NtI*9NOsMC=?q|30@EGBw`9%!(1j{#7XqLrf zHB6pzuh;!-e@CAD7F3g46fyOg9c(0^5>MLeYA(y0X$qGT>S*I9!mC9(9{M5SZ}`48 zxRPB|3J$ej#!2DW;GohA0YnMweaar1WP>zcPnxk*ltp{W{uRi%?ZPV}Jz8dJ>`m=3 z({(0;%}V~xQrdcg+}d*&61$){W4HZ@FJ!DWiT*+ zYcY5?bR*m$O1R+`fW!@lvzTC#JmeO^P8_d6!@l-NJN!)HK0VdXwRqKk;QBQ{l+ltar!RG`XOUnAB6 zw1+=|C!PN!SKXaqESR)nrT=3-g`Mg%zc4SY^Q#}z#FTWTZec9a!4(t2zKr}S_sZD$ zw2a5%H*?AC<-7x9AI92u=QT6i2iPzD<^K1jjIs*+jR#_#J?YX0*g+U58?zUh>YGR| zj34lIu8BY^j0ldD&9<-oOLZ2aPNbZ{=Y-eOABat!qCtCC)n6|VK`dNpp@p>#*=~>o zekupfaZ&Wl$ZL92Ge(c>{fA?JE%g+-e^WXtS}$ItZkruw4ZF}5kA;xVwkZBD{36>0OnI;>r`CiZRsJXJ)?G-ceYY1l?!f71|7 zpuO8TKB>&~Wwo#}*U`H}cPLV(gByIy7jErw?Jb&iN;tKo|0R5C({qdG&Pv=26e>~p z!cRP#VwEwFG69hj0Ir7}qDC2Gy7>S-HBLB3*a@I%6n2)=T(l*AxYs%rK#ErJ(4?Uh zSo{ItLBFe?^EU@*`X%xu^&U7!d9VDQ!>zgXLg{%FPU2wsYH-njJ8u)LOf(UW#~W9s z)!roM=@3p7VZlmLCh-)Hb_YtXUiM`Wf`&ja zQC4E-Io?Bjlj}_oD z?jib?opGy*a~{`HrS7ss3N!kdL9pxbMqBn|O~+g^dX^l42ODeDiL)*Kbylg6-u6$L zWuUC09a(S(uic}RV$cCq;%T;i+Y%# z1jGYP2W*!(X*SNt8}dXURE>l-ULoEui(p3(nfdk}TCQl9&NB4{P zny6JL!V23M@XyauOUnM7(rlWO!8fpB2sdu#i38y6TL_@j0 z%ZRs6KU4t$H`dl6q2O1W_sMJwGhU^^)$KdqEFR)zFDSZ z4RpYnuxA!~1Ng~DK8nh98ObO$L14ra*!s2Z;Q0>HYn|bAFq2Za;#IWV;0Vujab{;? zf4>2A_Xu3ZbGF_9fCrz}=Yp%!H$dBE%*&BVpS$Y8D$NY@$rckFFZ!>d`alfaBn~|> zW#BY--<= ziL}^&pY5~=JvLd-1cpH|d$Or;pZOa={|Xm=TMJ+wCou1EVXVipHRT$?lT*K#CTF;Q z2EcfMdv)ueGyk`}l{cZC>Gy5ji=^FWgC*#)hHf?UF%`YnQNm}ov>=9?9p;L0SN!0> za0J4^J2S7uch%%|Uq02V5zBgZEu35&uNThB^9JxCzb+-h;>@8?{)DBve)|RxX5u^{ z-wD2m)lc}?i|_U?YiOoNnFohsj!Vfs>OKv_Ig90G5gGvDw4Cfjw!``jC2F@C_!-@)a{MxPrJ!6;)dK|z_FB;$vvrnfTj^htF-+8m>WU~!51|1wtH5E2!I=N@-z*%-^ zq^}?|BFG|kI1)zga$5muWBj2!j~x&`!55ugx;a$({166AjgGfP}h-PCOCfX_hxY zB;U9)Et%^{pjQzD0gIRxU_3I zZ&FsOVeI{~F(5OvaQ8T)HxhaY{dja!vcVzpWBrr&)2!`p&1Or~5EP#rZ#fdQIDOw9 znWeizhZpvKj$5`#s*~=oEyPbVbLU>#7ql7_UJp;%0bmSdtJ}EDV3GTZLrdF%(d#!r z$ff+W4ZYEGkt7AL`3DvK8|{7Dp-wcWg0Fx{`f=MigVXeznywz1Zp(nPx(9!m zu~*JFK>V5xk@!2&0Ox9cGq&BX?|r-hui^JnTr^cl{)lMxCG7Fs9xjcpfdKw9<1H^Z zkI&csgy%p1auOppOygJmO?a^quyAyjj%Iatfcjl%A(M6j!D_`o>e)$WkzzLAGP!6NB5fAtukdni8j(X;SF21 zu93Yj5|HgTfX5D58A8DY&1Lf=C9N1tk^PEb`5Qpv-g|~)%`cdYnP0Lk6tC)vDU?C$>lsD*Uc<_uq6if`z97axS#<(0oOy7 zMHoB!z@Twjd9&mQF^y{VNXSF_BBm8YiIc4F^Is?zrv$PL{@z@N;6TOp{ny^xgR2Zb zev+olbspsaHDgC`AlC?c!?x^$XtKKqM`o0gC~;-0QPUKLDWs~5=K%V6=*9NaEV^_q z{oDB)AXrd|Z|cNf(Sl-ap0<*B9W9IRNX?+0rh#6ET$&BvvXMT8xBK$f`pfjqO%-B= z-J_K?Tzhyh^?(jWNU+K`Gd@j3JRQ+k0=C zTh&Om{94ZKOZI}X65H*AlYay8IS(-?L{S)T=jKd_a!FWb{V(m7#ulv2UA4aN3Ax*e zvCR4RfWkvd65N0+?~4QDDx!O%R!()^2dQ?JA z0RrjwA!YJn4_|ADZ?>i8Z4^sfkKo^-9@+9+I{1YTWd-2tdgz?VZ6Wk&Y9NB;(0 zBI+x$7=!A&vZA$}?N`@TzO4>kVZIVm1GDydRHQ?UM%On0-YMZJ8p8c2bw3g$A@ew| zS5pY3iwwz8(R~!r(0dp5;MpOp)hHkdU*ZSIuZEqFYFp=nI&?MyCbxa9;=lU&Y%?P5 zBopJ}lR06>Lb;(j8k?a^sDi&}@`DC2D&+&fF0(5#8zQ#sb!9khU#>(lW?!K%v0jd( z|8(wH^=Kp~M*n2BKtHq?JjsH8{wi9Ow2;}hx5Er>w?yO?nr9amp$MnOOj&gj2_c@d zyZlOBJNT7}E0Vav4KXAr2F>$g{_9LMo^5jaN|k6xU;$jFI}T5}RBY-LJ#+7S;I{`b zE@L*P3F&AO`(R**9ZEj*1(iJ}bu0I|Jb!t|H$O%(;}^;c0^pt3ESlARFe;_k1bO)nTG~p=MSbDiZ8f6-?{7}q|KyG+d5UeQeQo2yQQRBME_V0CP%fOC;xw7W#Sl&*^|C>1y)8k`ift z{7OUKqnb`BE4u+v7zY z?=&bjfrwV#=bFBSB?fi2QUAti+iC92eeH1(XG>J`CzwC|E&`d^=Cyf4Q2m2!*|T7FEh+_y zVTVdJ@gbR{H(7;YoMYtU;wK7awGw>fY@1m{eP+$e;tvntga&jy5t|`*t|5*s^0R&9 zvtt|VXY#T$CE*q>$Q4gW*7JJy4WiPicXPK%*eoA^Pk{bSy|L7}-k(GbP%sgS*W-K@ zI|_#rU^~&citOEP6p#L6H$!B!%Q@HoT11b?9@4|7cetLy5Kc8>P(k7okWxQB?%f-a zxi69=fSz;^#;PSk)_fxr*vCCEh2` zvP0#*NK-31Sh}l?T~z#o7H^y*MA6JIQ9R!$9JcR z%V#>S_zU=#Aa360+r#$GtHq}^ETsK;y{w160qS&cjoe<^ukI0*A*ROk=IOI8BByg0 zvCqGhT)5X%%CAIJ@Uzy}G`j|GqrXYD)H8IhnHGFy zh-~m~OX)P~D6j0*aqAZF`SyZh?Q{|kBS<VNi{ZJmhs4Q5_WCqS@M4JxW(FnLhz$7Q`M zl)+OPjUY$i!gG-g<-5kMEE%2_EI`5*$nvbw~XT|C-nw;VC0{((U_>f zt6}Wr!tfLgv+gzyoG4ambl00HB-PO7?|=55}8vE1wk_n3Uy~(>OI2`OAz_Q7p4z~Q@8!MhJ6>A-_4!; z!}F@@6gIXCT~bt-U7dqP3L3d4h$B~R9)68Pm%tIWXeGH?O%;HAXmf8{@Vy^jL0Focx1%m8TbHdOnJf=Vu!(o@8Mr1nS9U9~~i8z9ba;>9Ik+jhYJz)N>u4k9^7atsE;MbYslN|iZyRw{!n5NUI@>lNb@oREhEZ(~!m%aX^o1c>Y=V-MNOh7$L+%5|??H$U zqH)!v7szU5LJ8$mrw_w>1dlPc^S(yH;N}Q0vNi9orcOLQMDl!boc^T{NP3)fag(~~_7(-!Hr0kmEhLXm|S#=)J*=Xjyh;!_E71s3f&dlvE1`$1$L zq7$p_6FtTxQ8JTuH^~W0C%@Ih6rwIG&>F1zKBLGoFS}15bZm~x?lpv2ZR=@Gvc=21 zFVDgiogmGkG1l<y7>^GWu3$_m;I?qvsBLt*Y&Xt| zP1s3R7yb(vBZrRq+2+iXUs4Bho|%SFP3lzm8k{G2^FSOc7Y9DiUDRBZNG6t%dt*+_ zb9b*<-_BQ7bvN7L|8TUqn!4qz7pXfU3g0c6f3ze%ijzg8i#(__*P1?&2$o=2X8Pc! znH3MbJoh>?NVgzd`TBva(9c$X{6dD+h*W>-nwvM6bDTY1uQl`!W)o-JyS`_#jTEFT z-fw2q#ubF&-IM7sp@FTFf=0O-PsYN4n4MfMyA`5UnZ!~Uz(9b@<3(aEx2nVX(~F@{ zr_~Qs2&*c861=30?|i1d3>ZxtN7N6N7^9TVeK4z-j^HM#va{0PEhzfNWPQiE#MvKi zHI7Vr(`CC!bfRE9^#*9Dwrq*yhmLTKj!XazHI;S@8A6;XoW@n;8{waC=P{RM$gj2p z<3jfX2rC-%5=)Sc8mj~DsgSW&MMqr_KP2+q4083WQm+Lg<5OnJI&t20_*s)+DlbOU zmFQcV%mpvp6l2FRaD={RO>(p0X|0iKBUccGX5t1ZTOxJ%G~;!1#PG3I8G7kO8WOjA z$zeqqz&d>~{KMCU?Ok6>FLt*tLQe}_=32uugwWApr6}thUj6)-0(m2UmcuqU@t+uV z#oXZEFxgY;CMP;XRsP;yt-fn4bhSEUC>);B-H9_HY*D>*WS)I>*8 zV`lZ&Pm-1d%WT??wTl-U9g$KrP9N*={#J+k#lHx-6UoFj&fBD8(;Z`?y$qq?brbS$ z{L=fvOms9RuY1MO7e9diL5Dm+{AAxhc}FcO+1y=VI2u`@EYIGxEyUf@D z4kF%%H$RLijao$H>{@T$21)lwS;x)vC zUcKwh9froX0x7vmvsH8+#M@>xViVK2qYLd|lHR~2p8U^bJ#t$QI%(90yqw2QQ!#{@ z^f%2n_sL^bZm@Wx*iLZqNBW;DP1O;OQD@9cZbNE)Yrg+G1so}-tJT2s+ZPf$2}~!t z$l*z|7cc*I$7>dRFg$0Bu50XHj8QRDOpsobR&kI#r-&i2F%O$x{9MN*3s$2h15G9C9CX}xmy_=~sqI@I|K z$6h3t6wViW)IQl3c4V&dDbQ<$SkoQjcb#t_>vtl{;;JM_teMPu^Pl^sL}N*T?O%<#M)e75Uxgb;S9?y)&_#`;#-_l zI&H_pFEk?lg-2!*rhQJn;2qG1v-oIasuS+++m@skzWXQsp77*)Z4pnixj9B~1!de? zW-Wn1pJnZw_!F8JPSp6O_pFz|_Pnn-P^-7!!B1mj0z`^)fm%CoXQ|xoN)UN`qO=VgR?zPwY*sZUV9*ryZgZ(tRo{+-sA<#8B- zV_WKkSVrL(OUB{C2;Y8`kGM1$yMu=eUyQ!W?2w{lXJK#?8*7wl)8QY)WL~H%o)7F7 zLB#u+Z0xp|J+vo_wMI(6ODpqN#c*LtmkPibUb}eJNrp!FJ(CT$epq%Z1^*@5IS{e_ zLebyq;;qd+Hk4xVgU)JQt8J;8flVM@cZB@Ab~61p_1feq8{`y97ekntbH?XW%1~3Z zD^h`3CQVEWoqYj68`~dOhGP^fFUzw^lx&yD;MrHHmdp73#6g_T2SbIl8R>tnr|N1T zyXkxr9RzoUV;lykf72BwMNARF91gO*F4dyESEb10(}lj-g06*hqxhl$57V;aE)bjq zI|*f#M)rsg8T@_b-}f4sh-<-`u6&kikj8CCPh&TYitb&;#=E zo!l%_gLkvgM2!!(oX=u$CVkN>FN-F0g+?1*4;@J)cRt^<{u|`NzwG;&Q#}|AqF?gg zPc7w$zrVQG$@-JSsw{36bX_$f5yM9zo|6`XNOqjQSN-l+t_2oNP;Xnn zknW?MiQ%A!xfviwP1|96d=^z2iS9sGE0*inJ5?Zi0(JK<+Q5Ou@-a`ypYm5_)=$ky zz3w=#Nin<9gTrBnLfHbdsq-U2Us?Brfd;#*opcsWcQJ3u2;i$E#>SICtYz$-6HqE1#!F=G;3Am`>(x-0PrJYdNC?h-?ORW zM6fFR$n`5}Nblz_;N82b(OHgYUzoUt9X>nDepd@YGaV)+@~D9tY%*w!8w#QI?`adT7OrU zAPz=ThaU6XQcPA}_3zaPC&vy!?Mf#$nb@|3v}+<2zJ_(^4OLmb2+L_}+)wxLCx3Mw zux5F#QQ(`%&6i6n9u$f}Y!qpdP+3t{{5QR1$1#?ff1aByd?a${mZEJg%0!ANZ{2rCRtoi_E!e=a53xJ zAo01Jr+S4LMQLVgdCCI9?1w0zAilkBS)^mz(j1C55n!YDLstXH!?{|zyh@=e$xm=N z62oNUdNz4=;W=T^kf7L^5UeM_c9NZ+?^9~#SM=)8uFX|1G^*!`f1(!rjGF$>WbXKK zFJp{J%6G(`p{4J~!l^&!i|toW8bjZ5X~2ZTYjA?--t!VLt|vTTq~~FcZ3wowsszO9qxI3A%Ss|GNaG)OAMY?Kb)z zT_aLPE(dLw$BIYp|8$+Xbk@q>p5jKv;~OLz9PpF5pI5LxZ!_+w4?e`tzbuY6SB%fZ zj9*)A87vh1u!pwT!KBbR_gk(`cei1IT&yk6)VaZoPT1NOb66E@N#pJ{TDjpuR8pjK z6(eXl7hgzinh&NTqDld4ul|g<;)7fFp6S*J#<0T}PQ$^VJcW%_x9N^OcQ8ID{;W(5>*x@&Al zM6vdWq*o(#W&>#<7BA_|zJPm2$=722e!5?drmms51-hC)$x#E{uW|PRH-CHG6wxm` zm2T94fD$(qDT~Sdl_G|=4m$j!DSrn8c+_pwz(#v7M!#PHy>Ea%ErQ=CZXFy`GfP$J zmkjnxMQo6X*?b{QXkR*zb?vx_7^ctt4e)GJ*VR<@2H4B`pVc%r=Nv$#sP4LSuf8U4 zfK3KH+%dYM@sVDSIlM3@uA5&npKk*gVPj+pO&d?lj4bxlVy4EI1bpqeUM=GS%WpoW zK8Va}3v2JL_IOb!=&soot4~o}h9(8w1^oLqTz7U8)o}?iP#=ew+EeaTe@kgu+2NV+ zj^0p`!q#6FFO{VXm$!fmocidgOD;U9EBC^XV8tV?7ZLWZNnyHIY+0=bjG*kDy0!I* zGA^PbKp$~La!%)*=NwvIW@BFg@8Q8d9Z9OZ-A!9j>(gsqhjtc<`1DEHi00EF)X{&B zzy4Hy&9|95pq?l(qGU`MHRDrTPH%QBQ#|a?t>x2r1F*8a0WNSRPHb~(IK8y>t`HUQ z1MVZ+3gD5sNB_mAB-gyV5>3`7qzB3ewbP=&rI)jvn*()&e^ooNW1pfS(BCLBZ-Cq& zeI(d_OKku-((Io>^6IskR;^V-Nt^W?gXYQd^!ox9RRa-NCsHV)StQ~(2?n0{_;Q^^mvN<+dT;*fGwVFeu9vkN*y} z?1jF%p`|lTgc0C_^WbrT6Md#Xv~AM={rbce%7MYRlFfjs>t-0NEI1|g+7YlyHeNt| z#+}bcWTc}$$Qj0SsLZ)kQ__Gb$<|jZe4+d+sln11|At#_;C#VXoBFlu6`&^l^lv3-9^P1A+yzRE?GvrQX3UtZ&p)-EEwkl`|obi z;q1{80#%*b+{~uwsR9Rh>8C6nHN)CZacTTQGgz_)2MP?-TSA)B4YFHhY8{`urEs+H MLvhr^$lm__4??C&pa1{> diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/f.yml b/packages-legacy/serverless-app/test/fixtures/faas-v2/f.yml deleted file mode 100644 index fa6d74c1dd01..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/f.yml +++ /dev/null @@ -1,14 +0,0 @@ -service: serverless-midway-test - -provider: - name: aliyun - runtime: nodejs8 - -functions: - upload: - handler: http.upload - events: - - http: - method: - - post - path: /upload diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/package.json b/packages-legacy/serverless-app/test/fixtures/faas-v2/package.json deleted file mode 100644 index 58119a983bf7..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "hello-demo", - "dependencies": { - "@midwayjs/faas": "^2.8.0" - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/config/config.default.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/config/config.default.ts deleted file mode 100644 index d1bccb5d2e97..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/config/config.default.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const upload = { - mod: 'file', -} - -export const keys = ['1234545'] diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/configuration.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/configuration.ts deleted file mode 100644 index 38c5527ce085..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/configuration.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as faas from '@midwayjs/faas'; - -@Configuration({ - importConfigs: [ - join(__dirname, './config/') - ], - imports: [ - faas, - require('@midwayjs/faas-middleware-upload') - ] -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/controller.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/controller.ts deleted file mode 100644 index c06e092e8df1..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/controller.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Provide, Controller, Get, Inject } from '@midwayjs/core'; - -@Provide() -@Controller('/user') -export class ControllerTestService { - - @Inject() - ctx; - - @Get('/') - async handler() { - return 'user' - } - - @Get('/:test') - async test() { - return this.ctx.params.test; - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/event.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/event.ts deleted file mode 100644 index c4113d949aa9..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/event.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Provide, Inject, ServerlessTrigger, ServerlessTriggerType, App } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -import * as assert from 'assert'; -import { Application } from '../../../../src'; - -@Provide() -export class EventService { - @Inject() - ctx; - - @App() - app: Application; - - @ServerlessTrigger(ServerlessTriggerType.TIMER, { - type: 'cron', - value: '* * * * 4', - payload: 'test' - }) - async handler(event: FC.TimerEvent): Promise { - assert(this.app.getInitializeContext()); - return event; - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/func.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/func.ts deleted file mode 100644 index 9613124840bb..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/func.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { - Get, - Body, - Inject, - Provide, - Query, - ServerlessTrigger, - ServerlessTriggerType, - Headers -} from '@midwayjs/core'; - -@Provide() -export class FuncService { - - @Inject() - ctx; - - @ServerlessTrigger(ServerlessTriggerType.HTTP, { - method: 'get', - path: '/func/http/get' - }) - async handler(@Query('name') name) { - return 'user:' + name; - } - - @ServerlessTrigger(ServerlessTriggerType.API_GATEWAY, { - method: 'post', - path: '/func/http/post' - }) - async handler2(@Body('name') name, @Headers('content-type') type) { - return 'user:' + name; - } - - @Get('/:test') - async test() { - return this.ctx.params.test; - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/index.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/index.ts deleted file mode 100644 index 064f39eafa5f..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/index.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Provide, ServerlessTrigger, Inject, ServerlessTriggerType, ServerlessFunction } from '@midwayjs/core'; -@Provide() -export class HelloHttpService { - @Inject() - ctx; - - @ServerlessTrigger(ServerlessTriggerType.HTTP, { - path: '/hello', - method: 'get' - }) - @ServerlessTrigger(ServerlessTriggerType.HTTP, { - path: '/hello', - method: 'post' - }) - handler() { - return { - method: this.ctx.method, - path: this.ctx.path, - headers: this.ctx.headers, - query: this.ctx.query, - body: this.ctx.request.body, - } - } - - @ServerlessFunction({ - functionName: 'upload' - }) - @ServerlessTrigger(ServerlessTriggerType.EVENT, { middleware: ['fmw:upload'] }) - upload() { - const { files, fields } = this.ctx; - return { - files, - fields - } - } - - @ServerlessTrigger(ServerlessTriggerType.HTTP, { path: '/other', method: 'get'}) - other() { - return 'hello world' - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/src/interface.ts b/packages-legacy/serverless-app/test/fixtures/faas-v2/src/interface.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages-legacy/serverless-app/test/fixtures/faas-v2/tsconfig.json b/packages-legacy/serverless-app/test/fixtures/faas-v2/tsconfig.json deleted file mode 100644 index 681ce2a32495..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/faas-v2/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "inlineSourceMap": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "stripInternal": true, - "pretty": true, - "declaration": true, - "outDir": "dist", - "sourceRoot": "" - }, - "exclude": [ - "dist", - "node_modules", - "test" - ] -} diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/f.yml b/packages-legacy/serverless-app/test/fixtures/integration-v2/f.yml deleted file mode 100644 index e1eaa3099f3d..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/f.yml +++ /dev/null @@ -1,5 +0,0 @@ -service: serverless-midway-test - -provider: - name: aliyun - runtime: nodejs8 \ No newline at end of file diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/package.json b/packages-legacy/serverless-app/test/fixtures/integration-v2/package.json deleted file mode 100644 index 20a464b99a95..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@midwayjs/faas": "^2.8.0" - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/config/config.default.ts b/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/config/config.default.ts deleted file mode 100644 index 4a50ceaf1a12..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/config/config.default.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const testConfig = { - name: 'test' -} \ No newline at end of file diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/configuration.ts b/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/configuration.ts deleted file mode 100644 index ce34f842cd6c..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/configuration.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as faas from '@midwayjs/faas'; - -@Configuration({ - imports: [ - faas - ], - importConfigs: [ - join(__dirname, './config/') - ], -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/index.ts b/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/index.ts deleted file mode 100644 index 409033d6d894..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/apis/index.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Config, Inject, Provide, ServerlessTrigger, ServerlessTriggerType } from '@midwayjs/core'; -import * as assert from 'assert'; - -@Provide() -export class HelloHttpService { - @Inject() - ctx; - - @Config() - testConfig; - - @ServerlessTrigger(ServerlessTriggerType.HTTP, { path: '/hello'}) - async handler() { - assert(this.testConfig.name === 'test'); - return { - method: this.ctx.method, - path: this.ctx.path, - headers: this.ctx.headers, - query: this.ctx.query, - body: this.ctx.request.body, - } - } -} diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/pages/index.js b/packages-legacy/serverless-app/test/fixtures/integration-v2/src/pages/index.js deleted file mode 100644 index 61df575305b3..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/src/pages/index.js +++ /dev/null @@ -1 +0,0 @@ -console.log('frontend'); diff --git a/packages-legacy/serverless-app/test/fixtures/integration-v2/tsconfig.json b/packages-legacy/serverless-app/test/fixtures/integration-v2/tsconfig.json deleted file mode 100644 index 681ce2a32495..000000000000 --- a/packages-legacy/serverless-app/test/fixtures/integration-v2/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compileOnSave": true, - "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "moduleResolution": "node", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "inlineSourceMap": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "stripInternal": true, - "pretty": true, - "declaration": true, - "outDir": "dist", - "sourceRoot": "" - }, - "exclude": [ - "dist", - "node_modules", - "test" - ] -} diff --git a/packages-legacy/serverless-app/test/intergration-v2.test.ts b/packages-legacy/serverless-app/test/intergration-v2.test.ts deleted file mode 100644 index 83319097fb3d..000000000000 --- a/packages-legacy/serverless-app/test/intergration-v2.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { join } from 'path'; -import * as assert from 'assert'; -import { close } from '@midwayjs/mock'; -import { createFunctionApp } from './util'; -const request = require('supertest'); -const cwd = join(__dirname, 'fixtures/integration-v2'); -describe('test/index.test.ts', () => { - let app; - beforeAll(async () => { - app = await createFunctionApp(cwd, { - baseDir: join(cwd, 'src/apis'), - }); - }); - afterAll(async () => { - await close(app); - }); - it('http get no-yml', done => { - request(app) - .get('/hello?name=test&age=123') - .expect(200) - .then(response => { - assert(response.body.path === '/hello'); - assert(response.body.method === 'GET'); - assert(response.body.headers); - assert(response.body.query.name === 'test'); - assert(response.body.query.age === '123'); - done(); - }) - .catch(err => done(err)); - }); -}); diff --git a/packages-legacy/serverless-app/test/util.ts b/packages-legacy/serverless-app/test/util.ts deleted file mode 100644 index c24041e670e1..000000000000 --- a/packages-legacy/serverless-app/test/util.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { IMidwayFramework, MidwayApplicationManager, MidwayFrameworkType } from '@midwayjs/core'; -import { createApp } from '@midwayjs/mock'; -import * as ServerlessApp from '../src'; - -export async function createFunctionApp< - T extends IMidwayFramework, - Y = ReturnType - >( - baseDir: string = process.cwd(), - options?, -): Promise { - options = options ?? {}; - options.imports = [ServerlessApp]; - const framework = await createApp(baseDir, options); - const appCtx = framework.getApplicationContext(); - const appManager = appCtx.get(MidwayApplicationManager); - return appManager.getApplication(MidwayFrameworkType.SERVERLESS_APP); -} diff --git a/packages-legacy/serverless-app/tsconfig.json b/packages-legacy/serverless-app/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-app/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-aws-starter/CHANGELOG.md b/packages-legacy/serverless-aws-starter/CHANGELOG.md deleted file mode 100644 index 67ecc3b8c500..000000000000 --- a/packages-legacy/serverless-aws-starter/CHANGELOG.md +++ /dev/null @@ -1,533 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.1 ([#1754](https://github.com/midwayjs/midway/issues/1754)) ([6d9d819](https://github.com/midwayjs/midway/commit/6d9d819a3628ac8ecf91e75120a73f0533ba4bc9)) - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.0 ([#1731](https://github.com/midwayjs/midway/issues/1731)) ([6caec96](https://github.com/midwayjs/midway/commit/6caec96b976b9dce1a8cda4d3f809efd346ceaf5)) - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.4.3 ([#1705](https://github.com/midwayjs/midway/issues/1705)) ([d4a6b8c](https://github.com/midwayjs/midway/commit/d4a6b8c0a17d5187ac21afd72e8dbf86424fb14f)) - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -### Features - -- support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9)) - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-alpha.2](https://github.com/midwayjs/midway-faas/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [3.0.0-alpha.1](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -### Features - -- support entry file in bootstrap ([#819](https://github.com/midwayjs/midway-faas/issues/819)) ([49a5ff6](https://github.com/midwayjs/midway-faas/commit/49a5ff662134bdd42dc3a80738b44a05138f8f7c)) - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -### Features - -- add getFunctionName() and functionSerivceName() method to runtime and faas framework ([#734](https://github.com/midwayjs/midway-faas/issues/734)) ([f0bc5aa](https://github.com/midwayjs/midway-faas/commit/f0bc5aadd224e6ec85691b9c82cc7993cbc32cdb)) - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -### Bug Fixes - -- add default env for egg module ([#618](https://github.com/midwayjs/midway-faas/issues/618)) ([41272d0](https://github.com/midwayjs/midway-faas/commit/41272d02c9184cb3fc1d8b457ebac8228b16f116)) - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-aws-starter diff --git a/packages-legacy/serverless-aws-starter/README.md b/packages-legacy/serverless-aws-starter/README.md deleted file mode 100644 index 1c5fb2fb621a..000000000000 --- a/packages-legacy/serverless-aws-starter/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# serverless aws starter - -this module is a light runtime starter for amazon lambda. - -```ts -import { asyncWrapper, createRuntime } from '@midwayjs/serverless-aws-starter'; - -let runtime; -export.init = asyncWrapper(async () => { - runtime = await createRuntime(); -}); - -// for web request -export.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx) { - return 'hello world'; // ctx.body = 'hello world'; - })(...args); -}); - -// for event -export.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx, event) { - return {data: 1}; - })(...args); -}); - -``` diff --git a/packages-legacy/serverless-aws-starter/jest.config.js b/packages-legacy/serverless-aws-starter/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-aws-starter/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-aws-starter/jest.setup.js b/packages-legacy/serverless-aws-starter/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-aws-starter/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-aws-starter/package.json b/packages-legacy/serverless-aws-starter/package.json deleted file mode 100644 index c55a54c8e6df..000000000000 --- a/packages-legacy/serverless-aws-starter/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@midwayjs/serverless-aws-starter", - "private": true, - "version": "3.14.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/serverless-http-parser": "^3.14.0" - }, - "devDependencies": { - "raw-body": "2.5.2" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-aws-starter/resource/event.json b/packages-legacy/serverless-aws-starter/resource/event.json deleted file mode 100644 index cf85dd2712ee..000000000000 --- a/packages-legacy/serverless-aws-starter/resource/event.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "body": "eyJ0ZXN0IjoiYm9keSJ9", - "resource": "/{proxy+}", - "path": "/path/to/resource", - "httpMethod": "POST", - "isBase64Encoded": true, - "queryStringParameters": { - "foo": "bar" - }, - "multiValueQueryStringParameters": { - "foo": [ - "bar" - ] - }, - "pathParameters": { - "proxy": "/path/to/resource" - }, - "stageVariables": { - "baz": "qux" - }, - "headers": { - "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", - "Accept-Encoding": "gzip, deflate, sdch", - "Accept-Language": "en-US,en;q=0.8", - "Cache-Control": "max-age=0", - "CloudFront-Forwarded-Proto": "https", - "CloudFront-Is-Desktop-Viewer": "true", - "CloudFront-Is-Mobile-Viewer": "false", - "CloudFront-Is-SmartTV-Viewer": "false", - "CloudFront-Is-Tablet-Viewer": "false", - "CloudFront-Viewer-Country": "US", - "Host": "1234567890.execute-api.us-east-2.amazonaws.com", - "Upgrade-Insecure-Requests": "1", - "User-Agent": "Custom User Agent String", - "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)", - "X-Amz-Cf-Id": "cDehVQoZnx43VYQb9j2-nvCh-9z396Uhbp027Y2JvkCPNLmGJHqlaA==", - "X-Forwarded-For": "127.0.0.1, 127.0.0.2", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https" - }, - "multiValueHeaders": { - "Accept": [ - "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8" - ], - "Accept-Encoding": [ - "gzip, deflate, sdch" - ], - "Accept-Language": [ - "en-US,en;q=0.8" - ], - "Cache-Control": [ - "max-age=0" - ], - "CloudFront-Forwarded-Proto": [ - "https" - ], - "CloudFront-Is-Desktop-Viewer": [ - "true" - ], - "CloudFront-Is-Mobile-Viewer": [ - "false" - ], - "CloudFront-Is-SmartTV-Viewer": [ - "false" - ], - "CloudFront-Is-Tablet-Viewer": [ - "false" - ], - "CloudFront-Viewer-Country": [ - "US" - ], - "Host": [ - "0123456789.execute-api.us-east-2.amazonaws.com" - ], - "Upgrade-Insecure-Requests": [ - "1" - ], - "User-Agent": [ - "Custom User Agent String" - ], - "Via": [ - "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)" - ], - "X-Amz-Cf-Id": [ - "cDehVQoZnx43VYQb9j2-nvCh-9z396Uhbp027Y2JvkCPNLmGJHqlaA==" - ], - "X-Forwarded-For": [ - "127.0.0.1, 127.0.0.2" - ], - "X-Forwarded-Port": [ - "443" - ], - "X-Forwarded-Proto": [ - "https" - ] - }, - "requestContext": { - "accountId": "123456789012", - "resourceId": "123456", - "stage": "prod", - "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef", - "requestTime": "09/Apr/2015:12:34:56 +0000", - "requestTimeEpoch": 1428582896000, - "identity": { - "cognitoIdentityPoolId": null, - "accountId": null, - "cognitoIdentityId": null, - "caller": null, - "accessKey": null, - "sourceIp": "127.0.0.1", - "cognitoAuthenticationType": null, - "cognitoAuthenticationProvider": null, - "userArn": null, - "userAgent": "Custom User Agent String", - "user": null - }, - "path": "/prod/path/to/resource", - "resourcePath": "/{proxy+}", - "httpMethod": "POST", - "apiId": "1234567890", - "protocol": "HTTP/1.1" - } -} \ No newline at end of file diff --git a/packages-legacy/serverless-aws-starter/src/context.ts b/packages-legacy/serverless-aws-starter/src/context.ts deleted file mode 100644 index 3da967ee07d5..000000000000 --- a/packages-legacy/serverless-aws-starter/src/context.ts +++ /dev/null @@ -1,156 +0,0 @@ -const ORIGIN_EVENT = Symbol.for('ctx#origin_event'); -const EVENT = Symbol.for('ctx#event'); -const EVENT_PARSED = Symbol.for('ctx#event_parsed'); -const PARSED_EVENT = Symbol.for('ctx#parsed_body'); -const BODY_PARSED = Symbol.for('ctx#body_parsed'); -const BODY = Symbol.for('ctx#body'); - -export class Request { - originEvent; - - constructor(event) { - this.originEvent = event; - this[ORIGIN_EVENT] = event; - this[PARSED_EVENT] = null; - } - - get [EVENT]() { - if (!this[EVENT_PARSED]) { - this[EVENT_PARSED] = - typeof this[ORIGIN_EVENT] === 'object' - ? this[ORIGIN_EVENT] - : JSON.parse(this[ORIGIN_EVENT] || '{}'); - this[ORIGIN_EVENT] = null; - } - - return this[EVENT_PARSED]; - } - - get ip() { - return this[EVENT].requestContext.identity.sourceIp; - } - - get url() { - return this[EVENT].path; - } - - get path() { - return this[EVENT].path; - } - - get method() { - return this[EVENT].httpMethod; - } - - get headers() { - return this[EVENT].headers; - } - - get query() { - return this[EVENT].queryStringParameters; - } - - get body() { - if (!this[BODY_PARSED]) { - if (this[EVENT].isBase64Encoded) { - this[BODY] = Buffer.from(this[EVENT].body, 'base64').toString(); - } else { - this[BODY] = this[EVENT].body; - } - this[BODY_PARSED] = true; - } - - return this[BODY]; - } -} - -export class Response { - statusCode; - headers; - body; - - constructor() { - this.statusCode = 200; - this.headers = { - // 'content-type': 'application/json', - }; - this.body = null; - } -} - -export class Context { - req; - request; - res; - response; - statusCode; - requestId; - credentials; - function; - - constructor(event, context) { - this.req = this.request = new Request(event); - this.res = this.response = new Response(); - this.requestId = context.requestId; - this.credentials = context.credentials; - this.function = context.function; - } - - // req delegate - get headers() { - return this.req.headers; - } - - get method() { - return this.req.method; - } - - get path() { - return this.req.path; - } - - get query() { - return this.req.query; - } - - get ip() { - return this.req.ip; - } - - get url() { - return this.req.url; - } - - get(key) { - return this.headers[key]; - } - - // response delegate - set type(value) { - this.res.headers['content-type'] = value; - } - - get type() { - return this.res.headers['content-type']; - } - - set body(value) { - this.res.body = value; - } - - get body() { - return this.res.body; - } - - set status(code) { - this.res.statusCode = code; - } - - get status() { - return this.res.statusCode; - } - - set(key, value) { - this.res.headers[key] = value; - } -} diff --git a/packages-legacy/serverless-aws-starter/src/index.ts b/packages-legacy/serverless-aws-starter/src/index.ts deleted file mode 100644 index 10def288fc6a..000000000000 --- a/packages-legacy/serverless-aws-starter/src/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { BaseRuntimeEngine, LightRuntime } from '@midwayjs/runtime-engine'; -import { AWSRuntime } from './runtime'; - -export { asyncWrapper } from '@midwayjs/runtime-engine'; - -export const start = async () => { - if (!process.env.NODE_ENV) { - process.env.NODE_ENV = 'production'; - } - const runtimeEngine = new BaseRuntimeEngine(); - runtimeEngine.add(engine => { - engine.addBaseRuntime(new AWSRuntime()); - }); - - await runtimeEngine.ready(); - return runtimeEngine.getCurrentRuntime() as LightRuntime; -}; diff --git a/packages-legacy/serverless-aws-starter/src/interface.ts b/packages-legacy/serverless-aws-starter/src/interface.ts deleted file mode 100644 index 4f720649cf0f..000000000000 --- a/packages-legacy/serverless-aws-starter/src/interface.ts +++ /dev/null @@ -1,81 +0,0 @@ -export interface AWSContext { - functionName: string; // The name of the Lambda function. - functionVersion: string; // The version of the function. - invokedFunctionArn: string; // The Amazon Resource Name (ARN) that's used to invoke the function. Indicates if the invoker specified a version number or alias. - memoryLimitInMB: string; // The amount of memory that's allocated for the function. - awsRequestId: string; // The identifier of the invocation request. - logGroupName: string; // The log group for the function. - logStreamName: string; // The log stream for the function instance. - - identity: { - cognitoIdentityId: string; // The authenticated Amazon Cognito identity. - cognitoIdentityPoolId: string; // The Amazon Cognito identity pool that authorized the invocation. - }; // (mobile apps) Information about the Amazon Cognito identity that authorized the request. - - clientContext: { - client: { - installation_id: string; - app_title: string; - app_version_name: string; - app_version_code: string; - app_package_name: string; - }; - - env: { - platform_version: string; - platform: string; - make: string; - model: string; - locale: string; - }; - - Custom: any; // Custom values that are set by the mobile application. - }; // (mobile apps) Client context that's provided to Lambda by the client application. - - callbackWaitsForEmptyEventLoop: string; // Set to false to send the response right away when the callback executes, instead of waiting for the Node.js event loop to be empty. If this is false, any outstanding events continue to run during the next invocation. - - getRemainingTimeInMillis(): number; // Returns the number of milliseconds left before the execution times out -} - -export interface AWSBasicHTTPEvent { - body: any; - path: string; - httpMethod: string; - isBase64Encoded: boolean; - queryStringParameters: { [key: string]: string }; - headers: { [key: string]: string }; -} - -export interface AWSHTTPEvent extends AWSBasicHTTPEvent { - resource: string; - multiValueQueryStringParameters: { [key: string]: string[] }; - pathParameters: { [key: string]: string }; - stageVariables: { [key: string]: string }; - multiValueHeaders: { [key: string]: string[] }; - requestContext: { - accountId: string; - resourceId: string; - stage: string; - requestId: string; - requestTime: string; - requestTimeEpoch: number; - identity: { - cognitoIdentityPoolId: any; // TODO - accountId: string; - cognitoIdentityId: string; - caller: any; // TODO - accessKey: string; - sourceIp: string; - cognitoAuthenticationType: any; // TODO - cognitoAuthenticationProvider: any; // TODO - userArn: string; - userAgent: string; - user: string; - }; - path: string; - resourcePath: string; - httpMethod: string; - apiId: string; - protocol: string; - }; -} diff --git a/packages-legacy/serverless-aws-starter/src/runtime.ts b/packages-legacy/serverless-aws-starter/src/runtime.ts deleted file mode 100644 index 89bf714d1868..000000000000 --- a/packages-legacy/serverless-aws-starter/src/runtime.ts +++ /dev/null @@ -1,142 +0,0 @@ -import { - FAAS_ARGS_KEY, - ServerlessLightRuntime, -} from '@midwayjs/runtime-engine'; -import { AWSContext, AWSHTTPEvent } from './interface'; -import { - Application, - HTTPRequest, - HTTPResponse, -} from '@midwayjs/serverless-http-parser'; - -const isOutputError = () => { - return ( - process.env.SERVERLESS_OUTPUT_ERROR_STACK === 'true' || - ['local', 'development'].includes(process.env.MIDWAY_SERVER_ENV) || - ['local', 'development'].includes(process.env.NODE_ENV) - ); -}; - -export class AWSRuntime extends ServerlessLightRuntime { - app; - respond; - - async init(): Promise { - this.app = new Application(); - } - - /** - * for handler wrapper - * @param handler - */ - asyncEvent(handler) { - if (handler.constructor.name !== 'AsyncFunction') { - throw new TypeError('Must be an AsyncFunction'); - } - return (event = {}, context?: AWSContext) => { - if (isHttpEvent(event)) { - return this.wrapperWebInvoker(handler, event, context); - } - return this.wrapperEventInvoker(handler, event, context); - }; - } - - async wrapperWebInvoker(handler, event: AWSHTTPEvent, context: AWSContext) { - if (!this.respond) { - this.respond = this.app.callback(); - } - const newReq = new HTTPRequest(event, context); - const newRes = new HTTPResponse(); - - return this.respond.apply(this.respond, [ - newReq, - newRes, - ctx => { - return this.invokeHandlerWrapper(ctx, async () => { - const args = [ctx]; - if (ctx.method === 'GET') { - if (ctx.query && ctx.query[FAAS_ARGS_KEY]) { - args.push(ctx.query[FAAS_ARGS_KEY]); - } - } else if (ctx.method === 'POST') { - if (ctx.req && ctx.req.body && ctx.req.body[FAAS_ARGS_KEY]) { - args.push(ctx.req.body[FAAS_ARGS_KEY]); - } - } - return handler.apply(handler, args); - }) - .then(result => { - if (result) { - ctx.body = result; - } - const data = ctx.body; - let encoded = false; - if (typeof data === 'string') { - if (!ctx.type) { - ctx.type = 'text/plain'; - } - ctx.body = data; - } else if (Buffer.isBuffer(data)) { - encoded = true; - if (!ctx.type) { - ctx.type = 'application/octet-stream'; - } - ctx.body = data.toString('base64'); - } else if (typeof data === 'object') { - if (!ctx.type) { - ctx.type = 'application/json'; - } - ctx.body = JSON.stringify(data); - } - - return { - isBase64Encoded: encoded, - statusCode: ctx.status, - headers: ctx.res.headers, - body: ctx.body, - }; - }) - .catch(err => { - ctx.logger.error(err); - return { - isBase64Encoded: false, - statusCode: err.status ?? 500, - headers: {}, - body: isOutputError() ? err.stack : 'Internal Server Error', - }; - }); - }, - ]); - } - - async wrapperEventInvoker(handler, event: any, context: AWSContext) { - const args = [context]; - if (event && event[FAAS_ARGS_KEY]) { - args.push(event[FAAS_ARGS_KEY]); - } else { - args.push(event); - } - // 其他事件场景 - return this.invokeHandlerWrapper(context, async () => { - return handler.apply(handler, args); - }); - } - - getApplication() { - return this.app; - } - - getFunctionName(): string { - // https://docs.aws.amazon.com/zh_cn/lambda/latest/dg/configuration-envvars.html - return process.env.AWS_LAMBDA_FUNCTION_NAME || super.getFunctionName(); - } - - getFunctionServiceName(): string { - // lambda 没有服务名 - return super.getFunctionServiceName(); - } -} - -function isHttpEvent(event): event is AWSHTTPEvent { - return event.httpMethod && event.headers && event.requestContext; -} diff --git a/packages-legacy/serverless-aws-starter/test/__snapshots__/index.test.ts.snap b/packages-legacy/serverless-aws-starter/test/__snapshots__/index.test.ts.snap deleted file mode 100644 index d4479f53c937..000000000000 --- a/packages-legacy/serverless-aws-starter/test/__snapshots__/index.test.ts.snap +++ /dev/null @@ -1,19 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`/test/index.test.ts wrapper web event should ok with asyncWrap when error 1`] = ` -{ - "body": "Internal Server Error", - "headers": {}, - "isBase64Encoded": false, - "statusCode": 500, -} -`; - -exports[`/test/index.test.ts wrapper web event should ok with error 1`] = ` -{ - "body": "Internal Server Error", - "headers": {}, - "isBase64Encoded": false, - "statusCode": 500, -} -`; diff --git a/packages-legacy/serverless-aws-starter/test/index.test.ts b/packages-legacy/serverless-aws-starter/test/index.test.ts deleted file mode 100644 index 7c432e8f44c8..000000000000 --- a/packages-legacy/serverless-aws-starter/test/index.test.ts +++ /dev/null @@ -1,403 +0,0 @@ -import * as assert from 'assert'; -import { asyncWrapper, start } from '../src'; -import { AWSBasicHTTPEvent } from '../src/interface'; -import * as mm from 'mm'; - -class Tester { - handler; - - constructor(handler) { - this.handler = handler; - } - - async runHttp(event: AWSBasicHTTPEvent, context = {}) { - const args = [ - Object.assign({}, require('../resource/event'), event), - context, - ]; - return this.handler.apply(this.handler, args); - } - - run(...args) { - return new Promise((resolve, reject) => { - args.push((err, result) => { - if (err) { - return reject(err); - } - resolve(result); - }); - return this.handler(...args); - }); - } -} - -function test(handler) { - return new Tester(handler); -} - -describe('/test/index.test.ts', () => { - describe('wrapper normal event', () => { - it('should wrap in init function', async () => { - const handle = asyncWrapper(async context => { - return context.data; - }); - const res: any = await test(handle).run({ data: 1 }); - assert.equal(res, 1); - }); - - it('should wrap with event and context', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return event.data; - })(...args); - }); - const res: any = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 1); - }); - }); - - describe('wrapper web event', () => { - it('should ok with plain text', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = 'hello world!'; - })(...args); - }); - const res: any = await test(handle).runHttp( - require('../resource/event'), - {} - ); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'text/plain; charset=utf-8'); - assert.equal(res.body, 'hello world!'); - }); - - it('should ok with json', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with raw json', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = '{"ok":true}'; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with raw json/object', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with Buffer', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = Buffer.from('hello world!'); - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'application/octet-stream'); - assert.equal(res.body, Buffer.from('hello world!').toString('base64')); - }); - - it('should ok with context', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = ctx.query.hello; - })(...args); - }); - const res = await test(handle).runHttp( - { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: { hello: 'world' }, - body: null, - isBase64Encoded: false, - }, - {} - ); - assert.equal(res.statusCode, 200); - assert.equal(res.body, 'world'); - }); - - it('should ok with error', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('oops'); - })(...args); - }); - const result = await test(handle).runHttp(require('../resource/event'), {}); - expect(result).toMatchSnapshot(); - }); - - it('should ok with non-async function', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - let err; - try { - await test(handle).runHttp(require('../resource/event'), {}); - } catch (ex) { - err = ex; - } - assert.ok(err); - assert.equal(err.message, 'Must be an AsyncFunction'); - }); - - it('should ok with asyncWrap', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return 'hello world!'; - })(...args); - }); - const res = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 'hello world!'); - }); - - it('should ok with asyncWrap when error', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('ooops!'); - })(...args); - }); - const result = await test(handle).run(require('../resource/event'), {}); - expect(result).toMatchSnapshot(); - }); - - it('should ok with asyncWrap when not async functions', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - let err; - try { - await test(handle).run(require('../resource/event'), {}); - } catch (ex) { - err = ex; - } - - assert.ok(err); - assert.equal(err.message, 'Must be an AsyncFunction'); - }); - - it('GET should ok', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - httpMethod: 'GET', - headers: {}, - queryStringParameters: q, - body: '', - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(event, {}); - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - it('GET should ok', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - // ctx.req.body; // second access - ctx.get('content-type'); - ctx.set('content-type', 'application/json'); - ctx.status = 200; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: q, - body: Buffer.from('hello world').toString('base64'), - isBase64Encoded: true, - }; - const data = await test(handle).runHttp(event, {}); - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - it('GET should use faas parameters to appoint parameter', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - ctx.body = user + ' hello'; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: { - FAAS_ARGS: 'harry', - }, - body: null, - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'harry hello'); - }); - - it('GET should get text if return data', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - return 'hello world ' + user; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: { - FAAS_ARGS: 'harry', - }, - body: null, - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'hello world harry'); - }); - - it('GET should get params in post method', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - return 'hello world ' + user; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'POST', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: {}, - body: { - FAAS_ARGS: ['harry'], - }, - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'hello world harry'); - }); - - it('should ok with asyncWrap use appoint args in event', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, name) => { - return 'hello world!' + name; - })(...args); - }); - const res = await test(handle).run( - { - FAAS_ARGS: ['harry'], - }, - '' - ); - assert.equal(res, 'hello world!harry'); - }); - - it('POST should ok use fc request with body', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return ctx.request.body.toString(); - })(...args); - }); - const postData = JSON.stringify({ name: 'fc request' }); - const data = await test(handle).runHttp( - { - path: '/', - headers: { 'content-type': 'text/plain' }, - queryStringParameters: {}, - httpMethod: 'POST', - body: postData, - isBase64Encoded: false, - }, - {} - ); - assert.equal(data.body, postData); - }); - }); - - describe('test base info', () => { - it('should get function name and service name from environment', async () => { - mm(process.env, 'AWS_LAMBDA_FUNCTION_NAME', 'aaa'); - const runtime = await start(); - expect(runtime.getFunctionName()).toEqual('aaa'); - expect(runtime.getFunctionServiceName()).toEqual(''); - mm.restore(); - }); - }) -}); diff --git a/packages-legacy/serverless-aws-starter/tsconfig.json b/packages-legacy/serverless-aws-starter/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-aws-starter/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-fc-starter/CHANGELOG.md b/packages-legacy/serverless-fc-starter/CHANGELOG.md deleted file mode 100644 index 6b34537386c9..000000000000 --- a/packages-legacy/serverless-fc-starter/CHANGELOG.md +++ /dev/null @@ -1,950 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.1 ([#1754](https://github.com/midwayjs/midway/issues/1754)) ([6d9d819](https://github.com/midwayjs/midway/commit/6d9d819a3628ac8ecf91e75120a73f0533ba4bc9)) - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.0 ([#1731](https://github.com/midwayjs/midway/issues/1731)) ([6caec96](https://github.com/midwayjs/midway/commit/6caec96b976b9dce1a8cda4d3f809efd346ceaf5)) - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.4.3 ([#1705](https://github.com/midwayjs/midway/issues/1705)) ([d4a6b8c](https://github.com/midwayjs/midway/commit/d4a6b8c0a17d5187ac21afd72e8dbf86424fb14f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -### Features - -- support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9)) - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- add log for 'Internal Server Error' ([#1282](https://github.com/midwayjs/midway/issues/1282)) ([f333466](https://github.com/midwayjs/midway/commit/f333466d138a319b417964cdb9cb065f2b955722)) - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -### Bug Fixes - -- change limit for fc ([0546c81](https://github.com/midwayjs/midway-faas/commit/0546c817e8d60a86dfd5dd5703bd96a29e365c27)) - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -### Bug Fixes - -- hide real error when user code throw error ([#1128](https://github.com/midwayjs/midway-faas/issues/1128)) ([e728b0b](https://github.com/midwayjs/midway-faas/commit/e728b0b80956c09cfb856ffe082f44fa29cfeb82)) - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -### Bug Fixes - -- replace ctx.logger in fc serverless environment ([#1112](https://github.com/midwayjs/midway-faas/issues/1112)) ([8ac87b8](https://github.com/midwayjs/midway-faas/commit/8ac87b832154f2ec0fe82df1ec31e283f03b9b2f)) - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -### Bug Fixes - -- remove zlib ([#1035](https://github.com/midwayjs/midway-faas/issues/1035)) ([cc2cd40](https://github.com/midwayjs/midway-faas/commit/cc2cd405a104b3388d93a09d981b59b472fd8ea1)) - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -### Bug Fixes - -- output serverless error in some environment ([#1030](https://github.com/midwayjs/midway-faas/issues/1030)) ([b162b89](https://github.com/midwayjs/midway-faas/commit/b162b897812d1a1a5e981328fbbb43aa75eacf10)) - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -### Features - -- support fun router ([#867](https://github.com/midwayjs/midway-faas/issues/867)) ([01e673f](https://github.com/midwayjs/midway-faas/commit/01e673f50d48d302e449ab88c2e419bcaeab1458)) - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -### Features - -- support entry file in bootstrap ([#819](https://github.com/midwayjs/midway-faas/issues/819)) ([49a5ff6](https://github.com/midwayjs/midway-faas/commit/49a5ff662134bdd42dc3a80738b44a05138f8f7c)) - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -### Bug Fixes - -- fc runtime default ctx ([#813](https://github.com/midwayjs/midway-faas/issues/813)) ([23ad9a2](https://github.com/midwayjs/midway-faas/commit/23ad9a281cbba0e37e3356b15151d8bf08937662)) - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -### Bug Fixes - -- missing originContext property in http trigger ([#799](https://github.com/midwayjs/midway-faas/issues/799)) ([5cd96a0](https://github.com/midwayjs/midway-faas/commit/5cd96a00bdbd733d89dbcb50e460e4a9392679d5)) - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -### Features - -- add getFunctionName() and functionSerivceName() method to runtime and faas framework ([#734](https://github.com/midwayjs/midway-faas/issues/734)) ([f0bc5aa](https://github.com/midwayjs/midway-faas/commit/f0bc5aadd224e6ec85691b9c82cc7993cbc32cdb)) - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -### Bug Fixes - -- fc egg app body parse ([#719](https://github.com/midwayjs/midway-faas/issues/719)) ([18c0aad](https://github.com/midwayjs/midway-faas/commit/18c0aad1d9a187d59da6d9f11940ef82b2770ff0)) - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -### Bug Fixes - -- add default env for egg module ([#618](https://github.com/midwayjs/midway-faas/issues/618)) ([41272d0](https://github.com/midwayjs/midway-faas/commit/41272d02c9184cb3fc1d8b457ebac8228b16f116)) - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -### Bug Fixes - -- fc-starter layer contextExtensions failed ([#614](https://github.com/midwayjs/midway-faas/issues/614)) ([f69f434](https://github.com/midwayjs/midway-faas/commit/f69f43486f73ea101412592f7c85cee4b498b59b)) - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -### Bug Fixes - -- application return 301 and buffer case ([#596](https://github.com/midwayjs/midway-faas/issues/596)) ([a31c022](https://github.com/midwayjs/midway-faas/commit/a31c022409d234e001030d81ce1e414159039a0b)) - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Bug Fixes - -- status 204 when user not set status ([#533](https://github.com/midwayjs/midway-faas/issues/533)) ([9276fe8](https://github.com/midwayjs/midway-faas/commit/9276fe846b983f4f870c2b3eb97e2c254bd5ff5a)) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -### Bug Fixes - -- status 204 when user not set status ([#533](https://github.com/midwayjs/midway-faas/issues/533)) ([9276fe8](https://github.com/midwayjs/midway-faas/commit/9276fe846b983f4f870c2b3eb97e2c254bd5ff5a)) - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- aliyun gateway accept number ([55c77b3](https://github.com/midwayjs/midway-faas/commit/55c77b3aa9000249e0987e808cb558a74bf51a55)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fc starter apigw ([acaa9d1](https://github.com/midwayjs/midway-faas/commit/acaa9d1c5a7704175feb2525970e2609bd237a7b)) -- fix buffer event ([c05b219](https://github.com/midwayjs/midway-faas/commit/c05b2197658c869aff03f38d55df7775c87ac163)) -- fix cookie in fc apigw ([e15decb](https://github.com/midwayjs/midway-faas/commit/e15decba1d751e6e6a448d9da89dec7eec1303e7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix send json when fc use http trigger ([#155](https://github.com/midwayjs/midway-faas/issues/155)) ([1e9abc4](https://github.com/midwayjs/midway-faas/commit/1e9abc48bb479f91caee2ecd09db0fe747827a65)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- lambda params can't use ...args ([#15](https://github.com/midwayjs/midway-faas/issues/15)) ([3c18e50](https://github.com/midwayjs/midway-faas/commit/3c18e5068e408188862c10a810e59b5b8f14cd94)) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- aliyun gateway accept number ([55c77b3](https://github.com/midwayjs/midway-faas/commit/55c77b3aa9000249e0987e808cb558a74bf51a55)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fc starter apigw ([acaa9d1](https://github.com/midwayjs/midway-faas/commit/acaa9d1c5a7704175feb2525970e2609bd237a7b)) -- fix buffer event ([c05b219](https://github.com/midwayjs/midway-faas/commit/c05b2197658c869aff03f38d55df7775c87ac163)) -- fix cookie in fc apigw ([e15decb](https://github.com/midwayjs/midway-faas/commit/e15decba1d751e6e6a448d9da89dec7eec1303e7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix send json when fc use http trigger ([#155](https://github.com/midwayjs/midway-faas/issues/155)) ([1e9abc4](https://github.com/midwayjs/midway-faas/commit/1e9abc48bb479f91caee2ecd09db0fe747827a65)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- lambda params can't use ...args ([#15](https://github.com/midwayjs/midway-faas/issues/15)) ([3c18e50](https://github.com/midwayjs/midway-faas/commit/3c18e5068e408188862c10a810e59b5b8f14cd94)) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- aliyun gateway accept number ([55c77b3](https://github.com/midwayjs/midway-faas/commit/55c77b3aa9000249e0987e808cb558a74bf51a55)) -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fc starter apigw ([acaa9d1](https://github.com/midwayjs/midway-faas/commit/acaa9d1c5a7704175feb2525970e2609bd237a7b)) -- fix buffer event ([c05b219](https://github.com/midwayjs/midway-faas/commit/c05b2197658c869aff03f38d55df7775c87ac163)) -- fix cookie in fc apigw ([e15decb](https://github.com/midwayjs/midway-faas/commit/e15decba1d751e6e6a448d9da89dec7eec1303e7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix send json when fc use http trigger ([#155](https://github.com/midwayjs/midway-faas/issues/155)) ([1e9abc4](https://github.com/midwayjs/midway-faas/commit/1e9abc48bb479f91caee2ecd09db0fe747827a65)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- lambda params can't use ...args ([#15](https://github.com/midwayjs/midway-faas/issues/15)) ([3c18e50](https://github.com/midwayjs/midway-faas/commit/3c18e5068e408188862c10a810e59b5b8f14cd94)) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## [0.3.7](https://github.com/midwayjs/midway-faas/compare/v0.3.6...v0.3.7) (2020-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.3.5](https://github.com/midwayjs/midway-faas/compare/v0.3.4...v0.3.5) (2020-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.3.2](https://github.com/midwayjs/midway-faas/compare/v0.3.1...v0.3.2) (2020-06-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.3.1](https://github.com/midwayjs/midway-faas/compare/v0.3.0...v0.3.1) (2020-05-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -### Features - -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) - -## [0.2.99](https://github.com/midwayjs/midway-faas/compare/v0.2.98...v0.2.99) (2020-05-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -### Features - -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## [0.2.93](https://github.com/midwayjs/midway-faas/compare/v0.2.92...v0.2.93) (2020-05-05) - -### Bug Fixes - -- fix send json when fc use http trigger ([#155](https://github.com/midwayjs/midway-faas/issues/155)) ([1e9abc4](https://github.com/midwayjs/midway-faas/commit/1e9abc48bb479f91caee2ecd09db0fe747827a65)) - -## [0.2.92](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92) (2020-05-05) - -### Bug Fixes - -- fix cookie in fc apigw ([e15decb](https://github.com/midwayjs/midway-faas/commit/e15decba1d751e6e6a448d9da89dec7eec1303e7)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) - -## [0.2.92-beta.1](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92-beta.1) (2020-05-04) - -### Bug Fixes - -- fix cookie in fc apigw ([e15decb](https://github.com/midwayjs/midway-faas/commit/e15decba1d751e6e6a448d9da89dec7eec1303e7)) -- fix error control in fc ([fd99384](https://github.com/midwayjs/midway-faas/commit/fd99384375b038d8f4c9767a9e5730923bbf6dda)) -- fix test case ([81fc9d6](https://github.com/midwayjs/midway-faas/commit/81fc9d61f4e0ff0e9f78dad28d5353f5f23b74a9)) - -## [0.2.90](https://github.com/midwayjs/midway-faas/compare/v0.2.89...v0.2.90) (2020-04-29) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.86](https://github.com/midwayjs/midway-faas/compare/v0.2.85...v0.2.86) (2020-04-24) - -### Bug Fixes - -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) - -## [0.2.85](https://github.com/midwayjs/midway-faas/compare/v0.2.84...v0.2.85) (2020-04-23) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.81](https://github.com/midwayjs/midway-faas/compare/v0.2.80...v0.2.81) (2020-04-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.78](https://github.com/midwayjs/midway-faas/compare/v0.2.77...v0.2.78) (2020-04-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.77](https://github.com/midwayjs/midway-faas/compare/v0.2.76...v0.2.77) (2020-04-18) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -### Bug Fixes - -- aliyun gateway accept number ([55c77b3](https://github.com/midwayjs/midway-faas/commit/55c77b3aa9000249e0987e808cb558a74bf51a55)) -- fc starter apigw ([acaa9d1](https://github.com/midwayjs/midway-faas/commit/acaa9d1c5a7704175feb2525970e2609bd237a7b)) -- fix buffer event ([c05b219](https://github.com/midwayjs/midway-faas/commit/c05b2197658c869aff03f38d55df7775c87ac163)) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -### Bug Fixes - -- aliyun gateway accept number ([55c77b3](https://github.com/midwayjs/midway-faas/commit/55c77b3aa9000249e0987e808cb558a74bf51a55)) -- fc starter apigw ([acaa9d1](https://github.com/midwayjs/midway-faas/commit/acaa9d1c5a7704175feb2525970e2609bd237a7b)) -- fix buffer event ([c05b219](https://github.com/midwayjs/midway-faas/commit/c05b2197658c869aff03f38d55df7775c87ac163)) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -### Bug Fixes - -- fc starter apigw ([00da6a9](https://github.com/midwayjs/midway-faas/commit/00da6a94292b9217da94fde81c338666d44bde33)) -- support apigw ([abfc27a](https://github.com/midwayjs/midway-faas/commit/abfc27a93ae1b335bcb040679bbb5d39f71f5c9e)) - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.73-alpha.0](https://github.com/midwayjs/midway-faas/compare/v0.2.72...v0.2.73-alpha.0) (2020-04-11) - -### Bug Fixes - -- fix buffer event ([2d43e75](https://github.com/midwayjs/midway-faas/commit/2d43e75b4c1c8561345a3ce00c23e55f76e34f0c)) - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -### Bug Fixes - -- aliyun gateway accept number ([03a79b7](https://github.com/midwayjs/midway-faas/commit/03a79b74045dff1ed58522154025af3747549a13)) - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.2.10](https://github.com/midwayjs/midway-faas/compare/v0.2.9...v0.2.10) (2020-01-16) - -### Bug Fixes - -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) - -## [0.2.4](https://github.com/midwayjs/midway-faas/compare/v0.2.3...v0.2.4) (2020-01-09) - -### Bug Fixes - -- lambda params can't use ...args ([#15](https://github.com/midwayjs/midway-faas/issues/15)) ([3c18e50](https://github.com/midwayjs/midway-faas/commit/3c18e5068e408188862c10a810e59b5b8f14cd94)) - -### Features - -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-starter - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -### Bug Fixes - -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) diff --git a/packages-legacy/serverless-fc-starter/README.md b/packages-legacy/serverless-fc-starter/README.md deleted file mode 100644 index d9411f2cbb91..000000000000 --- a/packages-legacy/serverless-fc-starter/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# serverless fc starter - -本模块用于包裹无法定制运行时的 FaaS 平台，比如阿里云 FC。 - -## 阿里云 FC - -```ts -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -let runtime; -exports.init = asyncWrapper(async () => { - runtime = await start(); -}); - -// for web request -exports.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx) { - return 'hello world'; // ctx.body = 'hello world'; - })(...args); -}); - -// for event -exports.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx, event) { - return {data: 1}; - })(...args); -}); - -``` diff --git a/packages-legacy/serverless-fc-starter/jest.config.js b/packages-legacy/serverless-fc-starter/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-fc-starter/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-fc-starter/jest.setup.js b/packages-legacy/serverless-fc-starter/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-fc-starter/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-fc-starter/package.json b/packages-legacy/serverless-fc-starter/package.json deleted file mode 100644 index 6bf7a6d1d806..000000000000 --- a/packages-legacy/serverless-fc-starter/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@midwayjs/serverless-fc-starter", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/serverless-http-parser": "^3.14.0" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/runtime-mock": "^3.7.0", - "raw-body": "2.5.2" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-fc-starter/resource/event_req.json b/packages-legacy/serverless-fc-starter/resource/event_req.json deleted file mode 100644 index 3843685715a5..000000000000 --- a/packages-legacy/serverless-fc-starter/resource/event_req.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "domain": null, - "_events": {}, - "_eventsCount": 0, - "method": "GET", - "clientIP": "127.0.0.1", - "url": "/daily/?a=1", - "path": "/daily/", - "queries": { - "a": "1" - }, - "headers": { - "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3", - "accept-language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7", - "cache-control": "max-age=0", - "cookie": "****", - "upgrade-insecure-requests": "1", - "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36" - } -} diff --git a/packages-legacy/serverless-fc-starter/src/index.ts b/packages-legacy/serverless-fc-starter/src/index.ts deleted file mode 100644 index 683f7fc144d2..000000000000 --- a/packages-legacy/serverless-fc-starter/src/index.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { BaseBootstrap } from '@midwayjs/runtime-engine'; -import { FCRuntime } from './runtime'; - -export { asyncWrapper } from '@midwayjs/runtime-engine'; -export * from './runtime'; - -let bootstrap; - -export const start = async (options: any = {}) => { - if (!process.env.NODE_ENV) { - process.env.NODE_ENV = 'production'; - } - - if (process.env['FC_FUNC_CODE_PATH']) { - // 用于替换默认的上下文日志 - process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] = 'true'; - // 移除控制台颜色，fc 控制台无法探测是否支持，日志采集也必须把颜色禁用掉 - process.env['MIDWAY_LOGGER_DISABLE_COLORS'] = 'true'; - } - bootstrap = new BaseBootstrap( - Object.assign( - { - runtime: new FCRuntime(), - }, - options - ) - ); - await bootstrap.start(); - return bootstrap.getRuntime(); -}; - -export const close = async () => { - return bootstrap.close(); -}; diff --git a/packages-legacy/serverless-fc-starter/src/runtime.ts b/packages-legacy/serverless-fc-starter/src/runtime.ts deleted file mode 100644 index 5b3638517eb2..000000000000 --- a/packages-legacy/serverless-fc-starter/src/runtime.ts +++ /dev/null @@ -1,287 +0,0 @@ -import * as getRawBody from 'raw-body'; -import { - FAAS_ARGS_KEY, - ServerlessLightRuntime, -} from '@midwayjs/runtime-engine'; -import { - Application, - HTTPRequest, - HTTPResponse, -} from '@midwayjs/serverless-http-parser'; -import * as util from 'util'; - -const isOutputError = () => { - return ( - process.env.SERVERLESS_OUTPUT_ERROR_STACK === 'true' || - ['local', 'development'].includes(process.env.MIDWAY_SERVER_ENV) || - ['local', 'development'].includes(process.env.NODE_ENV) - ); -}; - -export class FCRuntime extends ServerlessLightRuntime { - app; - respond; - - async init(contextExtensions): Promise { - super.init(contextExtensions); - this.app = new Application(); - } - - /** - * for handler wrapper - * @param handler - */ - asyncEvent(handler) { - if (handler && handler.constructor.name !== 'AsyncFunction') { - throw new TypeError('Must be an AsyncFunction'); - } - - return (...args) => { - const [req, res, context] = args; - if (context) { - return this.wrapperWebInvoker(handler, req, res, context); - } else { - return this.wrapperEventInvoker(handler, req, res); - } - }; - } - - async wrapperWebInvoker(handler, req, res, context) { - // for web - const isHTTPMode = - req.constructor.name === 'IncomingMessage' || - req.constructor.name === 'EventEmitter' || - util.types.isProxy(req); // for local test - - if (!this.respond) { - this.respond = this.app.callback(); - } - - let newReq = null; - const newRes = new HTTPResponse(); - - if (isHTTPMode) { - req.getOriginContext = () => { - return context; - }; - // http - // const rawBody = 'test'; - // req.rawBody = rawBody; - - // 如果需要解析body并且body是个stream - if ( - ['post', 'put', 'delete'].indexOf(req.method.toLowerCase()) !== -1 && - !req.body && - typeof req.on === 'function' - ) { - req.body = await getRawBody(req, { - limit: '10mb', - }); - } - newReq = req; - } else { - // api gateway - newReq = new HTTPRequest(req, context); - } - - // if (ctx.method === 'GET') { - // if (ctx.query && ctx.query[FAAS_ARGS_KEY]) { - // args.push(ctx.query[FAAS_ARGS_KEY]); - // } - // } else if (ctx.method === 'POST') { - // if (ctx.req && ctx.req.body && ctx.req.body[FAAS_ARGS_KEY]) { - // args.push(ctx.req.body[FAAS_ARGS_KEY]); - // } - // } - - return this.respond.apply(this.respond, [ - newReq, - newRes, - ctx => { - return this.invokeHandlerWrapper(ctx, async () => { - if (!handler) { - const args = isHTTPMode ? [ctx] : [ctx, req]; - return this.defaultInvokeHandler(...args); - } - return handler.apply(handler, isHTTPMode ? [ctx] : [ctx, req]); - }) - .then(result => { - if (res.headersSent) { - return; - } - - if (result) { - ctx.body = result; - } - - if (!ctx.response._explicitStatus) { - if (ctx.body === null || ctx.body === 'undefined') { - ctx.body = ''; - ctx.type = 'text'; - ctx.status = 204; - } - } - - let encoded = false; - - let data = ctx.body; - if (typeof data === 'string') { - if (!ctx.type) { - ctx.type = 'text/plain'; - } - ctx.body = data; - } else if (Buffer.isBuffer(data)) { - encoded = true; - if (!ctx.type) { - ctx.type = 'application/octet-stream'; - } - - // data is reserved as buffer - ctx.body = data.toString('base64'); - } else if (typeof data === 'object') { - if (!ctx.type) { - ctx.type = 'application/json'; - } - // set data to string - ctx.body = data = JSON.stringify(data); - } else { - // 阿里云网关必须返回字符串 - if (!ctx.type) { - ctx.type = 'text/plain'; - } - // set data to string - ctx.body = data = data + ''; - } - - const newHeader = {}; - - for (const key in ctx.res.headers) { - // The length after base64 is wrong. - if (!['content-length'].includes(key)) { - if ('set-cookie' === key && !isHTTPMode) { - // unsupport multiple cookie when use apiGateway - newHeader[key] = ctx.res.headers[key][0]; - if (ctx.res.headers[key].length > 1) { - ctx.logger.warn( - '[fc-starter]: unsupport multiple cookie when use apiGateway' - ); - } - } else { - newHeader[key] = ctx.res.headers[key]; - } - } - } - - if (res.setHeader) { - for (const key in newHeader) { - res.setHeader(key, newHeader[key]); - } - } - - if (res.statusCode !== ctx.status) { - if (res.setStatusCode) { - res.setStatusCode(ctx.status); - } - - if (res.statusCode) { - res.statusCode = ctx.status; - } - } - - if (res.send) { - // http trigger only support `Buffer` or a `string` or a `stream.Readable` - res.send(data); - } - - return { - isBase64Encoded: encoded, - statusCode: ctx.status, - headers: newHeader, - body: ctx.body, - }; - }) - .catch(err => { - ctx.logger.error(err); - if (res.setHeader) { - res.setHeader('content-type', 'text/plain'); - } - if (res.send) { - res.setStatusCode(err.status ?? 500); - res.send(isOutputError() ? err.stack : 'Internal Server Error'); - } - return { - isBase64Encoded: false, - statusCode: err.status ?? 500, - headers: {}, - body: isOutputError() ? err.stack : 'Internal Server Error', - }; - }); - }, - ]); - } - - async wrapperEventInvoker(handler, event, context: any = {}) { - const args = [context]; - if (event && event[FAAS_ARGS_KEY]) { - args.push(event[FAAS_ARGS_KEY]); - } else { - // 阿里云无触发器，入参是 buffer - if (Buffer.isBuffer(event)) { - event = event.toString('utf8'); - try { - event = JSON.parse(event); - } catch (_err) { - /** ignore */ - } - } - if ( - event && - event.headers && - 'queryParameters' in event && - 'httpMethod' in event - ) { - return this.wrapperWebInvoker(handler, event, {}, context); - } - args.push(event); - } - // format context - const newCtx = { - logger: context.logger || console, - originEvent: event, - originContext: context, - }; - // 其他事件场景 - return this.invokeHandlerWrapper(newCtx, async () => { - args[0] = newCtx; - - try { - if (!handler) { - return await this.defaultInvokeHandler(...args); - } else { - return await handler.apply(handler, args); - } - } catch (err) { - newCtx.logger.error(err); - if (isOutputError()) { - throw err; - } else { - throw new Error('Internal Server Error'); - } - } - }); - } - - getApplication() { - return this.app; - } - - getFunctionName(): string { - return this.options?.initContext?.function?.name || super.getFunctionName(); - } - - getFunctionServiceName(): string { - return ( - this.options?.initContext?.service?.name || super.getFunctionServiceName() - ); - } -} diff --git a/packages-legacy/serverless-fc-starter/test/fixtures/apigw/index.ts b/packages-legacy/serverless-fc-starter/test/fixtures/apigw/index.ts deleted file mode 100644 index 3262502aebc2..000000000000 --- a/packages-legacy/serverless-fc-starter/test/fixtures/apigw/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { asyncWrapper, start } from '../../../src'; -import { deepStrictEqual } from 'assert'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - return runtime.asyncEvent(async function (ctx, event) { - deepStrictEqual(ctx.logger, console); - deepStrictEqual(event.path, '/test'); - deepStrictEqual(event.httpMethod, 'POST'); - ctx.status = 200; - ctx.set('set-cookie', [ - 'bbbb=123; path=/; httponly', - 'ccc=321; path=/; httponly', - ]); - ctx.body = { - headers: ctx.headers, - method: ctx.method, - path: ctx.path, - body: ctx.request.body, - params: ctx.params, - }; - })(...args); -}); diff --git a/packages-legacy/serverless-fc-starter/test/fixtures/event/index.ts b/packages-legacy/serverless-fc-starter/test/fixtures/event/index.ts deleted file mode 100644 index 754a0e7b9eec..000000000000 --- a/packages-legacy/serverless-fc-starter/test/fixtures/event/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { asyncWrapper, start } from '../../../src'; - -let runtime; -exports.init = asyncWrapper(async () => { - runtime = await start(); -}); - -exports.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function (ctx, event) { - return 'hello world'; - })(...args); -}); diff --git a/packages-legacy/serverless-fc-starter/test/fixtures/http-302/index.ts b/packages-legacy/serverless-fc-starter/test/fixtures/http-302/index.ts deleted file mode 100644 index ecb670e0704a..000000000000 --- a/packages-legacy/serverless-fc-starter/test/fixtures/http-302/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { asyncWrapper, start } from '../../../src'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - return runtime.asyncEvent(async function (ctx) { - ctx.status = 302; - ctx.set('Location', 'https://github.com/midwayjs/midway'); - })(...args); -}); diff --git a/packages-legacy/serverless-fc-starter/test/fixtures/http-json/index.ts b/packages-legacy/serverless-fc-starter/test/fixtures/http-json/index.ts deleted file mode 100644 index b7851729d33d..000000000000 --- a/packages-legacy/serverless-fc-starter/test/fixtures/http-json/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { asyncWrapper, start } from '../../../src'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - return runtime.asyncEvent(async function (ctx) { - ctx.body = { - name: 'Alan', - }; - })(...args); -}); diff --git a/packages-legacy/serverless-fc-starter/test/fixtures/http/index.ts b/packages-legacy/serverless-fc-starter/test/fixtures/http/index.ts deleted file mode 100644 index bfca90e69ff8..000000000000 --- a/packages-legacy/serverless-fc-starter/test/fixtures/http/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { asyncWrapper, start } from '../../../src'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - return runtime.asyncEvent(async function (ctx) { - ctx.body = 'Alan|' + ctx.originContext.requestId; - })(...args); -}); diff --git a/packages-legacy/serverless-fc-starter/test/index.test.ts b/packages-legacy/serverless-fc-starter/test/index.test.ts deleted file mode 100644 index e47a0f619a26..000000000000 --- a/packages-legacy/serverless-fc-starter/test/index.test.ts +++ /dev/null @@ -1,573 +0,0 @@ -import { createRuntime } from '@midwayjs/runtime-mock'; -import * as assert from 'assert'; -import * as events from 'events'; -import { asyncWrapper, start } from '../src'; -import * as mm from 'mm'; -// 这里不能用包引，会循环依赖 -import { - HTTPTrigger, - ApiGatewayTrigger, -} from '../../serverless-fc-trigger/src'; -import { join } from 'path'; - -class Tester { - handler; - - constructor(handler) { - this.handler = handler; - } - - async runHttp(req, res, context = {}) { - const args = [req, res, context]; - return this.handler.apply(this.handler, args); - } - - run(...args) { - return new Promise((resolve, reject) => { - args.push((err, result) => { - if (err) { - return reject(err); - } - resolve(result); - }); - return this.handler(...args); - }); - } -} - -function test(handler) { - return new Tester(handler); -} - -function makeRequest(opts) { - const ee: any = new events.EventEmitter(); - - ee.path = '/'; - ee.method = 'POST'; - ee.queries = {}; - ee.headers = {}; - - return Object.assign(ee, opts); -} - -function send(request: events.EventEmitter, data: string) { - process.nextTick(() => { - request.emit('data', Buffer.from(data)); - request.emit('end'); - }); -} - -describe('/test/index.test.ts', () => { - - afterEach(() => { - jest.restoreAllMocks() - }); - - describe('wrapper normal event', () => { - it('should wrap in init function', async () => { - const handle = asyncWrapper(async context => { - return context.data; - }); - const res: any = await test(handle).run({ data: 1 }); - assert.equal(res, 1); - }); - - it('should wrap with event and context', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return event.data; - })(...args); - }); - const res: any = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 1); - }); - - it('should wrap with event and throw error', async () => { - const runtime = await start({}); - - let err; - - try { - await runtime.asyncEvent(async (ctx, event) => { - throw new Error('abc'); - })(); - } catch (error) { - err = error; - } - expect(err.message).toEqual('Internal Server Error'); - }); - - it('should wrap with event and throw real error with env', async () => { - process.env.SERVERLESS_OUTPUT_ERROR_STACK = 'true'; - const runtime = await start({}); - - let err; - - try { - await runtime.asyncEvent(async (ctx, event) => { - throw new Error('abc'); - })(); - } catch (error) { - err = error; - } - expect(err.message).toEqual('abc'); - process.env.SERVERLESS_OUTPUT_ERROR_STACK = ''; - }); - }); - - describe('wrapper web event fc', () => { - it('should ok with plain text', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = 'hello world!'; - })(...args); - }); - const res: any = await test(handle).runHttp('', ''); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'text/plain; charset=utf-8'); - assert.equal(res.body, 'hello world!'); - }); - - it('should ok with json', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp('', ''); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with raw json', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = '{"ok":true}'; - })(...args); - }); - const res = await test(handle).runHttp('', ''); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with raw json/object', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp('', ''); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with Buffer', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = Buffer.from('hello world!'); - })(...args); - }); - const res = await test(handle).runHttp('', ''); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'application/octet-stream'); - assert.equal(res.body, Buffer.from('hello world!').toString('base64')); - }); - - it('should ok with context', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = ctx.query.requestId; - })(...args); - }); - const res = await test(handle).runHttp( - { - queries: { - requestId: 'requestId', - }, - }, - {} - ); - assert.equal(res.statusCode, 200); - assert.equal(res.body, 'requestId'); - }); - - it('should ok with error', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('oops'); - })(...args); - }); - const result = await test(handle).runHttp('', ''); - assert.deepStrictEqual(result, { - isBase64Encoded: false, - statusCode: 500, - headers: {}, - body: 'Internal Server Error', - }); - }); - - it('should ok with non-async function', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - let err; - try { - await test(handle).runHttp('', ''); - } catch (ex) { - err = ex; - } - assert.ok(err); - assert.equal(err.message, 'Must be an AsyncFunction'); - }); - - it('should ok with asyncWrap', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return 'hello world!'; - })(...args); - }); - const res = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 'hello world!'); - }); - - it('should ok with asyncWrap when error', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('ooops!'); - })(...args); - }); - let err; - try { - await test(handle).run('', ''); - } catch (ex) { - err = ex; - } - - assert.ok(err); - assert.equal(err.message, 'Internal Server Error'); - }); - - it('should ok with asyncWrap when not async functions', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - let err; - try { - await test(handle).run('', ''); - } catch (ex) { - err = ex; - } - - assert.ok(err); - assert.equal(err.message, 'Must be an AsyncFunction'); - }); - - it('GET should ok', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - method: 'GET', - headers: {}, - queries: q, - body: '', - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(JSON.stringify(event), {}); - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - it('GET should ok', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - // ctx.req.body; // second access - ctx.get('content-type'); - ctx.set('content-type', 'application/json'); - ctx.status = 200; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - method: 'GET', - headers: { 'content-type': 'text/plain' }, - queries: q, - body: Buffer.from('hello world').toString('base64'), - isBase64Encoded: true, - }; - const data = await test(handle).runHttp(JSON.stringify(event), {}); - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - xit('GET should use faas parameters to appoint parameter', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - ctx.body = user + ' hello'; - })(...args); - }); - const event = { - path: '/', - method: 'GET', - headers: { 'content-type': 'text/plain' }, - queries: { - FAAS_ARGS: ['harry'], - }, - }; - const data = await test(handle).runHttp(JSON.stringify(event), {}); - assert(data.body === 'harry hello'); - }); - - xit('GET should get text if return data', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - return 'hello world ' + user; - })(...args); - }); - const event = { - path: '/', - method: 'GET', - headers: { 'content-type': 'text/plain' }, - queries: { - FAAS_ARGS: ['harry'], - }, - }; - const data = await test(handle).runHttp(JSON.stringify(event), {}); - assert(data.body === 'hello world harry'); - }); - - xit('GET should get params in post method', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, user) => { - return 'hello world ' + user; - })(...args); - }); - const event = { - path: '/', - method: 'POST', - headers: { 'content-type': 'text/plain' }, - queries: {}, - body: { - FAAS_ARGS: ['harry'], - }, - }; - const data = await test(handle).runHttp(JSON.stringify(event), {}); - assert(data.body === 'hello world harry'); - }); - - it('should ok with asyncWrap use appoint args in event', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, name) => { - return 'hello world!' + name; - })(...args); - }); - const res = await test(handle).run( - { - FAAS_ARGS: ['harry'], - }, - '' - ); - assert.equal(res, 'hello world!harry'); - }); - - it('POST should ok use fc request with body', async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return ctx.request.body.toString(); - })(...args); - }); - const req = makeRequest({ - method: 'POST', - }); - const postData = JSON.stringify({ name: 'fc request' }); - send(req, postData); - const data = await test(handle).runHttp(req, {}); - assert.equal(data.body, postData); - }); - }); - - describe('should test with runtime-mock', () => { - it('should invoke normal code', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const result = await runtime.invoke( - new HTTPTrigger({ - path: '/help', - method: 'GET', - }) - ); - assert.equal(result.body, 'Alan|b1c5100f-819d-c421-3a5e-7782a27d8a33'); - await runtime.close(); - }); - - it('should invoke 302', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http-302'), - }); - await runtime.start(); - const result = await runtime.invoke( - new HTTPTrigger({ - path: '/help', - method: 'GET', - }) - ); - await runtime.close(); - assert.equal(result.statusCode, 302); - assert.equal( - result.headers.location, - 'https://github.com/midwayjs/midway' - ); - }); - - it('should invoke normal code', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http-json'), - }); - await runtime.start(); - const result = await runtime.invoke( - new HTTPTrigger({ - path: '/help', - method: 'GET', - }) - ); - assert.equal( - result.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(result.body, '{"name":"Alan"}'); - await runtime.close(); - }); - - it('should invoke with api gateway', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/apigw'), - }); - await runtime.start(); - const result = await runtime.invoke( - new ApiGatewayTrigger({ - headers: { - 'Content-Type': 'text/json', - }, - method: 'POST', - query: { - q: 'testq', - }, - pathParameters: { - id: 'id', - }, - path: '/test', - body: { - name: 'test', - }, - }) - ); - assert(result.isBase64Encoded === false); - assert(result.statusCode === 200); - assert(result.headers); - assert(result.headers['set-cookie'] === 'bbbb=123; path=/; httponly'); - result.headers; - assert.equal(typeof result.body, 'string'); - const body = JSON.parse(result.body); - assert.equal(body.method, 'POST'); - assert.equal(body.path, '/test'); - assert.equal(body.body.name, 'test'); - assert.equal(body.params.id, 'id'); - await runtime.close(); - }); - }); - - describe('test new property', () => { - - it('should get app', async () => { - const runtime = await start(); - const app = runtime.getApplication(); - expect(app.use).toBeDefined(); - }); - - it('should get function name and service name from init context', async () => { - const runtime = await start({ - initContext:{ - function: { - "name": "fc-tmallvtop", - "handler": "tmallvtop.handler", - "initializer": "tmallvtop.initializer", - "initializationTimeout": 3 - }, - service: {"name": "fc-rank-v-ald-pre", "versionId": "1"} - } - }); - expect(runtime.getFunctionName()).toEqual('fc-tmallvtop'); - expect(runtime.getFunctionServiceName()).toEqual('fc-rank-v-ald-pre'); - }); - - it('should get function name when empty and set environment', async () => { - mm(process.env, 'MIDWAY_SERVERLESS_FUNCTION_NAME', 'aaa'); - mm(process.env, 'MIDWAY_SERVERLESS_SERVICE_NAME', 'bbb'); - const runtime = await start(); - expect(runtime.getFunctionName()).toEqual('aaa'); - expect(runtime.getFunctionServiceName()).toEqual('bbb'); - mm.restore(); - }); - }) -}); diff --git a/packages-legacy/serverless-fc-starter/tsconfig.json b/packages-legacy/serverless-fc-starter/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-fc-starter/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-fc-trigger/CHANGELOG.md b/packages-legacy/serverless-fc-trigger/CHANGELOG.md deleted file mode 100644 index 37e30cf4fb12..000000000000 --- a/packages-legacy/serverless-fc-trigger/CHANGELOG.md +++ /dev/null @@ -1,874 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency express to v4.18.2 ([#2413](https://github.com/midwayjs/midway/issues/2413)) ([ace153b](https://github.com/midwayjs/midway/commit/ace153b796a8b962d307ee1568634869f727431a)) -- **deps:** update dependency supertest to v6.3.0 ([#2435](https://github.com/midwayjs/midway/issues/2435)) ([6342e1d](https://github.com/midwayjs/midway/commit/6342e1d2a5301f3bd512d7c58b90482bca390898)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.20.1 ([#2355](https://github.com/midwayjs/midway/issues/2355)) ([4cf6bda](https://github.com/midwayjs/midway/commit/4cf6bdaa8b10b4ae40598305e1df9ad29dd701ed)) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.19.2 ([#1708](https://github.com/midwayjs/midway/issues/1708)) ([01626e8](https://github.com/midwayjs/midway/commit/01626e882710108cc9bede8c6f2adcfd142f72f0)) -- **deps:** update dependency express to v4.17.3 ([#1713](https://github.com/midwayjs/midway/issues/1713)) ([c781eca](https://github.com/midwayjs/midway/commit/c781eca27586b1d07cf672e71776ad9a521e149f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.2 ([#1599](https://github.com/midwayjs/midway/issues/1599)) ([982d888](https://github.com/midwayjs/midway/commit/982d88816e90e43785f4c429608ce8eafed4da81)) - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.1 ([#1561](https://github.com/midwayjs/midway/issues/1561)) ([0bcde23](https://github.com/midwayjs/midway/commit/0bcde231d562d2daedcbefcdaaa8ddcf5bb9ad58)) - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.0 ([#1555](https://github.com/midwayjs/midway/issues/1555)) ([4ff0e03](https://github.com/midwayjs/midway/commit/4ff0e03e833825b7a79c530665b4ab27b5d25294)) - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -### Bug Fixes - -- serverless event test ([#967](https://github.com/midwayjs/midway-faas/issues/967)) ([e0c15e3](https://github.com/midwayjs/midway-faas/commit/e0c15e316c2813fd574f38bdf6a16a339bfede18)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.2.4](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.3...serverless-v1.2.4) (2020-08-19) - -### Bug Fixes - -- curl in windows ([#609](https://github.com/midwayjs/midway-faas/issues/609)) ([efad770](https://github.com/midwayjs/midway-faas/commit/efad7703a4628b0bc7c805ae519425ca0881de10)) - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix fc http trigger header ([3e80468](https://github.com/midwayjs/midway-faas/commit/3e80468833072649d35a4222963b1653e9bf9558)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix fc http trigger header ([3e80468](https://github.com/midwayjs/midway-faas/commit/3e80468833072649d35a4222963b1653e9bf9558)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- egg-layer test case ([060cdab](https://github.com/midwayjs/midway-faas/commit/060cdab4b18592eae63ca4e598f35cff0f4dde4c)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix fc http trigger header ([3e80468](https://github.com/midwayjs/midway-faas/commit/3e80468833072649d35a4222963b1653e9bf9558)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -## [0.3.7](https://github.com/midwayjs/midway-faas/compare/v0.3.6...v0.3.7) (2020-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.3.5](https://github.com/midwayjs/midway-faas/compare/v0.3.4...v0.3.5) (2020-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.3.2](https://github.com/midwayjs/midway-faas/compare/v0.3.1...v0.3.2) (2020-06-12) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.3.1](https://github.com/midwayjs/midway-faas/compare/v0.3.0...v0.3.1) (2020-05-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.99](https://github.com/midwayjs/midway-faas/compare/v0.2.98...v0.2.99) (2020-05-21) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.93](https://github.com/midwayjs/midway-faas/compare/v0.2.92...v0.2.93) (2020-05-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.92](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92) (2020-05-05) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix fc http trigger header ([3e80468](https://github.com/midwayjs/midway-faas/commit/3e80468833072649d35a4222963b1653e9bf9558)) - -## [0.2.92-beta.1](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92-beta.1) (2020-05-04) - -### Bug Fixes - -- fix error control in fc ([fd99384](https://github.com/midwayjs/midway-faas/commit/fd99384375b038d8f4c9767a9e5730923bbf6dda)) -- fix fc http trigger header ([3e80468](https://github.com/midwayjs/midway-faas/commit/3e80468833072649d35a4222963b1653e9bf9558)) - -## [0.2.90](https://github.com/midwayjs/midway-faas/compare/v0.2.89...v0.2.90) (2020-04-29) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.86](https://github.com/midwayjs/midway-faas/compare/v0.2.85...v0.2.86) (2020-04-24) - -### Bug Fixes - -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) - -## [0.2.85](https://github.com/midwayjs/midway-faas/compare/v0.2.84...v0.2.85) (2020-04-23) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.81](https://github.com/midwayjs/midway-faas/compare/v0.2.80...v0.2.81) (2020-04-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.78](https://github.com/midwayjs/midway-faas/compare/v0.2.77...v0.2.78) (2020-04-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.77](https://github.com/midwayjs/midway-faas/compare/v0.2.76...v0.2.77) (2020-04-18) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -### Bug Fixes - -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -### Bug Fixes - -- support apigw ([2321c08](https://github.com/midwayjs/midway-faas/commit/2321c08be4ed7a076aa6004df95a64f04db0ee6d)) - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -### Bug Fixes - -- support apigw ([abfc27a](https://github.com/midwayjs/midway-faas/commit/abfc27a93ae1b335bcb040679bbb5d39f71f5c9e)) - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.73-alpha.0](https://github.com/midwayjs/midway-faas/compare/v0.2.72...v0.2.73-alpha.0) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.10](https://github.com/midwayjs/midway-faas/compare/v0.2.9...v0.2.10) (2020-01-16) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.2.4](https://github.com/midwayjs/midway-faas/compare/v0.2.3...v0.2.4) (2020-01-09) - -### Features - -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-fc-trigger diff --git a/packages-legacy/serverless-fc-trigger/jest.config.js b/packages-legacy/serverless-fc-trigger/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-fc-trigger/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-fc-trigger/jest.setup.js b/packages-legacy/serverless-fc-trigger/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-fc-trigger/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-fc-trigger/package.json b/packages-legacy/serverless-fc-trigger/package.json deleted file mode 100644 index 87c8b40d94e1..000000000000 --- a/packages-legacy/serverless-fc-trigger/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@midwayjs/serverless-fc-trigger", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/faas-typings": "^3.10.13", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "body-parser": "1.20.3", - "express": "4.20.0" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "supertest": "6.3.3" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-fc-trigger/src/apiGateway.ts b/packages-legacy/serverless-fc-trigger/src/apiGateway.ts deleted file mode 100644 index 328d494ee09c..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/apiGateway.ts +++ /dev/null @@ -1,74 +0,0 @@ -import * as express from 'express'; -import { FCBaseTrigger } from './base'; -import * as expressBodyParser from 'body-parser'; - -/** - * https://help.aliyun.com/document_detail/54788.html - */ -export class ApiGatewayTrigger extends FCBaseTrigger { - handler; - app: express.Application; - - async delegate(invokeWrapper: (invokeArgs: any[]) => any) { - if (!this.app) { - this.app = express(); - this.app.use(expressBodyParser.urlencoded({ extended: false })); - this.app.use(expressBodyParser.json()); - this.app.all('*', (req, res, next) => { - const event = Buffer.from( - JSON.stringify( - Object.assign({ - path: req.path, - httpMethod: req.method, - headers: req.headers, - queryParameters: req.query, - pathParameters: {}, - body: JSON.stringify(req.body), - isBase64Encoded: false, - }) - ) - ); - invokeWrapper([event, this.createContext()]).then( - (result: { - isBase64Encoded: boolean; - statusCode: number; - headers: any; - body: any; - }) => { - res.set(result.headers); - res.status(result.statusCode); - if (result.isBase64Encoded) { - res.send(Buffer.from(result.body, 'base64')); - } else { - res.send(result.body); - } - } - ); - }); - } - return this.app; - } - - async toArgs(): Promise { - const event = Buffer.from( - JSON.stringify( - Object.assign({ - path: this.triggerOptions.path || 'api request path', - httpMethod: this.triggerOptions.method || 'request method name', - headers: Object.assign( - { 'X-Ca-Timestamp': Date.now() }, - this.triggerOptions.headers - ), - queryParameters: this.triggerOptions.query || {}, - pathParameters: this.triggerOptions.pathParameters || {}, - body: this.triggerOptions.body || '', - isBase64Encoded: false, - }) - ) - ); - - return [event, this.createContext()]; - } -} - -export const apigw = ApiGatewayTrigger; diff --git a/packages-legacy/serverless-fc-trigger/src/base.ts b/packages-legacy/serverless-fc-trigger/src/base.ts deleted file mode 100644 index aba248346044..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/base.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { BaseTrigger } from '@midwayjs/runtime-mock'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; - -export class FCBaseTrigger extends BaseTrigger { - useCallback = true; - triggerOptions: any; - - constructor(triggerOptions = {}) { - super(); - this.triggerOptions = triggerOptions; - } - - createContext() { - return { - requestId: 'b1c5100f-819d-c421-3a5e-7782a27d8a33', - credentials: { - accessKeyId: 'STS.access_key_id', - accessKeySecret: 'access_key_secret', - securityToken: 'security_token', - }, - function: { - name: 'my-func', - handler: 'index.handler', - memory: 128, - timeout: 10, - initializer: 'index.initializer', - initializationTimeout: 10, - }, - service: { - name: 'my-service', - logProject: 'my-log-project', - logStore: 'my-log-store', - qualifier: 'qualifier', - versionId: '1', - }, - region: 'cn-shanghai', - accountId: '123456', - }; - } - - getEvent() { - return this.triggerOptions; - } -} - -export const event = FCBaseTrigger; -export const createInitializeContext = ( - ctx: any = {} -): FC.InitializeContext => { - return extend(true, new FCBaseTrigger().createContext(), ctx); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/cdn.ts b/packages-legacy/serverless-fc-trigger/src/cdn.ts deleted file mode 100644 index c299bb958762..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/cdn.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/62922.html - */ -export class CDNTrigger extends FCBaseTrigger { - getEvent() { - return { - events: [ - { - eventName: 'LogFileCreated', - eventSource: 'cdn', - region: 'cn-hangzhou', - eventVersion: '1.0.0', - eventTime: 'xxxxx', - userIdentity: { - aliUid: '1xxxxxxxxxxxx', - }, - resource: { - domain: 'example.com', - }, - eventParameter: { - domain: 'example.com', - endTime: 1000000, - fileSize: 1788115, - filePath: - 'http://cdnlog.cn-hangzhou.oss.aliyun-inc.com/xxx/xxx/xxx.gz?OSSAccessKeyId=xxxx&Expires=xxxx&Signature=xxxx', - startTime: 11000000, - }, - traceId: 'xxxxxx', - }, - ], - }; - } -} - -export const cdn = CDNTrigger; -export const createCDNEvent = (data: any = {}): FC.CDNEvent => { - return extend(true, new CDNTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/http.ts b/packages-legacy/serverless-fc-trigger/src/http.ts deleted file mode 100644 index b9ca85316191..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/http.ts +++ /dev/null @@ -1,197 +0,0 @@ -import * as express from 'express'; -import * as HTTP from 'http'; -import { FCBaseTrigger } from './base'; -import * as expressBodyParser from 'body-parser'; - -interface HTTPTriggerOpts { - path: string; - method: string; - headers?: { [key: string]: any }; - query?: { [key: string]: any }; - body?: { [key: string]: any } | Buffer; -} - -export class HTTPTrigger extends FCBaseTrigger { - httpServer; - app: express.Application; - opts: HTTPTriggerOpts; - handler: (err, result) => void; - - constructor(options?: HTTPTriggerOpts) { - super(); - this.opts = options; - } - - async delegate(invokeWrapper: (invokeArgs: any[]) => any) { - if (!this.app) { - this.app = express(); - this.app.use(expressBodyParser.urlencoded({ extended: false })); - this.app.use(expressBodyParser.json()); - this.app.all('*', (req, res, next) => { - /** - * function(request, response, context) - */ - invokeWrapper([req, res, this.createContext()]).then(() => { - next(); - }); - }); - } - return this.app; - } - - async toArgs(): Promise { - return new Promise((resolve, reject) => { - if (!this.httpServer) { - const app = express(); - this.httpServer = HTTP.createServer(app); - - app.get('*', (req, res, next) => { - /** - * function(request, response, context) - */ - const resp = new Response(this, res); - resolve([ - new Proxy(req, { - get: (target, key) => { - if (key === 'queries') { - key = 'query'; - } - if (key in this.opts) { - return this.opts[key]; - } - return target[key]; - }, - }), - resp, - this.createContext(), - ]); - }); - } - - this.httpServer.listen(0, err => { - if (err) { - reject(err); - } else { - const options = { - port: this.httpServer.address().port, - host: '127.0.0.1', - method: 'GET', - }; - - const req = HTTP.request(options); - req.end(); - } - }); - }); - } - - createCallback(handler) { - this.handler = handler; - return err => { - if (err) { - throw err; - } - }; - } - - async close(): Promise { - return new Promise((resolve, reject) => { - if (this.httpServer) { - this.httpServer.close(err => { - if (err) { - reject(err); - } - resolve(); - }); - } else { - resolve(); - } - }); - } -} - -class Response { - statusCode: number; - _headers; - typeSetted; - body; - _res; - trigger; - _headersSent: boolean; - - constructor(trigger: HTTPTrigger, res) { - this.trigger = trigger; - this._res = res; - - this.statusCode = 200; - this._headers = { - 'content-type': 'application/json; charset=utf-8', - }; - this.typeSetted = false; - this.body = null; - } - - get headers() { - return this._headers; - } - - set headers(json) { - const keys = Object.keys(json); - const map = {}; - for (const key of keys) { - const item = json[key]; - if (Array.isArray(item)) { - map[key] = item; - } else { - map[key] = [item]; - } - } - this._headers = map; - } - - setHeader(key, value) { - this._headers[key] = value; - } - - send(data) { - if (this._headersSent) { - throw new Error('can not send multi times'); - } - this.body = data; - this._headersSent = true; - this.trigger.handler(null, this.toJSON()); - this._res.end(); - } - - setStatusCode(statusCode) { - this.statusCode = statusCode; - } - - end(data) { - this.send(data); - } - - toJSON() { - const headers = this.headers; - let isBase64Encoded = false; - let body; - if (typeof this.body === 'string') { - body = this.body; - } else if (Buffer.isBuffer(this.body)) { - body = this.body.toString('base64'); - isBase64Encoded = true; - } else { - body = JSON.stringify(this.body); - } - - // Orignal data - return { - headers, - statusCode: this.statusCode, - body, - isBase64Encoded, - }; - } -} - -export const http = HTTPTrigger; diff --git a/packages-legacy/serverless-fc-trigger/src/index.ts b/packages-legacy/serverless-fc-trigger/src/index.ts deleted file mode 100644 index 44be81974cf3..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './interface'; -export * from './http'; -export * from './apiGateway'; -export * from './oss'; -export * from './sls'; -export * from './cdn'; -export * from './timer'; -export * from './base'; diff --git a/packages-legacy/serverless-fc-trigger/src/interface.ts b/packages-legacy/serverless-fc-trigger/src/interface.ts deleted file mode 100644 index f0405d2a2ec2..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/interface.ts +++ /dev/null @@ -1,194 +0,0 @@ -import * as stream from 'stream'; - -/** - * context - */ -export interface FCOriginContext { - requestId: string; - credentials: { - accessKeyId: string; - accessKeySecret: string; - securityToken: string; - }; - function: { - name: string; - handler: string; - memory: number; - timeout: number; - initializer: string; - initializationTimeout: number; - }; - service: { - name: string; - logProject: string; - logStore: string; - qualifier: string; - versionId: string; - }; - region: string; - accountId: string; -} - -/** - * HTTP Trigger - */ -export interface FCOriginHTTPRequest { - headers: object; - path: string; - queries: object; - method: string; - clientIP: string; - url: string; -} - -export interface FCOriginHTTPResponse { - setStatusCode(statusCode: number); - - setHeader(headerKey: string, headerValue: string); - - deleteHeader(headerKey: string); - - send(body: string | Buffer | stream.Readable); -} - -/** - * API Gateway - */ -export interface FCOriginApiGatewayEvent { - path: string; - httpMethod: string; - headers: object; - queryParameters: object; - pathParameters: object; - body: string; - isBase64Encoded: 'false' | 'true'; -} - -export interface FCOriginApiGatewayResponse { - isBase64Encoded: boolean; - statusCode: number; - headers: object; - body: string; -} - -/** - * OSS - */ -export interface FCOriginInnerOSSEvent { - eventName: string; - eventSource: string; - eventTime: string; - eventVersion: string; - oss: { - bucket: { - arn: string; - name: string; - ownerIdentity: string; - virtualBucket: string; - }; - object: { - deltaSize: number; - eTag: string; - key: string; - size: number; - }; - ossSchemaVersion: string; - ruleId: string; - }; - region: string; - requestParameters: { - sourceIPAddress: string; - }; - responseElements: { - requestId: string; - }; - userIdentity: { - principalId: string; - }; -} - -export interface FCOriginOSSEvent { - events: FCOriginInnerOSSEvent[]; -} - -/** - * Timer - */ -export interface FCOriginTimerEvent { - triggerTime: string; - triggerName: string; - payload: any; -} - -/** - * SLS - */ -export interface FCOriginSLSEvent { - parameter: object; - source: { - endpoint: string; - projectName: string; - logstoreName: string; - shardId: number; - beginCursor: string; - endCursor: string; - }; - jobName: string; - taskId: string; - cursorTime: number; -} - -/** - * CDN - */ -export type FCOriginInnerCDNEvent = - | FCOriginInnerCDNCachedObjectsRefreshedEvent - | FCOriginInnerCDNCachedObjectsPushedEvent - | FCOriginInnerCDNCachedObjectsBlockedEvent - | FCOriginInnerCDNLogFileCreatedEvent; - -export interface FCOriginInnerCDNBaseEvent { - eventName: string; // 事件类型 - eventVersion: string; // 事件版本，目前都是1.0.0版本 - eventSource: string; // 事件源名称 - region: string; // 区域，默认为"cn-hangzhou" - eventTime: string; // 事件发生时间 - traceId: string; // 事件源传递过来的id, 用于排查问题 - resource: { - domain: string; // 资源所在的域名 - }; - userIdentity: { - aliUid: string; // 用户ID - }; -} - -export interface FCOriginInnerCDNCachedObjectsRefreshedEvent - extends FCOriginInnerCDNBaseEvent { - eventParameter: { - objectPath: string[]; - createTime: number; // 刷新开始时间 - domain: string; // 资源所在的域名 - completeTime: number; // 刷新结束时间 - objectType: string; // 刷新类型，取值为File，Directory - taskId: number; // 资源刷新任务ID - }; -} - -export type FCOriginInnerCDNCachedObjectsPushedEvent = FCOriginInnerCDNCachedObjectsRefreshedEvent; - -export type FCOriginInnerCDNCachedObjectsBlockedEvent = FCOriginInnerCDNCachedObjectsRefreshedEvent; - -export interface FCOriginInnerCDNLogFileCreatedEvent - extends FCOriginInnerCDNBaseEvent { - eventParameter: { - domain: number; // 域名 - endTime: number; // 日志文件的结束时间 - fileSize: number; // 日志文件大小 - filePath: number; // 日志文件地址 - startTime: number; // 日志文件的起始时间 - }; -} - -export interface FCOriginCDNEvent { - events: FCOriginInnerCDNEvent[]; -} diff --git a/packages-legacy/serverless-fc-trigger/src/mns.ts b/packages-legacy/serverless-fc-trigger/src/mns.ts deleted file mode 100644 index 59f9d0337f95..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/mns.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/100092.html - */ -export class MNSTrigger extends FCBaseTrigger { - getEvent() { - return { - Context: 'user custom info', - TopicOwner: '1186202104331798', - Message: 'hello topic', - Subscriber: '1186202104331798', - PublishTime: 1550216302888, - SubscriptionName: 'test-fc-subscibe', - MessageMD5: 'BA4BA9B48AC81F0F9C66F6C909C39DBB', - TopicName: 'test-topic', - MessageId: '2F5B3C281B283D4EAC694B7425288675', - }; - } -} - -export const mq = MNSTrigger; -export const createMNSEvent = (data: any = {}): FC.MNSEvent => { - return extend(true, new MNSTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/oss.ts b/packages-legacy/serverless-fc-trigger/src/oss.ts deleted file mode 100644 index 1664fa04cc29..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/oss.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/62922.html - */ -export class OSSTrigger extends FCBaseTrigger { - getEvent() { - return { - events: [ - { - eventName: 'ObjectCreated:PutObject', - eventSource: 'acs:oss', - eventTime: '2017-04-21T12:46:37.000Z', - eventVersion: '1.0', - oss: { - bucket: { - arn: 'acs:oss:cn-shanghai:123456789:bucketname', - name: 'testbucket', - ownerIdentity: '123456789', - virtualBucket: '', - }, - object: { - deltaSize: 122539, - eTag: '688A7BF4F233DC9C88A80BF985AB7329', - key: 'image/a.jpg', - size: 122539, - }, - ossSchemaVersion: '1.0', - ruleId: '9adac8e253828f4f7c0466d941fa3db81161e853', - }, - region: 'cn-shanghai', - requestParameters: { - sourceIPAddress: '140.205.128.221', - }, - responseElements: { - requestId: '58F9FF2D3DF792092E12044C', - }, - userIdentity: { - principalId: '123456789', - }, - }, - ], - }; - } -} - -export const oss = OSSTrigger; -export const os = OSSTrigger; -export const cos = OSSTrigger; - -export const createOSSEvent = (data: any = {}): FC.OSSEvent => { - return extend(true, new OSSTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/sls.ts b/packages-legacy/serverless-fc-trigger/src/sls.ts deleted file mode 100644 index f08bfd56d06f..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/sls.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/84092.html - */ -export class SLSTrigger extends FCBaseTrigger { - getEvent() { - return { - parameter: {}, - source: { - endpoint: 'http://cn-shanghai-intranet.log.aliyuncs.com', - projectName: 'log-com', - logstoreName: 'log-en', - shardId: 0, - beginCursor: 'MTUyOTQ4MDIwOTY1NTk3ODQ2Mw==', - endCursor: 'MTUyOTQ4MDIwOTY1NTk3ODQ2NA==', - }, - jobName: '1f7043ced683de1a4e3d8d70b5a412843d817a39', - taskId: 'c2691505-38da-4d1b-998a-f1d4bb8c9994', - cursorTime: 1529486425, - }; - } -} - -export const sls = SLSTrigger; -export const createSLSEvent = (data: any = {}): FC.SLSEvent => { - return extend(true, new SLSTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/tableStore.ts b/packages-legacy/serverless-fc-trigger/src/tableStore.ts deleted file mode 100644 index 31847d51e933..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/tableStore.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/100092.html - */ -export class TableStoreTrigger extends FCBaseTrigger { - getEvent() { - return { - Version: 'string', - Records: [ - { - Type: 'string', - Info: { - Timestamp: Date.now(), - }, - PrimaryKey: [ - { - ColumnName: 'string', - Value: 'new event', - }, - ], - Columns: [ - { - Type: 'string', - ColumnName: 'string', - Value: 'new event', - Timestamp: Date.now(), - }, - ], - }, - ], - }; - } -} - -export const tableStore = TableStoreTrigger; -export const createTableStoreEvent = (data: any = {}): FC.TableStoreEvent => { - return extend(true, new TableStoreTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/src/timer.ts b/packages-legacy/serverless-fc-trigger/src/timer.ts deleted file mode 100644 index e84959cf1849..000000000000 --- a/packages-legacy/serverless-fc-trigger/src/timer.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { FCBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { FC } from '@midwayjs/faas-typings'; -/** - * https://help.aliyun.com/document_detail/62922.html - */ -export class TimerTrigger extends FCBaseTrigger { - getEvent() { - return { - triggerTime: new Date().toJSON(), - triggerName: 'timer', - payload: '', - }; - } -} -export const timer = TimerTrigger; -export const createTimerEvent = (data: any = {}): FC.TimerEvent => { - const result = {}; - return extend(true, result, new TimerTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/apiGateway/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/apiGateway/index.ts deleted file mode 100644 index 1d33fb224895..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/apiGateway/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, { - isBase64Encoded: false, - statusCode: 200, - headers: {}, - body: 'hello Alan' - }); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/cdn/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/cdn/index.ts deleted file mode 100644 index 33ecab036c7f..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/cdn/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/event/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/event/index.ts deleted file mode 100644 index 33ecab036c7f..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/event/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/http/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/http/index.ts deleted file mode 100644 index 5f2fbd069ae9..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/http/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (req, res, context) => { - res.send('hello Alan'); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/oss/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/oss/index.ts deleted file mode 100644 index 33ecab036c7f..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/oss/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/sls/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/sls/index.ts deleted file mode 100644 index 33ecab036c7f..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/sls/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/fixtures/timer/index.ts b/packages-legacy/serverless-fc-trigger/test/fixtures/timer/index.ts deleted file mode 100644 index 33ecab036c7f..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/fixtures/timer/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { asyncWrapper, start } from '@midwayjs/serverless-fc-starter'; - -exports.init = asyncWrapper(async () => { - await start(); -}); - -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-fc-trigger/test/index.test.ts b/packages-legacy/serverless-fc-trigger/test/index.test.ts deleted file mode 100644 index 6ac1c38049f5..000000000000 --- a/packages-legacy/serverless-fc-trigger/test/index.test.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { createRuntime } from '@midwayjs/runtime-mock'; -import { join } from 'path'; -import { - ApiGatewayTrigger, - CDNTrigger, - HTTPTrigger, - OSSTrigger, - SLSTrigger, - TimerTrigger, - FCBaseTrigger, -} from '../src'; -import * as assert from 'assert'; -import * as request from 'supertest'; - -describe('/test/index.test.ts', () => { - it('should use event', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/event'), - }); - await runtime.start(); - const result = await runtime.invoke( - new FCBaseTrigger({ - bbb: 111, - }) - ); - expect(result).toEqual({ bbb: 111 }); - await runtime.close(); - }); - - it('should use origin http trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const result = await runtime.invoke( - new HTTPTrigger({ - path: '/help', - method: 'GET', - }) - ); - assert.equal(result.body, 'hello Alan'); - await runtime.close(); - }); - - describe('should test http trigger use app directly', () => { - let app; - let runtime; - beforeAll(async () => { - runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - beforeAll(() => runtime.close()); - - it('should test with supertest', done => { - request(app) - .get('/user') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/hello Alan/) - .expect(200, done); - }); - }); - - it('should use origin api gateway', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/apiGateway'), - }); - await runtime.start(); - const result = await runtime.invoke( - new ApiGatewayTrigger({ - headers: { - 'Content-Type': 'text/json', - }, - method: 'POST', - query: { - q: 'testq', - }, - pathParameters: { - id: 'id', - }, - path: '/test', - body: { - name: 'test', - }, - }) - ); - assert.equal(result.body, 'hello Alan'); - await runtime.close(); - }); - - it('should use origin oss trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/oss'), - }); - await runtime.start(); - const result = await runtime.invoke(new OSSTrigger()); - assert(result.events.length > 0); - await runtime.close(); - }); - - it('should use origin cdn trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/cdn'), - }); - await runtime.start(); - const result = await runtime.invoke(new CDNTrigger()); - assert(result.events.length > 0); - await runtime.close(); - }); - - it('should use origin sls trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/sls'), - }); - await runtime.start(); - const result = await runtime.invoke(new SLSTrigger()); - assert(result.taskId); - await runtime.close(); - }); - - it('should use origin timer trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/timer'), - }); - await runtime.start(); - const result = await runtime.invoke(new TimerTrigger()); - assert(result.triggerTime); - await runtime.close(); - }); -}); diff --git a/packages-legacy/serverless-fc-trigger/tsconfig.json b/packages-legacy/serverless-fc-trigger/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-fc-trigger/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-scf-starter/CHANGELOG.md b/packages-legacy/serverless-scf-starter/CHANGELOG.md deleted file mode 100644 index b1e982263836..000000000000 --- a/packages-legacy/serverless-scf-starter/CHANGELOG.md +++ /dev/null @@ -1,639 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -### Features - -- support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9)) - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- add log for 'Internal Server Error' ([#1282](https://github.com/midwayjs/midway/issues/1282)) ([f333466](https://github.com/midwayjs/midway/commit/f333466d138a319b417964cdb9cb065f2b955722)) - -# [3.0.0-alpha.2](https://github.com/midwayjs/midway-faas/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [3.0.0-alpha.1](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -### Bug Fixes - -- hide real error when user code throw error ([#1128](https://github.com/midwayjs/midway-faas/issues/1128)) ([e728b0b](https://github.com/midwayjs/midway-faas/commit/e728b0b80956c09cfb856ffe082f44fa29cfeb82)) - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -### Bug Fixes - -- remove zlib ([#1035](https://github.com/midwayjs/midway-faas/issues/1035)) ([cc2cd40](https://github.com/midwayjs/midway-faas/commit/cc2cd405a104b3388d93a09d981b59b472fd8ea1)) - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -### Bug Fixes - -- disable wait event loop in tencent serverless ([#1029](https://github.com/midwayjs/midway-faas/issues/1029)) ([89d5c2e](https://github.com/midwayjs/midway-faas/commit/89d5c2ec9b83f619d72b31cc003a41bc691a1f19)) -- output serverless error in some environment ([#1030](https://github.com/midwayjs/midway-faas/issues/1030)) ([b162b89](https://github.com/midwayjs/midway-faas/commit/b162b897812d1a1a5e981328fbbb43aa75eacf10)) - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -### Bug Fixes - -- http parser get body ([#837](https://github.com/midwayjs/midway-faas/issues/837)) ([9afdbbb](https://github.com/midwayjs/midway-faas/commit/9afdbbbd201834ec989f45a4d54cb26883d812e6)) - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -### Features - -- support entry file in bootstrap ([#819](https://github.com/midwayjs/midway-faas/issues/819)) ([49a5ff6](https://github.com/midwayjs/midway-faas/commit/49a5ff662134bdd42dc3a80738b44a05138f8f7c)) - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -### Features - -- add getFunctionName() and functionSerivceName() method to runtime and faas framework ([#734](https://github.com/midwayjs/midway-faas/issues/734)) ([f0bc5aa](https://github.com/midwayjs/midway-faas/commit/f0bc5aadd224e6ec85691b9c82cc7993cbc32cdb)) - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -### Bug Fixes - -- add default env for egg module ([#618](https://github.com/midwayjs/midway-faas/issues/618)) ([41272d0](https://github.com/midwayjs/midway-faas/commit/41272d02c9184cb3fc1d8b457ebac8228b16f116)) - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Bug Fixes - -- status 204 when user not set status ([#533](https://github.com/midwayjs/midway-faas/issues/533)) ([9276fe8](https://github.com/midwayjs/midway-faas/commit/9276fe846b983f4f870c2b3eb97e2c254bd5ff5a)) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -### Bug Fixes - -- status 204 when user not set status ([#533](https://github.com/midwayjs/midway-faas/issues/533)) ([9276fe8](https://github.com/midwayjs/midway-faas/commit/9276fe846b983f4f870c2b3eb97e2c254bd5ff5a)) - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## [0.3.7](https://github.com/midwayjs/midway-faas/compare/v0.3.6...v0.3.7) (2020-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.3.5](https://github.com/midwayjs/midway-faas/compare/v0.3.4...v0.3.5) (2020-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.3.2](https://github.com/midwayjs/midway-faas/compare/v0.3.1...v0.3.2) (2020-06-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.3.1](https://github.com/midwayjs/midway-faas/compare/v0.3.0...v0.3.1) (2020-05-31) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -### Features - -- support koa app create ([#173](https://github.com/midwayjs/midway-faas/issues/173)) ([c3793eb](https://github.com/midwayjs/midway-faas/commit/c3793eba182f634684fdaf147981433bb64639a1)) - -## [0.2.99](https://github.com/midwayjs/midway-faas/compare/v0.2.98...v0.2.99) (2020-05-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -### Features - -- support koa application ([#162](https://github.com/midwayjs/midway-faas/issues/162)) ([364d62b](https://github.com/midwayjs/midway-faas/commit/364d62b48242d2ee86f97f087f912e640e8ff6e7)) - -## [0.2.92](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92) (2020-05-05) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) - -## [0.2.92-beta.1](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92-beta.1) (2020-05-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.90](https://github.com/midwayjs/midway-faas/compare/v0.2.89...v0.2.90) (2020-04-29) - -### Bug Fixes - -- add origin context for normal event ([#146](https://github.com/midwayjs/midway-faas/issues/146)) ([9d5b353](https://github.com/midwayjs/midway-faas/commit/9d5b353b13e0d70cc68205d0b9626db10245c4b5)) - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.86](https://github.com/midwayjs/midway-faas/compare/v0.2.85...v0.2.86) (2020-04-24) - -### Bug Fixes - -- fix http local buffer support ([#143](https://github.com/midwayjs/midway-faas/issues/143)) ([39e0cbf](https://github.com/midwayjs/midway-faas/commit/39e0cbf30de87fbe802c3209ef73eac6cfa8c48b)) - -## [0.2.81](https://github.com/midwayjs/midway-faas/compare/v0.2.80...v0.2.81) (2020-04-22) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -### Bug Fixes - -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.2.10](https://github.com/midwayjs/midway-faas/compare/v0.2.9...v0.2.10) (2020-01-16) - -### Bug Fixes - -- refactor appregation & pass process env to invoke debug ([#24](https://github.com/midwayjs/midway-faas/issues/24)) ([f8cd981](https://github.com/midwayjs/midway-faas/commit/f8cd98118e91d3e1b15c2b37d1aaad6b15282f26)) - -## [0.2.4](https://github.com/midwayjs/midway-faas/compare/v0.2.3...v0.2.4) (2020-01-09) - -### Features - -- single process invoke and debug ([#16](https://github.com/midwayjs/midway-faas/issues/16)) ([826a8c7](https://github.com/midwayjs/midway-faas/commit/826a8c7a7a36d8ec03a84f3d29498bef58811146)) - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-starter - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -### Bug Fixes - -- aggregation custom domain configure ([5c92e5b](https://github.com/midwayjs/midway-faas/commit/5c92e5b0b9725f5507e2d692f8839b47586f71d9)) diff --git a/packages-legacy/serverless-scf-starter/README.md b/packages-legacy/serverless-scf-starter/README.md deleted file mode 100644 index eadc542f38df..000000000000 --- a/packages-legacy/serverless-scf-starter/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# Serverless SCF starter - -本模块用于包裹无法定制运行时的 FaaS 平台，比如腾讯云 SCF。 - -## 腾讯云 SCF - -```ts -import { asyncWrapper, start } from '@midwayjs/serverless-scf-starter'; - -let runtime; -export.init = asyncWrapper(async () => { - runtime = await start(); -}); - -// for web request -export.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx) { - return 'hello world'; // ctx.body = 'hello world'; - })(...args); -}); - -// for event -export.handler = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async function(ctx, event) { - return {data: 1}; - })(...args); -}); - -``` diff --git a/packages-legacy/serverless-scf-starter/jest.config.js b/packages-legacy/serverless-scf-starter/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-scf-starter/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-scf-starter/jest.setup.js b/packages-legacy/serverless-scf-starter/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-scf-starter/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-scf-starter/package.json b/packages-legacy/serverless-scf-starter/package.json deleted file mode 100644 index ccde87f7115e..000000000000 --- a/packages-legacy/serverless-scf-starter/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@midwayjs/serverless-scf-starter", - "private": true, - "version": "3.14.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/serverless-http-parser": "^3.14.0" - }, - "devDependencies": { - "@midwayjs/faas-typings": "^3.10.13" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-scf-starter/resource/event.json b/packages-legacy/serverless-scf-starter/resource/event.json deleted file mode 100644 index 0dc19ff660da..000000000000 --- a/packages-legacy/serverless-scf-starter/resource/event.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "requestContext": { - "serviceId": "service-f94sy04v", - "path": "/test/api", - "httpMethod": "POST", - "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef", - "identity": { - "secretId": "abdcdxxxxxxxsdfs" - }, - "sourceIp": "10.0.2.14", - "stage": "release" - }, - "headers": { - "Accept-Language": "en-US,en,cn", - "Accept": "text/html,application/xml,application/json", - "Host": "service-3ei3tii4-251000691.ap-guangzhou.apigateway.myqloud.com", - "User-Agent": "User Agent String" - }, - "body": "{\"test\":\"body\"}", - "pathParameters": { - "path": "value" - }, - "queryStringParameters": { - "foo": "bar" - }, - "headerParameters": { - "Refer": "10.0.2.14" - }, - "stageVariables": { - "stage": "release" - }, - "path": "/test/value", - "queryString": { - "foo": "bar", - "bob": "alice" - }, - "httpMethod": "POST" -} diff --git a/packages-legacy/serverless-scf-starter/src/index.ts b/packages-legacy/serverless-scf-starter/src/index.ts deleted file mode 100644 index 9b37403e27bc..000000000000 --- a/packages-legacy/serverless-scf-starter/src/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { BaseBootstrap } from '@midwayjs/runtime-engine'; -import { SCFRuntime } from './runtime'; - -export * from './runtime'; -export { asyncWrapper } from '@midwayjs/runtime-engine'; - -let bootstrap; - -export const start = async (options: any = {}) => { - if (!process.env.NODE_ENV) { - process.env.NODE_ENV = 'production'; - } - bootstrap = new BaseBootstrap( - Object.assign( - { - runtime: new SCFRuntime(), - }, - options - ) - ); - await bootstrap.start(); - return bootstrap.getRuntime(); -}; - -export const close = async () => { - return bootstrap.close(); -}; diff --git a/packages-legacy/serverless-scf-starter/src/runtime.ts b/packages-legacy/serverless-scf-starter/src/runtime.ts deleted file mode 100644 index 00b9bca490f9..000000000000 --- a/packages-legacy/serverless-scf-starter/src/runtime.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { ServerlessLightRuntime } from '@midwayjs/runtime-engine'; -import { SCF } from '@midwayjs/faas-typings'; -import { - Application, - HTTPRequest, - HTTPResponse, -} from '@midwayjs/serverless-http-parser'; - -const isOutputError = () => { - return ( - process.env.SERVERLESS_OUTPUT_ERROR_STACK === 'true' || - ['local', 'development'].includes(process.env.MIDWAY_SERVER_ENV) || - ['local', 'development'].includes(process.env.NODE_ENV) - ); -}; - -export class SCFRuntime extends ServerlessLightRuntime { - app; - respond; - - async init(): Promise { - this.app = new Application(); - } - - /** - * for handler wrapper - * @param handler - */ - asyncEvent(handler) { - return (event = {}, context = {} as SCF.RequestContext) => { - if (isHttpEvent(event)) { - return this.wrapperWebInvoker(handler, event, context); - } - return this.wrapperEventInvoker(handler, event, context); - }; - } - - async wrapperWebInvoker( - handler, - event: SCF.APIGatewayEvent, - context: SCF.RequestContext - ) { - if (!this.respond) { - this.respond = this.app.callback(); - } - - const newReq = new HTTPRequest(event, context); - const newRes = new HTTPResponse(); - - return this.respond.apply(this.respond, [ - newReq, - newRes, - ctx => { - return this.invokeHandlerWrapper(ctx, async () => { - if (!handler) { - return this.defaultInvokeHandler.apply(this, [ctx, event]); - } - return handler.apply(handler, [ctx, event]); - }) - .then(result => { - let encoded = false; - if (result) { - ctx.body = result; - } - - if (!ctx.response._explicitStatus) { - if (ctx.body === null || ctx.body === undefined) { - ctx.body = ''; - ctx.type = 'text'; - ctx.status = 204; - } - } - - const setContentType = (type: string) => { - if (!ctx.type) { - ctx.type = type; - } - }; - - if (typeof ctx.body === 'string') { - setContentType('text/plain'); - } - - if (Buffer.isBuffer(ctx.body)) { - encoded = true; - setContentType('application/octet-stream'); - ctx.body = ctx.body.toString('base64'); - } else if (typeof ctx.body === 'object') { - setContentType('application/json'); - ctx.body = JSON.stringify(ctx.body); - } - - const newHeader = {}; - for (const key in ctx.res.headers) { - // The length after base64 is wrong. - if (!['content-length'].includes(key)) { - newHeader[key] = ctx.res.headers[key]; - } - } - - // 不再等待事件循环 - // https://cloud.tencent.com/document/product/583/11060 - context.callbackWaitsForEmptyEventLoop = false; - return { - isBase64Encoded: encoded, - statusCode: ctx.status, - headers: newHeader, - body: ctx.body, - }; - }) - .catch(err => { - ctx.logger.error(err); - context.callbackWaitsForEmptyEventLoop = false; - return { - isBase64Encoded: false, - statusCode: err.status ?? 500, - headers: {}, - body: isOutputError() ? err.stack : 'Internal Server Error', - }; - }); - }, - ]); - } - - async wrapperEventInvoker(handler, event: any, context: SCF.RequestContext) { - // format context - const newCtx = { - logger: console, - originEvent: event, - originContext: context, - }; - const args = [newCtx, event]; - // 其他事件场景 - return this.invokeHandlerWrapper(context, async () => { - try { - if (!handler) { - return await this.defaultInvokeHandler(...args); - } else { - return await handler.apply(handler, args); - } - } catch (err) { - newCtx.logger.error(err); - if (isOutputError()) { - throw err; - } else { - throw new Error('Internal Server Error'); - } - } - }); - } - - getApplication() { - return this.app; - } - - getFunctionName(): string { - // https://cloud.tencent.com/document/product/583/30228 - return process.env.SCF_FUNCTIONNAME || super.getFunctionName(); - } - - getFunctionServiceName(): string { - // 腾讯云没有服务名 - return super.getFunctionServiceName(); - } -} - -function isHttpEvent(event): event is SCF.APIGatewayEvent { - return event?.httpMethod && event?.headers && event?.requestContext; -} diff --git a/packages-legacy/serverless-scf-starter/test/index.test.ts b/packages-legacy/serverless-scf-starter/test/index.test.ts deleted file mode 100644 index 68ddcc7dcd66..000000000000 --- a/packages-legacy/serverless-scf-starter/test/index.test.ts +++ /dev/null @@ -1,483 +0,0 @@ -import * as assert from 'assert'; -import { asyncWrapper, start } from '../src'; -import * as mm from 'mm'; - -class Tester { - handler; - - constructor(handler) { - this.handler = handler; - } - - async runHttp(event, context = {}) { - const args = [ - Object.assign({}, require('../resource/event'), event), - context, - ]; - const result = await this.handler.apply(this.handler, args); - return result; - } - - run(...args) { - return new Promise((resolve, reject) => { - args.push((err, result) => { - if (err) { - return reject(err); - } - resolve(result); - }); - return this.handler(...args); - }); - } -} - -function test(handler) { - return new Tester(handler); -} - -describe('/test/index.test.ts', () => { - - afterEach(() => { - jest.restoreAllMocks() - }); - - describe('wrapper normal event', () => { - it('should wrap in init function', async () => { - const handle = asyncWrapper(async context => { - return context.data; - }); - const res: any = await test(handle).run({ data: 1 }); - assert.equal(res, 1); - }); - - it('should wrap with event and context', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return event.data; - })(...args); - }); - const res: any = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 1); - }); - - it('should wrap with event and throw error', async () => { - const runtime = await start({}); - - let err; - - try { - await runtime.asyncEvent(async (ctx, event) => { - throw new Error('abc'); - })(); - } catch (error) { - err = error; - } - expect(err.message).toEqual('Internal Server Error'); - }); - - it('should wrap with event and throw real error with env', async () => { - process.env.SERVERLESS_OUTPUT_ERROR_STACK = 'true'; - const runtime = await start({}); - - let err; - - try { - await runtime.asyncEvent(async (ctx, event) => { - throw new Error('abc'); - })(); - } catch (error) { - err = error; - } - expect(err.message).toEqual('abc'); - process.env.SERVERLESS_OUTPUT_ERROR_STACK = ''; - }); - }); - - describe('wrapper web event scf', () => { - it('should ok with plain text', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = 'hello world!'; - })(...args); - }); - const res: any = await test(handle).runHttp( - require('../resource/event'), - {} - ); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'text/plain; charset=utf-8'); - assert.equal(res.body, 'hello world!'); - }); - - it('should ok with json', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should 302', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.status = 302; - ctx.set('Location', 'https://github.com/midwayjs/midway'); - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 302); - }); - - it('should ok with raw json', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = '{"ok":true}'; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with raw json/object', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.type = 'application/json'; - ctx.body = { ok: true }; - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal( - res.headers['content-type'], - 'application/json; charset=utf-8' - ); - assert.equal(res.body, '{"ok":true}'); - }); - - it('should ok with Buffer', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = Buffer.from('hello world!'); - })(...args); - }); - const res = await test(handle).runHttp(require('../resource/event'), {}); - assert.equal(res.statusCode, 200); - assert.equal(res.headers['content-type'], 'application/octet-stream'); - assert.equal(res.body, Buffer.from('hello world!').toString('base64')); - }); - - it('should ok with context', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = ctx.query.hello; - })(...args); - }); - const res = await test(handle).runHttp( - { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryString: { hello: 'world' }, - body: null, - }, - {} - ); - assert.equal(res.statusCode, 200); - assert.equal(res.body, 'world'); - }); - - it('should ok with error', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('oops'); - })(...args); - }); - const result = await test(handle).runHttp( - require('../resource/event'), - {} - ); - assert.ok(result.statusCode === 500); - assert.equal(result.body, 'Internal Server Error'); - }); - - it('non-async should passed', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - const result = await test(handle).runHttp( - require('../resource/event'), - {} - ); - assert.ok(result.statusCode === 204); - assert.ok(result.body === ''); - }); - - it('should ok with asyncWrap', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, event) => { - return 'hello world!'; - })(...args); - }); - const res = await test(handle).run({ data: 1 }, {}); - assert.equal(res, 'hello world!'); - }); - - it('should ok with asyncWrap when error', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - throw new Error('ooops!'); - })(...args); - }); - - const result: any = await test(handle).run( - require('../resource/event'), - {} - ); - assert.ok(result.statusCode === 500); - assert.ok(result.body === 'Internal Server Error'); - }); - - it('should ok with asyncWrap when not async functions', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(ctx => {})(...args); - }); - let err; - try { - await test(handle).run(require('../resource/event'), {}); - } catch (ex) { - err = ex; - } - - assert.ok(!err); - }); - - it('should ok with empty functions', async () => { - const runtime = await start(); - - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent()(...args); - }); - - let err; - let defaultRun = false; - - runtime.defaultInvokeHandler = () => { - defaultRun = true; - }; - - try { - await test(handle).run(require('../resource/event'), {}); - } catch (ex) { - err = ex; - } - - assert.ok(!err); - assert.ok(defaultRun); - }); - - it('GET should ok', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - httpMethod: 'GET', - headers: {}, - queryString: q, - body: '', - }; - - const data = await test(handle).runHttp(event, {}); - - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - it('GET should ok', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - params: ctx.params, - body: ctx.req.body, - }; - // ctx.req.body; // second access - ctx.get('content-type'); - ctx.set('content-type', 'application/json'); - ctx.status = 200; - })(...args); - }); - const q: any = {}; - q.echostr = 'hehe'; - const event = { - path: '/wechat', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryString: q, - body: Buffer.from('hello world').toString('base64'), - isBase64Encoded: true, - }; - const data = await test(handle).runHttp(event, {}); - const body = JSON.parse(data.body); - assert.equal(body.path, '/wechat'); - assert.equal(body.method, 'GET'); - assert.equal(body.query.echostr, 'hehe'); - }); - - it('GET should get text if return data', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return 'hello world ' + ctx.query.user; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'text/plain' }, - queryString: { - user: 'harry', - }, - body: null, - isBase64Encoded: false, - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'hello world harry'); - }); - - it('should get params in post method', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return 'hello world ' + ctx.req.body.user; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'POST', - headers: { 'content-type': 'application/json' }, - queryString: {}, - body: JSON.stringify({ - user: 'harry', - }), - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'hello world harry'); - }); - - it('should get urlencoded params in get method', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return 'hello world'; - })(...args); - }); - const event = { - path: '/', - httpMethod: 'GET', - headers: { 'content-type': 'application/x-www-form-urlencoded' }, - queryString: {}, - body: 'user=harry', - }; - const data = await test(handle).runHttp(event, {}); - assert(data.body === 'hello world'); - }); - - it('should ok with asyncWrap use appoint args in event', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async (ctx, data) => { - return 'hello world!' + data.name; - })(...args); - }); - const res = await test(handle).run( - { - name: 'harry', - }, - '' - ); - assert.equal(res, 'hello world!harry'); - }); - - it('POST should ok use scf request with body', async () => { - const runtime = await start(); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(async ctx => { - return ctx.request.body; - })(...args); - }); - const postData = JSON.stringify({ name: 'fc request' }); - const data = await test(handle).runHttp( - { - path: '/', - headers: { 'content-type': 'text/plain' }, - queryString: {}, - httpMethod: 'POST', - body: postData, - }, - {} - ); - assert.equal(data.body, postData); - }); - }); - - describe('test base info', () => { - it('should get function name and service name from environment', async () => { - mm(process.env, 'SCF_FUNCTIONNAME', 'aaa'); - const runtime = await start(); - expect(runtime.getFunctionName()).toEqual('aaa'); - expect(runtime.getFunctionServiceName()).toEqual(''); - mm.restore(); - }); - - it('should get app', async () => { - const runtime = await start(); - const app = runtime.getApplication(); - expect(app.use).toBeDefined(); - }); - }) -}); diff --git a/packages-legacy/serverless-scf-starter/tsconfig.json b/packages-legacy/serverless-scf-starter/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-scf-starter/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-scf-trigger/CHANGELOG.md b/packages-legacy/serverless-scf-trigger/CHANGELOG.md deleted file mode 100644 index c927703a4743..000000000000 --- a/packages-legacy/serverless-scf-trigger/CHANGELOG.md +++ /dev/null @@ -1,838 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency express to v4.18.2 ([#2413](https://github.com/midwayjs/midway/issues/2413)) ([ace153b](https://github.com/midwayjs/midway/commit/ace153b796a8b962d307ee1568634869f727431a)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.20.1 ([#2355](https://github.com/midwayjs/midway/issues/2355)) ([4cf6bda](https://github.com/midwayjs/midway/commit/4cf6bdaa8b10b4ae40598305e1df9ad29dd701ed)) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency body-parser to v1.19.2 ([#1708](https://github.com/midwayjs/midway/issues/1708)) ([01626e8](https://github.com/midwayjs/midway/commit/01626e882710108cc9bede8c6f2adcfd142f72f0)) -- **deps:** update dependency express to v4.17.3 ([#1713](https://github.com/midwayjs/midway/issues/1713)) ([c781eca](https://github.com/midwayjs/midway/commit/c781eca27586b1d07cf672e71776ad9a521e149f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -### Bug Fixes - -- serverless app more method ([#1034](https://github.com/midwayjs/midway-faas/issues/1034)) ([9c44c3f](https://github.com/midwayjs/midway-faas/commit/9c44c3f58930d0c12464d00eceee93cb9e7aaa62)) - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -### Bug Fixes - -- serverless event test ([#967](https://github.com/midwayjs/midway-faas/issues/967)) ([e0c15e3](https://github.com/midwayjs/midway-faas/commit/e0c15e316c2813fd574f38bdf6a16a339bfede18)) - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -## [1.0.11](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.10...serverless-v1.0.11) (2020-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [1.0.8](https://github.com/midwayjs/midway-faas/compare/v1.0.7...v1.0.8) (2020-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## 1.0.7 (2020-07-14) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- aws support ([#526](https://github.com/midwayjs/midway-faas/issues/526)) ([9da022e](https://github.com/midwayjs/midway-faas/commit/9da022ecdf1e7770c21705131679940adc67ff3c)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## 1.0.1 (2020-07-06) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -# 1.0.0 (2020-07-02) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) -- commit development code ([a51a14a](https://github.com/midwayjs/midway-faas/commit/a51a14ae266a12f37fbe20ebf7eabfa764cf6532)) - -## [0.3.7](https://github.com/midwayjs/midway-faas/compare/v0.3.6...v0.3.7) (2020-07-02) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.3.5](https://github.com/midwayjs/midway-faas/compare/v0.3.4...v0.3.5) (2020-06-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.3.2](https://github.com/midwayjs/midway-faas/compare/v0.3.1...v0.3.2) (2020-06-12) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.3.1](https://github.com/midwayjs/midway-faas/compare/v0.3.0...v0.3.1) (2020-05-31) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [0.3.0](https://github.com/midwayjs/midway-faas/compare/v0.2.99...v0.3.0) (2020-05-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.99](https://github.com/midwayjs/midway-faas/compare/v0.2.98...v0.2.99) (2020-05-21) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.97](https://github.com/midwayjs/midway-faas/compare/v0.2.96...v0.2.97) (2020-05-16) - -### Bug Fixes - -- fix windows path when invoke ([#169](https://github.com/midwayjs/midway-faas/issues/169)) ([e637a0a](https://github.com/midwayjs/midway-faas/commit/e637a0ab05a769a3797e2dccf0612bbbf650d074)) - -## [0.2.95](https://github.com/midwayjs/midway-faas/compare/v0.2.94...v0.2.95) (2020-05-15) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.93](https://github.com/midwayjs/midway-faas/compare/v0.2.92...v0.2.93) (2020-05-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.92](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92) (2020-05-05) - -### Bug Fixes - -- fix error control in fc ([#153](https://github.com/midwayjs/midway-faas/issues/153)) ([f7dd007](https://github.com/midwayjs/midway-faas/commit/f7dd0070f9c1b7f07e628c8d2052d273a8133910)) - -## [0.2.92-beta.1](https://github.com/midwayjs/midway-faas/compare/v0.2.91...v0.2.92-beta.1) (2020-05-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.90](https://github.com/midwayjs/midway-faas/compare/v0.2.89...v0.2.90) (2020-04-29) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.89](https://github.com/midwayjs/midway-faas/compare/v0.2.88...v0.2.89) (2020-04-28) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.88](https://github.com/midwayjs/midway-faas/compare/v0.2.87...v0.2.88) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.87](https://github.com/midwayjs/midway-faas/compare/v0.2.86...v0.2.87) (2020-04-26) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.86](https://github.com/midwayjs/midway-faas/compare/v0.2.85...v0.2.86) (2020-04-24) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.85](https://github.com/midwayjs/midway-faas/compare/v0.2.84...v0.2.85) (2020-04-23) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.81](https://github.com/midwayjs/midway-faas/compare/v0.2.80...v0.2.81) (2020-04-22) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.78](https://github.com/midwayjs/midway-faas/compare/v0.2.77...v0.2.78) (2020-04-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.77](https://github.com/midwayjs/midway-faas/compare/v0.2.76...v0.2.77) (2020-04-18) - -### Features - -- add dev pack ([#134](https://github.com/midwayjs/midway-faas/issues/134)) ([cd08f54](https://github.com/midwayjs/midway-faas/commit/cd08f54859da80f517cb37f99857679286f10f0f)) - -## [0.2.76](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.76) (2020-04-16) - -### Bug Fixes - -- tencent trigger ([#131](https://github.com/midwayjs/midway-faas/issues/131)) ([0e93057](https://github.com/midwayjs/midway-faas/commit/0e93057205c2b761d1ee6fcf7e9c5d35bab349a7)) - -## [0.2.75](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.75) (2020-04-15) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.74](https://github.com/midwayjs/midway-faas/compare/v0.2.73...v0.2.74) (2020-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.73](https://github.com/midwayjs/midway-faas/compare/v0.2.73-alpha.0...v0.2.73) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.73-alpha.0](https://github.com/midwayjs/midway-faas/compare/v0.2.72...v0.2.73-alpha.0) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.72](https://github.com/midwayjs/midway-faas/compare/v0.2.71...v0.2.72) (2020-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.65](https://github.com/midwayjs/midway-faas/compare/v0.2.64...v0.2.65) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.64](https://github.com/midwayjs/midway-faas/compare/v0.2.63...v0.2.64) (2020-04-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.63](https://github.com/midwayjs/midway-faas/compare/v0.2.62...v0.2.63) (2020-04-03) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.61](https://github.com/midwayjs/midway-faas/compare/v0.2.60...v0.2.61) (2020-03-31) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.59](https://github.com/midwayjs/midway-faas/compare/v0.2.58...v0.2.59) (2020-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.55](https://github.com/midwayjs/midway-faas/compare/v0.2.54...v0.2.55) (2020-03-20) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.49](https://github.com/midwayjs/midway-faas/compare/v0.2.48...v0.2.49) (2020-03-14) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.27](https://github.com/midwayjs/midway-faas/compare/v0.2.26...v0.2.27) (2020-02-21) - -### Bug Fixes - -- invoke source map ([#52](https://github.com/midwayjs/midway-faas/issues/52)) ([9149d2a](https://github.com/midwayjs/midway-faas/commit/9149d2a9a3f3d9ba975588b61c6f9bbeec2e8d86)), closes [#51](https://github.com/midwayjs/midway-faas/issues/51) - -## [0.2.22](https://github.com/midwayjs/midway-faas/compare/v0.2.21...v0.2.22) (2020-02-17) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.19](https://github.com/midwayjs/midway-faas/compare/v0.2.18...v0.2.19) (2020-02-10) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.17](https://github.com/midwayjs/midway-faas/compare/v0.2.16...v0.2.17) (2020-02-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.16](https://github.com/midwayjs/midway-faas/compare/v0.2.15...v0.2.16) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.15](https://github.com/midwayjs/midway-faas/compare/v0.2.14...v0.2.15) (2020-02-04) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.10](https://github.com/midwayjs/midway-faas/compare/v0.2.9...v0.2.10) (2020-01-16) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.2.4](https://github.com/midwayjs/midway-faas/compare/v0.2.3...v0.2.4) (2020-01-09) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [0.2.0](https://github.com/midwayjs/midway-faas/compare/v0.1.12...v0.2.0) (2020-01-05) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.12](https://github.com/midwayjs/midway-faas/compare/v0.1.11...v0.1.12) (2020-01-01) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.11](https://github.com/midwayjs/midway-faas/compare/v0.1.10...v0.1.11) (2019-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.10](https://github.com/midwayjs/midway-faas/compare/v0.1.9...v0.1.10) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.9](https://github.com/midwayjs/midway-faas/compare/v0.1.8...v0.1.9) (2019-12-27) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.8](https://github.com/midwayjs/midway-faas/compare/v0.1.7...v0.1.8) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.7](https://github.com/midwayjs/midway-faas/compare/v0.1.6...v0.1.7) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.6](https://github.com/midwayjs/midway-faas/compare/v0.1.5...v0.1.6) (2019-12-25) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.5](https://github.com/midwayjs/midway-faas/compare/v0.1.4...v0.1.5) (2019-12-22) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.3](https://github.com/midwayjs/midway-faas/compare/v0.1.2...v0.1.3) (2019-12-18) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.2](https://github.com/midwayjs/midway-faas/compare/v0.1.1...v0.1.2) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -## [0.1.1](https://github.com/midwayjs/midway-faas/compare/v0.1.0...v0.1.1) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger - -# [0.1.0](https://github.com/midwayjs/midway-faas/compare/v0.0.10...v0.1.0) (2019-12-13) - -**Note:** Version bump only for package @midwayjs/serverless-scf-trigger diff --git a/packages-legacy/serverless-scf-trigger/jest.config.js b/packages-legacy/serverless-scf-trigger/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-scf-trigger/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-scf-trigger/jest.setup.js b/packages-legacy/serverless-scf-trigger/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-scf-trigger/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-scf-trigger/package.json b/packages-legacy/serverless-scf-trigger/package.json deleted file mode 100644 index affa6afc9aab..000000000000 --- a/packages-legacy/serverless-scf-trigger/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@midwayjs/serverless-scf-trigger", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/faas-typings": "^3.10.13", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "body-parser": "1.20.3", - "express": "4.20.0" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-scf-trigger/src/apiGateway.ts b/packages-legacy/serverless-scf-trigger/src/apiGateway.ts deleted file mode 100644 index 887550e99e8b..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/apiGateway.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { SCF } from '@midwayjs/faas-typings'; -import { SCFBaseTrigger } from './base'; -import * as express from 'express'; -import * as expressBodyParser from 'body-parser'; - -/** - * https://cloud.tencent.com/document/product/583/12513 - */ -export class ApiGatewayTrigger extends SCFBaseTrigger { - app: express.Application; - - async delegate(invokeWrapper: (invokeArgs: any[]) => any) { - if (!this.app) { - this.app = express(); - this.app.use(expressBodyParser.urlencoded({ extended: false })); - this.app.use(expressBodyParser.json()); - this.app.all('*', (req, res, next) => { - /** - * function(request, response, context) - */ - - const event: Partial = { - headerParameters: { - Refer: '10.0.2.14', - }, - headers: req.headers, - httpMethod: req.method, - path: req.path, - pathParameters: {}, - queryString: req.query, - queryStringParameters: req.query, - body: JSON.stringify(req.body), - requestContext: { - httpMethod: req.method, - identity: { - secretId: 'abdcdxxxxxxxsdfs', - }, - path: req.path, - serviceId: 'service-qcz3nag0', - sourceIp: '42.120.74.90', - stage: 'release', - requestId: '', - }, - }; - - invokeWrapper([event, this.createContext()]).then( - (result: { - isBase64Encoded: boolean; - statusCode: number; - headers: any; - body: any; - }) => { - res.set(result.headers); - res.status(result.statusCode); - if (result.isBase64Encoded) { - res.send(Buffer.from(result.body, 'base64')); - } else { - res.send(result.body); - } - } - ); - }); - } - return this.app; - } - - async toArgs() { - const event: Partial = { - headerParameters: { - Refer: '10.0.2.14', - }, - headers: this.triggerOptions.headers || {}, - httpMethod: this.triggerOptions.method || 'request method name', - path: this.triggerOptions.path || 'api request path', - pathParameters: this.triggerOptions.pathParameters || {}, - queryString: this.triggerOptions.query || {}, - queryStringParameters: this.triggerOptions.query || {}, - body: this.triggerOptions.body, - requestContext: { - httpMethod: this.triggerOptions.method || 'request method name', - identity: { - secretId: 'abdcdxxxxxxxsdfs', - }, - path: this.triggerOptions.path || 'api request path', - serviceId: 'service-qcz3nag0', - sourceIp: '42.120.74.90', - stage: 'release', - requestId: '', - }, - }; - - return [event, this.createContext()]; - } -} - -export const apigw = ApiGatewayTrigger; -export const http = ApiGatewayTrigger; diff --git a/packages-legacy/serverless-scf-trigger/src/base.ts b/packages-legacy/serverless-scf-trigger/src/base.ts deleted file mode 100644 index 0e619bb5aa75..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/base.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { BaseTrigger } from '@midwayjs/runtime-mock'; -import { SCF } from '@midwayjs/faas-typings'; -import { extend } from '@midwayjs/core'; - -export class SCFBaseTrigger extends BaseTrigger { - useCallback = true; - triggerOptions: any; - - constructor(triggerOptions = {}) { - super(); - this.triggerOptions = triggerOptions; - } - - createContext(): SCF.RequestContext { - return { - callbackWaitsForEmptyEventLoop: true, - memory_limit_in_mb: 128, - time_limit_in_ms: 3000, - request_id: '201cb979-17d4-11ea-97b2-5254005dc76e', - environ: - 'TENCENTCLOUD_SECRETID=12345;TENCENTCLOUD_SECRETKEY=54321;TENCENTCLOUD_SESSIONTOKEN=1234554321;SCF_NAMESPACE=default', - function_version: '$LATEST', - function_name: 'hellotest', - namespace: 'default', - }; - } -} - -export const createInitializeContext = (ctx: any = {}): SCF.RequestContext => { - return extend(true, new SCFBaseTrigger().createContext(), ctx); -}; diff --git a/packages-legacy/serverless-scf-trigger/src/ckafka.ts b/packages-legacy/serverless-scf-trigger/src/ckafka.ts deleted file mode 100644 index 4d10d32ae89e..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/ckafka.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { SCFBaseTrigger } from './base'; -import { extend } from '@midwayjs/core'; -import { SCF } from '@midwayjs/faas-typings'; - -/** - * https://cloud.tencent.com/document/product/583/17530 - */ -export class CKafkaTrigger extends SCFBaseTrigger { - getEvent() { - return { - Records: [ - { - Ckafka: { - topic: 'test-topic', - partition: 1, - offset: 36, - msgKey: 'None', - msgBody: 'Hello from Ckafka!', - }, - }, - { - Ckafka: { - topic: 'test-topic', - partition: 1, - offset: 37, - msgKey: 'None', - msgBody: 'Hello from Ckafka again!', - }, - }, - ], - }; - } -} - -export const ckafka = CKafkaTrigger; -export const createCKafkaEvent = (data: any = {}): SCF.CKafkaEvent => { - return extend(true, new CKafkaTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-scf-trigger/src/cmq.ts b/packages-legacy/serverless-scf-trigger/src/cmq.ts deleted file mode 100644 index 9b9f4746324a..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/cmq.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { SCFBaseTrigger } from './base'; -import { SCF } from '@midwayjs/faas-typings'; -import { extend } from '@midwayjs/core'; - -/** - * https://cloud.tencent.com/document/product/583/11517 - */ -export class CMQTrigger extends SCFBaseTrigger { - getEvent() { - return { - Records: [ - { - CMQ: { - type: 'topic', - topicOwner: 1567, - topicName: 'testtopic', - subscriptionName: 'xxxxxx', - publishTime: '1970-01-01T00:00:00.000Z', - msgId: '123345346', - requestId: '123345346', - msgBody: 'Hello from CMQ!', - msgTag: 'tag1,tag2', - }, - }, - ], - }; - } -} - -export const mq = CMQTrigger; -export const cmq = CMQTrigger; -export const createCMQEvent = (data: any = {}): SCF.CMQEvent => { - return extend(true, new CMQTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-scf-trigger/src/cos.ts b/packages-legacy/serverless-scf-trigger/src/cos.ts deleted file mode 100644 index e871bfb66c1e..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/cos.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { SCFBaseTrigger } from './base'; -import { SCF } from '@midwayjs/faas-typings'; -import { extend } from '@midwayjs/core'; -/** - * https://cloud.tencent.com/document/product/583/9707 - */ -export class COSTrigger extends SCFBaseTrigger { - getEvent() { - return { - Records: [ - { - cos: { - cosSchemaVersion: '1.0', - cosObject: { - url: 'http://testpic-1253970026.cos.ap-chengdu.myqcloud.com/testfile', - meta: { - 'x-cos-request-id': 'NWMxOWY4MGFfMjViMjU4NjRfMTUyMV8yNzhhZjM=', - 'Content-Type': '', - }, - vid: '', - key: '/1253970026/testpic/testfile', - size: 1029, - }, - cosBucket: { - region: 'cd', - name: 'testpic', - appid: '1253970026', - }, - cosNotificationId: 'unkown', - }, - event: { - eventName: 'cos:ObjectCreated:*', - eventVersion: '1.0', - eventTime: 1545205770, - eventSource: 'qcs::cos', - requestParameters: { - requestSourceIP: '192.168.15.101', - requestHeaders: { - Authorization: - 'q-sign-algorithm=sha1&q-ak=AKIDQm6iUh2NJ6jL41tVUis9KpY5Rgv49zyC&q-sign-time=1545205709;1545215769&q-key-time=1545205709;1545215769&q-header-list=host;x-cos-storage-class&q-url-param-list=&q-signature=098ac7dfe9cf21116f946c4b4c29001c2b449b14', - }, - }, - eventQueue: - 'qcs:0:lambda:cd:appid/1253970026:default.printevent.$LATEST', - reservedInfo: '', - reqid: 179398952, - }, - }, - ], - }; - } -} - -export const os = COSTrigger; -export const cos = COSTrigger; -export const oss = COSTrigger; -export const createCOSEvent = (data: any = {}): SCF.COSEvent => { - return extend(true, new COSTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-scf-trigger/src/index.ts b/packages-legacy/serverless-scf-trigger/src/index.ts deleted file mode 100644 index ba345ed3a193..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './apiGateway'; -export * from './cos'; -export * from './timer'; -export * from './ckafka'; -export * from './cmq'; diff --git a/packages-legacy/serverless-scf-trigger/src/timer.ts b/packages-legacy/serverless-scf-trigger/src/timer.ts deleted file mode 100644 index ba8266c02744..000000000000 --- a/packages-legacy/serverless-scf-trigger/src/timer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { SCFBaseTrigger } from './base'; -import { SCF } from '@midwayjs/faas-typings'; -import { extend } from '@midwayjs/core'; -/** - * https://cloud.tencent.com/document/product/583/9708 - */ -export class TimerTrigger extends SCFBaseTrigger { - getEvent() { - return { - Message: '', - Time: new Date().toJSON(), - TriggerName: 'test', - Type: 'Timer', - }; - } -} - -export const timer = TimerTrigger; -export const createTimerEvent = (data: any = {}): SCF.TimerEvent => { - return extend(true, new TimerTrigger().getEvent(), data); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/fixtures/apiGateway/index.ts b/packages-legacy/serverless-scf-trigger/test/fixtures/apiGateway/index.ts deleted file mode 100644 index e6294be7c148..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/fixtures/apiGateway/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -exports.handler = (event, context, callback) => { - callback(null, { - isBase64Encoded: false, - statusCode: 200, - headers: {}, - body: 'hello Alan' - }); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/fixtures/ckafka/index.ts b/packages-legacy/serverless-scf-trigger/test/fixtures/ckafka/index.ts deleted file mode 100644 index f7c6674b58bb..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/fixtures/ckafka/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/fixtures/cmq/index.ts b/packages-legacy/serverless-scf-trigger/test/fixtures/cmq/index.ts deleted file mode 100644 index f7c6674b58bb..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/fixtures/cmq/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/fixtures/cos/index.ts b/packages-legacy/serverless-scf-trigger/test/fixtures/cos/index.ts deleted file mode 100644 index f7c6674b58bb..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/fixtures/cos/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/fixtures/timer/index.ts b/packages-legacy/serverless-scf-trigger/test/fixtures/timer/index.ts deleted file mode 100644 index f7c6674b58bb..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/fixtures/timer/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -exports.handler = (event, context, callback) => { - callback(null, event); -}; diff --git a/packages-legacy/serverless-scf-trigger/test/index.test.ts b/packages-legacy/serverless-scf-trigger/test/index.test.ts deleted file mode 100644 index fd4f92d61796..000000000000 --- a/packages-legacy/serverless-scf-trigger/test/index.test.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { createRuntime } from '@midwayjs/runtime-mock'; -import { join } from 'path'; -import { ApiGatewayTrigger, COSTrigger, TimerTrigger } from '../src'; -import * as assert from 'assert'; -import { CMQTrigger } from '../src/cmq'; -import { CKafkaTrigger } from '../src/ckafka'; - -describe('/test/index.test.ts', () => { - it('should use origin api gateway', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/apiGateway'), - }); - await runtime.start(); - const result = await runtime.invoke(new ApiGatewayTrigger()); - assert.equal(result.body, 'hello Alan'); - await runtime.close(); - }); - - it('should use origin timer trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/timer'), - }); - await runtime.start(); - const result = await runtime.invoke(new TimerTrigger()); - assert(result.Time); - await runtime.close(); - }); - - it('should use origin cos trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/cos'), - }); - await runtime.start(); - const result = await runtime.invoke(new COSTrigger()); - assert(result.Records[0].cos); - assert(result.Records[0].event); - await runtime.close(); - }); - - it('should use origin cmq trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/cmq'), - }); - await runtime.start(); - const result = await runtime.invoke(new CMQTrigger()); - assert(result.Records[0].CMQ); - await runtime.close(); - }); - - it('should use origin CKafka trigger', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/ckafka'), - }); - await runtime.start(); - const result = await runtime.invoke(new CKafkaTrigger()); - assert(result.Records[0].Ckafka); - await runtime.close(); - }); -}); diff --git a/packages-legacy/serverless-scf-trigger/tsconfig.json b/packages-legacy/serverless-scf-trigger/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-scf-trigger/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-vercel-starter/CHANGELOG.md b/packages-legacy/serverless-vercel-starter/CHANGELOG.md deleted file mode 100644 index 1df7a0cefef0..000000000000 --- a/packages-legacy/serverless-vercel-starter/CHANGELOG.md +++ /dev/null @@ -1,290 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.1 ([#1754](https://github.com/midwayjs/midway/issues/1754)) ([6d9d819](https://github.com/midwayjs/midway/commit/6d9d819a3628ac8ecf91e75120a73f0533ba4bc9)) - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.5.0 ([#1731](https://github.com/midwayjs/midway/issues/1731)) ([6caec96](https://github.com/midwayjs/midway/commit/6caec96b976b9dce1a8cda4d3f809efd346ceaf5)) - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- **deps:** update dependency raw-body to v2.4.3 ([#1705](https://github.com/midwayjs/midway/issues/1705)) ([d4a6b8c](https://github.com/midwayjs/midway/commit/d4a6b8c0a17d5187ac21afd72e8dbf86424fb14f)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -### Features - -- support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9)) - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-starter - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -### Bug Fixes - -- task redefine context logger ([#1213](https://github.com/midwayjs/midway/issues/1213)) ([f8887c9](https://github.com/midwayjs/midway/commit/f8887c94b234b0156b8b4c6ad728c97a748c5a4f)) - -### Features - -- vercel starter and trigger ([#1199](https://github.com/midwayjs/midway/issues/1199)) ([7d978a2](https://github.com/midwayjs/midway/commit/7d978a2bd46bf0b96c689ace2a9268e31a2e4acd)) diff --git a/packages-legacy/serverless-vercel-starter/README.md b/packages-legacy/serverless-vercel-starter/README.md deleted file mode 100644 index cc5e78d635d9..000000000000 --- a/packages-legacy/serverless-vercel-starter/README.md +++ /dev/null @@ -1 +0,0 @@ -# serverless vercel starter diff --git a/packages-legacy/serverless-vercel-starter/jest.config.js b/packages-legacy/serverless-vercel-starter/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-vercel-starter/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-vercel-starter/jest.setup.js b/packages-legacy/serverless-vercel-starter/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-vercel-starter/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-vercel-starter/package.json b/packages-legacy/serverless-vercel-starter/package.json deleted file mode 100644 index 5162dc06c201..000000000000 --- a/packages-legacy/serverless-vercel-starter/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@midwayjs/serverless-vercel-starter", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/serverless-http-parser": "^3.14.0", - "parseurl": "1.3.3" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/runtime-mock": "^3.7.0", - "raw-body": "2.5.2" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-vercel-starter/src/index.ts b/packages-legacy/serverless-vercel-starter/src/index.ts deleted file mode 100644 index e121a7d25780..000000000000 --- a/packages-legacy/serverless-vercel-starter/src/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { BaseBootstrap } from '@midwayjs/runtime-engine'; -import { VercelRuntime } from './runtime'; - -export { asyncWrapper } from '@midwayjs/runtime-engine'; -export * from './runtime'; - -let bootstrap: BaseBootstrap; - -export const start = async (options: any = {}) => { - if (!process.env.NODE_ENV) { - process.env.NODE_ENV = 'production'; - } - - bootstrap = new BaseBootstrap( - Object.assign( - { - runtime: new VercelRuntime(), - }, - options - ) - ); - await bootstrap.start(); - return bootstrap.getRuntime(); -}; - -export const close = async () => { - return bootstrap.close(); -}; diff --git a/packages-legacy/serverless-vercel-starter/src/runtime.ts b/packages-legacy/serverless-vercel-starter/src/runtime.ts deleted file mode 100644 index def582b5a413..000000000000 --- a/packages-legacy/serverless-vercel-starter/src/runtime.ts +++ /dev/null @@ -1,130 +0,0 @@ -import * as getRawBody from 'raw-body'; -import { ServerlessLightRuntime } from '@midwayjs/runtime-engine'; -import { Application, HTTPResponse } from '@midwayjs/serverless-http-parser'; -import * as parseurl from 'parseurl'; - -const isOutputError = () => { - return ( - process.env.SERVERLESS_OUTPUT_ERROR_STACK === 'true' || - ['local', 'development'].includes(process.env.MIDWAY_SERVER_ENV) || - ['local', 'development'].includes(process.env.NODE_ENV) - ); -}; - -export class VercelRuntime extends ServerlessLightRuntime { - app; - respond; - - async init(contextExtensions): Promise { - super.init(contextExtensions); - this.app = new Application(); - } - - /** - * for handler wrapper - * @param handler - */ - asyncEvent(handler) { - if (handler && handler.constructor.name !== 'AsyncFunction') { - throw new TypeError('Must be an AsyncFunction'); - } - - return (...args) => { - const [req, res] = args; - return this.wrapperWebInvoker(handler, req, res); - }; - } - - async wrapperWebInvoker(handler, req, res) { - if (!this.respond) { - this.respond = this.app.callback(); - } - - const newRes = new HTTPResponse(); - - req.getOriginContext = () => { - return {}; - }; - - // vercel req is IncomingMessage , no path - const newUrlInfo = parseurl({ url: req.url }); - req.path = newUrlInfo.pathname; - - if ( - ['post', 'put', 'delete'].indexOf(req.method.toLowerCase()) !== -1 && - !req.body && - typeof req.on === 'function' - ) { - req.body = await getRawBody(req); // TODO: body parser - } - const newReq = req; - - return this.respond.apply(this.respond, [ - newReq, - newRes, - ctx => { - return this.invokeHandlerWrapper(ctx, async () => { - if (!handler) { - const args = [ctx]; - return this.defaultInvokeHandler(...args); - } - return handler.apply(handler, [ctx]); - }) - .then(result => { - if (res.headersSent) { - return; - } - - if (result) { - ctx.body = result; - } - - if (!ctx.response._explicitStatus) { - if (ctx.body === null || ctx.body === undefined) { - ctx.body = ''; - ctx.type = 'text'; - ctx.status = 204; - } - } - - const newHeader = {}; - for (const key in ctx.res.headers) { - // The length after base64 is wrong. - if (!['content-length'].includes(key)) { - newHeader[key] = ctx.res.headers[key]; - } - } - - for (const key in newHeader) { - res.setHeader(key, newHeader[key]); - } - - if (res.statusCode !== ctx.status) { - res.status(ctx.status); - } - // vercel support object/string/buffer - res.send(ctx.body); - }) - .catch(err => { - ctx.logger.error(err); - res.status(err.status ?? 500); - res.send(isOutputError() ? err.stack : 'Internal Server Error'); - }); - }, - ]); - } - - getApplication() { - return this.app; - } - - getFunctionName(): string { - return this.options?.initContext?.function?.name || super.getFunctionName(); - } - - getFunctionServiceName(): string { - return ( - this.options?.initContext?.service?.name || super.getFunctionServiceName() - ); - } -} diff --git a/packages-legacy/serverless-vercel-starter/test/fixtures/http/index.ts b/packages-legacy/serverless-vercel-starter/test/fixtures/http/index.ts deleted file mode 100644 index 86c86c30be6c..000000000000 --- a/packages-legacy/serverless-vercel-starter/test/fixtures/http/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { asyncWrapper, start, close } from '../../../src'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - const res = await runtime.asyncEvent(async function (ctx) { - const app = runtime.getApplication(); - const functionName = runtime.getFunctionName(); - const functionServiceName = runtime.getFunctionServiceName(); - if (ctx.query?.str) { - return '123'; - } - if (ctx.query?.noReturn) { - return; - } - if (ctx.query?.undefined) { - return undefined; - } - if (ctx.query?.error) { - throw new Error('error') - } - if (ctx.query?.buffer) { - ctx.status = 401; - return Buffer.from('123'); - } - return { path: ctx.path, functionName, functionServiceName, isExistsApp: !!app }; - })(...args); - await close(); - return res; -}); diff --git a/packages-legacy/serverless-vercel-starter/test/index.test.ts b/packages-legacy/serverless-vercel-starter/test/index.test.ts deleted file mode 100644 index da5811aadcc8..000000000000 --- a/packages-legacy/serverless-vercel-starter/test/index.test.ts +++ /dev/null @@ -1,104 +0,0 @@ -import { createRuntime } from '@midwayjs/runtime-mock'; -import * as assert from 'assert'; -// 这里不能用包引，会循环依赖 -import { HTTPTrigger } from '../../serverless-vercel-trigger/src'; -import { join } from 'path'; - -describe('/test/index.test.ts', () => { - it('should invoke normal code', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - }); - const result = await runtime.invoke(trigger); - assert.equal(JSON.parse(result.body).path, '/help'); - await runtime.close(); - }); - it('should get string response', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - str: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.body, '123'); - assert(result.headers['content-type'].includes('text/plain')); - await runtime.close(); - }); - it('should get buffer response', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - buffer: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.body, '123'); - assert.equal(result.statusCode, 401); - assert.equal(result.headers['content-type'], 'application/octet-stream'); - await runtime.close(); - }); - it('should get empty response', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - noReturn: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.statusCode, 204); - await runtime.close(); - }); - it('should get error', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - error: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.statusCode, 500); - await runtime.close(); - }); - it('should get error', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - undefined: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.statusCode, 204); - await runtime.close(); - }); -}); diff --git a/packages-legacy/serverless-vercel-starter/tsconfig.json b/packages-legacy/serverless-vercel-starter/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-vercel-starter/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-vercel-trigger/CHANGELOG.md b/packages-legacy/serverless-vercel-trigger/CHANGELOG.md deleted file mode 100644 index a94fea8ebdca..000000000000 --- a/packages-legacy/serverless-vercel-trigger/CHANGELOG.md +++ /dev/null @@ -1,150 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -### Bug Fixes - -- add config filter and modify sequelize & mongoose config ([#2150](https://github.com/midwayjs/midway/issues/2150)) ([5db3b9b](https://github.com/midwayjs/midway/commit/5db3b9b56b6eac393820acf9f089e6f8cdd6a8b6)) - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -**Note:** Version bump only for package @midwayjs/serverless-vercel-trigger - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -### Features - -- vercel starter and trigger ([#1199](https://github.com/midwayjs/midway/issues/1199)) ([7d978a2](https://github.com/midwayjs/midway/commit/7d978a2bd46bf0b96c689ace2a9268e31a2e4acd)) diff --git a/packages-legacy/serverless-vercel-trigger/jest.config.js b/packages-legacy/serverless-vercel-trigger/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/serverless-vercel-trigger/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-vercel-trigger/jest.setup.js b/packages-legacy/serverless-vercel-trigger/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-vercel-trigger/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-vercel-trigger/package.json b/packages-legacy/serverless-vercel-trigger/package.json deleted file mode 100644 index 089203da2f85..000000000000 --- a/packages-legacy/serverless-vercel-trigger/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@midwayjs/serverless-vercel-trigger", - "private": true, - "version": "3.7.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-mock": "^3.7.0" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/serverless-vercel-trigger/src/http.ts b/packages-legacy/serverless-vercel-trigger/src/http.ts deleted file mode 100644 index e49a129e95f1..000000000000 --- a/packages-legacy/serverless-vercel-trigger/src/http.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { BaseTrigger } from '@midwayjs/runtime-mock'; -interface HTTPTriggerOpts { - path: string; - method: string; - headers?: { [key: string]: any }; - query?: { [key: string]: any }; - body?: { [key: string]: any } | Buffer; -} - -export class HTTPTrigger extends BaseTrigger { - opts: HTTPTriggerOpts; - useCallback = true; - handler: any; - - constructor(options?: HTTPTriggerOpts) { - super(); - this.opts = options; - } - - async toArgs(): Promise { - const res = new Response({ - end: () => { - this.handler(null, res.toJSON()); - }, - }); - const req = { - ...this.opts, - path: '', - url: this.opts.path, - }; - return [req, res]; - } - - createCallback(handler) { - this.handler = handler; - return err => { - if (err) { - throw err; - } - }; - } -} - -class Response { - statusCode: number; - _headers; - typeSetted; - body; - _res; - _headersSent: boolean; - - constructor(res) { - this._res = res; - - this.statusCode = 200; - this._headers = { - 'content-type': 'application/json; charset=utf-8', - }; - this.typeSetted = false; - this.body = null; - } - - get headers() { - return this._headers; - } - - setHeader(key, value) { - this._headers[key] = value; - } - - send(data) { - if (this._headersSent) { - throw new Error('can not send multi times'); - } - this.body = data; - this._headersSent = true; - this._res.end(); - } - - status(statusCode) { - this.statusCode = statusCode; - } - - toJSON() { - const headers = this.headers; - let body; - if (typeof this.body === 'string') { - body = this.body; - } else if (Buffer.isBuffer(this.body)) { - body = this.body.toString(); - headers['content-type'] = 'application/octet-stream'; - } else { - body = JSON.stringify(this.body); - headers['content-type'] = 'application/json'; - } - - // Orignal data - return { - headers, - statusCode: this.statusCode, - body, - }; - } -} - -export const http = HTTPTrigger; diff --git a/packages-legacy/serverless-vercel-trigger/src/index.ts b/packages-legacy/serverless-vercel-trigger/src/index.ts deleted file mode 100644 index c202386ae710..000000000000 --- a/packages-legacy/serverless-vercel-trigger/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './http'; diff --git a/packages-legacy/serverless-vercel-trigger/test/fixtures/http/index.ts b/packages-legacy/serverless-vercel-trigger/test/fixtures/http/index.ts deleted file mode 100644 index 3d63644e3466..000000000000 --- a/packages-legacy/serverless-vercel-trigger/test/fixtures/http/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { asyncWrapper, start, close } from '../../../../serverless-vercel-starter/src'; - -let runtime; -let inited; - -exports.handler = asyncWrapper(async (...args) => { - if (!inited) { - inited = true; - runtime = await start(); - } - const res = await runtime.asyncEvent(async function (ctx) { - const app = runtime.getApplication(); - const functionName = runtime.getFunctionName(); - const functionServiceName = runtime.getFunctionServiceName(); - if (ctx.query?.str) { - return '123'; - } - if (ctx.query?.buffer) { - ctx.status = 401; - return Buffer.from('123'); - } - ctx.status = 401; - return { path: ctx.path, functionName, functionServiceName, isExistsApp: !!app }; - })(...args); - await close(); - return res; -}); diff --git a/packages-legacy/serverless-vercel-trigger/test/index.test.ts b/packages-legacy/serverless-vercel-trigger/test/index.test.ts deleted file mode 100644 index 7c24ca03c27b..000000000000 --- a/packages-legacy/serverless-vercel-trigger/test/index.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { createRuntime } from '@midwayjs/runtime-mock'; -import * as assert from 'assert'; -// 这里不能用包引，会循环依赖 -import { HTTPTrigger } from '../src'; -import { join } from 'path'; - -describe('/test/index.test.ts', () => { - it('should invoke normal code', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - }); - const result = await runtime.invoke(trigger); - assert.equal(JSON.parse(result.body).path, '/help'); - assert.equal(result.statusCode, 401); - await runtime.close(); - }); - it('should get string response', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - str: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.body, '123'); - assert(result.headers['content-type'].includes('text/plain')); - await runtime.close(); - }); - it('should get buffer response', async () => { - const runtime = createRuntime({ - functionDir: join(__dirname, './fixtures/http'), - }); - await runtime.start(); - const trigger = new HTTPTrigger({ - path: '/help', - method: 'GET', - query: { - buffer: true - } - }); - const result = await runtime.invoke(trigger); - assert.equal(result.body, '123'); - assert.equal(result.statusCode, 401); - assert.equal(result.headers['content-type'], 'application/octet-stream'); - await runtime.close(); - }); -}); \ No newline at end of file diff --git a/packages-legacy/serverless-vercel-trigger/tsconfig.json b/packages-legacy/serverless-vercel-trigger/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/serverless-vercel-trigger/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/serverless-worker-starter/CHANGELOG.md b/packages-legacy/serverless-worker-starter/CHANGELOG.md deleted file mode 100644 index 22d54fcefc74..000000000000 --- a/packages-legacy/serverless-worker-starter/CHANGELOG.md +++ /dev/null @@ -1,303 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.5](https://github.com/midwayjs/midway/compare/v3.4.4...v3.4.5) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -### Bug Fixes - -- worker starter origin context ([#1814](https://github.com/midwayjs/midway/issues/1814)) ([0168bcc](https://github.com/midwayjs/midway/commit/0168bcceef0f7cf39a8f0d903c24496f5f4f056f)) - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -### Features - -- starter for node.js and serverless-worker environment ([#1768](https://github.com/midwayjs/midway/issues/1768)) ([0c48b73](https://github.com/midwayjs/midway/commit/0c48b739e54be4e18aeff4c989fd3b96e955805c)) -- support event for worker starter ([#1788](https://github.com/midwayjs/midway/issues/1788)) ([2d97dc7](https://github.com/midwayjs/midway/commit/2d97dc7908b0a76245d8a8e3089b9756fb579394)) - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.0.12](https://github.com/midwayjs/midway/compare/v3.0.11...v3.0.12) (2022-02-25) - -### Bug Fixes - -- remove winston logger compatibility code ([#1749](https://github.com/midwayjs/midway/issues/1749)) ([3b4c67c](https://github.com/midwayjs/midway/commit/3b4c67cc11ead3923ba060aa9369406fbb16c187)) - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -### Bug Fixes - -- export asyncWrapper from runtime-engine ([#1717](https://github.com/midwayjs/midway/issues/1717)) ([f40d0b9](https://github.com/midwayjs/midway/commit/f40d0b9bbd05025f0472ae0a0e62fd9accb84937)) - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -### Features - -- support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9)) - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -### Bug Fixes - -- faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639)) - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Features - -- serverless-worker-starter ([#1171](https://github.com/midwayjs/midway/issues/1171)) ([081a3ec](https://github.com/midwayjs/midway/commit/081a3ec360af4f0d771bd4cc5a39b185c87c0307)) - -# [3.0.0-alpha.2](https://github.com/midwayjs/midway/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2021-08-05) - -**Note:** Version bump only for package @midwayjs/serverless-worker-starter - -# [3.0.0-alpha.1](https://github.com/midwayjs/midway/compare/v2.12.1...v3.0.0-alpha.1) (2021-08-04) - -### Features - -- serverless-worker-starter ([#1171](https://github.com/midwayjs/midway/issues/1171)) ([b5b519c](https://github.com/midwayjs/midway/commit/b5b519c234d9789055d945e217f6fc1ff8c2d719)) diff --git a/packages-legacy/serverless-worker-starter/README.md b/packages-legacy/serverless-worker-starter/README.md deleted file mode 100644 index d4525d8a2507..000000000000 --- a/packages-legacy/serverless-worker-starter/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# serverless worker starter - -本模块用于包裹无法定制运行时的 FaaS 平台，比如阿里云 FC。 - -## Serverless Worker - -```ts -import { eventWaitUntil, eventRespondWith, start } from '@midwayjs/serverless-worker-starter'; - -let runtime; -addEventListener('install', eventWaitUntil(async event => { - runtime = await start(); -})); - -addEventListener('fetch', eventRespondWith(async event => { - return runtime.asyncEvent(async function(ctx) { - return 'hello world'; // ctx.body = 'hello world'; - })(event); -})); -``` diff --git a/packages-legacy/serverless-worker-starter/jest.config.js b/packages-legacy/serverless-worker-starter/jest.config.js deleted file mode 100644 index 7512d240f345..000000000000 --- a/packages-legacy/serverless-worker-starter/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: '@midwayjs/jest-environment-service-worker', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/serverless-worker-starter/jest.setup.js b/packages-legacy/serverless-worker-starter/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/serverless-worker-starter/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/serverless-worker-starter/package.json b/packages-legacy/serverless-worker-starter/package.json deleted file mode 100644 index 3336c5e313dd..000000000000 --- a/packages-legacy/serverless-worker-starter/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@midwayjs/serverless-worker-starter", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "typings": "dist/index.d.ts", - "dependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/serverless-http-parser": "^3.14.0", - "type-is": "1.6.18" - }, - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/jest-environment-service-worker": "0.1.3", - "@midwayjs/jsdom-service-worker": "0.1.3", - "@midwayjs/runtime-mock": "^3.7.0" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts" - ], - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT" -} diff --git a/packages-legacy/serverless-worker-starter/src/http-request.ts b/packages-legacy/serverless-worker-starter/src/http-request.ts deleted file mode 100644 index f13adfb80c90..000000000000 --- a/packages-legacy/serverless-worker-starter/src/http-request.ts +++ /dev/null @@ -1,109 +0,0 @@ -import { is as typeis } from 'type-is'; -import * as qs from 'querystring'; -import { getWorkerContext, isWorkerEnvironment } from './util'; -import { WorkerContext, EntryRequest } from './interface'; - -const kBody = Symbol.for('ctx#body'); -const kHeaders = Symbol.for('ctx#headers'); -const kQuery = Symbol.for('ctx#query'); -const kPath = Symbol.for('ctx#path'); - -export class HTTPRequest { - private readonly originEvent: Request; - public bodyParsed; - private readonly originContext: WorkerContext; - - constructor(request, bodyText, bodyParsed = false, entryReq: EntryRequest) { - this.originEvent = request; - this[kBody] = bodyText; - this.bodyParsed = bodyParsed; - this.originContext = getWorkerContext(entryReq); - } - - getOriginEvent() { - return this.originEvent; - } - - getOriginContext() { - return this.originContext; - } - - get headers() { - if (this[kHeaders] == null) { - this[kHeaders] = isWorkerEnvironment - ? Object.fromEntries(this.originEvent.headers.entries()) - : this.originEvent.headers; - } - return this[kHeaders]; - } - - get url() { - return this.originEvent.url; - } - - get path() { - if (this[kPath] == null) { - this[kPath] = new URL(this.url).pathname; - } - return this[kPath]; - } - - get method() { - return this.originEvent.method; - } - - get query() { - if (this[kQuery] == null) { - this[kQuery] = Object.fromEntries( - new URL(this.url).searchParams.entries() - ); - } - return this[kQuery]; - } - - get body() { - const method = this.method.toLowerCase(); - if (['get', 'head', 'options'].includes(method)) { - return undefined; - } - if (this.bodyParsed) { - return this[kBody]; - } - - const body = this[kBody]; - - switch (typeis(this.getHeader('content-type'), ['urlencoded', 'json'])) { - case 'json': - try { - this[kBody] = JSON.parse(body); - } catch { - throw new Error('invalid json received'); - } - break; - case 'urlencoded': - try { - this[kBody] = qs.parse(body); - } catch (err) { - throw new Error('invalid urlencoded received'); - } - break; - default: - this[kBody] = body; - } - - this.bodyParsed = true; - return this[kBody]; - } - - getHeader(field) { - return this.headers[field.toLowerCase()] || ''; - } - - removeHeader(field) { - delete this.headers[field.toLowerCase()]; - } - - hasHeader(field) { - return field.toLowerCase() in this.headers; - } -} diff --git a/packages-legacy/serverless-worker-starter/src/index.ts b/packages-legacy/serverless-worker-starter/src/index.ts deleted file mode 100644 index 792d2ba657e6..000000000000 --- a/packages-legacy/serverless-worker-starter/src/index.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { BaseBootstrap, BootstrapOptions } from '@midwayjs/runtime-engine'; -import { WorkerRuntime } from './runtime'; - -export { asyncWrapper } from '@midwayjs/runtime-engine'; -export * from './runtime'; -export * from './interface'; - -let bootstrap; - -export const start = async (options: BootstrapOptions = {}) => { - if (!process.env.NODE_ENV) { - process.env.NODE_ENV = 'production'; - } - - // TODO: remove these environ switches. - if (process.env['FC_FUNC_CODE_PATH']) { - // 用于替换默认的上下文日志 - process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] = 'true'; - // 移除控制台颜色，fc 控制台无法探测是否支持，日志采集也必须把颜色禁用掉 - process.env['MIDWAY_LOGGER_DISABLE_COLORS'] = 'true'; - } - bootstrap = new BaseBootstrap( - Object.assign( - { - runtime: new WorkerRuntime(), - }, - options - ) - ); - await bootstrap.start(); - return bootstrap.getRuntime(); -}; - -export const close = async () => { - return bootstrap.close(); -}; - -export function eventWaitUntil(handler) { - return extendedEvent => { - return extendedEvent.waitUntil( - Promise.resolve(extendedEvent).then(handler) - ); - }; -} - -export function eventRespondWith(handler) { - return fetchEvent => { - return fetchEvent.respondWith(Promise.resolve(fetchEvent).then(handler)); - }; -} diff --git a/packages-legacy/serverless-worker-starter/src/interface.ts b/packages-legacy/serverless-worker-starter/src/interface.ts deleted file mode 100644 index 3f969f875d31..000000000000 --- a/packages-legacy/serverless-worker-starter/src/interface.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { Readable, Writable } from "stream"; - -// Node.js environment: WorkerContext, IncomingMessage, OutgoingMessage -// Serverless worker environment: FetchEvent -export type WorkerEntryRequest = FetchEvent[]; -export type NodeEntryRequest = [WorkerContext, IncomingMessage, ServerResponse]; -export type EntryRequest = WorkerEntryRequest | NodeEntryRequest; - -export const EVENT_INVOKE_METHOD = 'alice-event-invoke'; -export const NOSLATED_EVENT_INVOKE_METHOD = 'noslated-event-invoke'; - -export interface DaprResponse { - status: number; - json(): Promise; - text(): Promise; - buffer(): Promise; -} - -export interface DaprInvokeOptions { - app: string; - methodName: string; - data: Buffer; -} - -export interface DaprBindingOptions { - name: string; - metadata: Record; - operation: string; - data: Buffer; -} - -export interface WorkerContext { - Dapr: { - ['1.0']: { - invoke: (req: DaprInvokeOptions) => Promise; - binding: (req: DaprBindingOptions) => Promise; - }; - }; -} - -export interface IncomingMessage extends Readable { - readonly url: string; - readonly method: string; - readonly headers: Record; - readonly rawHeaders: string[]; -} - -export interface ServerResponse extends Writable { - readonly headerSent: boolean; - statusCode: number; - readonly statusMessage: string; - flushHeaders(): void; - getHeader(name: string): string | string[]; - getHeaderNames(): string[]; - hasHeader(name: string): boolean; - removeHeader(name: string): void; - setHeader(name: string, value: string): void; - writeHead(status: number, headers: Record | string[]): void; -} diff --git a/packages-legacy/serverless-worker-starter/src/runtime.ts b/packages-legacy/serverless-worker-starter/src/runtime.ts deleted file mode 100644 index 19d65b52550d..000000000000 --- a/packages-legacy/serverless-worker-starter/src/runtime.ts +++ /dev/null @@ -1,316 +0,0 @@ -import { - ServerlessLightRuntime, - ContextExtensionHandler, -} from '@midwayjs/runtime-engine'; -import { Application, HTTPResponse } from '@midwayjs/serverless-http-parser'; -import { types } from 'util'; -import { HTTPRequest } from './http-request'; -import { - EntryRequest, - EVENT_INVOKE_METHOD, - NOSLATED_EVENT_INVOKE_METHOD, - IncomingMessage, - NodeEntryRequest, - ServerResponse, -} from './interface'; -import { - bufferFromStream, - safeJSONParse, - isWorkerEnvironment, - getWorkerContext, - isString, -} from './util'; - -const { isAnyArrayBuffer, isArrayBufferView } = types; - -const isOutputError = () => { - return ( - process.env.SERVERLESS_OUTPUT_ERROR_STACK === 'true' || - ['local', 'development'].includes(process.env.MIDWAY_SERVER_ENV) || - ['local', 'development'].includes(process.env.NODE_ENV) - ); -}; - -export class WorkerRuntime extends ServerlessLightRuntime { - app: Application; - respond; - - async init(contextExtensions: ContextExtensionHandler[]): Promise { - await super.init(contextExtensions); - this.app = new Application(); - } - - /** - * for handler wrapper - * @param handler - */ - asyncEvent(handler) { - if (typeof handler !== 'function') { - throw new TypeError('Handler must be a function'); - } - - return (...req: EntryRequest) => { - let request: Request | IncomingMessage; - - if (isWorkerEnvironment) { - request = (req[0] as FetchEvent).request as Request; - } else { - request = req[1] as IncomingMessage; - } - - const isEventRequest = - request.method === EVENT_INVOKE_METHOD || - request.method === NOSLATED_EVENT_INVOKE_METHOD; - - if (isEventRequest) { - return this.wrapperEventInvoker(handler, request, req); - } - - return this.wrapperWebInvoker(handler, request, req); - }; - } - - getApplication() { - return this.app; - } - - getFunctionName(): string { - return this.options?.initContext?.function?.name || super.getFunctionName(); - } - - getFunctionServiceName(): string { - return ( - this.options?.initContext?.service?.name || super.getFunctionServiceName() - ); - } - - private async getRequestData(request: Request | IncomingMessage) { - if (isWorkerEnvironment) { - return (request as Request).text(); - } else { - return bufferFromStream(request as IncomingMessage); - } - } - - private normalizeContext(targetContext, request: Request | IncomingMessage) { - const headers = request.headers; - - Object.keys(headers).forEach(key => { - targetContext[key] = headers[key]; - }); - } - - private responseEventSuccess(data: unknown, response: ServerResponse) { - if (isWorkerEnvironment) { - return data; - } else { - response.statusCode = 200; - - if (Buffer.isBuffer(data) || isString(data)) { - return response.end(data); - } else { - return response.end(JSON.stringify(data)); - } - } - } - - private responseEventError(error: Error, response: ServerResponse) { - const errorMsg = isOutputError() ? error.stack : 'Internal Server Error'; - - if (isWorkerEnvironment) { - return errorMsg; - } else { - response.statusCode = 500; - response.end(errorMsg); - } - } - - async wrapperEventInvoker( - handler, - request: Request | IncomingMessage, - entryReq: EntryRequest - ) { - let requestData = await this.getRequestData(request); - - if (Buffer.isBuffer(requestData)) { - requestData = requestData.toString('utf8'); - } - - const requestDataParsed = safeJSONParse(requestData); - - const newCtx = { - logger: console, - originEvent: requestData, - originContext: getWorkerContext(entryReq), - }; - - this.normalizeContext(newCtx, request); - - try { - const result = await this.invokeHandlerWrapper(newCtx, async () => { - try { - if (!handler) { - return await this.defaultInvokeHandler(newCtx); - } else { - return await handler.apply(handler, [newCtx, requestDataParsed]); - } - } catch (err) { - newCtx.logger.error(err); - - throw err; - } - }); - - return this.responseEventSuccess( - result, - (entryReq as NodeEntryRequest)[2] - ); - } catch (error) { - return this.responseEventError(error, (entryReq as NodeEntryRequest)[2]); - } - } - - private responseWebSuccess( - data: Buffer | string, - initOpts: ResponseInit, - response: ServerResponse - ) { - if (isWorkerEnvironment) { - return new Response(data, initOpts); - } else { - const headers = initOpts.headers; - - Object.keys(headers).forEach(key => { - response.setHeader(key, headers[key]); - }); - - response.statusCode = initOpts.status ?? 200; - response.end(data); - } - } - - private responseWebError( - error: Error, - initOpts: ResponseInit, - response: ServerResponse - ) { - const errorMsg = isOutputError() ? error.stack : 'Internal Server Error'; - - if (isWorkerEnvironment) { - return new Response(errorMsg, initOpts); - } else { - response.statusCode = 500; - response.end(errorMsg); - } - } - - async wrapperWebInvoker( - handler, - request: Request | IncomingMessage, - entryReq: EntryRequest - ) { - if (this.respond == null) { - this.respond = this.app.callback(); - } - - const url = new URL(request.url); - let bodyParsed = false; - let body = await this.getRequestData(request); - - if (url.protocol === 'event:') { - // 阿里云无触发器，入参可能是 json - if (Buffer.isBuffer(body)) { - body = body.toString('utf8'); - } - - body = safeJSONParse(body); - bodyParsed = true; - } - - const koaReq = new HTTPRequest(request, body, bodyParsed, entryReq); - const koaRes = new HTTPResponse(); - - return this.respond.apply(this.respond, [ - koaReq, - koaRes, - ctx => { - return this.invokeHandlerWrapper(ctx, async () => { - const args = [ctx]; - if (handler == null) { - return this.defaultInvokeHandler(...args); - } - - return handler(...args); - }) - .then(result => { - if (result) { - ctx.body = result; - } - - if (!ctx.response._explicitStatus) { - if (ctx.body === null || ctx.body === 'undefined') { - ctx.body = ''; - ctx.type = 'text'; - ctx.status = 204; - } - } - - let data = ctx.body; - - if (typeof data === 'string') { - if (!ctx.type) { - ctx.type = 'text/plain'; - } - } else if (isAnyArrayBuffer(data) || isArrayBufferView(data)) { - if (!ctx.type) { - ctx.type = 'application/octet-stream'; - } - } else if (typeof data === 'object') { - if (!ctx.type) { - ctx.type = 'application/json'; - } - - // set data to string - data = JSON.stringify(data); - } else { - // 阿里云网关必须返回字符串 - if (!ctx.type) { - ctx.type = 'text/plain'; - } - - // set data to string - data = data + ''; - } - - const headers = {}; - - for (const key in ctx.res.headers) { - if (!['content-length'].includes(key)) { - headers[key] = ctx.res.headers[key]; - } - } - - return this.responseWebSuccess( - data, - { - headers, - status: ctx.status, - }, - (entryReq as NodeEntryRequest)[2] - ); - }) - .catch(err => { - ctx.logger.error(err); - - return this.responseWebError( - err, - { - status: err.status ?? 500, - }, - (entryReq as NodeEntryRequest)[2] - ); - }); - }, - ]); - } -} diff --git a/packages-legacy/serverless-worker-starter/src/util.ts b/packages-legacy/serverless-worker-starter/src/util.ts deleted file mode 100644 index 747762a5bda8..000000000000 --- a/packages-legacy/serverless-worker-starter/src/util.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Readable } from 'stream'; - -export const isWorkerEnvironment = - typeof ServiceWorkerGlobalScope === 'function' && - globalThis instanceof ServiceWorkerGlobalScope; - -export function getWorkerContext(entryReq) { - return isWorkerEnvironment ? globalThis.Alinode : entryReq[0]; -} - -export async function bufferFromStream(stream: Readable): Promise { - const chunks = []; - - for await (const chunk of stream) { - chunks.push(chunk); - } - - return Buffer.concat(chunks); -} - -export function safeJSONParse(text: string) { - try { - return JSON.parse(text); - } catch (error) { - return text; - } -} - -export function isString(value) { - return typeof value === 'string' || value instanceof String; -} diff --git a/packages-legacy/serverless-worker-starter/test/helper/request_response.ts b/packages-legacy/serverless-worker-starter/test/helper/request_response.ts deleted file mode 100644 index ec39ac98842c..000000000000 --- a/packages-legacy/serverless-worker-starter/test/helper/request_response.ts +++ /dev/null @@ -1,124 +0,0 @@ -const { STATUS_CODES } = require('http'); -const { Readable, Writable } = require('stream'); - -export class IncomingMessage extends Readable { - #url; - #method; - #headers; - - constructor(metadataInit) { - super({ - read() {}, - }); - this.#url = metadataInit.url; - this.#method = metadataInit.method; - this.#headers = metadataInit.headers; - } - - get headers() { - return Object.fromEntries(this.#headers); - } - - get rawHeaders() { - return this.#headers.flatMap(it => it); - } - - get method() { - return this.#method; - } - - get url() { - return this.#url; - } -} - -export class ServerResponse extends Writable { - #headersSent = false; - #headers = Object.create(null); - #statusCode = 200; - data; - - constructor() { - super({ - write(chunk, encoding, callback) { - if (!this.data) { - this.data = chunk; - } else { - this.data = Buffer.concat([this.data, chunk]); - } - callback(); - }, - autoDestroy: true, - }); - } - - flushHeaders() { - this.writeHead(this.statusCode); - } - - getHeader(name) { - return this.#headers[name]; - } - - getHeaderNames() { - return Object.keys(this.#headers); - } - - getHeaders() { - return { - ...this.#headers, - }; - } - - hasHeader(name) { - return name in this.#headers; - } - - get headersSent() { - return this.#headersSent; - } - - removeHeader(name) { - delete this.#headers[name]; - } - - setHeader(name, value) { - this.#headers[name] = value; - } - - get statusCode() { - return this.#statusCode; - } - - set statusCode(val) { - this.#statusCode = val; - } - - get statusMessage() { - return STATUS_CODES[this.#statusCode]; - } - - writeHead(statusCode, statusMessage?, headers?) { - if (typeof statusMessage !== 'string') { - headers = statusMessage; - statusMessage = undefined; - } - this.statusCode = statusCode; - - if (Array.isArray(headers)) { - if (headers.length % 2 !== 0) { - throw new Error('headers is not valid'); - } - - let key; - for (let n = 0; n < headers.length; n += 2) { - key = headers[n + 0]; - if (key) this.setHeader(key, headers[n + 1]); - } - } else if (headers) { - for (const [ key, val ] of Object.entries(headers)) { - this.setHeader(key, val); - } - } - } -} \ No newline at end of file diff --git a/packages-legacy/serverless-worker-starter/test/node-worker.test.ts b/packages-legacy/serverless-worker-starter/test/node-worker.test.ts deleted file mode 100644 index 6d281688094d..000000000000 --- a/packages-legacy/serverless-worker-starter/test/node-worker.test.ts +++ /dev/null @@ -1,334 +0,0 @@ -/** - * @jest-environment node - */ - -import { sleep } from '@midwayjs/runtime-mock'; -import { start, asyncWrapper } from '../src'; -import { IncomingMessage, ServerResponse } from './helper/request_response'; - -class Tester { - handler; - - constructor(handler) { - this.handler = handler; - } - - async runHttp(context = {}, req, res) { - const args = [context, req, res]; - return this.handler.apply(this.handler, args); - } - - run(...args) { - return new Promise((resolve, reject) => { - args.push((err, result) => { - if (err) { - return reject(err); - } - resolve(result); - }); - return this.handler(...args); - }); - } -} - -function test(handler) { - return new Tester(handler); -} - -describe('test/node-worker.test.ts', () => { - - describe('handle event', () => { - it('event success', async () => { - const runtime = await start({}); - const request = new IncomingMessage({ - url: 'event://alice-event-invoke/', - method: 'alice-event-invoke', - headers: new Map([['traceid', 'traceId']]) - }); - - request.push('test'); - request.push(null); - - const response = new ServerResponse(); - - const entryRequest = [ - { - Dapr: { - ['1.0']: {} - } - }, - request, - response - ]; - - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent((ctx, event) => { - return event + ctx.traceid; - })(...args); - }); - - const res: any = await test(handle).run(...entryRequest); - expect(res.data.toString()).toEqual('testtraceId'); - }); - }); - - describe('handle http', () => { - const cases = [ - { - name: 'get request', - request: { - url: 'http://dont.care/?name=test', - method: 'GET', - headers: new Map() - }, - body: 'ignore', - handler: (ctx) => { - return `hello,${ctx.query.name},${ctx.request.body}`; - }, - expect: { - data: Buffer.from('hello,test,undefined') - } - }, - { - name: 'post request', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map() - }, - body: 'world', - handler: (ctx) => { - return `hello ${ctx.request.body}`; - }, - expect: { - data: Buffer.from('hello world') - } - }, - { - name: 'post request with json data', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map([['content-type', 'application/json']]) - }, - body: '{"name": "world"}', - handler: (ctx) => { - return `hello ${ctx.request.body.name}`; - }, - expect: { - data: Buffer.from('hello world') - } - }, - { - name: 'plain text body', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map() - }, - handler: async (ctx) => { - ctx.body = 'hello world!'; - }, - body: '', - expect: { - status: 200, - headers: { - 'content-type': 'text/plain; charset=utf-8', - }, - data: Buffer.from('hello world!'), - }, - }, - { - name: 'json body', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map() - }, - handler: async (ctx) => { - ctx.body = { ok: true }; - }, - body: '', - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - data: Buffer.from('{"ok":true}'), - }, - }, - { - name: 'serialized json body with ctx.type', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map() - }, - handler: async (ctx) => { - ctx.type = 'application/json'; - ctx.body = '{"ok":true}'; - }, - body: '', - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - data: Buffer.from('{"ok":true}'), - }, - }, - { - name: 'Buffer body', - request: { - url: 'http://dont.care/', - method: 'POST', - headers: new Map() - }, - handler: async (ctx) => { - ctx.body = Buffer.from('hello world!'); - }, - body: '', - expect: { - status: 200, - headers: { - 'content-type': 'application/octet-stream', - }, - data: Buffer.from('hello world!'), - }, - }, - { - name: 'ctx query', - request: { - url: 'http://example.com/?requestId=foobar', - method: 'GET', - headers: new Map() - }, - handler: async (ctx) => { - ctx.body = ctx.query.requestId; - }, - body: '', - expect: { - status: 200, - headers: { - 'content-type': 'text/plain; charset=utf-8', - }, - data: Buffer.from('foobar'), - }, - }, - { - name: 'rejection', - request: { - url: 'http://dont.care/', - method: 'GET', - headers: new Map() - }, - handler: async (ctx) => { - throw new Error('oops'); - }, - body: '', - expect: { - status: 500, - data: Buffer.from('Internal Server Error'), - }, - }, - { - name: 'non-async-function', - request: { - url: 'http://dont.care/', - method: 'GET', - headers: new Map() - }, - handler: (ctx) => { - return sleep(100).then(() => { - ctx.body = 'foobar'; - }); - }, - body: '', - expect: { - status: 200, - data: Buffer.from('foobar'), - }, - }, - { - name: 'ctx properties', - request: { - url: 'http://example.com/wechat?query_item=foobar', - method: 'POST', - headers: new Map([['content-type', 'text/plain;charset=UTF-8']]), - }, - handler: async (ctx) => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - body: ctx.request.body.toString(), - }; - }, - body: 'foobar', - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - data: Buffer.from(JSON.stringify({ - path: '/wechat', - method: 'POST', - query: { - query_item: 'foobar', - }, - headers: { - 'content-type': 'text/plain;charset=UTF-8', - }, - body: 'foobar', - })), - }, - }, - ]; - - for (const item of cases) { - it(`case: ${item.name}`, async () => { - const runtime = await start({}); - const handle = asyncWrapper(async (...args) => { - return runtime.asyncEvent(item.handler)(...args); - }); - - const request = new IncomingMessage(item.request); - - if (item.body) { - request.push(item.body); - } - request.push(null); - - const response = new ServerResponse(); - - await test(handle).runHttp({ - Dapr: { - ['1.0']: { - invoke() {}, - binding() {} - } - } - }, request, response); - - assertResponse(response, item.expect); - }); - } - }); -}); - -async function assertResponse(response: ServerResponse, expected) { - if (expected.status !== undefined) { - expect(response.statusCode).toEqual(expected.status); - } else { - expect(response.statusCode).toEqual(200); - } - - if (expected.headers !== undefined) { - for (const [key, val] of Object.entries(expected.headers)) { - expect(response.getHeader(key)).toEqual(val); - } - } - - expect(response.data).toEqual(expected.data); -} \ No newline at end of file diff --git a/packages-legacy/serverless-worker-starter/test/service-worker.test.ts b/packages-legacy/serverless-worker-starter/test/service-worker.test.ts deleted file mode 100644 index f3b03023310a..000000000000 --- a/packages-legacy/serverless-worker-starter/test/service-worker.test.ts +++ /dev/null @@ -1,276 +0,0 @@ -import { sleep } from '@midwayjs/runtime-mock'; -import * as assert from 'assert'; -import { eventRespondWith, eventWaitUntil, start } from '../src'; -import type { JSWorkerExtendableEvent, JSWorkerFetchEvent } from '@midwayjs/jsdom-service-worker'; - -declare class ExtendableEvent extends Event implements ExtendableEvent {} -declare class FetchEvent extends Event implements ExtendableEvent { constructor(type, init: FetchEventInit); } - -describe('test/service-worker.test.ts', () => { - afterEach(() => { - jest.restoreAllMocks() - }); - - describe('event listener handlers', () => { - it('eventWaitUntil', async () => { - let count = 0; - const handle = eventWaitUntil(async () => { - await sleep(100); - count++; - }); - const target = new EventTarget(); - target.addEventListener('install', handle); - const event = new ExtendableEvent('install') as unknown as JSWorkerExtendableEvent; - target.dispatchEvent(event); - await Promise.all(event._extendLifeTimePromises); - assert.strictEqual(count, 1); - }); - - it('eventRespondWith', async () => { - let count = 0; - const handle = eventRespondWith(async (event) => { - const { request } = event; - await sleep(100); - count++; - return new Response(request.body); - }); - const target = new EventTarget(); - target.addEventListener('fetch', handle); - const event = new FetchEvent('fetch', { - request: new Request('http://example.com', { - method: 'POST', - body: 'foobar', - }), - }) as unknown as JSWorkerFetchEvent; - target.dispatchEvent(event); - await Promise.resolve(event._respondWithPromise); - const response = event._potentialResponse; - assert(response != null); - const text = await response.text(); - assert.strictEqual(count, 1); - assert.strictEqual(text, 'foobar'); - }); - }); - - - describe('handle fetch event', () => { - const cases = [ - { - name: 'plain text body', - handler: async (ctx) => { - ctx.body = 'hello world!'; - }, - input: {}, - expect: { - status: 200, - headers: { - 'content-type': 'text/plain; charset=utf-8', - }, - body: 'hello world!', - }, - }, - { - name: 'json body', - handler: async (ctx) => { - ctx.body = { ok: true }; - }, - input: {}, - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - body: '{"ok":true}', - }, - }, - { - name: 'serialized json body with ctx.type', - handler: async (ctx) => { - ctx.type = 'application/json'; - ctx.body = '{"ok":true}'; - }, - input: {}, - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - body: '{"ok":true}', - }, - }, - { - name: 'json body with ctx.type', - handler: async (ctx) => { - ctx.type = 'application/json'; - ctx.body = { ok: true }; - }, - input: {}, - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - body: '{"ok":true}', - }, - }, - { - name: 'Buffer body', - handler: async (ctx) => { - ctx.body = Buffer.from('hello world!'); - }, - input: {}, - expect: { - status: 200, - headers: { - 'content-type': 'application/octet-stream', - }, - body: Buffer.from('hello world!'), - }, - }, - { - name: 'ctx query', - handler: async (ctx) => { - ctx.body = ctx.query.requestId; - }, - input: { - url: 'http://example.com/?requestId=foobar', - requestInit: {}, - }, - expect: { - status: 200, - headers: { - 'content-type': 'text/plain; charset=utf-8', - }, - body: 'foobar', - }, - }, - { - name: 'rejection', - handler: async (ctx) => { - throw new Error('oops'); - }, - input: {}, - expect: { - status: 500, - body: 'Internal Server Error', - }, - }, - { - name: 'non-async-function', - handler: (ctx) => { - return sleep(100).then(() => { - ctx.body = 'foobar'; - }); - }, - input: {}, - expect: { - status: 200, - body: 'foobar', - }, - }, - { - name: 'ctx properties', - handler: async (ctx) => { - ctx.body = { - path: ctx.path, - method: ctx.method, - query: ctx.query, - headers: ctx.headers, - body: ctx.request.body, - }; - }, - input: { - url: 'http://example.com/wechat?query_item=foobar', - requestInit: { - method: 'POST', - headers: {}, - body: 'foobar', - }, - }, - expect: { - status: 200, - headers: { - 'content-type': 'application/json; charset=utf-8', - }, - body: JSON.stringify({ - path: '/wechat', - method: 'POST', - query: { - query_item: 'foobar', - }, - headers: { - 'content-type': 'text/plain;charset=UTF-8', - }, - body: 'foobar', - }), - }, - }, - { - name: 'event request', - handler: async (ctx) => { - return 'test'; - }, - input: { - url: 'event://alice-event-invoke/', - requestInit: { - method: 'alice-event-invoke', - headers: {}, - body: 'foobar', - }, - }, - expect: { - status: 200, - headers: {}, - body: 'test', - }, - }, - ]; - - for (const item of cases) { - it(`case: ${item.name}`, async () => { - const runtime = await start({}); - const handle = eventRespondWith(async (...args) => { - return runtime.asyncEvent(item.handler)(...args); - }); - const target = new EventTarget(); - target.addEventListener('fetch', handle); - const event = new FetchEvent('fetch', { - request: new Request( - item.input.url ?? 'http://example.com', - item.input.requestInit as any), - }) as unknown as JSWorkerFetchEvent; - target.dispatchEvent(event); - await Promise.resolve(event._respondWithPromise); - const response = event._potentialResponse; - assert(response != null); - await assertResponse(response, item.expect); - }); - } - }); -}); - -const decoder = new TextDecoder(); -async function assertResponse(response: Response, expected) { - if (expected.status !== undefined) { - assert.strictEqual(response.status, expected.status); - } else { - assert.strictEqual(response.status, 200); - } - if (expected.headers !== undefined) { - for (const [key, val] of Object.entries(expected.headers)) { - assert.strictEqual(response.headers.get(key), val); - } - } - const data = await response.arrayBuffer(); - if (typeof expected.body === 'string') { - assert.strictEqual(decoder.decode(data), expected.body); - } else if (expected.body != null) { - const actual = Buffer.from(data); - const expectedData = Buffer.from(expected.body); - assert.ok(actual.equals(expectedData), `Expect: -${expectedData.toString()} - -Actual: -${actual.toString()}`); - } -} diff --git a/packages-legacy/serverless-worker-starter/tsconfig.json b/packages-legacy/serverless-worker-starter/tsconfig.json deleted file mode 100644 index 0dc43f7c05f8..000000000000 --- a/packages-legacy/serverless-worker-starter/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "lib": ["WebWorker", "Webworker.Iterable", "ES2019"], - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages-legacy/static-layer/CHANGELOG.md b/packages-legacy/static-layer/CHANGELOG.md deleted file mode 100644 index 4a0cb863cf23..000000000000 --- a/packages-legacy/static-layer/CHANGELOG.md +++ /dev/null @@ -1,586 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.3.0 ([#2435](https://github.com/midwayjs/midway/issues/2435)) ([6342e1d](https://github.com/midwayjs/midway/commit/6342e1d2a5301f3bd512d7c58b90482bca390898)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.5.2](https://github.com/midwayjs/midway/compare/v3.5.1...v3.5.2) (2022-09-08) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.5](https://github.com/midwayjs/midway/compare/v3.4.4...v3.4.5) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.3.11](https://github.com/midwayjs/midway/compare/v3.3.10...v3.3.11) (2022-05-27) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.2 ([#1599](https://github.com/midwayjs/midway/issues/1599)) ([982d888](https://github.com/midwayjs/midway/commit/982d88816e90e43785f4c429608ce8eafed4da81)) - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.1 ([#1561](https://github.com/midwayjs/midway/issues/1561)) ([0bcde23](https://github.com/midwayjs/midway/commit/0bcde231d562d2daedcbefcdaaa8ddcf5bb9ad58)) - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -### Bug Fixes - -- **deps:** update dependency supertest to v6.2.0 ([#1555](https://github.com/midwayjs/midway/issues/1555)) ([4ff0e03](https://github.com/midwayjs/midway/commit/4ff0e03e833825b7a79c530665b4ab27b5d25294)) - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -### Features - -- default add session & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf)) - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Bug Fixes - -- load component with enabledEnvironment ([#1329](https://github.com/midwayjs/midway/issues/1329)) ([3182271](https://github.com/midwayjs/midway/commit/3182271a1eab931e2bf872bff6e2725ebb906ad0)) -- static prefix ([#1321](https://github.com/midwayjs/midway/issues/1321)) ([31fe961](https://github.com/midwayjs/midway/commit/31fe961931fed7656a144b1682ee4c4bb25fdff5)) - -## [2.12.3](https://github.com/midwayjs/midway-faas/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.12.2](https://github.com/midwayjs/midway-faas/compare/v2.12.1...v2.12.2) (2021-08-04) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.12.1](https://github.com/midwayjs/midway-faas/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [2.12.0](https://github.com/midwayjs/midway-faas/compare/v2.11.7...v2.12.0) (2021-07-30) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.11.6](https://github.com/midwayjs/midway-faas/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.11.5](https://github.com/midwayjs/midway-faas/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.11.4](https://github.com/midwayjs/midway-faas/compare/v2.11.3...v2.11.4) (2021-07-06) - -### Bug Fixes - -- support ignore dsl ([#1133](https://github.com/midwayjs/midway-faas/issues/1133)) ([3ca6c23](https://github.com/midwayjs/midway-faas/commit/3ca6c236d97853fcd7eaed7732fa782b74b45c07)) - -## [2.11.3](https://github.com/midwayjs/midway-faas/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.11.2](https://github.com/midwayjs/midway-faas/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.11.1](https://github.com/midwayjs/midway-faas/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [2.11.0](https://github.com/midwayjs/midway-faas/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.18](https://github.com/midwayjs/midway-faas/compare/v2.10.17...v2.10.18) (2021-05-26) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.14](https://github.com/midwayjs/midway-faas/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.13](https://github.com/midwayjs/midway-faas/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.12](https://github.com/midwayjs/midway-faas/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.11](https://github.com/midwayjs/midway-faas/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.10](https://github.com/midwayjs/midway-faas/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.9](https://github.com/midwayjs/midway-faas/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.8](https://github.com/midwayjs/midway-faas/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.7](https://github.com/midwayjs/midway-faas/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- add event name args ([#986](https://github.com/midwayjs/midway-faas/issues/986)) ([bfd8232](https://github.com/midwayjs/midway-faas/commit/bfd82320aee8600d8fa30bd2821a0e68c80fd755)) -- format ([#997](https://github.com/midwayjs/midway-faas/issues/997)) ([456cc14](https://github.com/midwayjs/midway-faas/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -## [2.10.6](https://github.com/midwayjs/midway-faas/compare/v2.10.5...v2.10.6) (2021-04-14) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.5](https://github.com/midwayjs/midway-faas/compare/v2.10.4...v2.10.5) (2021-04-13) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.4](https://github.com/midwayjs/midway-faas/compare/v2.10.3...v2.10.4) (2021-04-10) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.3](https://github.com/midwayjs/midway-faas/compare/v2.10.2...v2.10.3) (2021-04-07) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.10.2](https://github.com/midwayjs/midway-faas/compare/v2.10.1...v2.10.2) (2021-04-05) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [2.10.0](https://github.com/midwayjs/midway-faas/compare/v2.9.3...v2.10.0) (2021-04-02) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.9.3](https://github.com/midwayjs/midway-faas/compare/v2.9.2...v2.9.3) (2021-03-30) - -### Bug Fixes - -- client ip proxy to real server ([#956](https://github.com/midwayjs/midway-faas/issues/956)) ([fa6d53c](https://github.com/midwayjs/midway-faas/commit/fa6d53cde0f8bcbca875cf69faa08a708746c0bc)) - -## [2.9.2](https://github.com/midwayjs/midway-faas/compare/v2.9.1...v2.9.2) (2021-03-27) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.9.1](https://github.com/midwayjs/midway-faas/compare/v2.9.0...v2.9.1) (2021-03-24) - -**Note:** Version bump only for package @midwayjs/static-layer - -# [2.9.0](https://github.com/midwayjs/midway-faas/compare/v2.8.13...v2.9.0) (2021-03-22) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.8.13](https://github.com/midwayjs/midway-faas/compare/v2.8.12...v2.8.13) (2021-03-17) - -**Note:** Version bump only for package @midwayjs/static-layer - -## [2.8.11](https://github.com/midwayjs/midway-faas/compare/v2.8.10...v2.8.11) (2021-03-12) - -### Features - -- complete static-layer ([#908](https://github.com/midwayjs/midway-faas/issues/908)) ([75033b5](https://github.com/midwayjs/midway-faas/commit/75033b51c89e51e573c0789ec2466447918bcd61)) - -## [2.8.9](https://github.com/midwayjs/midway-faas/compare/v2.8.8...v2.8.9) (2021-03-08) - -### Bug Fixes - -- delete method parse body and form body ([#891](https://github.com/midwayjs/midway-faas/issues/891)) ([f5c1e70](https://github.com/midwayjs/midway-faas/commit/f5c1e7042ed85656e323563421391a719999979e)) - -## [2.8.8](https://github.com/midwayjs/midway-faas/compare/v2.8.7...v2.8.8) (2021-03-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.7](https://github.com/midwayjs/midway-faas/compare/v2.8.6...v2.8.7) (2021-03-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.6](https://github.com/midwayjs/midway-faas/compare/v2.8.5...v2.8.6) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.5](https://github.com/midwayjs/midway-faas/compare/v2.8.4...v2.8.5) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.4](https://github.com/midwayjs/midway-faas/compare/v2.8.3...v2.8.4) (2021-03-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.3](https://github.com/midwayjs/midway-faas/compare/v2.8.2...v2.8.3) (2021-03-01) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.8.2](https://github.com/midwayjs/midway-faas/compare/v2.8.0...v2.8.2) (2021-02-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.7.7](https://github.com/midwayjs/midway-faas/compare/v2.7.6...v2.7.7) (2021-02-20) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.7.4](https://github.com/midwayjs/midway-faas/compare/v2.7.3...v2.7.4) (2021-02-03) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.7.0](https://github.com/midwayjs/midway-faas/compare/v2.6.13...v2.7.0) (2021-01-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.13](https://github.com/midwayjs/midway-faas/compare/v2.6.12...v2.6.13) (2021-01-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.11](https://github.com/midwayjs/midway-faas/compare/v2.6.10...v2.6.11) (2021-01-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.8](https://github.com/midwayjs/midway-faas/compare/v2.6.7...v2.6.8) (2021-01-06) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.7](https://github.com/midwayjs/midway-faas/compare/v2.6.6...v2.6.7) (2021-01-05) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.6](https://github.com/midwayjs/midway-faas/compare/v2.6.5...v2.6.6) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.5](https://github.com/midwayjs/midway-faas/compare/v2.6.4...v2.6.5) (2021-01-04) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.4](https://github.com/midwayjs/midway-faas/compare/v2.6.3...v2.6.4) (2021-01-02) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.3](https://github.com/midwayjs/midway-faas/compare/v2.6.2...v2.6.3) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.2](https://github.com/midwayjs/midway-faas/compare/v2.6.1...v2.6.2) (2020-12-30) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.6.1](https://github.com/midwayjs/midway-faas/compare/v2.6.0...v2.6.1) (2020-12-29) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.6.0](https://github.com/midwayjs/midway-faas/compare/v2.5.5...v2.6.0) (2020-12-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.5.3](https://github.com/midwayjs/midway-faas/compare/v2.5.2...v2.5.3) (2020-12-11) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.5.0](https://github.com/midwayjs/midway-faas/compare/v2.4.8...v2.5.0) (2020-11-28) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [2.4.3](https://github.com/midwayjs/midway-faas/compare/v2.4.2...v2.4.3) (2020-11-16) - -**Note:** Version bump only for package @midwayjs/koa-layer - -# [2.4.0](https://github.com/midwayjs/midway-faas/compare/v2.3.23...v2.4.0) (2020-11-11) - -### Features - -- support define custom egg framework ([#709](https://github.com/midwayjs/midway-faas/issues/709)) ([f5baba1](https://github.com/midwayjs/midway-faas/commit/f5baba18d10e3dc91ba9651effadd00b8f66cf8b)) - -## [1.2.9](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.8...serverless-v1.2.9) (2020-08-26) - -### Bug Fixes - -- support async entry for koa/express ([#621](https://github.com/midwayjs/midway-faas/issues/621)) ([19bb466](https://github.com/midwayjs/midway-faas/commit/19bb466e99f3c7e7cb5b755e9fb4bb89f0a65256)) - -## [1.2.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.7...serverless-v1.2.8) (2020-08-24) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.7](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.6...serverless-v1.2.7) (2020-08-21) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.6](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.5...serverless-v1.2.6) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.4](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.3...serverless-v1.2.4) (2020-08-19) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.2.2](https://github.com/midwayjs/midway-faas/compare/serverless-v1.2.1...serverless-v1.2.2) (2020-08-18) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.1.19](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.18...serverless-v1.1.19) (2020-08-11) - -### Bug Fixes - -- application return 301 and buffer case ([#596](https://github.com/midwayjs/midway-faas/issues/596)) ([a31c022](https://github.com/midwayjs/midway-faas/commit/a31c022409d234e001030d81ce1e414159039a0b)) - -## [1.1.16](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.15...serverless-v1.1.16) (2020-08-05) - -### Bug Fixes - -- remove layer console ([#586](https://github.com/midwayjs/midway-faas/issues/586)) ([51b144b](https://github.com/midwayjs/midway-faas/commit/51b144b8d18b15cc31b31d8a2eacf7b16c12cdd1)) - -## [1.1.8](https://github.com/midwayjs/midway-faas/compare/serverless-v1.1.7...serverless-v1.1.8) (2020-07-27) - -**Note:** Version bump only for package @midwayjs/koa-layer - -## [1.1.4](https://github.com/midwayjs/midway-faas/compare/v1.0.8...v1.1.4) (2020-07-24) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) - -# [1.1.0](https://github.com/midwayjs/midway-faas/compare/serverless-v1.0.11...serverless-v1.1.0) (2020-07-21) - -### Features - -- Support application layer ([#534](https://github.com/midwayjs/midway-faas/issues/534)) ([7a141c0](https://github.com/midwayjs/midway-faas/commit/7a141c0c9404dc20d4d146a14e01dff404943142)) diff --git a/packages-legacy/static-layer/index.js b/packages-legacy/static-layer/index.js deleted file mode 100644 index 866b590bef3b..000000000000 --- a/packages-legacy/static-layer/index.js +++ /dev/null @@ -1,112 +0,0 @@ -const staticCache = require('koa-static-cache'); -const { join } = require('path'); -const { readFileSync, existsSync, unlinkSync } = require('fs'); -const rewrite = require('./rewrite'); -const request = require('request'); -const KOA = require('koa'); -const os = require('os'); - -const socketPath = join(os.tmpdir(), `server-${Date.now()}.sock`); - -module.exports = engine => { - engine.addRuntimeExtension({ - async beforeRuntimeStart(runtime) { - const baseDir = runtime.getPropertyParser().getEntryDir(); - const runtimeConfig = runtime.getRuntimeConfig(); - let deployConfig = {}; - if ( - runtimeConfig['deployType'] && - runtimeConfig['deployType']['config'] - ) { - deployConfig = runtimeConfig['deployType']['config']; - } - - if (!deployConfig.rootDir) { - deployConfig.rootDir = 'build'; - } - - const staticConfig = { - dynamic: true, - index: 'index.html', - preload: false, - buffer: true, - maxFiles: 1000, - }; - staticConfig.dir = join(baseDir, deployConfig.rootDir); - if (deployConfig.prefix && !/^\//.test(deployConfig.prefix)) { - deployConfig.prefix = '/' + deployConfig.prefix; - } - staticConfig.prefix = deployConfig.prefix || '/'; - - const app = new KOA(); - // handleRequest = koaApp.callback(); - if (existsSync(socketPath)) { - unlinkSync(socketPath); - } - - let notFoundPageCache; - - if (deployConfig['rewrite']) { - for (const pattern of Object.keys(deployConfig['rewrite'])) { - app.use(rewrite(pattern, deployConfig['rewrite'][pattern])); - } - } - - app.use(async (ctx, next) => { - let orig = ctx.path; - const last = orig.split('/').pop(); - if (last.indexOf('.') === -1) { - orig += '/'; - } - if (/\/$/.test(orig)) { - ctx.path = orig + 'index.html'; - } - ctx.path = ctx.path.replace('//', '/'); - await next(); - if (!ctx.response._explicitStatus) { - ctx.status = 404; - if (deployConfig['notFoundUrl']) { - if (notFoundPageCache) { - ctx.body = notFoundPageCache; - } else { - const fullPath = join( - staticConfig.dir, - deployConfig['notFoundUrl'] - ); - if (existsSync(fullPath)) { - ctx.body = notFoundPageCache = readFileSync(fullPath); - ctx.type = 'text/html'; - } - } - } - } - }); - app.use(staticCache(staticConfig)); - app.listen(socketPath); - }, - async defaultInvokeHandler(context) { - return new Promise((resolve, reject) => { - delete context.headers['content-length']; - const requestOption = { - uri: `http://unix:${socketPath}:${context.path}`, - qs: context.query, - method: context.method, - headers: context.headers, - followRedirect: false, - encoding: null, - }; - request(requestOption, (error, response, body) => { - if (error) { - context.status = 500; - console.error('[static-layer]' + error); - resolve('Internal Server Error'); - } else { - context.res = response; - context.status = response.statusCode; - resolve(body); - } - }); - }); - }, - }); -}; diff --git a/packages-legacy/static-layer/jest.config.js b/packages-legacy/static-layer/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/static-layer/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/static-layer/jest.setup.js b/packages-legacy/static-layer/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/static-layer/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/static-layer/package.json b/packages-legacy/static-layer/package.json deleted file mode 100644 index 77a635b20b0e..000000000000 --- a/packages-legacy/static-layer/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@midwayjs/static-layer", - "private": true, - "version": "3.18.0", - "main": "dist/index.js", - "scripts": { - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit", - "build": "ncc build index.js -o dist" - }, - "devDependencies": { - "@midwayjs/runtime-engine": "^3.7.0", - "@midwayjs/runtime-mock": "^3.7.0", - "@midwayjs/serverless-fc-starter": "^3.18.0", - "@midwayjs/serverless-fc-trigger": "^3.18.0", - "@midwayjs/serverless-scf-starter": "^3.14.0", - "@midwayjs/serverless-scf-trigger": "^3.18.0", - "koa": "2.15.3", - "koa-static-cache": "5.1.4", - "path-to-regexp": "6.3.0", - "request": "2.88.2", - "supertest": "6.3.3" - }, - "engines": { - "node": ">=12" - }, - "files": [ - "dist" - ], - "repository": { - "type": "git", - "url": "git@github.com:midwayjs/midway.git" - }, - "license": "MIT", - "gitHead": "1afeb34cbb6c0ad49ccdb9cfaebd254ae73afc6a" -} diff --git a/packages-legacy/static-layer/rewrite.js b/packages-legacy/static-layer/rewrite.js deleted file mode 100644 index cc0c855f6928..000000000000 --- a/packages-legacy/static-layer/rewrite.js +++ /dev/null @@ -1,66 +0,0 @@ -'use strict'; -/** - * Module dependencies. - */ - -const { pathToRegexp } = require('path-to-regexp'); - -/** - * Rwrite `src` to `dst`. - * - * @param {String|RegExp} src - * @param {String} dst - * @return {Function} - * @api public - */ - -module.exports = function rewrite(src, dst) { - const keys = []; - let isNot = false; - if (/^@not /.test(src)) { - isNot = true; - src = src.replace('@not ', ''); - } - const re = pathToRegexp(src, keys); - const map = toMap(keys); - - return function (ctx, next) { - const orig = ctx.url; - let m = re.exec(orig); - if (isNot) { - m = !m; - } - - if (m) { - ctx.url = dst.replace(/\$(\d+)|(?::(\w+))/g, (_, n, name) => { - if (name) return m[map[name].index + 1] || ''; - return m[n] || ''; - }); - - return next().then(() => { - ctx.url = orig; - }); - } - - return next(); - }; -}; - -/** - * Turn params array into a map for quick lookup. - * - * @param {Array} params - * @return {Object} - * @api private - */ - -function toMap(params) { - const map = {}; - - params.forEach((param, i) => { - param.index = i; - map[param.name] = param; - }); - - return map; -} diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/README.md b/packages-legacy/static-layer/test/fixtures/app-fc-404/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/404.html b/packages-legacy/static-layer/test/fixtures/app-fc-404/build/404.html deleted file mode 100644 index d0eedd275ebd..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/404.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Title - - -404 - - diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.html b/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.html deleted file mode 100644 index a98a137642d2..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Title - - - - -hello world - - diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.js b/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.js deleted file mode 100644 index 2df17242dfb9..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/index.js +++ /dev/null @@ -1 +0,0 @@ -console.log('aaa') diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/build/main.css b/packages-legacy/static-layer/test/fixtures/app-fc-404/build/main.css deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/f.yml b/packages-legacy/static-layer/test/fixtures/app-fc-404/f.yml deleted file mode 100644 index 1c4740f958da..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/f.yml +++ /dev/null @@ -1,11 +0,0 @@ -service: my-static-demo - -provider: - name: aliyun - -deployType: - type: static - config: - rootDir: build - prefix: / - notFoundUrl: /404.html diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/index.js b/packages-legacy/static-layer/test/fixtures/app-fc-404/index.js deleted file mode 100644 index 5a35b754cee2..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/index.js +++ /dev/null @@ -1,35 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const StaticLayer = require('../../../index'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [StaticLayer], - isAppMode: true, - runtimeConfig: { - deployType: { - config: { - rootDir: 'build', - notFoundUrl: '/404.html' - } - } - } - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-404/package.json b/packages-legacy/static-layer/test/fixtures/app-fc-404/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-404/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/api.html b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/api.html deleted file mode 100644 index 875cb815e36f..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/api.html +++ /dev/null @@ -1 +0,0 @@ -in api html \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/index.html b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/index.html deleted file mode 100644 index 191ae93926fd..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/index.html +++ /dev/null @@ -1 +0,0 @@ -in root html \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/static/index.html b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/static/index.html deleted file mode 100644 index 0e18ce328b48..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/build/static/index.html +++ /dev/null @@ -1 +0,0 @@ -in static html \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/f.yml b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/f.yml deleted file mode 100644 index b0e61fe57497..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/f.yml +++ /dev/null @@ -1,21 +0,0 @@ -service: my-static-demo ## 应用发布到云平台的名字 - -provider: - name: aliyun ## 发布的云平台，aliyun，tencent 等 - -deployType: - type: static - config: - rootDir: build - rewrite: - '@not /static/(.*)': /index.html - -package: - include: - - build ## 需要拷贝的目录 - exclude: - - package-lock.json ## 忽略 package-lock.json 文件 - -custom: - customDomain: - domainName: auto diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/index.js b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/index.js deleted file mode 100644 index ec3f657b26fb..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/index.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const StaticLayer = require('../../../index'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [StaticLayer], - isAppMode: true, - runtimeConfig: { - deployType: { - config: { - rootDir: 'build', - rewrite: { - '@not /static/(.*)': '/index.html' - } - } - } - } - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/package.json b/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc-rewrite/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/README.md b/packages-legacy/static-layer/test/fixtures/app-fc/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/build/index.html b/packages-legacy/static-layer/test/fixtures/app-fc/build/index.html deleted file mode 100644 index a98a137642d2..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/build/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Title - - - - -hello world - - diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/build/index.js b/packages-legacy/static-layer/test/fixtures/app-fc/build/index.js deleted file mode 100644 index 2df17242dfb9..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/build/index.js +++ /dev/null @@ -1 +0,0 @@ -console.log('aaa') diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/build/main.css b/packages-legacy/static-layer/test/fixtures/app-fc/build/main.css deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/f.yml b/packages-legacy/static-layer/test/fixtures/app-fc/f.yml deleted file mode 100644 index 1c4740f958da..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/f.yml +++ /dev/null @@ -1,11 +0,0 @@ -service: my-static-demo - -provider: - name: aliyun - -deployType: - type: static - config: - rootDir: build - prefix: / - notFoundUrl: /404.html diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/index.js b/packages-legacy/static-layer/test/fixtures/app-fc/index.js deleted file mode 100644 index 757606f88dbc..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/index.js +++ /dev/null @@ -1,35 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-fc-starter'); -const StaticLayer = require('../../../index'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [StaticLayer], - isAppMode: true, - runtimeConfig: { - deployType: { - config: { - rootDir: 'build', - prefix: '/web' - } - } - } - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/static-layer/test/fixtures/app-fc/package.json b/packages-legacy/static-layer/test/fixtures/app-fc/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-fc/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/static-layer/test/fixtures/app-scf/README.md b/packages-legacy/static-layer/test/fixtures/app-scf/README.md deleted file mode 100644 index 1f300321df3e..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-scf/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# test-eaas - -test-eaas - -## QuickStart - - - -see [egg docs][egg] for more detail. - -### Development - -```bash -$ npm i -$ npm run dev -$ open http://localhost:7001/ -``` - -### Deploy - -```bash -$ npm start -$ npm stop -``` - -### npm scripts - -- Use `npm run lint` to check code style. -- Use `npm test` to run unit test. -- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail. - - -[egg]: https://eggjs.org \ No newline at end of file diff --git a/packages-legacy/static-layer/test/fixtures/app-scf/app.js b/packages-legacy/static-layer/test/fixtures/app-scf/app.js deleted file mode 100644 index 04d31eabc298..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-scf/app.js +++ /dev/null @@ -1,34 +0,0 @@ -const Koa = require('koa'); -const Router = require('koa-router'); -const app = new Koa(); -const assert = require('assert'); -const router = new Router(); -const bodyParser = require('koa-bodyparser'); - -router.get('/get', (ctx, next) => { - ctx.type = 'html'; - ctx.body = 'Hello World'; -}); - -router.get('/get/query', (ctx, next) => { - ctx.body = { - query: ctx.query - }; -}); - -router.post('/post', (ctx, next) => { - ctx.body = 'Hello World, post'; -}); - -router.post('/post/body', (ctx, next) => { - ctx.body = { - body: ctx.request.body - }; -}); - -app.use(bodyParser()); -app.use(router.routes()).use(router.allowedMethods()); - -// app.listen(3000); - -module.exports = app; diff --git a/packages-legacy/static-layer/test/fixtures/app-scf/f.yml b/packages-legacy/static-layer/test/fixtures/app-scf/f.yml deleted file mode 100644 index 644969cfc01b..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-scf/f.yml +++ /dev/null @@ -1,6 +0,0 @@ -service: my-static-demo - -provider: - name: tencent - -deployType: static diff --git a/packages-legacy/static-layer/test/fixtures/app-scf/index.js b/packages-legacy/static-layer/test/fixtures/app-scf/index.js deleted file mode 100644 index 3c592923b430..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-scf/index.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -const { asyncWrapper } = require('@midwayjs/runtime-engine'); -const { start } = require('@midwayjs/serverless-scf-starter'); -const KoaLayer = require('../../../index'); - -let runtime; -let inited; - -async function initializeMethod() { - if(!inited) { - inited = true; - runtime = await start({ - layers: [KoaLayer], - isAppMode: true - }); - } -} - -exports.initializer = asyncWrapper(async (...args) => { - await initializeMethod(); -}); - -exports.handler = asyncWrapper(async (...args) => { - await initializeMethod(); - return runtime.asyncEvent()(...args); -}); diff --git a/packages-legacy/static-layer/test/fixtures/app-scf/package.json b/packages-legacy/static-layer/test/fixtures/app-scf/package.json deleted file mode 100644 index 5fd108c44d8b..000000000000 --- a/packages-legacy/static-layer/test/fixtures/app-scf/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "test-app", - "version": "1.0.0", - "private": true, - "dependencies": { - "koa": "^2.15.1" - }, - "devDependencies": { - }, - "engines": { - "node": ">=10.0.0" - }, - "scripts": { - "dev": "node app.js" - }, - "repository": { - "type": "git", - "url": "" - }, - "license": "MIT" -} diff --git a/packages-legacy/static-layer/test/index.test.js b/packages-legacy/static-layer/test/index.test.js deleted file mode 100644 index 97cb18e360f9..000000000000 --- a/packages-legacy/static-layer/test/index.test.js +++ /dev/null @@ -1,149 +0,0 @@ -const { createRuntime } = require('@midwayjs/runtime-mock'); -const { HTTPTrigger } = require('@midwayjs/serverless-fc-trigger'); -const FCApiGatewayTrigger = require('@midwayjs/serverless-fc-trigger') - .ApiGatewayTrigger; -const { join } = require('path'); -const request = require('supertest'); - -describe('/test/index.test.ts', () => { - describe('FC test with http trigger', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new HTTPTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/web') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/hello world/) - .expect(200, done); - }); - }); - - describe('FC test with api gateway', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test with get', done => { - request(app) - .get('/web') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(/hello world/) - .expect(200, done); - }); - - it('should test 404', done => { - request(app) - .get('/404') - .expect(404, done); - }); - - }); - - describe('FC test with 404', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc-404'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test custom 404 page', done => { - request(app) - .get('/404.html') - .expect(/404/) - .expect(200, done); - }); - - it('should not exists page and get 404 page', done => { - request(app) - .get('/404') - .expect(/404/) - .expect(404, done); - }); - - }); - - describe('FC test with rewrite', () => { - let runtime; - let app; - - beforeAll(async () => { - const entryDir = join(__dirname, './fixtures/app-fc-rewrite'); - process.env.ENTRY_DIR = entryDir; - runtime = createRuntime({ - functionDir: entryDir, - }); - await runtime.start(); - app = await runtime.delegate(new FCApiGatewayTrigger()); - }); - - afterAll(() => { - if (runtime) { - runtime.close(); - } - process.env.ENTRY_DIR = ''; - }); - - it('should test rewrite to index', done => { - request(app) - .get('/api') - .expect(/in root html/) - .expect(200, done); - }); - - it('should test match rewrite rule', done => { - request(app) - .get('/static/index.html') - .expect(/in static html/) - .expect(200, done); - }); - - }); -}); diff --git a/packages-legacy/task/CHANGELOG.md b/packages-legacy/task/CHANGELOG.md deleted file mode 100644 index e5194b70a749..000000000000 --- a/packages-legacy/task/CHANGELOG.md +++ /dev/null @@ -1,431 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.7.0](https://github.com/midwayjs/midway/compare/v3.6.1...v3.7.0) (2022-10-29) - -### Bug Fixes - -- **deps:** pin dependency cron to v1.8.2 ([#2426](https://github.com/midwayjs/midway/issues/2426)) ([9873e13](https://github.com/midwayjs/midway/commit/9873e13224e4b935697fdc22ecca97d43f809083)) - -# [3.6.0](https://github.com/midwayjs/midway/compare/v3.5.3...v3.6.0) (2022-10-10) - -### Features - -- add casbin module ([#2358](https://github.com/midwayjs/midway/issues/2358)) ([a7d2786](https://github.com/midwayjs/midway/commit/a7d27863b756dcf81abc4d7dedaf35c517c2c1e3)) -- add guard ([#2345](https://github.com/midwayjs/midway/issues/2345)) ([1b952a1](https://github.com/midwayjs/midway/commit/1b952a1b09adbb88ff3cff9a2974eb1e37ce53a5)) -- add new bull component ([#2275](https://github.com/midwayjs/midway/issues/2275)) ([0a37b49](https://github.com/midwayjs/midway/commit/0a37b491720c5d5f0b98e9e42835ba263dd8b975)) - -## [3.5.3](https://github.com/midwayjs/midway/compare/v3.5.2...v3.5.3) (2022-09-25) - -**Note:** Version bump only for package @midwayjs/task - -## [3.5.1](https://github.com/midwayjs/midway/compare/v3.5.0...v3.5.1) (2022-09-06) - -**Note:** Version bump only for package @midwayjs/task - -# [3.5.0](https://github.com/midwayjs/midway/compare/v3.4.13...v3.5.0) (2022-08-29) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.13](https://github.com/midwayjs/midway/compare/v3.4.12...v3.4.13) (2022-08-24) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.12](https://github.com/midwayjs/midway/compare/v3.4.11...v3.4.12) (2022-08-20) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.11](https://github.com/midwayjs/midway/compare/v3.4.10...v3.4.11) (2022-08-16) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.10](https://github.com/midwayjs/midway/compare/v3.4.9...v3.4.10) (2022-08-12) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.9](https://github.com/midwayjs/midway/compare/v3.4.8...v3.4.9) (2022-08-10) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.7](https://github.com/midwayjs/midway/compare/v3.4.6...v3.4.7) (2022-08-01) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.6](https://github.com/midwayjs/midway/compare/v3.4.5...v3.4.6) (2022-07-31) - -### Bug Fixes - -- **task:** createClient config missing ([#2163](https://github.com/midwayjs/midway/issues/2163)) ([129ce16](https://github.com/midwayjs/midway/commit/129ce1643201b36d10eac08a97dd6d99e35026aa)) - -## [3.4.4](https://github.com/midwayjs/midway/compare/v3.4.3...v3.4.4) (2022-07-25) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.3](https://github.com/midwayjs/midway/compare/v3.4.2...v3.4.3) (2022-07-21) - -**Note:** Version bump only for package @midwayjs/task - -## [3.4.1](https://github.com/midwayjs/midway/compare/v3.4.0...v3.4.1) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0](https://github.com/midwayjs/midway/compare/v3.4.0-beta.12...v3.4.0) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.12](https://github.com/midwayjs/midway/compare/v3.4.0-beta.11...v3.4.0-beta.12) (2022-07-20) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.11](https://github.com/midwayjs/midway/compare/v3.4.0-beta.10...v3.4.0-beta.11) (2022-07-19) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.10](https://github.com/midwayjs/midway/compare/v3.4.0-beta.9...v3.4.0-beta.10) (2022-07-18) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.9](https://github.com/midwayjs/midway/compare/v3.4.0-beta.8...v3.4.0-beta.9) (2022-07-14) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.8](https://github.com/midwayjs/midway/compare/v3.4.0-beta.7...v3.4.0-beta.8) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.7](https://github.com/midwayjs/midway/compare/v3.4.0-beta.6...v3.4.0-beta.7) (2022-07-12) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.6](https://github.com/midwayjs/midway/compare/v3.4.0-beta.5...v3.4.0-beta.6) (2022-07-07) - -**Note:** Version bump only for package @midwayjs/task - -# [3.4.0-beta.5](https://github.com/midwayjs/midway/compare/v3.4.0-beta.4...v3.4.0-beta.5) (2022-07-07) - -### Bug Fixes - -- replace onReady to onServerReady ([#2092](https://github.com/midwayjs/midway/issues/2092)) ([b3a2804](https://github.com/midwayjs/midway/commit/b3a2804820bc651366c1c3f83118262cd8947884)) - -# [3.4.0-beta.4](https://github.com/midwayjs/midway/compare/v3.4.0-beta.3...v3.4.0-beta.4) (2022-07-04) - -**Note:** Version bump only for package @midwayjs/task - -## [3.3.14](https://github.com/midwayjs/midway/compare/v3.3.13...v3.3.14) (2022-06-17) - -### Bug Fixes - -- throw error when task run fail and add task to fail queue ([#2044](https://github.com/midwayjs/midway/issues/2044)) ([3c6cd0f](https://github.com/midwayjs/midway/commit/3c6cd0f69bb3c934c56ab5d1e30a333bac6b3e1a)) - -## [3.3.12](https://github.com/midwayjs/midway/compare/v3.3.11...v3.3.12) (2022-06-02) - -### Bug Fixes - -- add duplicate check for task ([#2019](https://github.com/midwayjs/midway/issues/2019)) ([0b42b56](https://github.com/midwayjs/midway/commit/0b42b560c11d6ff718493b752e2c32cb2c44eb59)) - -## [3.3.9](https://github.com/midwayjs/midway/compare/v3.3.8...v3.3.9) (2022-05-25) - -### Bug Fixes - -- i18 resolver and task typing ([#2003](https://github.com/midwayjs/midway/issues/2003)) ([c7b8ad1](https://github.com/midwayjs/midway/commit/c7b8ad1a86eb680059ab685e1f84ffe046a59292)) - -## [3.3.6](https://github.com/midwayjs/midway/compare/v3.3.5...v3.3.6) (2022-05-11) - -**Note:** Version bump only for package @midwayjs/task - -## [3.3.5](https://github.com/midwayjs/midway/compare/v3.3.4...v3.3.5) (2022-04-27) - -**Note:** Version bump only for package @midwayjs/task - -## [3.3.4](https://github.com/midwayjs/midway/compare/v3.3.3...v3.3.4) (2022-04-21) - -**Note:** Version bump only for package @midwayjs/task - -## [3.3.2](https://github.com/midwayjs/midway/compare/v3.3.1...v3.3.2) (2022-04-13) - -**Note:** Version bump only for package @midwayjs/task - -## [3.3.1](https://github.com/midwayjs/midway/compare/v3.3.0...v3.3.1) (2022-04-11) - -**Note:** Version bump only for package @midwayjs/task - -# [3.3.0](https://github.com/midwayjs/midway/compare/v3.2.2...v3.3.0) (2022-04-07) - -**Note:** Version bump only for package @midwayjs/task - -## [3.2.2](https://github.com/midwayjs/midway/compare/v3.2.1...v3.2.2) (2022-03-30) - -**Note:** Version bump only for package @midwayjs/task - -## [3.2.1](https://github.com/midwayjs/midway/compare/v3.2.0...v3.2.1) (2022-03-27) - -### Bug Fixes - -- swagger ui replace json path ([#1860](https://github.com/midwayjs/midway/issues/1860)) ([0f3728d](https://github.com/midwayjs/midway/commit/0f3728daccba12923f23f5b498c7dda13ced36d7)) - -# [3.2.0](https://github.com/midwayjs/midway/compare/v3.1.6...v3.2.0) (2022-03-25) - -**Note:** Version bump only for package @midwayjs/task - -## [3.1.6](https://github.com/midwayjs/midway/compare/v3.1.5...v3.1.6) (2022-03-21) - -**Note:** Version bump only for package @midwayjs/task - -## [3.1.5](https://github.com/midwayjs/midway/compare/v3.1.4...v3.1.5) (2022-03-18) - -**Note:** Version bump only for package @midwayjs/task - -## [3.1.2](https://github.com/midwayjs/midway/compare/v3.1.1...v3.1.2) (2022-03-15) - -**Note:** Version bump only for package @midwayjs/task - -## [3.1.1](https://github.com/midwayjs/midway/compare/v3.1.0...v3.1.1) (2022-03-09) - -**Note:** Version bump only for package @midwayjs/task - -# [3.1.0](https://github.com/midwayjs/midway/compare/v3.0.13...v3.1.0) (2022-03-07) - -### Bug Fixes - -- use hook to load egg application ([#1782](https://github.com/midwayjs/midway/issues/1782)) ([b47f27b](https://github.com/midwayjs/midway/commit/b47f27bf441431ddb1d0d35d5ee0ae80ae56fce8)) - -## [3.0.13](https://github.com/midwayjs/midway/compare/v3.0.12...v3.0.13) (2022-03-01) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.11](https://github.com/midwayjs/midway/compare/v3.0.10...v3.0.11) (2022-02-25) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.10](https://github.com/midwayjs/midway/compare/v3.0.9...v3.0.10) (2022-02-24) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.9](https://github.com/midwayjs/midway/compare/v3.0.8...v3.0.9) (2022-02-21) - -### Bug Fixes - -- missing getLocalTask method ([#1728](https://github.com/midwayjs/midway/issues/1728)) ([1c916e9](https://github.com/midwayjs/midway/commit/1c916e9f6bb8de6ea8b64f45f8043ca315396d62)) - -## [3.0.8](https://github.com/midwayjs/midway/compare/v3.0.7...v3.0.8) (2022-02-19) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.7](https://github.com/midwayjs/midway/compare/v3.0.6...v3.0.7) (2022-02-17) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.6](https://github.com/midwayjs/midway/compare/v3.0.5...v3.0.6) (2022-02-13) - -### Bug Fixes - -- [#1692](https://github.com/midwayjs/midway/issues/1692) ([#1696](https://github.com/midwayjs/midway/issues/1696)) ([a3ac74a](https://github.com/midwayjs/midway/commit/a3ac74ab1152e8762ab6ae7d6bfa513255de4a56)) -- queue service scope ([#1699](https://github.com/midwayjs/midway/issues/1699)) ([d2e46e5](https://github.com/midwayjs/midway/commit/d2e46e5d4ef8af8016a4153bf132fed32770f06f)) - -## [3.0.5](https://github.com/midwayjs/midway/compare/v3.0.4...v3.0.5) (2022-02-10) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.4](https://github.com/midwayjs/midway/compare/v3.0.3...v3.0.4) (2022-02-09) - -### Bug Fixes - -- supertest typings and createFunctionApp ([#1642](https://github.com/midwayjs/midway/issues/1642)) ([484f4f4](https://github.com/midwayjs/midway/commit/484f4f41b3b9e889d4d285f4871a0b37fa51e73f)) -- task typings ([#1678](https://github.com/midwayjs/midway/issues/1678)) ([02aeef6](https://github.com/midwayjs/midway/commit/02aeef69a472709fba97e8250757b6136f859a84)) - -### Features - -- move context format to user config ([#1673](https://github.com/midwayjs/midway/issues/1673)) ([db53b8e](https://github.com/midwayjs/midway/commit/db53b8eaf22b50df61945ff11086e1eb7aec99a1)) - -## [3.0.3](https://github.com/midwayjs/midway/compare/v3.0.2...v3.0.3) (2022-01-28) - -**Note:** Version bump only for package @midwayjs/task - -## [3.0.2](https://github.com/midwayjs/midway/compare/v3.0.1...v3.0.2) (2022-01-24) - -### Bug Fixes - -- singleton invoke request scope not valid ([#1622](https://github.com/midwayjs/midway/issues/1622)) ([f97c063](https://github.com/midwayjs/midway/commit/f97c0632107b47cf357d17774a4e4bb5233bba57)) - -## [3.0.1](https://github.com/midwayjs/midway/compare/v3.0.0...v3.0.1) (2022-01-24) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0](https://github.com/midwayjs/midway/compare/v3.0.0-beta.17...v3.0.0) (2022-01-20) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.17](https://github.com/midwayjs/midway/compare/v3.0.0-beta.16...v3.0.0-beta.17) (2022-01-18) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.16](https://github.com/midwayjs/midway/compare/v3.0.0-beta.15...v3.0.0-beta.16) (2022-01-11) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04) - -### Bug Fixes - -- cos config definition & 3.x doc update ([#1515](https://github.com/midwayjs/midway/issues/1515)) ([0ac7ac5](https://github.com/midwayjs/midway/commit/0ac7ac5805b7ab8873f8792fc1712a74e3223172)) -- **deps:** update dependency bull to v4 ([#1511](https://github.com/midwayjs/midway/issues/1511)) ([9100d21](https://github.com/midwayjs/midway/commit/9100d21d0cd29ff948981f1c5616dd996929f6e3)) - -# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24) - -### Features - -- add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55)) - -# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18) - -### Features - -- add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3)) - -# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16) - -**Note:** Version bump only for package @midwayjs/task - -# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14) - -### Features - -- queue support concurrency config ([#1231](https://github.com/midwayjs/midway/issues/1231)) ([67bb7f5](https://github.com/midwayjs/midway/commit/67bb7f50b3dcf80439d1b4b4b9c06f930a8b4468)) - -## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09) - -**Note:** Version bump only for package @midwayjs/task - -## [2.12.1](https://github.com/midwayjs/midway/compare/v2.12.0...v2.12.1) (2021-08-01) - -**Note:** Version bump only for package @midwayjs/task - -# [2.12.0](https://github.com/midwayjs/midway/compare/v2.11.7...v2.12.0) (2021-07-30) - -### Features - -- add task log ([#1173](https://github.com/midwayjs/midway/issues/1173)) ([00ca5e8](https://github.com/midwayjs/midway/commit/00ca5e8028141db94d8e2ed0ca2729efdc449e75)) - -## [2.11.6](https://github.com/midwayjs/midway/compare/v2.11.5...v2.11.6) (2021-07-16) - -**Note:** Version bump only for package @midwayjs/task - -## [2.11.5](https://github.com/midwayjs/midway/compare/v2.11.4...v2.11.5) (2021-07-15) - -**Note:** Version bump only for package @midwayjs/task - -## [2.11.4](https://github.com/midwayjs/midway/compare/v2.11.3...v2.11.4) (2021-07-06) - -**Note:** Version bump only for package @midwayjs/task - -## [2.11.3](https://github.com/midwayjs/midway/compare/v2.11.2...v2.11.3) (2021-07-02) - -**Note:** Version bump only for package @midwayjs/task - -## [2.11.2](https://github.com/midwayjs/midway/compare/v2.11.1...v2.11.2) (2021-06-28) - -**Note:** Version bump only for package @midwayjs/task - -## [2.11.1](https://github.com/midwayjs/midway/compare/v2.11.0...v2.11.1) (2021-06-19) - -**Note:** Version bump only for package @midwayjs/task - -# [2.11.0](https://github.com/midwayjs/midway/compare/v2.10.19...v2.11.0) (2021-06-10) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.19](https://github.com/midwayjs/midway/compare/v2.10.18...v2.10.19) (2021-05-27) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.18](https://github.com/midwayjs/midway/compare/v2.10.17...v2.10.18) (2021-05-26) - -### Bug Fixes - -- task execute typo ([#1068](https://github.com/midwayjs/midway/issues/1068)) ([20b424d](https://github.com/midwayjs/midway/commit/20b424d9bf7eeca0e9247571000d02d44f342ad9)) - -## [2.10.16](https://github.com/midwayjs/midway/compare/v2.10.15...v2.10.16) (2021-05-17) - -### Features - -- **task:** add job parameter for task execute ([#1044](https://github.com/midwayjs/midway/issues/1044)) ([314a1f0](https://github.com/midwayjs/midway/commit/314a1f08dea08ca10ac64a4a408997eefa4352f5)) - -## [2.10.14](https://github.com/midwayjs/midway/compare/v2.10.13...v2.10.14) (2021-05-11) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.13](https://github.com/midwayjs/midway/compare/v2.10.12...v2.10.13) (2021-05-08) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.12](https://github.com/midwayjs/midway/compare/v2.10.11...v2.10.12) (2021-05-07) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.11](https://github.com/midwayjs/midway/compare/v2.10.10...v2.10.11) (2021-04-29) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.10](https://github.com/midwayjs/midway/compare/v2.10.9...v2.10.10) (2021-04-24) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.9](https://github.com/midwayjs/midway/compare/v2.10.8...v2.10.9) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.8](https://github.com/midwayjs/midway/compare/v2.10.7...v2.10.8) (2021-04-21) - -**Note:** Version bump only for package @midwayjs/task - -## [2.10.7](https://github.com/midwayjs/midway/compare/v2.10.6...v2.10.7) (2021-04-17) - -### Bug Fixes - -- format ([#997](https://github.com/midwayjs/midway/issues/997)) ([456cc14](https://github.com/midwayjs/midway/commit/456cc14513bdb000d1aa3130e9719caf7a8a803f)) - -### Features - -- add midway task component ([#995](https://github.com/midwayjs/midway/issues/995)) ([befb81d](https://github.com/midwayjs/midway/commit/befb81dee90f01a20bba2c1835e8685cf85a76e7)) diff --git a/packages-legacy/task/README.md b/packages-legacy/task/README.md deleted file mode 100644 index 0741510c0875..000000000000 --- a/packages-legacy/task/README.md +++ /dev/null @@ -1,146 +0,0 @@ -# @midwayjs/task - -## 简介 -midwayjs/task是为了能解决任务系列的模块，例如分布式定时任务、延迟任务调度。例如订单2小时后失效、每日定时的数据处理等工作。 - -## 安装方法 - -```bash -npm install @midwayjs/task -S -``` - -## 使用方法 - -在 Configuration.ts 导入子组件 - -```typescript - -import * as task from '@midwayjs/task'; - -@Configuration({ - imports: [task], - importConfigs: [ - join(__dirname, 'config') - ] -}) -export class AutoConfiguration{ -} -``` - -配置： - -在 config.default.ts 文件中配置对应的模块信息： - -```typescript -export const taskConfig = { - redis: `redis://127.0.0.1:6379`, - prefix: 'midway-task', - defaultJobOptions: { - repeat: { - tz: "Asia/Shanghai" - } - } -} -``` - -## 业务代码编写方式 - -分布式定时任务： - -```typescript -@Provide() -export class UserService { - @Inject() - helloService: HelloService; - - // 例如下面是每分钟执行一次，并且是分布式任务 - @Task({ - repeat: { cron: '* * * * *'} - }) - async test(){ - console.log(this.helloService.getName()) - } -} -``` - -本地定时任务： - -```typescript -@Provide() -export class UserService { - @Inject() - helloService: HelloService; - - // 例如下面是每分钟执行一次 - @TaskLocal('* * * * *') - async test(){ - console.log(this.helloService.getName()) - } -} -``` - -定时执行任务： - -```typescript -@Provide() -export class UserService { - @Inject() - helloService: HelloService; - - // 例如下面是每分钟执行一次 - @TaskLocal('* * * * *') - async test(){ - console.log(this.helloService.getName()) - } -} -``` - -让用户定义任务 - -```typescript - -@Queue() -@Provide() -export class HelloTask{ - - @Inject() - service; - - async execute(params){ - console.log(params); - } -} -``` - -```typescript -import { QueueService } from '@midwayjs/task'; -@Provide() -export class UserTask{ - - @Inject() - service; - - @Inject() - queueService: QueueService; - - async execute(params){ - // 3秒后触发分布式任务调度。 - const xxx = this.queueService.execute(HelloTask, params, {delay: 3000}); - } -} - -``` -## 其他 - -关于task任务的配置： -``` -* * * * * * -┬ ┬ ┬ ┬ ┬ ┬ -│ │ │ │ │ | -│ │ │ │ │ └ day of week (0 - 7) (0 or 7 is Sun) -│ │ │ │ └───── month (1 - 12) -│ │ │ └────────── day of month (1 - 31) -│ │ └─────────────── hour (0 - 23) -│ └──────────────────── minute (0 - 59) -└───────────────────────── second (0 - 59, optional) -``` diff --git a/packages-legacy/task/index.d.ts b/packages-legacy/task/index.d.ts deleted file mode 100644 index 7d9c50e780a1..000000000000 --- a/packages-legacy/task/index.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -export * from './dist/index'; - -declare module '@midwayjs/core/dist/interface' { - // eslint-disable-next-line - interface MidwayConfig { - task?: { - redis?: any; - prefix?: string; - defaultJobOptions?: any; - concurrency?: number; - }; - } -} diff --git a/packages-legacy/task/jest.config.js b/packages-legacy/task/jest.config.js deleted file mode 100644 index 784df0fb05b0..000000000000 --- a/packages-legacy/task/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/test/fixtures'], - coveragePathIgnorePatterns: ['/test/', '/dist/'], - setupFilesAfterEnv: ['./jest.setup.js'], - coverageProvider: 'v8', -}; diff --git a/packages-legacy/task/jest.setup.js b/packages-legacy/task/jest.setup.js deleted file mode 100644 index 53c7930592d0..000000000000 --- a/packages-legacy/task/jest.setup.js +++ /dev/null @@ -1,2 +0,0 @@ -process.env.MIDWAY_TS_MODE = 'true'; -jest.setTimeout(30000); diff --git a/packages-legacy/task/package.json b/packages-legacy/task/package.json deleted file mode 100644 index 18999cce53ad..000000000000 --- a/packages-legacy/task/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "@midwayjs/task", - "version": "3.18.0", - "private": true, - "description": "midway component for task and schedule", - "main": "dist/index.js", - "typings": "index.d.ts", - "scripts": { - "build": "tsc", - "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit" - }, - "keywords": [ - "midway", - "IoC", - "task", - "plugin" - ], - "author": "", - "files": [ - "dist/**/*.js", - "dist/**/*.d.ts", - "index.d.ts" - ], - "license": "MIT", - "devDependencies": { - "@midwayjs/core": "^3.18.0", - "@midwayjs/koa": "^3.18.0", - "@midwayjs/mock": "^3.18.0", - "@types/bull": "3.15.9", - "@types/cron": "2.4.0" - }, - "dependencies": { - "bull": "4.16.3", - "cron": "2.4.4" - }, - "engines": { - "node": ">=12" - } -} diff --git a/packages-legacy/task/src/config/config.default.ts b/packages-legacy/task/src/config/config.default.ts deleted file mode 100644 index c9bd4aec57fc..000000000000 --- a/packages-legacy/task/src/config/config.default.ts +++ /dev/null @@ -1,24 +0,0 @@ -export const task = { - redis: 'redis://127.0.0.1:6379', - prefix: 'midway-task', - defaultJobOptions: { - repeat: { - tz: 'Asia/Shanghai', - }, - }, - concurrency: 1, - contextLoggerApplyLogger: 'taskLog', - contextLoggerFormat: info => { - const { taskInfo } = info.ctx; - return `${info.timestamp} ${info.LEVEL} ${info.pid} [${taskInfo.type}][${taskInfo.id}][${taskInfo.trigger}] ${info.message}`; - }, -}; - -export const midwayLogger = { - clients: { - taskLog: { - fileLogName: 'midway-task.log', - disableConsole: true, - }, - }, -}; diff --git a/packages-legacy/task/src/configuration.ts b/packages-legacy/task/src/configuration.ts deleted file mode 100644 index 9dd0679f42b8..000000000000 --- a/packages-legacy/task/src/configuration.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Configuration, Inject, ILifeCycle } from '@midwayjs/core'; -import * as DefaultConfig from './config/config.default'; -import { TaskFramework } from './framework'; - -@Configuration({ - namespace: 'task', - importConfigs: [ - { - default: DefaultConfig, - }, - ], -}) -export class TaskConfiguration implements ILifeCycle { - @Inject() - framework: TaskFramework; - - async onServerReady() { - await this.framework.loadTask(); - await this.framework.loadLocalTask(); - await this.framework.loadQueue(); - } -} diff --git a/packages-legacy/task/src/framework.ts b/packages-legacy/task/src/framework.ts deleted file mode 100644 index c49ea7131316..000000000000 --- a/packages-legacy/task/src/framework.ts +++ /dev/null @@ -1,216 +0,0 @@ -import { - BaseFramework, - IMidwayBootstrapOptions, - MidwayCommonError, - Framework, - getClassMetadata, - getProviderName, - Inject, - listModule, - MidwayFrameworkType, - MODULE_TASK_KEY, - MODULE_TASK_METADATA, - MODULE_TASK_QUEUE_KEY, - MODULE_TASK_QUEUE_OPTIONS, - MODULE_TASK_TASK_LOCAL_KEY, - MODULE_TASK_TASK_LOCAL_OPTIONS, - Utils, - deprecatedOutput, -} from '@midwayjs/core'; -import * as Bull from 'bull'; -import { CronJob } from 'cron'; -import { Application, Context, IQueue } from './interface'; -import { QueueService } from './service/queueService'; - -@Framework() -export class TaskFramework extends BaseFramework { - queueList: any[] = []; - jobList: any[] = []; - - @Inject() - queueService: QueueService; - - applicationInitialize(options: IMidwayBootstrapOptions) { - this.app = {} as any; - } - - configure() { - return this.configService.getConfiguration('task'); - } - - getFrameworkType() { - return MidwayFrameworkType.TASK; - } - - async run() {} - - async loadTask() { - const legacyConfig = this.configService.getConfiguration('taskConfig'); - if (legacyConfig) { - deprecatedOutput('[midway:task] Please use "task" replace "taskConfig"'); - this.configService.addObject({ - task: legacyConfig, - }); - } - const taskConfig = this.configService.getConfiguration('task'); - const modules = listModule(MODULE_TASK_KEY); - const duplicatedCheck = new Set(); - - for (const module of modules) { - const providerName = getProviderName(module); - if (duplicatedCheck.has(providerName)) { - throw new MidwayCommonError( - `Duplicate task class name "${providerName}"` - ); - } else { - duplicatedCheck.add(providerName); - } - const rules = getClassMetadata(MODULE_TASK_METADATA, module); - for (const rule of rules) { - const queue = new Bull(`${rule.name}:${rule.propertyKey}`, taskConfig); - queue.process(async job => { - const ctx = this.app.createAnonymousContext({ - taskInfo: { - type: 'Task', - id: job.id, - trigger: `${rule.name}:${rule.propertyKey}`, - }, - }); - const { logger } = ctx; - try { - logger.info('task start.'); - const service = await ctx.requestContext.getAsync(module); - await Utils.toAsyncFunction(rule.value.bind(service))(job.data); - } catch (e) { - logger.error(`${e.stack}`); - throw e; - } - logger.info('task end.'); - }); - this.queueService.saveQueueTask( - `${rule.name}:${rule.propertyKey}`, - queue - ); - const allJobs = await queue.getRepeatableJobs(); - if (allJobs.length > 0) { - if ( - !( - allJobs.length === 1 && - allJobs[0].cron === rule.options.repeat.cron - ) - ) { - for (const item of allJobs) { - await queue.removeRepeatableByKey(item.key); - } - } - } - queue.add({}, rule.options); - this.queueList.push(queue); - } - } - duplicatedCheck.clear(); - } - - async loadLocalTask() { - const taskConfig = this.configService.getConfiguration('task'); - const modules = listModule(MODULE_TASK_TASK_LOCAL_KEY); - const duplicatedCheck = new Set(); - for (const module of modules) { - const providerName = getProviderName(module); - if (duplicatedCheck.has(providerName)) { - throw new MidwayCommonError( - `Duplicate task class name "${providerName}"` - ); - } else { - duplicatedCheck.add(providerName); - } - const rules = getClassMetadata(MODULE_TASK_TASK_LOCAL_OPTIONS, module); - for (const rule of rules) { - const triggerFunction = async () => { - const requestId = Utils.randomUUID(); - const ctx = this.app.createAnonymousContext({ - taskInfo: { - type: 'LocalTask', - id: requestId, - trigger: `${module.name}:${rule.propertyKey}`, - }, - }); - const { logger } = ctx; - try { - const service = await ctx.requestContext.getAsync(module); - logger.info('local task start.'); - await Utils.toAsyncFunction(rule.value.bind(service))(); - } catch (err) { - logger.error(err); - throw err; - } - logger.info('local task end.'); - }; - const job = new CronJob( - rule.options, - triggerFunction, - null, - true, - taskConfig.defaultJobOptions.repeat.tz - ); - job.start(); - this.queueService.saveLocalTask( - `${module.name}:${rule.propertyKey}`, - triggerFunction - ); - this.jobList.push(job); - } - } - duplicatedCheck.clear(); - } - - async loadQueue() { - const modules = listModule(MODULE_TASK_QUEUE_KEY); - const taskConfig = this.configService.getConfiguration('task'); - const config = JSON.parse(JSON.stringify(taskConfig)); - - if (taskConfig && taskConfig.createClient) { - config.createClient = taskConfig.createClient; - } - - const concurrency = config.concurrency || 1; - delete config.defaultJobOptions.repeat; - for (const module of modules) { - const rule = getClassMetadata(MODULE_TASK_QUEUE_OPTIONS, module); - const queue = new Bull(`${rule.name}:execute`, config); - queue.process(concurrency, async job => { - const ctx = this.app.createAnonymousContext({ - taskInfo: { - type: 'Queue', - id: job.id, - trigger: `${module.name}`, - }, - }); - const { logger } = ctx; - try { - logger.info('queue process start.'); - const service = await ctx.requestContext.getAsync(module); - await Utils.toAsyncFunction(service.execute.bind(service))( - job.data, - job - ); - } catch (e) { - logger.error(`${e.stack}`); - throw e; - } - logger.info('queue process end.'); - }); - this.queueService.saveQueue(`${rule.name}:execute`, queue); - this.queueList.push(queue); - } - } - - protected async beforeStop() { - this.queueList.map(queue => { - queue.close(); - }); - this.jobList.map(job => { - job.stop(); - }); - } -} diff --git a/packages-legacy/task/src/index.ts b/packages-legacy/task/src/index.ts deleted file mode 100644 index 7160266be312..000000000000 --- a/packages-legacy/task/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { TaskConfiguration as Configuration } from './configuration'; -export { QueueService } from './service/queueService'; -export * from './framework'; -export * from './interface'; diff --git a/packages-legacy/task/src/interface.ts b/packages-legacy/task/src/interface.ts deleted file mode 100644 index 12738c2e0bed..000000000000 --- a/packages-legacy/task/src/interface.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core'; -import * as Bull from 'bull'; - -export interface IQueue { - execute(data: any, job: Bull.Job): Promise; -} - -export interface Application extends IMidwayApplication {} -export type NextFunction = BaseNextFunction; - -export interface Context extends IMidwayContext { - taskInfo: { - type: string; - id: string; - trigger: string; - } -} diff --git a/packages-legacy/task/src/service/queueService.ts b/packages-legacy/task/src/service/queueService.ts deleted file mode 100644 index c531552c8281..000000000000 --- a/packages-legacy/task/src/service/queueService.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Provide, Scope, ScopeEnum } from '@midwayjs/core'; -import { JobOptions, Queue } from 'bull'; - -@Provide() -@Scope(ScopeEnum.Singleton) -export class QueueService { - private queueMap = {}; - private queueTaskMap = {}; - private localTaskMap = {}; - - async execute( - queueName: any, - data: Record, - options: JobOptions = {} - ) { - const queue = this.queueMap[`${queueName.name}:execute`] as Queue; - return await queue.add(data || {}, options); - } - - getClassQueue(queueName: any): Queue { - return this.queueMap[`${queueName.name}:execute`] as Queue; - } - - getQueueTask(queueClass: string, queueName: string): Queue { - return this.queueTaskMap[`${queueClass}:${queueName}`] as Queue; - } - - getLocalTask(queueClass: string, queueName: string): any { - return this.localTaskMap[`${queueClass}:${queueName}`] as any; - } - - saveQueue(key, value) { - this.queueMap[key] = value; - } - - saveQueueTask(key, value) { - this.queueTaskMap[key] = value; - } - - saveLocalTask(key, value) { - this.localTaskMap[key] = value; - } -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/package.json b/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/package.json deleted file mode 100644 index 621cdc6a4174..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "ali-demo" -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/config/config.default.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/config/config.default.ts deleted file mode 100644 index 148ab6284703..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/config/config.default.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const task = { - redis: 'redis://127.0.0.1:6379', - prefix: 'midway-task', - defaultJobOptions: { - repeat: { - tz: 'Asia/Shanghai', - }, - }, - concurrency: 1, -}; diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/configuration.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/configuration.ts deleted file mode 100644 index 061574a82c99..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/configuration.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as task from '../../../../src'; - -@Configuration({ - imports: [ - task - ], - importConfigs: [ - join(__dirname, './config') - ] -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/another.task.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/another.task.ts deleted file mode 100644 index 76cd6059d97c..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/another.task.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { App, Provide, TaskLocal } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; - -@Provide() -export class HelloTask { - - @App() - app: Application; - - @TaskLocal('*/2 * * * * *') - async hello() { - this.app.getApplicationContext().registerObject(`name`, 'taskLocal'); - } -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/hello.task.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/hello.task.ts deleted file mode 100644 index 76cd6059d97c..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-local-task/src/task/hello.task.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { App, Provide, TaskLocal } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; - -@Provide() -export class HelloTask { - - @App() - app: Application; - - @TaskLocal('*/2 * * * * *') - async hello() { - this.app.getApplicationContext().registerObject(`name`, 'taskLocal'); - } -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-task/package.json b/packages-legacy/task/test/fixtures/base-app-duplicate-task/package.json deleted file mode 100644 index 621cdc6a4174..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-task/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "ali-demo" -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/config/config.default.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/config/config.default.ts deleted file mode 100644 index 148ab6284703..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/config/config.default.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const task = { - redis: 'redis://127.0.0.1:6379', - prefix: 'midway-task', - defaultJobOptions: { - repeat: { - tz: 'Asia/Shanghai', - }, - }, - concurrency: 1, -}; diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/configuration.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/configuration.ts deleted file mode 100644 index 061574a82c99..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/configuration.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as task from '../../../../src'; - -@Configuration({ - imports: [ - task - ], - importConfigs: [ - join(__dirname, './config') - ] -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/another.task.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/another.task.ts deleted file mode 100644 index 65fa8d323e52..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/another.task.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { App, FORMAT, Provide, Task } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; - -@Provide() -export class HelloTask { - - @App() - app: Application; - - @Task({ - repeat: { cron: FORMAT.CRONTAB.EVERY_PER_5_SECOND }, - }) - async task(){ - this.app.getApplicationContext().registerObject(`task`, 'task'); - } -} diff --git a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/hello.task.ts b/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/hello.task.ts deleted file mode 100644 index 65fa8d323e52..000000000000 --- a/packages-legacy/task/test/fixtures/base-app-duplicate-task/src/task/hello.task.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { App, FORMAT, Provide, Task } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; - -@Provide() -export class HelloTask { - - @App() - app: Application; - - @Task({ - repeat: { cron: FORMAT.CRONTAB.EVERY_PER_5_SECOND }, - }) - async task(){ - this.app.getApplicationContext().registerObject(`task`, 'task'); - } -} diff --git a/packages-legacy/task/test/fixtures/base-app/package.json b/packages-legacy/task/test/fixtures/base-app/package.json deleted file mode 100644 index 621cdc6a4174..000000000000 --- a/packages-legacy/task/test/fixtures/base-app/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "ali-demo" -} diff --git a/packages-legacy/task/test/fixtures/base-app/src/config/config.default.ts b/packages-legacy/task/test/fixtures/base-app/src/config/config.default.ts deleted file mode 100644 index 148ab6284703..000000000000 --- a/packages-legacy/task/test/fixtures/base-app/src/config/config.default.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const task = { - redis: 'redis://127.0.0.1:6379', - prefix: 'midway-task', - defaultJobOptions: { - repeat: { - tz: 'Asia/Shanghai', - }, - }, - concurrency: 1, -}; diff --git a/packages-legacy/task/test/fixtures/base-app/src/configuration.ts b/packages-legacy/task/test/fixtures/base-app/src/configuration.ts deleted file mode 100644 index 061574a82c99..000000000000 --- a/packages-legacy/task/test/fixtures/base-app/src/configuration.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Configuration } from '@midwayjs/core'; -import { join } from 'path'; -import * as task from '../../../../src'; - -@Configuration({ - imports: [ - task - ], - importConfigs: [ - join(__dirname, './config') - ] -}) -export class ContainerConfiguration { -} diff --git a/packages-legacy/task/test/fixtures/base-app/src/task/hello.task.ts b/packages-legacy/task/test/fixtures/base-app/src/task/hello.task.ts deleted file mode 100644 index 9597af59ce12..000000000000 --- a/packages-legacy/task/test/fixtures/base-app/src/task/hello.task.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { App, FORMAT, Provide, Task } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; -import { TaskLocal } from '@midwayjs/core'; - -@Provide() -export class HelloTask { - - @App() - app: Application; - - @TaskLocal('*/2 * * * * *') - async hello() { - this.app.getApplicationContext().registerObject(`name`, 'taskLocal'); - } - - @Task({ - repeat: { cron: FORMAT.CRONTAB.EVERY_PER_5_SECOND }, - }) - async task(){ - this.app.getApplicationContext().registerObject(`task`, 'task'); - } -} diff --git a/packages-legacy/task/test/fixtures/base-app/src/task/queue.task.ts b/packages-legacy/task/test/fixtures/base-app/src/task/queue.task.ts deleted file mode 100644 index d0484b79348a..000000000000 --- a/packages-legacy/task/test/fixtures/base-app/src/task/queue.task.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { App, Inject, Provide, Queue } from '@midwayjs/core'; -import { Application } from "@midwayjs/koa"; - -@Queue() -@Provide() -export class QueueTask{ - - @App() - app: Application; - - @Inject() - logger; - - async execute(params){ - this.logger.info(`====>QueueTask execute`) - this.app.getApplicationContext().registerObject(`queueConfig`, JSON.stringify(params)); - } -} diff --git a/packages-legacy/task/test/index.test.ts b/packages-legacy/task/test/index.test.ts deleted file mode 100644 index 68661e116de8..000000000000 --- a/packages-legacy/task/test/index.test.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { createApp, close } from '@midwayjs/mock'; -import { QueueTask } from './fixtures/base-app/src/task/queue.task'; -import { join } from 'path'; -import { sleep } from '@midwayjs/core'; -import * as TaskModule from '../src'; - -describe(`midway task`, () => { - let app: TaskModule.Application; - - beforeAll(async () => { - app = await createApp(join(__dirname, 'fixtures', 'base-app'), {}, TaskModule); - }); - - afterAll(async () => { - await close(app); - }); - - it('local task', async () => { - await sleep(3 * 1000); - let res = app.getApplicationContext().get(`name`); - expect(res).toEqual(`taskLocal`) - }) - - it('task', async () => { - await sleep(5 * 1000); - let res = app.getApplicationContext().get(`task`); - expect(res).toEqual(`task`) - }) - - it('add task to queue', async () => { - let ctx = app.createAnonymousContext(); - expect(() => app.getApplicationContext().get(`queueConfig`)).toThrow(); - let service = await ctx.requestContext.getAsync(`task:queueService`); - let params: any = { - name: 'stone-jin' - }; - (service as any).execute(QueueTask, params, {delay: 1000}); - await sleep(3 * 1000); - expect(app.getApplicationContext().get(`queueConfig`)).toBe(JSON.stringify(params)); - }) - - it(`stop queue`, async () => { - let ctx = app.createAnonymousContext(); - let service = await ctx.requestContext.getAsync(`task:queueService`); - expect((service as any).getClassQueue(QueueTask)).not.toBeNull(); - }); -}) - -describe('test another duplicated error', function () { - it('should throw error when start with duplicate task', async () => { - let error; - try { - await createApp(join(__dirname, 'fixtures', 'base-app-duplicate-task'), {}, TaskModule); - } catch (err) { - error = err; - } - expect(error).toBeDefined(); - }); - - it('should throw error when start with duplicate local task', async () => { - let error; - try { - await createApp(join(__dirname, 'fixtures', 'base-app-duplicate-local-task'), {}, TaskModule); - } catch (err) { - error = err; - } - expect(error).toBeDefined(); - }); -}); diff --git a/packages-legacy/task/tsconfig.json b/packages-legacy/task/tsconfig.json deleted file mode 100644 index 324fe88c9b14..000000000000 --- a/packages-legacy/task/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compileOnSave": true, - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - }, - "include": [ - "./src/**/*.ts" - ] -} diff --git a/packages/faas/test/index.test.ts b/packages/faas/test/index.test.ts index 9fa2cbf7aa64..2c9b9a559189 100644 --- a/packages/faas/test/index.test.ts +++ b/packages/faas/test/index.test.ts @@ -1,5 +1,4 @@ import * as assert from 'assert'; -import * as mm from 'mm'; import { creatStarter, closeApp } from './utils'; describe('test/index.test.ts', () => { @@ -112,128 +111,6 @@ describe('test/index.test.ts', () => { await closeApp(starter); }); - it('test custom global middleware in fc', async () => { - mm(process.env, 'MIDWAY_SERVERLESS_FUNCTION_NAME', 'aaa'); - mm(process.env, 'MIDWAY_SERVERLESS_SERVICE_NAME', 'bbb'); - const { start } = require('@midwayjs/serverless-fc-starter'); - const runtime = await start(); - const starter = await creatStarter('base-app-middleware', { - applicationAdapter: runtime, - }); - - const data = await runtime.asyncEvent( - starter.handleInvokeWrapper('helloService.handler') - )( - { - text: 'hello', - httpMethod: 'GET', - headers: {}, - requestContext: {}, - queryParameters: {}, - }, - { text: 'a' } - ); - - expect(data.body).toEqual('ahello555aaabbb'); - await closeApp(starter); - mm.restore(); - }); - - it('test custom global middleware in scf', async () => { - const { start } = require('@midwayjs/serverless-scf-starter'); - const runtime = await start(); - const starter = await creatStarter('base-app-middleware-scf', { - applicationAdapter: runtime, - }); - - const data = await runtime.asyncEvent( - starter.handleInvokeWrapper('helloService.handler') - )( - { - text: 'hello', - httpMethod: 'GET', - headers: {}, - requestContext: {}, - }, - { text: 'a' } - ); - - expect(data.body).toEqual('ahello555'); - await closeApp(starter); - }); - - it('test throw error from code and middleware catch it', async () => { - const { start } = require('@midwayjs/serverless-scf-starter'); - const runtime = await start(); - - const starter = await creatStarter('base-app-middleware-err', { - applicationAdapter: runtime, - }); - const data = await runtime.asyncEvent( - starter.handleInvokeWrapper('helloService.handler') - )( - { - text: 'hello', - httpMethod: 'GET', - headers: {}, - requestContext: {}, - }, - { text: 'a' } - ); - - assert.ok(data.body === 'ahello555'); - await closeApp(starter); - }); - - it('test inject app and plugin', async () => { - const { start } = require('@midwayjs/serverless-scf-starter'); - const runtime = await start(); - const starter = await creatStarter('base-app-inject', { - applicationAdapter: runtime, - }); - // set app - const app = runtime.getApplication(); - app.mysql = { - model: '123', - }; - const data = await runtime.asyncEvent( - starter.handleInvokeWrapper('helloService.handler') - )( - { - text: 'hello', - httpMethod: 'GET', - requestContext: {}, - }, - { text: 'a' } - ); - - expect(data).toEqual('ahello123'); - await closeApp(starter); - }); - - it('test inject logger', async () => { - const { start } = require('@midwayjs/serverless-scf-starter'); - const runtime = await start(); - const starter = await creatStarter('base-app-inject-logger', { - applicationAdapter: runtime, - }); - - const data = await runtime.asyncEvent( - starter.handleInvokeWrapper('helloService.handler') - )( - { - text: 'hello', - httpMethod: 'GET', - headers: {}, - requestContext: {}, - }, - { text: 'a' } - ); - - assert.ok(data.body === 'hello world'); - await closeApp(starter); - }); - it('invoke controller handler', async () => { const starter = await creatStarter('base-app-controller'); let data = await starter.handleInvokeWrapper('helloService.handler')( From 756a70b884c2cc51b1d570fe7bfc3794c889dde4 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 12:46:11 +0800 Subject: [PATCH 07/18] fix: test --- .../fixtures/base-app/src/service/test.ts | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 packages/view/test/fixtures/base-app/src/service/test.ts diff --git a/packages/view/test/fixtures/base-app/src/service/test.ts b/packages/view/test/fixtures/base-app/src/service/test.ts deleted file mode 100644 index f8528d6ffbae..000000000000 --- a/packages/view/test/fixtures/base-app/src/service/test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Provide, Scope, ScopeEnum, Init } from '@midwayjs/core'; -import { getModelForClass, prop, ReturnModelType } from '@typegoose/typegoose'; - -class User { - - @prop() - public name?: string; - - @prop({ type: () => [String] }) - public jobs?: string[]; -} - -@Provide() -@Scope(ScopeEnum.Singleton) -export class TestService{ - - userModel: ReturnModelType; - - @Init() - init() { - this.userModel = getModelForClass(User); - } - - async getTest(){ - const { _id: id } = await this.userModel.create({ name: 'JohnDoe', jobs: ['Cleaner'] } as User); // an "as" assertion, to have types for all properties - const user = await this.userModel.findById(id).exec(); - console.log(user) - } -} From d16318976ed3bb4803dfabef9070b1e545b6745a Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 14:45:56 +0800 Subject: [PATCH 08/18] chore: pnpm hoist --- .npmrc | 2 ++ .run/All Tests in bootstrap.run.xml | 12 ++++++++++++ .run/All Tests in bull-board.run.xml | 12 ++++++++++++ .run/All Tests in bull.run.xml | 12 ++++++++++++ .run/All Tests in cache-manager.run.xml | 12 ++++++++++++ .run/All Tests in captcha.run.xml | 12 ++++++++++++ .run/All Tests in casbin-redis-adapter.run.xml | 12 ++++++++++++ .run/All Tests in casbin-typeorm-adapter.run.xml | 12 ++++++++++++ .run/All Tests in casbin.run.xml | 12 ++++++++++++ .run/All Tests in code-dye.run.xml | 12 ++++++++++++ .run/All Tests in consul.run.xml | 12 ++++++++++++ .run/All Tests in core.run.xml | 12 ++++++++++++ .run/All Tests in cos.run.xml | 12 ++++++++++++ .run/All Tests in cron.run.xml | 12 ++++++++++++ .run/All Tests in cross-domain.run.xml | 12 ++++++++++++ .run/All Tests in etcd.run.xml | 12 ++++++++++++ .run/All Tests in faas.run.xml | 12 ++++++++++++ .run/All Tests in fc-starter.run.xml | 12 ++++++++++++ .run/All Tests in grpc.run.xml | 12 ++++++++++++ .run/All Tests in http-proxy.run.xml | 12 ++++++++++++ .run/All Tests in i18n.run.xml | 12 ++++++++++++ .run/All Tests in info.run.xml | 12 ++++++++++++ .run/All Tests in jwt.run.xml | 12 ++++++++++++ .run/All Tests in kafka.run.xml | 12 ++++++++++++ .run/All Tests in leoric.run.xml | 12 ++++++++++++ .run/All Tests in mikro.run.xml | 12 ++++++++++++ .run/All Tests in mock.run.xml | 12 ++++++++++++ .run/All Tests in mongoose.run.xml | 12 ++++++++++++ .run/All Tests in mqtt.run.xml | 12 ++++++++++++ .run/All Tests in oss.run.xml | 12 ++++++++++++ .run/All Tests in otel.run.xml | 12 ++++++++++++ .run/All Tests in passport.run.xml | 12 ++++++++++++ .run/All Tests in process-agent.run.xml | 12 ++++++++++++ .run/All Tests in prometheus-socket-io.run.xml | 12 ++++++++++++ .run/All Tests in prometheus.run.xml | 12 ++++++++++++ .run/All Tests in rabbitmq.run.xml | 12 ++++++++++++ .run/All Tests in redis.run.xml | 12 ++++++++++++ .run/All Tests in security.run.xml | 12 ++++++++++++ .run/All Tests in sequelize.run.xml | 12 ++++++++++++ .run/All Tests in session.run.xml | 12 ++++++++++++ .run/All Tests in socketio.run.xml | 12 ++++++++++++ .run/All Tests in static-file.run.xml | 12 ++++++++++++ .run/All Tests in swagger.run.xml | 12 ++++++++++++ .run/All Tests in tablestore.run.xml | 12 ++++++++++++ .run/All Tests in tags.run.xml | 12 ++++++++++++ .run/All Tests in tenant.run.xml | 12 ++++++++++++ .run/All Tests in typegoose.run.xml | 12 ++++++++++++ .run/All Tests in typeorm.run.xml | 12 ++++++++++++ .run/All Tests in upload.run.xml | 12 ++++++++++++ .run/All Tests in validate.run.xml | 12 ++++++++++++ .run/All Tests in version.run.xml | 12 ++++++++++++ .run/All Tests in view-ejs.run.xml | 12 ++++++++++++ .run/All Tests in view-nunjucks.run.xml | 12 ++++++++++++ .run/All Tests in view.run.xml | 12 ++++++++++++ .run/All Tests in web-express.run.xml | 12 ++++++++++++ .run/All Tests in web.run.xml | 12 ++++++++++++ 56 files changed, 662 insertions(+) create mode 100644 .run/All Tests in bootstrap.run.xml create mode 100644 .run/All Tests in bull-board.run.xml create mode 100644 .run/All Tests in bull.run.xml create mode 100644 .run/All Tests in cache-manager.run.xml create mode 100644 .run/All Tests in captcha.run.xml create mode 100644 .run/All Tests in casbin-redis-adapter.run.xml create mode 100644 .run/All Tests in casbin-typeorm-adapter.run.xml create mode 100644 .run/All Tests in casbin.run.xml create mode 100644 .run/All Tests in code-dye.run.xml create mode 100644 .run/All Tests in consul.run.xml create mode 100644 .run/All Tests in core.run.xml create mode 100644 .run/All Tests in cos.run.xml create mode 100644 .run/All Tests in cron.run.xml create mode 100644 .run/All Tests in cross-domain.run.xml create mode 100644 .run/All Tests in etcd.run.xml create mode 100644 .run/All Tests in faas.run.xml create mode 100644 .run/All Tests in fc-starter.run.xml create mode 100644 .run/All Tests in grpc.run.xml create mode 100644 .run/All Tests in http-proxy.run.xml create mode 100644 .run/All Tests in i18n.run.xml create mode 100644 .run/All Tests in info.run.xml create mode 100644 .run/All Tests in jwt.run.xml create mode 100644 .run/All Tests in kafka.run.xml create mode 100644 .run/All Tests in leoric.run.xml create mode 100644 .run/All Tests in mikro.run.xml create mode 100644 .run/All Tests in mock.run.xml create mode 100644 .run/All Tests in mongoose.run.xml create mode 100644 .run/All Tests in mqtt.run.xml create mode 100644 .run/All Tests in oss.run.xml create mode 100644 .run/All Tests in otel.run.xml create mode 100644 .run/All Tests in passport.run.xml create mode 100644 .run/All Tests in process-agent.run.xml create mode 100644 .run/All Tests in prometheus-socket-io.run.xml create mode 100644 .run/All Tests in prometheus.run.xml create mode 100644 .run/All Tests in rabbitmq.run.xml create mode 100644 .run/All Tests in redis.run.xml create mode 100644 .run/All Tests in security.run.xml create mode 100644 .run/All Tests in sequelize.run.xml create mode 100644 .run/All Tests in session.run.xml create mode 100644 .run/All Tests in socketio.run.xml create mode 100644 .run/All Tests in static-file.run.xml create mode 100644 .run/All Tests in swagger.run.xml create mode 100644 .run/All Tests in tablestore.run.xml create mode 100644 .run/All Tests in tags.run.xml create mode 100644 .run/All Tests in tenant.run.xml create mode 100644 .run/All Tests in typegoose.run.xml create mode 100644 .run/All Tests in typeorm.run.xml create mode 100644 .run/All Tests in upload.run.xml create mode 100644 .run/All Tests in validate.run.xml create mode 100644 .run/All Tests in version.run.xml create mode 100644 .run/All Tests in view-ejs.run.xml create mode 100644 .run/All Tests in view-nunjucks.run.xml create mode 100644 .run/All Tests in view.run.xml create mode 100644 .run/All Tests in web-express.run.xml create mode 100644 .run/All Tests in web.run.xml diff --git a/.npmrc b/.npmrc index 3d5d238fe463..0761129d62f2 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,3 @@ link-workspace-packages = true +hoist=true +hoist-pattern[]=@midwayjs/* \ No newline at end of file diff --git a/.run/All Tests in bootstrap.run.xml b/.run/All Tests in bootstrap.run.xml new file mode 100644 index 000000000000..855d49483167 --- /dev/null +++ b/.run/All Tests in bootstrap.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in bull-board.run.xml b/.run/All Tests in bull-board.run.xml new file mode 100644 index 000000000000..54201ee9c213 --- /dev/null +++ b/.run/All Tests in bull-board.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in bull.run.xml b/.run/All Tests in bull.run.xml new file mode 100644 index 000000000000..d6532b7e94bf --- /dev/null +++ b/.run/All Tests in bull.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in cache-manager.run.xml b/.run/All Tests in cache-manager.run.xml new file mode 100644 index 000000000000..585db6ed4374 --- /dev/null +++ b/.run/All Tests in cache-manager.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in captcha.run.xml b/.run/All Tests in captcha.run.xml new file mode 100644 index 000000000000..11b0b352a4bd --- /dev/null +++ b/.run/All Tests in captcha.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in casbin-redis-adapter.run.xml b/.run/All Tests in casbin-redis-adapter.run.xml new file mode 100644 index 000000000000..59b90e47fc82 --- /dev/null +++ b/.run/All Tests in casbin-redis-adapter.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in casbin-typeorm-adapter.run.xml b/.run/All Tests in casbin-typeorm-adapter.run.xml new file mode 100644 index 000000000000..83512bfa4e14 --- /dev/null +++ b/.run/All Tests in casbin-typeorm-adapter.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in casbin.run.xml b/.run/All Tests in casbin.run.xml new file mode 100644 index 000000000000..99ac1bf36071 --- /dev/null +++ b/.run/All Tests in casbin.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in code-dye.run.xml b/.run/All Tests in code-dye.run.xml new file mode 100644 index 000000000000..5e115d52caca --- /dev/null +++ b/.run/All Tests in code-dye.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in consul.run.xml b/.run/All Tests in consul.run.xml new file mode 100644 index 000000000000..6b0aa8c123a4 --- /dev/null +++ b/.run/All Tests in consul.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in core.run.xml b/.run/All Tests in core.run.xml new file mode 100644 index 000000000000..3761647ff27b --- /dev/null +++ b/.run/All Tests in core.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in cos.run.xml b/.run/All Tests in cos.run.xml new file mode 100644 index 000000000000..8042e37fc68c --- /dev/null +++ b/.run/All Tests in cos.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in cron.run.xml b/.run/All Tests in cron.run.xml new file mode 100644 index 000000000000..f9581596bed6 --- /dev/null +++ b/.run/All Tests in cron.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in cross-domain.run.xml b/.run/All Tests in cross-domain.run.xml new file mode 100644 index 000000000000..df65063a2b22 --- /dev/null +++ b/.run/All Tests in cross-domain.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in etcd.run.xml b/.run/All Tests in etcd.run.xml new file mode 100644 index 000000000000..b4d6e4007579 --- /dev/null +++ b/.run/All Tests in etcd.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in faas.run.xml b/.run/All Tests in faas.run.xml new file mode 100644 index 000000000000..69a93097aafa --- /dev/null +++ b/.run/All Tests in faas.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in fc-starter.run.xml b/.run/All Tests in fc-starter.run.xml new file mode 100644 index 000000000000..0909c05cb204 --- /dev/null +++ b/.run/All Tests in fc-starter.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in grpc.run.xml b/.run/All Tests in grpc.run.xml new file mode 100644 index 000000000000..f531cfc127b3 --- /dev/null +++ b/.run/All Tests in grpc.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in http-proxy.run.xml b/.run/All Tests in http-proxy.run.xml new file mode 100644 index 000000000000..498b99720afd --- /dev/null +++ b/.run/All Tests in http-proxy.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in i18n.run.xml b/.run/All Tests in i18n.run.xml new file mode 100644 index 000000000000..3535503f5939 --- /dev/null +++ b/.run/All Tests in i18n.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in info.run.xml b/.run/All Tests in info.run.xml new file mode 100644 index 000000000000..4dcebf78ddb8 --- /dev/null +++ b/.run/All Tests in info.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in jwt.run.xml b/.run/All Tests in jwt.run.xml new file mode 100644 index 000000000000..e4e63172c000 --- /dev/null +++ b/.run/All Tests in jwt.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in kafka.run.xml b/.run/All Tests in kafka.run.xml new file mode 100644 index 000000000000..57df903e8a69 --- /dev/null +++ b/.run/All Tests in kafka.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in leoric.run.xml b/.run/All Tests in leoric.run.xml new file mode 100644 index 000000000000..56ae5c72b732 --- /dev/null +++ b/.run/All Tests in leoric.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in mikro.run.xml b/.run/All Tests in mikro.run.xml new file mode 100644 index 000000000000..4a074ee6947d --- /dev/null +++ b/.run/All Tests in mikro.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in mock.run.xml b/.run/All Tests in mock.run.xml new file mode 100644 index 000000000000..90bc939126c0 --- /dev/null +++ b/.run/All Tests in mock.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in mongoose.run.xml b/.run/All Tests in mongoose.run.xml new file mode 100644 index 000000000000..e860ed7e41ad --- /dev/null +++ b/.run/All Tests in mongoose.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in mqtt.run.xml b/.run/All Tests in mqtt.run.xml new file mode 100644 index 000000000000..55c495093c29 --- /dev/null +++ b/.run/All Tests in mqtt.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in oss.run.xml b/.run/All Tests in oss.run.xml new file mode 100644 index 000000000000..865ec74cf331 --- /dev/null +++ b/.run/All Tests in oss.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in otel.run.xml b/.run/All Tests in otel.run.xml new file mode 100644 index 000000000000..a5d27fd36870 --- /dev/null +++ b/.run/All Tests in otel.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in passport.run.xml b/.run/All Tests in passport.run.xml new file mode 100644 index 000000000000..cd97a4681293 --- /dev/null +++ b/.run/All Tests in passport.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in process-agent.run.xml b/.run/All Tests in process-agent.run.xml new file mode 100644 index 000000000000..723b9db16ea2 --- /dev/null +++ b/.run/All Tests in process-agent.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in prometheus-socket-io.run.xml b/.run/All Tests in prometheus-socket-io.run.xml new file mode 100644 index 000000000000..f95da18a8fb4 --- /dev/null +++ b/.run/All Tests in prometheus-socket-io.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in prometheus.run.xml b/.run/All Tests in prometheus.run.xml new file mode 100644 index 000000000000..a51f31c40132 --- /dev/null +++ b/.run/All Tests in prometheus.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in rabbitmq.run.xml b/.run/All Tests in rabbitmq.run.xml new file mode 100644 index 000000000000..ece5fd65a8eb --- /dev/null +++ b/.run/All Tests in rabbitmq.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in redis.run.xml b/.run/All Tests in redis.run.xml new file mode 100644 index 000000000000..cd11510d343c --- /dev/null +++ b/.run/All Tests in redis.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in security.run.xml b/.run/All Tests in security.run.xml new file mode 100644 index 000000000000..a0460fa65efb --- /dev/null +++ b/.run/All Tests in security.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in sequelize.run.xml b/.run/All Tests in sequelize.run.xml new file mode 100644 index 000000000000..1ca0243cd380 --- /dev/null +++ b/.run/All Tests in sequelize.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in session.run.xml b/.run/All Tests in session.run.xml new file mode 100644 index 000000000000..aefc098e777d --- /dev/null +++ b/.run/All Tests in session.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in socketio.run.xml b/.run/All Tests in socketio.run.xml new file mode 100644 index 000000000000..cb1d2be2f77b --- /dev/null +++ b/.run/All Tests in socketio.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in static-file.run.xml b/.run/All Tests in static-file.run.xml new file mode 100644 index 000000000000..b56248d94104 --- /dev/null +++ b/.run/All Tests in static-file.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in swagger.run.xml b/.run/All Tests in swagger.run.xml new file mode 100644 index 000000000000..ae9a016fee4b --- /dev/null +++ b/.run/All Tests in swagger.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in tablestore.run.xml b/.run/All Tests in tablestore.run.xml new file mode 100644 index 000000000000..95c13f9cdf6f --- /dev/null +++ b/.run/All Tests in tablestore.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in tags.run.xml b/.run/All Tests in tags.run.xml new file mode 100644 index 000000000000..0f58b4fb75f0 --- /dev/null +++ b/.run/All Tests in tags.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in tenant.run.xml b/.run/All Tests in tenant.run.xml new file mode 100644 index 000000000000..c96b04d4776d --- /dev/null +++ b/.run/All Tests in tenant.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in typegoose.run.xml b/.run/All Tests in typegoose.run.xml new file mode 100644 index 000000000000..0d49e0414f10 --- /dev/null +++ b/.run/All Tests in typegoose.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in typeorm.run.xml b/.run/All Tests in typeorm.run.xml new file mode 100644 index 000000000000..fd079c71ecc9 --- /dev/null +++ b/.run/All Tests in typeorm.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in upload.run.xml b/.run/All Tests in upload.run.xml new file mode 100644 index 000000000000..c8225c877891 --- /dev/null +++ b/.run/All Tests in upload.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in validate.run.xml b/.run/All Tests in validate.run.xml new file mode 100644 index 000000000000..9fdfb3100250 --- /dev/null +++ b/.run/All Tests in validate.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in version.run.xml b/.run/All Tests in version.run.xml new file mode 100644 index 000000000000..e439f94e6a4d --- /dev/null +++ b/.run/All Tests in version.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in view-ejs.run.xml b/.run/All Tests in view-ejs.run.xml new file mode 100644 index 000000000000..042a451b6379 --- /dev/null +++ b/.run/All Tests in view-ejs.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in view-nunjucks.run.xml b/.run/All Tests in view-nunjucks.run.xml new file mode 100644 index 000000000000..b76578c391a0 --- /dev/null +++ b/.run/All Tests in view-nunjucks.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in view.run.xml b/.run/All Tests in view.run.xml new file mode 100644 index 000000000000..e36130f1c501 --- /dev/null +++ b/.run/All Tests in view.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in web-express.run.xml b/.run/All Tests in web-express.run.xml new file mode 100644 index 000000000000..757f2e717ea3 --- /dev/null +++ b/.run/All Tests in web-express.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.run/All Tests in web.run.xml b/.run/All Tests in web.run.xml new file mode 100644 index 000000000000..6d262ae8392d --- /dev/null +++ b/.run/All Tests in web.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file From f1b59e1f15bee7ce051ed3d03af7a9cf552529f4 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 17:01:14 +0800 Subject: [PATCH 09/18] fix: test --- .npmrc | 3 +- packages/cache-manager/test/store.test.ts | 2 +- pnpm-lock.yaml | 116 +++++++++++----------- pnpm-workspace.yaml | 2 +- 4 files changed, 61 insertions(+), 62 deletions(-) diff --git a/.npmrc b/.npmrc index 0761129d62f2..9d8ac89c85f9 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,2 @@ link-workspace-packages = true -hoist=true -hoist-pattern[]=@midwayjs/* \ No newline at end of file +public-hoist-pattern[] = @midwayjs/* \ No newline at end of file diff --git a/packages/cache-manager/test/store.test.ts b/packages/cache-manager/test/store.test.ts index 29d160d2476e..502fe49a0688 100644 --- a/packages/cache-manager/test/store.test.ts +++ b/packages/cache-manager/test/store.test.ts @@ -1,4 +1,4 @@ -import * as cacheManager from '@midwayjs/cache-manager'; +import * as cacheManager from '../src'; import * as redis from '@midwayjs/redis'; import { createLightApp, close } from '@midwayjs/mock'; import { CachingFactory, createRedisStore } from '../src'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ff6718a6584..80ad0b297187 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1671,8 +1671,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/runtime@7.25.6': - resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==} + '@babel/runtime@7.25.7': + resolution: {integrity: sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==} engines: {node: '>=6.9.0'} '@babel/template@7.25.7': @@ -2395,20 +2395,20 @@ packages: '@protobufjs/utf8@1.1.0': resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} - '@shikijs/core@1.21.0': - resolution: {integrity: sha512-zAPMJdiGuqXpZQ+pWNezQAk5xhzRXBNiECFPcJLtUdsFM3f//G95Z15EHTnHchYycU8kIIysqGgxp8OVSj1SPQ==} + '@shikijs/core@1.22.0': + resolution: {integrity: sha512-S8sMe4q71TJAW+qG93s5VaiihujRK6rqDFqBnxqvga/3LvqHEnxqBIOPkt//IdXVtHkQWKu4nOQNk0uBGicU7Q==} - '@shikijs/engine-javascript@1.21.0': - resolution: {integrity: sha512-jxQHNtVP17edFW4/0vICqAVLDAxmyV31MQJL4U/Kg+heQALeKYVOWo0sMmEZ18FqBt+9UCdyqGKYE7bLRtk9mg==} + '@shikijs/engine-javascript@1.22.0': + resolution: {integrity: sha512-AeEtF4Gcck2dwBqCFUKYfsCq0s+eEbCEbkUuFou53NZ0sTGnJnJ/05KHQFZxpii5HMXbocV9URYVowOP2wH5kw==} - '@shikijs/engine-oniguruma@1.21.0': - resolution: {integrity: sha512-AIZ76XocENCrtYzVU7S4GY/HL+tgHGbVU+qhiDyNw1qgCA5OSi4B4+HY4BtAoJSMGuD/L5hfTzoRVbzEm2WTvg==} + '@shikijs/engine-oniguruma@1.22.0': + resolution: {integrity: sha512-5iBVjhu/DYs1HB0BKsRRFipRrD7rqjxlWTj4F2Pf+nQSPqc3kcyqFFeZXnBMzDf0HdqaFVvhDRAGiYNvyLP+Mw==} - '@shikijs/types@1.21.0': - resolution: {integrity: sha512-tzndANDhi5DUndBtpojEq/42+dpUF2wS7wdCDQaFtIXm3Rd1QkrcVgSSRLOvEwexekihOXfbYJINW37g96tJRw==} + '@shikijs/types@1.22.0': + resolution: {integrity: sha512-Fw/Nr7FGFhlQqHfxzZY8Cwtwk5E9nKDUgeLjZgt3UuhcM3yJR9xj3ZGNravZZok8XmEZMiYkSMTPlPkULB8nww==} - '@shikijs/vscode-textmate@9.2.2': - resolution: {integrity: sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==} + '@shikijs/vscode-textmate@9.3.0': + resolution: {integrity: sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==} '@sideway/address@4.1.5': resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==} @@ -5352,8 +5352,8 @@ packages: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} - import-in-the-middle@1.11.1: - resolution: {integrity: sha512-lGdg70ECFGv/OHQXL/IPhcxkFPeQ7YA4zborlA54XHVr58oM50QNxItRiayHMqj1MspC5Y9zaHf+QHod/gq7Ug==} + import-in-the-middle@1.11.2: + resolution: {integrity: sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==} import-lazy@2.1.0: resolution: {integrity: sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==} @@ -6034,8 +6034,8 @@ packages: keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - keyv@5.0.3: - resolution: {integrity: sha512-WmefGWaWkWiWDkIasfHxpWmM1lych/LPtRmNj8jnIQVGLsAgFw73Vg9utZ7ss97/JwRlERABb/fSejTPY4hlZQ==} + keyv@5.1.0: + resolution: {integrity: sha512-FUr1fbKVsj9IZkPkY9reJ80Lp2B3ldtFXH+xK0wvZYzOpwgHV1er3xP4JUhu2cgkV2X3BJQw+hzAbIGqa+hNIA==} kind-of@3.2.2: resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==} @@ -6655,8 +6655,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - moment-timezone@0.5.45: - resolution: {integrity: sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==} + moment-timezone@0.5.46: + resolution: {integrity: sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==} moment@2.30.1: resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==} @@ -7798,8 +7798,8 @@ packages: regex@4.3.3: resolution: {integrity: sha512-r/AadFO7owAq1QJVeZ/nq9jNS1vyZt+6t1p/E59B56Rn2GCya+gr1KSyOzNL/er+r+B7phv5jG2xU2Nz1YkmJg==} - regexp.prototype.flags@1.5.2: - resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} + regexp.prototype.flags@1.5.3: + resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==} engines: {node: '>= 0.4'} regexpp@3.2.0: @@ -8135,8 +8135,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@1.21.0: - resolution: {integrity: sha512-apCH5BoWTrmHDPGgg3RF8+HAAbEL/CdbYr8rMw7eIrdhCkZHdVGat5mMNlRtd1erNG01VPMIKHNQ0Pj2HMAiog==} + shiki@1.22.0: + resolution: {integrity: sha512-/t5LlhNs+UOKQCYBtl5ZsH/Vclz73GIqT2yQsCBygr8L/ppTdmpL4w3kPLoZJbMKVWtoG77Ue1feOjZfDxvMkw==} shimmer@1.2.1: resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==} @@ -9696,7 +9696,7 @@ snapshots: '@babel/core': 7.25.7 '@babel/helper-plugin-utils': 7.25.7 - '@babel/runtime@7.25.6': + '@babel/runtime@7.25.7': dependencies: regenerator-runtime: 0.14.1 @@ -10559,7 +10559,7 @@ snapshots: '@opentelemetry/api': 1.9.0 '@opentelemetry/api-logs': 0.53.0 '@types/shimmer': 1.2.0 - import-in-the-middle: 1.11.1 + import-in-the-middle: 1.11.2 require-in-the-middle: 7.4.0 semver: 7.6.3 shimmer: 1.2.1 @@ -10692,32 +10692,32 @@ snapshots: '@protobufjs/utf8@1.1.0': {} - '@shikijs/core@1.21.0': + '@shikijs/core@1.22.0': dependencies: - '@shikijs/engine-javascript': 1.21.0 - '@shikijs/engine-oniguruma': 1.21.0 - '@shikijs/types': 1.21.0 - '@shikijs/vscode-textmate': 9.2.2 + '@shikijs/engine-javascript': 1.22.0 + '@shikijs/engine-oniguruma': 1.22.0 + '@shikijs/types': 1.22.0 + '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 hast-util-to-html: 9.0.3 - '@shikijs/engine-javascript@1.21.0': + '@shikijs/engine-javascript@1.22.0': dependencies: - '@shikijs/types': 1.21.0 - '@shikijs/vscode-textmate': 9.2.2 + '@shikijs/types': 1.22.0 + '@shikijs/vscode-textmate': 9.3.0 oniguruma-to-js: 0.4.3 - '@shikijs/engine-oniguruma@1.21.0': + '@shikijs/engine-oniguruma@1.22.0': dependencies: - '@shikijs/types': 1.21.0 - '@shikijs/vscode-textmate': 9.2.2 + '@shikijs/types': 1.22.0 + '@shikijs/vscode-textmate': 9.3.0 - '@shikijs/types@1.21.0': + '@shikijs/types@1.22.0': dependencies: - '@shikijs/vscode-textmate': 9.2.2 + '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 - '@shikijs/vscode-textmate@9.2.2': {} + '@shikijs/vscode-textmate@9.3.0': {} '@sideway/address@4.1.5': dependencies: @@ -11935,7 +11935,7 @@ snapshots: cache-manager@6.0.0: dependencies: - keyv: 5.0.3 + keyv: 5.1.0 cacheable-request@6.1.0: dependencies: @@ -12443,7 +12443,7 @@ snapshots: cron-parser@2.18.0: dependencies: is-nan: 1.3.2 - moment-timezone: 0.5.45 + moment-timezone: 0.5.46 cron-parser@4.9.0: dependencies: @@ -12584,7 +12584,7 @@ snapshots: object-is: 1.1.6 object-keys: 1.1.1 object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 + regexp.prototype.flags: 1.5.3 side-channel: 1.0.6 which-boxed-primitive: 1.0.2 which-collection: 1.0.2 @@ -13323,7 +13323,7 @@ snapshots: object-inspect: 1.13.2 object-keys: 1.1.1 object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 + regexp.prototype.flags: 1.5.3 safe-array-concat: 1.1.2 safe-regex-test: 1.0.3 string.prototype.trim: 1.2.9 @@ -13708,7 +13708,7 @@ snapshots: fast-unique-numbers@8.0.13: dependencies: - '@babel/runtime': 7.25.6 + '@babel/runtime': 7.25.7 tslib: 2.7.0 fast-uri@3.0.2: {} @@ -14438,7 +14438,7 @@ snapshots: parent-module: 1.0.1 resolve-from: 4.0.0 - import-in-the-middle@1.11.1: + import-in-the-middle@1.11.2: dependencies: acorn: 8.12.1 acorn-import-attributes: 1.9.5(acorn@8.12.1) @@ -15281,7 +15281,7 @@ snapshots: dependencies: json-buffer: 3.0.1 - keyv@5.0.3: + keyv@5.1.0: dependencies: '@keyv/serialize': 1.0.1 @@ -16092,7 +16092,7 @@ snapshots: transitivePeerDependencies: - supports-color - moment-timezone@0.5.45: + moment-timezone@0.5.46: dependencies: moment: 2.30.1 @@ -17498,7 +17498,7 @@ snapshots: regex@4.3.3: {} - regexp.prototype.flags@1.5.2: + regexp.prototype.flags@1.5.3: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 @@ -17777,7 +17777,7 @@ snapshots: inflection: 1.13.4 lodash: 4.17.21 moment: 2.30.1 - moment-timezone: 0.5.45 + moment-timezone: 0.5.46 pg-connection-string: 2.7.0 retry-as-promised: 7.0.4 semver: 7.6.3 @@ -17856,13 +17856,13 @@ snapshots: shebang-regex@3.0.0: {} - shiki@1.21.0: + shiki@1.22.0: dependencies: - '@shikijs/core': 1.21.0 - '@shikijs/engine-javascript': 1.21.0 - '@shikijs/engine-oniguruma': 1.21.0 - '@shikijs/types': 1.21.0 - '@shikijs/vscode-textmate': 9.2.2 + '@shikijs/core': 1.22.0 + '@shikijs/engine-javascript': 1.22.0 + '@shikijs/engine-oniguruma': 1.22.0 + '@shikijs/types': 1.22.0 + '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 shimmer@1.2.1: {} @@ -18783,7 +18783,7 @@ snapshots: lunr: 2.3.9 markdown-it: 14.1.0 minimatch: 9.0.5 - shiki: 1.21.0 + shiki: 1.22.0 typescript: 5.3.3 yaml: 2.5.1 @@ -19147,19 +19147,19 @@ snapshots: worker-timers-broker@6.1.8: dependencies: - '@babel/runtime': 7.25.6 + '@babel/runtime': 7.25.7 fast-unique-numbers: 8.0.13 tslib: 2.7.0 worker-timers-worker: 7.0.71 worker-timers-worker@7.0.71: dependencies: - '@babel/runtime': 7.25.6 + '@babel/runtime': 7.25.7 tslib: 2.7.0 worker-timers@7.1.8: dependencies: - '@babel/runtime': 7.25.6 + '@babel/runtime': 7.25.7 tslib: 2.7.0 worker-timers-broker: 6.1.8 worker-timers-worker: 7.0.71 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9c2e9d889ff1..a7a093248406 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,4 @@ packages: - 'packages/*' - 'packages-serverless/*' - - 'packages-resource/*' + - 'packages-resource/*' \ No newline at end of file From 5d0936d0f1de4de9435b767b625b3eb22ba6eaa2 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 21:38:14 +0800 Subject: [PATCH 10/18] fix: test --- .../core/src/decorator/metadataManager.ts | 2 +- packages/core/src/legacy/decorator.ts | 17 ++++++++- .../test/decorator/metadataManager.test.ts | 14 +++++++ .../test/fixtures/base-app-redis/package.json | 3 -- .../base-app-redis/src/configuration.ts | 35 ------------------ .../base-app-redis/src/service/user.ts | 10 ----- .../fixtures/base-app-redis/src/socket/api.ts | 37 ------------------- packages/socketio/test/index.test.ts | 16 -------- packages/validate/src/decorator/rule.ts | 6 +-- packages/validate/test/check.test.ts | 6 ++- 10 files changed, 38 insertions(+), 108 deletions(-) delete mode 100644 packages/socketio/test/fixtures/base-app-redis/package.json delete mode 100644 packages/socketio/test/fixtures/base-app-redis/src/configuration.ts delete mode 100644 packages/socketio/test/fixtures/base-app-redis/src/service/user.ts delete mode 100644 packages/socketio/test/fixtures/base-app-redis/src/socket/api.ts diff --git a/packages/core/src/decorator/metadataManager.ts b/packages/core/src/decorator/metadataManager.ts index c9198c001ad3..d46bf60aacfc 100644 --- a/packages/core/src/decorator/metadataManager.ts +++ b/packages/core/src/decorator/metadataManager.ts @@ -369,7 +369,7 @@ export class MetadataManager { propertyKey => { const metadataValue = _metadata[this.metadataPropertySymbol][propertyKey]?.[metadataKey]; - if (metadataValue !== undefined) { + if (metadataValue !== undefined && propertiesWithMetadata[propertyKey] === undefined) { propertiesWithMetadata[propertyKey] = metadataValue; } } diff --git a/packages/core/src/legacy/decorator.ts b/packages/core/src/legacy/decorator.ts index 1c3025949754..85e11e462ddc 100644 --- a/packages/core/src/legacy/decorator.ts +++ b/packages/core/src/legacy/decorator.ts @@ -67,7 +67,8 @@ export function attachClassMetadata( return MetadataManager.attachMetadata( decoratorNameKey as string | symbol, data, - target + target, + groupBy ); } @@ -86,10 +87,22 @@ export function getClassExtendedMetadata( propertyName?: string, useCache?: boolean ): T { - return MetadataManager.getPropertiesWithMetadata( + const ret = MetadataManager.getPropertiesWithMetadata( decoratorNameKey as string | symbol, target ) as T; + + // array item to object + const res = {} as any; + for (const key in ret) { + const element = ret[key]; + if (Array.isArray(element) && element.length) { + res[key] = element[element.length - 1]; + } else { + res[key] = element; + } + } + return res; } /** diff --git a/packages/core/test/decorator/metadataManager.test.ts b/packages/core/test/decorator/metadataManager.test.ts index deadb039c72b..86883c3e00a2 100644 --- a/packages/core/test/decorator/metadataManager.test.ts +++ b/packages/core/test/decorator/metadataManager.test.ts @@ -481,5 +481,19 @@ describe('MetadataManager.test.ts', () => { propertyA: ['a'] }); }); + + it('should test inheritance with same property and attach metadata', () => { + class ParentClass { + public property: string; + } + class ChildClass extends ParentClass {} + + CacheMetadataManager.attachMetadata('property_inject', 'a', ParentClass, 'property'); + CacheMetadataManager.attachMetadata('property_inject', 'b', ChildClass, 'property'); + + expect(CacheMetadataManager.getPropertiesWithMetadata('property_inject', ChildClass)).toStrictEqual({ + property: ['b'], + }); + }); }); }); diff --git a/packages/socketio/test/fixtures/base-app-redis/package.json b/packages/socketio/test/fixtures/base-app-redis/package.json deleted file mode 100644 index 621cdc6a4174..000000000000 --- a/packages/socketio/test/fixtures/base-app-redis/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "ali-demo" -} diff --git a/packages/socketio/test/fixtures/base-app-redis/src/configuration.ts b/packages/socketio/test/fixtures/base-app-redis/src/configuration.ts deleted file mode 100644 index 0fc7fa9615d3..000000000000 --- a/packages/socketio/test/fixtures/base-app-redis/src/configuration.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Configuration, App } from '@midwayjs/core'; -import { ILifeCycle } from '@midwayjs/core'; -import { createRedisAdapter, Application } from '../../../../src'; - -@Configuration({ - importConfigs: [ - { - default: { - socketIO: { - port: 3000, - adapter: createRedisAdapter({ host: '127.0.0.1', port: 6379}), - } - } - } - ] -}) -export class AutoConfiguration implements ILifeCycle { - - @App() - app: Application; - - async onReady() { - this.app.on('connection', (socket) => { - console.log('global connection', socket.id); - - this.app.on('my', () => { - console.log('got my event'); - }); - - this.app.on('disconnect', () => { - console.log('closing socket server'); - }); - }); - } -} diff --git a/packages/socketio/test/fixtures/base-app-redis/src/service/user.ts b/packages/socketio/test/fixtures/base-app-redis/src/service/user.ts deleted file mode 100644 index 131f949a5b04..000000000000 --- a/packages/socketio/test/fixtures/base-app-redis/src/service/user.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Provide } from '@midwayjs/core'; - -@Provide() -export class UserService { - async hello(name) { - return { - name, - }; - } -} diff --git a/packages/socketio/test/fixtures/base-app-redis/src/socket/api.ts b/packages/socketio/test/fixtures/base-app-redis/src/socket/api.ts deleted file mode 100644 index 4a8bfe82b35d..000000000000 --- a/packages/socketio/test/fixtures/base-app-redis/src/socket/api.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { - Inject, - OnWSConnection, - OnWSDisConnection, - OnWSMessage, - Provide, - WSController, - WSEmit, -} from '@midwayjs/core'; -import { UserService } from '../service/user'; -import { Context } from '../../../../../src'; - -@Provide() -@WSController('/') -export class APIController { - @Inject() - ctx: Context; - - @Inject() - userService: UserService; - - @OnWSConnection() - init() { - console.log(`namespace / got a connection ${this.ctx.id}`); - } - - @OnWSMessage('my') - @WSEmit('ok') - async gotMyMessage(payload) { - return { name: 'harry' }; - } - - @OnWSDisConnection() - disconnect(reason: string) { - console.log(this.ctx.id + ' disconnect ' + reason); - } -} diff --git a/packages/socketio/test/index.test.ts b/packages/socketio/test/index.test.ts index e1d3cba9bc4d..c7026546a04a 100644 --- a/packages/socketio/test/index.test.ts +++ b/packages/socketio/test/index.test.ts @@ -141,22 +141,6 @@ describe('/test/index.test.ts', () => { await closeApp(app); }); - it('should test create socket app and with redis adapter', async () => { - const app = await createServer('base-app-redis'); - const client = await createSocketIOClient({ - port: '3000', - }); - const gotEvent = once(client, 'ok'); - client.send('my'); - const [data] = await gotEvent; - expect(data).toEqual({ - name: 'harry', - }); - - await client.close(); - await closeApp(app); - }); - it('should test create socket app and throw error', async () => { const app = await createServer('base-app-error'); const client = await createSocketIOClient({ diff --git a/packages/validate/src/decorator/rule.ts b/packages/validate/src/decorator/rule.ts index 67b3ddf930de..48b11acef9a9 100644 --- a/packages/validate/src/decorator/rule.ts +++ b/packages/validate/src/decorator/rule.ts @@ -1,8 +1,8 @@ import * as Joi from 'joi'; import { attachClassMetadata, - getClassMetadata, - getPropertyType, + getClassExtendedMetadata, + getPropertyType } from '@midwayjs/core'; import { RULES_KEY } from '../constants'; @@ -34,7 +34,7 @@ export function Rule( // property decorator if (!Joi.isSchema(rule)) { // 老代码，待废弃 - rule = Joi.object(getClassMetadata(RULES_KEY, rule)).meta({ + rule = Joi.object(getClassExtendedMetadata(RULES_KEY, rule)).meta({ id: rule.name, }); if (getPropertyType(target, propertyKey).name === 'Array') { diff --git a/packages/validate/test/check.test.ts b/packages/validate/test/check.test.ts index ef677d5b93a1..b34d65550679 100644 --- a/packages/validate/test/check.test.ts +++ b/packages/validate/test/check.test.ts @@ -551,7 +551,11 @@ describe('/test/check.test.ts', () => { defaultLocale: 'en-US' } - validateService['validateConfig'] = {}; + validateService['validateConfig'] = { + validationOptions: { + allowUnknown: true + } + }; class CustomValidationPipe extends AbstractValidationPipe { transform(value: any, options: TransformOptions) {} } From 11004469d52a5e46810d21ba3bb07c57dedabe12 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 21:43:50 +0800 Subject: [PATCH 11/18] fix: test --- packages/validate/src/dtoHelper.ts | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/validate/src/dtoHelper.ts b/packages/validate/src/dtoHelper.ts index 12dfe192e59e..d65b3f42ac78 100644 --- a/packages/validate/src/dtoHelper.ts +++ b/packages/validate/src/dtoHelper.ts @@ -1,4 +1,4 @@ -import { getClassExtendedMetadata, saveClassMetadata } from '@midwayjs/core'; +import { MetadataManager } from '@midwayjs/core'; import { RULES_KEY } from './constants'; export interface Dto { @@ -11,14 +11,11 @@ export function PickDto( ): Dto> { const pickedDto: any = function () {}; pickedDto.prototype = dto.prototype; - const fatherRule = getClassExtendedMetadata(RULES_KEY, dto); - const pickedRule: any = {}; - for (const key of keys) { - if (fatherRule[key]) { - pickedRule[key] = fatherRule[key]; - } - } - saveClassMetadata(RULES_KEY, pickedRule, pickedDto); + MetadataManager.copyMetadata(dto, pickedDto, { + metadataFilter: (key: string, propertyName: string) => { + return key === RULES_KEY && keys.includes(propertyName as K); + }, + }); return pickedDto as Dto>; } @@ -28,11 +25,10 @@ export function OmitDto( ): Dto> { const pickedDto: any = function () {}; pickedDto.prototype = dto.prototype; - const fatherRule = getClassExtendedMetadata(RULES_KEY, dto); - const pickedRule: any = Object.assign({}, fatherRule); - for (const key of keys) { - delete pickedRule[key]; - } - saveClassMetadata(RULES_KEY, pickedRule, pickedDto); + MetadataManager.copyMetadata(dto, pickedDto, { + metadataFilter: (key: string, propertyName: string) => { + return key === RULES_KEY && !keys.includes(propertyName as K); + }, + }); return pickedDto as Dto>; } From bb48c7f59f71eafe87263f93df2ee6f3dbaf3b14 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 21:50:13 +0800 Subject: [PATCH 12/18] fix: lint --- packages/core/src/decorator/metadataManager.ts | 5 ++++- packages/validate/src/decorator/rule.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/core/src/decorator/metadataManager.ts b/packages/core/src/decorator/metadataManager.ts index d46bf60aacfc..edd13a2445e9 100644 --- a/packages/core/src/decorator/metadataManager.ts +++ b/packages/core/src/decorator/metadataManager.ts @@ -369,7 +369,10 @@ export class MetadataManager { propertyKey => { const metadataValue = _metadata[this.metadataPropertySymbol][propertyKey]?.[metadataKey]; - if (metadataValue !== undefined && propertiesWithMetadata[propertyKey] === undefined) { + if ( + metadataValue !== undefined && + propertiesWithMetadata[propertyKey] === undefined + ) { propertiesWithMetadata[propertyKey] = metadataValue; } } diff --git a/packages/validate/src/decorator/rule.ts b/packages/validate/src/decorator/rule.ts index 48b11acef9a9..0b65165dbf18 100644 --- a/packages/validate/src/decorator/rule.ts +++ b/packages/validate/src/decorator/rule.ts @@ -2,7 +2,7 @@ import * as Joi from 'joi'; import { attachClassMetadata, getClassExtendedMetadata, - getPropertyType + getPropertyType, } from '@midwayjs/core'; import { RULES_KEY } from '../constants'; From 56281899aae95ab6239a1c7be254ddb95329cc1e Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 22:00:21 +0800 Subject: [PATCH 13/18] fix: test --- packages/core/src/legacy/decorator.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/core/src/legacy/decorator.ts b/packages/core/src/legacy/decorator.ts index 85e11e462ddc..6e5a751babbc 100644 --- a/packages/core/src/legacy/decorator.ts +++ b/packages/core/src/legacy/decorator.ts @@ -596,8 +596,12 @@ export function getObjectDefinition(target: any): ObjectDefinitionOptions { const res = {}; for (const key in ret) { const element = ret[key]; - for (const v of element) { - Object.assign(res, v); + if (Array.isArray(element)) { + for (const v of element) { + Object.assign(res, v); + } + } else { + Object.assign(res, element); } } // merge scope From 2d50d9b737035ce319fcf6ffef0a6d307deb31be Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 22:23:19 +0800 Subject: [PATCH 14/18] fix: node ver --- .github/workflows/nodejs.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 4bb9a60cd398..60e79af80014 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -16,13 +16,8 @@ jobs: timeout-minutes: 60 strategy: matrix: - node-version: [16, 18] + node-version: [18] os: [ubuntu-latest] - include: - - node-version: 16 - pnpm-version: 8 - - node-version: 18 - pnpm-version: 9 runs-on: ${{ matrix.os }} services: redis: @@ -92,7 +87,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 with: - version: ${{ matrix.pnpm-version }} + version: 9 run_install: false - name: Use Node.js ${{ matrix.node-version }} From 160ae5453e104b448da00f48510e58a3e6035fb6 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 22:40:11 +0800 Subject: [PATCH 15/18] fix: test --- packages/grpc/src/provider/framework.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/grpc/src/provider/framework.ts b/packages/grpc/src/provider/framework.ts index ec63ca8231ad..2bf00a916371 100644 --- a/packages/grpc/src/provider/framework.ts +++ b/packages/grpc/src/provider/framework.ts @@ -70,11 +70,7 @@ export class MidwayGRPCFramework extends BaseFramework< this.app = server as IMidwayGRPCApplication; this.server = server; - } - protected async afterContainerReady( - options: Partial - ): Promise { await this.loadService(); } From 7fac2696860ff5ba11049c3e2e55cb1f472207fb Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 23:07:50 +0800 Subject: [PATCH 16/18] fix: test --- .run/All Tests in busboy.run.xml | 12 ++++++++++++ packages/busboy/package.json | 4 +++- packages/busboy/test/clean.test.ts | 4 ++-- packages/busboy/test/faas.test.ts | 4 ++-- packages/busboy/test/fixtures/clean/f.yml | 4 +--- packages/busboy/test/fixtures/faas/f.yml | 4 +--- pnpm-lock.yaml | 6 ++++++ 7 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 .run/All Tests in busboy.run.xml diff --git a/.run/All Tests in busboy.run.xml b/.run/All Tests in busboy.run.xml new file mode 100644 index 000000000000..fd6c0908ca35 --- /dev/null +++ b/.run/All Tests in busboy.run.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/busboy/package.json b/packages/busboy/package.json index a123e204bf71..5ec42cf797ff 100644 --- a/packages/busboy/package.json +++ b/packages/busboy/package.json @@ -32,6 +32,8 @@ "@midwayjs/faas": "^3.18.0", "@midwayjs/koa": "^3.18.0", "@midwayjs/mock": "^3.18.0", - "@midwayjs/web": "^3.18.0" + "@midwayjs/web": "^3.18.0", + "@midwayjs/fc-starter": "^3.18.0", + "fs-extra": "11.2.0" } } diff --git a/packages/busboy/test/clean.test.ts b/packages/busboy/test/clean.test.ts index 236bb9de952d..ae13117843fb 100644 --- a/packages/busboy/test/clean.test.ts +++ b/packages/busboy/test/clean.test.ts @@ -1,15 +1,15 @@ import { createHttpRequest, close, createFunctionApp } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { existsSync, statSync } from 'fs'; import { sleep } from '@midwayjs/core'; +import { Framework } from '@midwayjs/faas'; describe('test/clean.test.ts', function () { it('upload file auto clean', async () => { const appDir = join(__dirname, 'fixtures/clean'); const imagePath = join(__dirname, 'fixtures/1.jpg'); - const app = await createFunctionApp(appDir, {}, ServerlessApp); + const app = await createFunctionApp(appDir, {}); const request = await createHttpRequest(app); const stat = statSync(imagePath); const response = await request.post('/upload') diff --git a/packages/busboy/test/faas.test.ts b/packages/busboy/test/faas.test.ts index fcd93d8181d3..781722f342ce 100644 --- a/packages/busboy/test/faas.test.ts +++ b/packages/busboy/test/faas.test.ts @@ -1,14 +1,14 @@ import { createHttpRequest, close, createFunctionApp } from '@midwayjs/mock'; import { join } from 'path'; import * as assert from 'assert'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { existsSync, statSync } from 'fs'; +import { Framework } from '@midwayjs/faas'; describe('test/faas.test.ts', function () { let app; beforeAll(async () => { const appDir = join(__dirname, 'fixtures/faas'); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }) afterAll(async () => { diff --git a/packages/busboy/test/fixtures/clean/f.yml b/packages/busboy/test/fixtures/clean/f.yml index bcc7040e311d..4023ffb212d2 100644 --- a/packages/busboy/test/fixtures/clean/f.yml +++ b/packages/busboy/test/fixtures/clean/f.yml @@ -1,5 +1,3 @@ -service: serverless-midway-test - provider: name: aliyun - runtime: nodejs12 \ No newline at end of file + starter: '@midwayjs/fc-starter' diff --git a/packages/busboy/test/fixtures/faas/f.yml b/packages/busboy/test/fixtures/faas/f.yml index bcc7040e311d..4023ffb212d2 100644 --- a/packages/busboy/test/fixtures/faas/f.yml +++ b/packages/busboy/test/fixtures/faas/f.yml @@ -1,5 +1,3 @@ -service: serverless-midway-test - provider: name: aliyun - runtime: nodejs12 \ No newline at end of file + starter: '@midwayjs/fc-starter' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80ad0b297187..c24e8734f20b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -243,6 +243,9 @@ importers: '@midwayjs/faas': specifier: ^3.18.0 version: link:../faas + '@midwayjs/fc-starter': + specifier: ^3.18.0 + version: link:../../packages-serverless/midway-fc-starter '@midwayjs/koa': specifier: ^3.18.0 version: link:../web-koa @@ -252,6 +255,9 @@ importers: '@midwayjs/web': specifier: ^3.18.0 version: link:../web + fs-extra: + specifier: 11.2.0 + version: 11.2.0 packages/cache-manager: dependencies: From 8d647c976dd7e63375b1b6bd9c2ac39252052799 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Mon, 7 Oct 2024 23:09:44 +0800 Subject: [PATCH 17/18] fix: test --- packages/static-file/test/fixtures/faas-with-dirs/f.yml | 4 +--- packages/static-file/test/index.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/static-file/test/fixtures/faas-with-dirs/f.yml b/packages/static-file/test/fixtures/faas-with-dirs/f.yml index bcc7040e311d..4023ffb212d2 100644 --- a/packages/static-file/test/fixtures/faas-with-dirs/f.yml +++ b/packages/static-file/test/fixtures/faas-with-dirs/f.yml @@ -1,5 +1,3 @@ -service: serverless-midway-test - provider: name: aliyun - runtime: nodejs12 \ No newline at end of file + starter: '@midwayjs/fc-starter' diff --git a/packages/static-file/test/index.test.ts b/packages/static-file/test/index.test.ts index 9cec741a80ff..51d41972716c 100644 --- a/packages/static-file/test/index.test.ts +++ b/packages/static-file/test/index.test.ts @@ -1,6 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '@midwayjs/serverless-app'; +import { Framework } from '@midwayjs/faas'; describe('test/index.test.ts', () => { it('serve with dirs with same prefix', async () => { @@ -30,7 +30,7 @@ describe('test/index.test.ts', () => { it('should test faas use static', async () => { const appDir = join(__dirname, 'fixtures/faas-with-dirs'); - const app = await createFunctionApp(appDir, {}, ServerlessApp.Framework); + const app = await createFunctionApp(appDir); const result = await createHttpRequest(app).get('/foo.js'); expect(result.text).toMatch('console'); await close(app); From 23697157e8c0be3d1e40a985117c8aa3a2016113 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Tue, 8 Oct 2024 00:23:39 +0800 Subject: [PATCH 18/18] fix: test --- package.json | 3 ++- packages/core/src/setup.ts | 3 +++ packages/otel/package.json | 4 +++- packages/passport/package.json | 3 ++- .../passport-express-jwt/src/jwt.middleware.ts | 5 ++--- .../src/configuration.ts | 5 ++--- .../src/jwt.middleware.ts | 5 ++--- .../passport-koa-jwt/src/jwt.middleware.ts | 5 ++--- .../passport-web/src/local.middleware.ts | 5 ++--- packages/processAgent/package.json | 3 ++- packages/prometheus-socket-io/package.json | 3 ++- packages/prometheus/test/index.test.ts | 6 ++---- packages/redis/src/manager.ts | 10 +++++----- .../base-app-bad-client/src/config.default.ts | 7 ++++--- packages/redis/test/index.test.ts | 2 +- packages/security/test/base.test.ts | 3 +-- packages/security/test/csp.test.ts | 3 +-- packages/security/test/csrf.test.ts | 14 ++++++-------- packages/security/test/fixtures/base/f.yml | 4 +--- .../test/fixtures/base/src/configuration.ts | 5 ++--- packages/security/test/hsts.test.ts | 5 ++--- packages/security/test/noopen.test.ts | 3 +-- packages/security/test/nosniff.test.ts | 3 +-- packages/security/test/xframe.test.ts | 3 +-- packages/security/test/xss.test.ts | 3 +-- pnpm-lock.yaml | 18 ++++++++++++++++++ 26 files changed, 71 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 7e97e3b02185..8268503a757a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "typedoc": "^0.26.8", "typescript": "5.3.3", "why-is-node-running": "2.3.0", - "zx": "7.2.3" + "zx": "7.2.3", + "fs-extra": "11.2.0" }, "scripts": { "install_npm": "sh scripts/install_npm.sh", diff --git a/packages/core/src/setup.ts b/packages/core/src/setup.ts index 8427423ba9eb..76e5c13a78b2 100644 --- a/packages/core/src/setup.ts +++ b/packages/core/src/setup.ts @@ -113,6 +113,9 @@ export async function destroyGlobalApplicationContext( loggerFactory.close(); global['MIDWAY_APPLICATION_CONTEXT'] = undefined; global['MIDWAY_MAIN_FRAMEWORK'] = undefined; + + // reset counter + stepIdx = 1; } /** diff --git a/packages/otel/package.json b/packages/otel/package.json index 2084603116c4..0ee416ab4b92 100644 --- a/packages/otel/package.json +++ b/packages/otel/package.json @@ -13,7 +13,9 @@ "@midwayjs/core": "^3.18.0", "@midwayjs/koa": "^3.18.0", "@midwayjs/mock": "^3.18.0", - "@opentelemetry/sdk-node": "0.53.0" + "@opentelemetry/sdk-node": "0.53.0", + "@opentelemetry/sdk-trace-base": "1.26.0", + "@opentelemetry/sdk-trace-node": "1.26.0" }, "dependencies": { "@opentelemetry/api": "1.9.0" diff --git a/packages/passport/package.json b/packages/passport/package.json index b69d7c04cb51..487ca2c0283b 100644 --- a/packages/passport/package.json +++ b/packages/passport/package.json @@ -33,6 +33,7 @@ "passport-http-bearer": "1.0.1", "passport-jwt": "4.0.1", "passport-local": "1.0.0", - "passport-openidconnect": "0.1.2" + "passport-openidconnect": "0.1.2", + "after": "0.8.2" } } diff --git a/packages/passport/test/fixtures/passport-express-jwt/src/jwt.middleware.ts b/packages/passport/test/fixtures/passport-express-jwt/src/jwt.middleware.ts index 324216765d50..ee04c6dd14f9 100644 --- a/packages/passport/test/fixtures/passport-express-jwt/src/jwt.middleware.ts +++ b/packages/passport/test/fixtures/passport-express-jwt/src/jwt.middleware.ts @@ -1,11 +1,10 @@ -import { PassportMiddleware } from '../../../../src'; +import { PassportMiddleware, AuthenticateOptions } from '../../../../src'; import { Provide } from '@midwayjs/core'; import { JwtStrategy } from './jwt.strategy'; -import * as passport from 'passport'; @Provide() export class JwtPassportMiddleware extends PassportMiddleware(JwtStrategy) { - getAuthenticateOptions(): Promise | passport.AuthenticateOptions { + getAuthenticateOptions(): Promise | AuthenticateOptions { return {}; } } diff --git a/packages/passport/test/fixtures/passport-express-session/src/configuration.ts b/packages/passport/test/fixtures/passport-express-session/src/configuration.ts index ce392ff9a0ab..5a2ea8db9505 100644 --- a/packages/passport/test/fixtures/passport-express-session/src/configuration.ts +++ b/packages/passport/test/fixtures/passport-express-session/src/configuration.ts @@ -1,6 +1,5 @@ import { App, Configuration, Middleware } from '@midwayjs/core'; -import * as passport from 'passport'; -import { PassportMiddleware, PassportStrategy, CustomStrategy as Strategy } from '../../../../src'; +import { PassportMiddleware, PassportStrategy, CustomStrategy as Strategy, AuthenticateOptions } from '../../../../src'; import * as path from 'path'; import * as LocalStrategy from 'passport-local'; import * as express from '@midwayjs/express'; @@ -31,7 +30,7 @@ export class CustomStrategy extends PassportStrategy(LocalStrategy.Strategy) { @Middleware() export class AuthMiddleware extends PassportMiddleware(CustomStrategy) { - getAuthenticateOptions(): Promise | passport.AuthenticateOptions { + getAuthenticateOptions(): Promise | AuthenticateOptions { return { failureRedirect: '/login', } diff --git a/packages/passport/test/fixtures/passport-koa-jwt-global/src/jwt.middleware.ts b/packages/passport/test/fixtures/passport-koa-jwt-global/src/jwt.middleware.ts index eb9625ecd617..682ad86afbe4 100644 --- a/packages/passport/test/fixtures/passport-koa-jwt-global/src/jwt.middleware.ts +++ b/packages/passport/test/fixtures/passport-koa-jwt-global/src/jwt.middleware.ts @@ -1,11 +1,10 @@ -import { PassportMiddleware } from '../../../../src'; +import { PassportMiddleware, AuthenticateOptions } from '../../../../src'; import { Middleware } from '@midwayjs/core'; import { JwtStrategy } from './jwt.strategy'; -import * as passport from 'passport'; @Middleware() export class JwtPassportMiddleware extends PassportMiddleware(JwtStrategy) { - getAuthenticateOptions(): Promise | passport.AuthenticateOptions { + getAuthenticateOptions(): Promise | AuthenticateOptions { return {}; } diff --git a/packages/passport/test/fixtures/passport-koa-jwt/src/jwt.middleware.ts b/packages/passport/test/fixtures/passport-koa-jwt/src/jwt.middleware.ts index 70a803f24317..180c1513362e 100644 --- a/packages/passport/test/fixtures/passport-koa-jwt/src/jwt.middleware.ts +++ b/packages/passport/test/fixtures/passport-koa-jwt/src/jwt.middleware.ts @@ -1,11 +1,10 @@ -import { PassportMiddleware } from '../../../../src'; +import { PassportMiddleware, AuthenticateOptions } from '../../../../src'; import { Middleware } from '@midwayjs/core'; import { JwtStrategy } from './jwt.strategy'; -import * as passport from 'passport'; @Middleware() export class JwtPassportMiddleware extends PassportMiddleware(JwtStrategy) { - getAuthenticateOptions(): Promise | passport.AuthenticateOptions { + getAuthenticateOptions(): Promise | AuthenticateOptions { return {}; } } diff --git a/packages/passport/test/fixtures/passport-web/src/local.middleware.ts b/packages/passport/test/fixtures/passport-web/src/local.middleware.ts index aad0bb697751..c7a0393f5f1b 100644 --- a/packages/passport/test/fixtures/passport-web/src/local.middleware.ts +++ b/packages/passport/test/fixtures/passport-web/src/local.middleware.ts @@ -1,11 +1,10 @@ -import { PassportMiddleware } from '../../../../src'; +import { PassportMiddleware, AuthenticateOptions } from '../../../../src'; import { Middleware } from '@midwayjs/core'; -import * as passport from 'passport'; import { CustomStrategy } from './local.strategy'; @Middleware() export class AuthMiddleware extends PassportMiddleware(CustomStrategy) { - getAuthenticateOptions(): Promise | passport.AuthenticateOptions { + getAuthenticateOptions(): Promise | AuthenticateOptions { return { failureRedirect: '/login' } diff --git a/packages/processAgent/package.json b/packages/processAgent/package.json index e6112677a752..e37827facc69 100644 --- a/packages/processAgent/package.json +++ b/packages/processAgent/package.json @@ -27,7 +27,8 @@ "devDependencies": { "@midwayjs/core": "^3.18.0", "@midwayjs/koa": "^3.18.0", - "@midwayjs/mock": "^3.18.0" + "@midwayjs/mock": "^3.18.0", + "koa-bodyparser": "4.4.1" }, "dependencies": { "request": "2.88.2" diff --git a/packages/prometheus-socket-io/package.json b/packages/prometheus-socket-io/package.json index c58d4403c4f3..8fcc37e48c79 100644 --- a/packages/prometheus-socket-io/package.json +++ b/packages/prometheus-socket-io/package.json @@ -27,7 +27,8 @@ "@midwayjs/mock": "^3.18.0", "@midwayjs/prometheus": "^3.18.0", "@midwayjs/socketio": "^3.18.0", - "@midwayjs/web": "^3.18.0" + "@midwayjs/web": "^3.18.0", + "egg": "^2.28.0" }, "engines": { "node": ">=12" diff --git a/packages/prometheus/test/index.test.ts b/packages/prometheus/test/index.test.ts index 1585aea43f80..9166e3f9610c 100644 --- a/packages/prometheus/test/index.test.ts +++ b/packages/prometheus/test/index.test.ts @@ -1,7 +1,6 @@ -import { createApp, close } from '@midwayjs/mock'; +import { createApp, close, createHttpRequest } from '@midwayjs/mock'; import { Framework } from '@midwayjs/koa'; import { join } from 'path'; -const request = require('supertest'); describe('/test/index.test.ts', () => { @@ -14,8 +13,7 @@ describe('/test/index.test.ts', () => { await close(app); }) it('should get metrics', done => { - - request(app.callback()) + createHttpRequest(app) .get('/metrics') .expect(200, done) }); diff --git a/packages/redis/src/manager.ts b/packages/redis/src/manager.ts index 0c23970fdf20..f34ea7c9649b 100644 --- a/packages/redis/src/manager.ts +++ b/packages/redis/src/manager.ts @@ -46,8 +46,8 @@ export class RedisServiceFactory extends ServiceFactory { `[midway:redis] 'host: ${client.host}', 'port: ${client.port}' are required on config` ); }); - this.logger.info('[midway:redis] cluster connecting'); client = new Redis.Cluster(config.nodes, config); + this.logger.info('[midway:redis] cluster is connecting'); } else if (config.sentinels) { assert.ok( config.sentinels && config.sentinels.length !== 0, @@ -61,23 +61,23 @@ export class RedisServiceFactory extends ServiceFactory { ); }); - this.logger.info('[midway:redis] sentinel connecting start'); client = new Redis(config); + this.logger.info('[midway:redis] sentinel is connecting'); } else { assert.ok( config.host && config.port, `[midway:redis] 'host: ${config.host}', 'port: ${config.port}' are required on config` ); + client = new Redis(config); this.logger.info( - '[midway:redis] server connecting redis://:***@%s:%s', + '[midway:redis] server is connecting redis://:***@%s:%s', config.host, config.port ); - client = new Redis(config); } await new Promise((resolve, reject) => { - client.on('connect', () => { + client.on('ready', () => { this.logger.info('[midway:redis] client connect success'); resolve(); }); diff --git a/packages/redis/test/fixtures/base-app-bad-client/src/config.default.ts b/packages/redis/test/fixtures/base-app-bad-client/src/config.default.ts index 8c28919f9455..58e4c248a4a2 100644 --- a/packages/redis/test/fixtures/base-app-bad-client/src/config.default.ts +++ b/packages/redis/test/fixtures/base-app-bad-client/src/config.default.ts @@ -1,10 +1,11 @@ export const redis = { client: { - host: '128.0.0.2', + host: 'non_existent_host', port: 6379, password: '', db: '0', - connectTimeout: 2e3, - retryStrategy: () => null + connectTimeout: 100, + commandTimeout: 500, + retryStrategy: null, }, }; diff --git a/packages/redis/test/index.test.ts b/packages/redis/test/index.test.ts index ee2450e8d965..f74663b30ca2 100644 --- a/packages/redis/test/index.test.ts +++ b/packages/redis/test/index.test.ts @@ -90,7 +90,7 @@ describe('/test/index.test.ts', () => { const service = new RedisService(); (service as any).serviceFactory = new Map(); await service.init(); - }).rejects.toThrowError(/instance not found/); + }).rejects.toThrow(/instance not found/); }); it('should test health check', async () => { diff --git a/packages/security/test/base.test.ts b/packages/security/test/base.test.ts index 11975b18fa36..2eb2b8cc06ef 100644 --- a/packages/security/test/base.test.ts +++ b/packages/security/test/base.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import * as assert from 'assert'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; @@ -143,7 +142,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/csp.test.ts b/packages/security/test/csp.test.ts index 96dce01933d2..72c1abb7a4c9 100644 --- a/packages/security/test/csp.test.ts +++ b/packages/security/test/csp.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; import * as assert from 'assert'; @@ -114,7 +113,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {csp: ${cspConfig}};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/csrf.test.ts b/packages/security/test/csrf.test.ts index 6f35149c7da1..e123565360b8 100644 --- a/packages/security/test/csrf.test.ts +++ b/packages/security/test/csrf.test.ts @@ -1,7 +1,6 @@ import { createHttpRequest, close, createApp, createFunctionApp } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import * as assert from 'assert'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; @@ -141,7 +140,8 @@ describe('test/csrf.test.ts', function () { afterAll(async () => { await close(app); }); - it('post with csrf token', async () => { + + it.only('post with csrf token', async () => { await postWithCsrfToken(app); }); @@ -226,7 +226,7 @@ describe('test/csrf.test.ts', function () { }); }); - describe('faas', function () { + describe.only('faas', function () { let app; beforeAll(async () => { const appDir = join(__dirname, `fixtures/csrf-tmp/faas`); @@ -236,13 +236,13 @@ describe('test/csrf.test.ts', function () { } await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { await close(app); }); - it('post with csrf token', async () => { + it.only('post with csrf token', async () => { await postWithCsrfToken(app); }); @@ -272,7 +272,7 @@ describe('test/csrf.test.ts', function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = { csrf: {type: 'all', refererWhiteList: ['.midwayjs.org']}};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { @@ -450,6 +450,4 @@ describe('test/csrf.test.ts', function () { await postWithCsrfTokenSetToBodyUsingSession(app); }); }); - - }); diff --git a/packages/security/test/fixtures/base/f.yml b/packages/security/test/fixtures/base/f.yml index bcc7040e311d..4023ffb212d2 100644 --- a/packages/security/test/fixtures/base/f.yml +++ b/packages/security/test/fixtures/base/f.yml @@ -1,5 +1,3 @@ -service: serverless-midway-test - provider: name: aliyun - runtime: nodejs12 \ No newline at end of file + starter: '@midwayjs/fc-starter' diff --git a/packages/security/test/fixtures/base/src/configuration.ts b/packages/security/test/fixtures/base/src/configuration.ts index 960295371ded..0e4e11689dff 100644 --- a/packages/security/test/fixtures/base/src/configuration.ts +++ b/packages/security/test/fixtures/base/src/configuration.ts @@ -1,6 +1,6 @@ import { Configuration, Controller, Inject, Post, Get } from '@midwayjs/core'; import * as framework from '${framework}'; -import * as defaultConcig from './config/config.default'; +import * as defaultConfig from './config/config.default'; @Configuration({ imports: [ @@ -9,7 +9,7 @@ import * as defaultConcig from './config/config.default'; ], importConfigs: [ { - default: defaultConcig + default: defaultConfig } ] }) @@ -22,7 +22,6 @@ export class HomeController { @Inject() ctx; - @Inject() res diff --git a/packages/security/test/hsts.test.ts b/packages/security/test/hsts.test.ts index bd6f1e564b8b..31c5722359ff 100644 --- a/packages/security/test/hsts.test.ts +++ b/packages/security/test/hsts.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; const type = 'hsts'; @@ -111,7 +110,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {hsts: { enable: true }};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { @@ -211,7 +210,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {hsts: { enable: true, includeSubdomains: true }};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/noopen.test.ts b/packages/security/test/noopen.test.ts index be17e924c83b..dcff8edfe57b 100644 --- a/packages/security/test/noopen.test.ts +++ b/packages/security/test/noopen.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; const type = 'noopen'; @@ -106,7 +105,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {noopen: { enable: true }};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/nosniff.test.ts b/packages/security/test/nosniff.test.ts index a36a15185dbb..9809ca49dfed 100644 --- a/packages/security/test/nosniff.test.ts +++ b/packages/security/test/nosniff.test.ts @@ -2,7 +2,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; import * as assert from 'assert'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; const type = 'nosniff'; @@ -125,7 +124,7 @@ describe(`test/${type}.test.ts`, function () { await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); await writeFile(config, readFileSync(config, 'utf-8') + `\nexport const security = {nosniff: { enable: true }};`); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/xframe.test.ts b/packages/security/test/xframe.test.ts index 79b53fca9b40..612b76b51caf 100644 --- a/packages/security/test/xframe.test.ts +++ b/packages/security/test/xframe.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; const type = 'xframe'; @@ -98,7 +97,7 @@ describe(`test/${type}.test.ts`, function () { } await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/packages/security/test/xss.test.ts b/packages/security/test/xss.test.ts index 8fc7809e45f2..e1edc0312463 100644 --- a/packages/security/test/xss.test.ts +++ b/packages/security/test/xss.test.ts @@ -1,7 +1,6 @@ import { close, createApp, createFunctionApp, createHttpRequest } from '@midwayjs/mock'; import { join } from 'path'; -import * as ServerlessApp from '../../../packages-legacy/serverless-app/src'; import { readFileSync, copy, writeFile, remove } from 'fs-extra'; import { existsSync } from 'fs'; const type = 'xssProtection'; @@ -98,7 +97,7 @@ describe(`test/${type}.test.ts`, function () { } await copy(csrfBase, appDir); await writeFile(configuration, csrfConfigurationCode.replace(/\$\{\s*framework\s*\}/g, `@midwayjs/faas`)); - app = await createFunctionApp(appDir, {}, ServerlessApp); + app = await createFunctionApp(appDir, {}); }); afterAll(async () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c24e8734f20b..3a9ca2e16768 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: autocannon: specifier: 7.15.0 version: 7.15.0 + fs-extra: + specifier: 11.2.0 + version: 11.2.0 jest: specifier: 29.7.0 version: 29.7.0(@types/node@20.16.10)(ts-node@10.9.2(@types/node@20.16.10)(typescript@5.3.3)) @@ -840,6 +843,12 @@ importers: '@opentelemetry/sdk-node': specifier: 0.53.0 version: 0.53.0(@opentelemetry/api@1.9.0) + '@opentelemetry/sdk-trace-base': + specifier: 1.26.0 + version: 1.26.0(@opentelemetry/api@1.9.0) + '@opentelemetry/sdk-trace-node': + specifier: 1.26.0 + version: 1.26.0(@opentelemetry/api@1.9.0) packages/passport: devDependencies: @@ -864,6 +873,9 @@ importers: '@types/passport-local': specifier: 1.0.38 version: 1.0.38 + after: + specifier: 0.8.2 + version: 0.8.2 express-session: specifier: 1.18.0 version: 1.18.0 @@ -895,6 +907,9 @@ importers: '@midwayjs/mock': specifier: ^3.18.0 version: link:../mock + koa-bodyparser: + specifier: 4.4.1 + version: 4.4.1 packages/prometheus: dependencies: @@ -938,6 +953,9 @@ importers: '@midwayjs/web': specifier: ^3.18.0 version: link:../web + egg: + specifier: ^2.28.0 + version: 2.37.0 packages/rabbitmq: dependencies: