Skip to content

K
Koishi Nestjs
Commit 280dc23a authored by nanahira's avatar nanahira
Browse files
Options

rc

parent 14f35677
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 39 deletions
package-lock.json
View file @ 280dc23a
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^3.4.1",
"express": "^4.17.1", "express": "^4.17.1",
"jest": "^27.4.4", "jest": "^27.4.4",
"koishi": "^4.0.0-beta.5", "koishi": "^4.0.0-rc.0",
"prettier": "^2.4.1", "prettier": "^2.4.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
...@@ -1044,23 +1044,23 @@ ...@@ -1044,23 +1044,23 @@
"dev": true "dev": true
}, },
"node_modules/@koishijs/core": { "node_modules/@koishijs/core": {
"version": "4.0.0-beta.5", "version": "4.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-rc.0.tgz",
"integrity": "sha512-r7cM7FM0QJ+6BYWFAe/H+8WkI85ffAFEyKWA3li71Pf26lPQ6h5Ms2bbIpHCsq/VFR7/EFQjzYWxK+wmwX/wwQ==", "integrity": "sha512-YHr63LnLxWaRQTYzAKq+xWf4ToYnJ/RI4VxdytOIrchwmRrUDQ19R35eO6yF2KiA+scyEZ4e7QpAIpn2pLmu5g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@koishijs/utils": "^5.0.0-beta.1", "@koishijs/utils": "^5.0.0-rc.0",
"fastest-levenshtein": "^1.0.12", "fastest-levenshtein": "^1.0.12",
"schemastery": "^2.1.1" "schemastery": "^2.1.2"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
} }
}, },
"node_modules/@koishijs/utils": { "node_modules/@koishijs/utils": {
"version": "5.0.0-beta.1", "version": "5.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-beta.1.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-rc.0.tgz",
"integrity": "sha512-JZae1kaums2beMH+AVc7jiKYJArnqCgw+1h2kEuvnaiaSHe7qNJp+BAhMJfxrXOe3VZ/oYKoUOd71FNjzaN2RA==", "integrity": "sha512-aG1FjFB9NKiSqGS/tjjsSnmSfrW5yXQK7aZAR7DhsSaiF+/CdWZ0sQ9XS830xZ6PV1UwKib9alluVMULyWvrbA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"supports-color": "^8.1.0" "supports-color": "^8.1.0"
...@@ -5339,14 +5339,14 @@ ...@@ -5339,14 +5339,14 @@
} }
}, },
"node_modules/koishi": { "node_modules/koishi": {
"version": "4.0.0-beta.5", "version": "4.0.0-rc.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-rc.0.tgz",
"integrity": "sha512-and+I4Ed7tgHg9uX2HgyVyUwCU2PWujhG17JXu6dvC+XXlwrkwh2BB5oF18OAKUMNLwXXPl2rQZmvvG+Zj6aUw==", "integrity": "sha512-GhnBVBOzsdny5GwwcC3twDWAKwdtA5Q6P64jtwHxUxq6iV69ttKhmz76xHSWQYM2h9JoOaXyOTO4b7n4M0nTkw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-beta.5", "@koishijs/core": "^4.0.0-rc.0",
"@koishijs/utils": "^5.0.0-beta.1", "@koishijs/utils": "^5.0.0-rc.0",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^7.4.7", "@types/ws": "^7.4.7",
...@@ -5355,7 +5355,8 @@ ...@@ -5355,7 +5355,8 @@
"koa-bodyparser": "^4.3.0", "koa-bodyparser": "^4.3.0",
"parseurl": "^1.3.3", "parseurl": "^1.3.3",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"proxy-agent": "^5.0.0" "proxy-agent": "^5.0.0",
"ws": "^8.2.1"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
...@@ -6400,9 +6401,9 @@ ...@@ -6400,9 +6401,9 @@
} }
}, },
"node_modules/schemastery": { "node_modules/schemastery": {
"version": "2.1.1", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.1.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.2.tgz",
"integrity": "sha512-ORumqcbLhe4fp+eN5COUFejTxvdfAUCQCFVF4c69HuFdexbU8kgqQsOHjJ3ZXokV15xstwWHPwAVQ8/AwldROw==", "integrity": "sha512-iHwWfKxWaTFgZmKNULNtgyo8VDpdEWx31b6+j0tGTST8dBIYU7VYAHmq5qdYKYZ0uNSM5u57c09cuN75Yf7WwQ==",
"dev": true "dev": true
}, },
"node_modules/semver": { "node_modules/semver": {
...@@ -8251,20 +8252,20 @@ ...@@ -8251,20 +8252,20 @@
} }
}, },
"@koishijs/core": { "@koishijs/core": {
"version": "4.0.0-beta.5", "version": "4.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-rc.0.tgz",
"integrity": "sha512-r7cM7FM0QJ+6BYWFAe/H+8WkI85ffAFEyKWA3li71Pf26lPQ6h5Ms2bbIpHCsq/VFR7/EFQjzYWxK+wmwX/wwQ==", "integrity": "sha512-YHr63LnLxWaRQTYzAKq+xWf4ToYnJ/RI4VxdytOIrchwmRrUDQ19R35eO6yF2KiA+scyEZ4e7QpAIpn2pLmu5g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@koishijs/utils": "^5.0.0-beta.1", "@koishijs/utils": "^5.0.0-rc.0",
"fastest-levenshtein": "^1.0.12", "fastest-levenshtein": "^1.0.12",
"schemastery": "^2.1.1" "schemastery": "^2.1.2"
} }
}, },
"@koishijs/utils": { "@koishijs/utils": {
"version": "5.0.0-beta.1", "version": "5.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-beta.1.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.0.0-rc.0.tgz",
"integrity": "sha512-JZae1kaums2beMH+AVc7jiKYJArnqCgw+1h2kEuvnaiaSHe7qNJp+BAhMJfxrXOe3VZ/oYKoUOd71FNjzaN2RA==", "integrity": "sha512-aG1FjFB9NKiSqGS/tjjsSnmSfrW5yXQK7aZAR7DhsSaiF+/CdWZ0sQ9XS830xZ6PV1UwKib9alluVMULyWvrbA==",
"dev": true, "dev": true,
"requires": { "requires": {
"supports-color": "^8.1.0" "supports-color": "^8.1.0"
...@@ -11555,14 +11556,14 @@ ...@@ -11555,14 +11556,14 @@
} }
}, },
"koishi": { "koishi": {
"version": "4.0.0-beta.5", "version": "4.0.0-rc.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.5.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-rc.0.tgz",
"integrity": "sha512-and+I4Ed7tgHg9uX2HgyVyUwCU2PWujhG17JXu6dvC+XXlwrkwh2BB5oF18OAKUMNLwXXPl2rQZmvvG+Zj6aUw==", "integrity": "sha512-GhnBVBOzsdny5GwwcC3twDWAKwdtA5Q6P64jtwHxUxq6iV69ttKhmz76xHSWQYM2h9JoOaXyOTO4b7n4M0nTkw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-beta.5", "@koishijs/core": "^4.0.0-rc.0",
"@koishijs/utils": "^5.0.0-beta.1", "@koishijs/utils": "^5.0.0-rc.0",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^7.4.7", "@types/ws": "^7.4.7",
...@@ -11571,7 +11572,8 @@ ...@@ -11571,7 +11572,8 @@
"koa-bodyparser": "^4.3.0", "koa-bodyparser": "^4.3.0",
"parseurl": "^1.3.3", "parseurl": "^1.3.3",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"proxy-agent": "^5.0.0" "proxy-agent": "^5.0.0",
"ws": "^8.2.1"
}, },
"dependencies": { "dependencies": {
"@types/ws": { "@types/ws": {
...@@ -12367,9 +12369,9 @@ ...@@ -12367,9 +12369,9 @@
} }
}, },
"schemastery": { "schemastery": {
"version": "2.1.1", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.1.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.2.tgz",
"integrity": "sha512-ORumqcbLhe4fp+eN5COUFejTxvdfAUCQCFVF4c69HuFdexbU8kgqQsOHjJ3ZXokV15xstwWHPwAVQ8/AwldROw==", "integrity": "sha512-iHwWfKxWaTFgZmKNULNtgyo8VDpdEWx31b6+j0tGTST8dBIYU7VYAHmq5qdYKYZ0uNSM5u57c09cuN75Yf7WwQ==",
"dev": true "dev": true
}, },
"semver": { "semver": {
......
package.json
View file @ 280dc23a
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"peerDependencies": { "peerDependencies": {
"@nestjs/common": "^8.0.0", "@nestjs/common": "^8.0.0",
"@nestjs/core": "^8.0.0", "@nestjs/core": "^8.0.0",
"koishi": "^4.0.0-beta.5", "koishi": "^4.0.0-rc.0",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"rxjs": "^7.4.0" "rxjs": "^7.4.0"
}, },
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^3.4.1",
"express": "^4.17.1", "express": "^4.17.1",
"jest": "^27.4.4", "jest": "^27.4.4",
"koishi": "^4.0.0-beta.5", "koishi": "^4.0.0-rc.0",
"prettier": "^2.4.1", "prettier": "^2.4.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
......
src/koishi.service.ts
View file @ 280dc23a
...@@ -38,7 +38,7 @@ export class KoishiService ...@@ -38,7 +38,7 @@ export class KoishiService
) { ) {
super({ super({
...koishiModuleOptions, ...koishiModuleOptions,
port: 0, port: 1,
}); });
this.options.baseDir ||= process.cwd(); this.options.baseDir ||= process.cwd();
this.globalInterceptors = this.koishiModuleOptions.globalInterceptors || []; this.globalInterceptors = this.koishiModuleOptions.globalInterceptors || [];
...@@ -46,11 +46,16 @@ export class KoishiService ...@@ -46,11 +46,16 @@ export class KoishiService
this._nestKoaTmpInstance.use(KoaBodyParser()); this._nestKoaTmpInstance.use(KoaBodyParser());
this._nestKoaTmpInstance.use(this.router.routes()); this._nestKoaTmpInstance.use(this.router.routes());
this._nestKoaTmpInstance.use(this.router.allowedMethods()); this._nestKoaTmpInstance.use(this.router.allowedMethods());
this.options.port = 1;
} }
readonly _nestKoaTmpInstance = new Koa(); readonly _nestKoaTmpInstance = new Koa();
override async start() {
this.isActive = true;
await this.parallel('ready');
this.logger('app').debug('started');
}
private async setHttpServer() { private async setHttpServer() {
const httpAdapter = this.httpDiscovery.getHttpAdapter(); const httpAdapter = this.httpDiscovery.getHttpAdapter();
if (!httpAdapter) { if (!httpAdapter) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment