knight-server 1.0.7 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Server.js +3 -3
- package/Server.js.map +1 -1
- package/base/AbstractModule.d.ts +19 -6
- package/base/AbstractModule.d.ts.map +1 -1
- package/base/AbstractModule.js +26 -2
- package/base/AbstractModule.js.map +1 -1
- package/base/AbstractObject.d.ts +4 -1
- package/base/AbstractObject.d.ts.map +1 -1
- package/base/AbstractObject.js +2 -1
- package/base/AbstractObject.js.map +1 -1
- package/base/AbstractRouter.d.ts +9 -3
- package/base/AbstractRouter.d.ts.map +1 -1
- package/base/AbstractRouter.js +11 -3
- package/base/AbstractRouter.js.map +1 -1
- package/module/database/DataBaseModule.d.ts +6 -3
- package/module/database/DataBaseModule.d.ts.map +1 -1
- package/module/database/DataBaseModule.js +9 -3
- package/module/database/DataBaseModule.js.map +1 -1
- package/module/database/DataBaseRouter.d.ts +10 -0
- package/module/database/DataBaseRouter.d.ts.map +1 -0
- package/module/database/DataBaseRouter.js +18 -0
- package/module/database/DataBaseRouter.js.map +1 -0
- package/module/database/index.d.ts +1 -0
- package/module/database/index.d.ts.map +1 -1
- package/module/database/index.js +1 -0
- package/module/database/index.js.map +1 -1
- package/module/http/HttpModule.d.ts +7 -7
- package/module/http/HttpModule.d.ts.map +1 -1
- package/module/http/HttpModule.js +30 -17
- package/module/http/HttpModule.js.map +1 -1
- package/module/http/HttpRouter.d.ts +1 -1
- package/module/http/HttpRouter.d.ts.map +1 -1
- package/module/http/HttpRouter.js +2 -2
- package/module/http/HttpRouter.js.map +1 -1
- package/module/websocket/WebSocketClient.d.ts +0 -2
- package/module/websocket/WebSocketClient.d.ts.map +1 -1
- package/module/websocket/WebSocketClient.js +1 -2
- package/module/websocket/WebSocketClient.js.map +1 -1
- package/module/websocket/WebSocketModule.d.ts +5 -6
- package/module/websocket/WebSocketModule.d.ts.map +1 -1
- package/module/websocket/WebSocketModule.js +25 -14
- package/module/websocket/WebSocketModule.js.map +1 -1
- package/module/websocket/WebSocketRouter.d.ts +3 -1
- package/module/websocket/WebSocketRouter.d.ts.map +1 -1
- package/module/websocket/WebSocketRouter.js +10 -6
- package/module/websocket/WebSocketRouter.js.map +1 -1
- package/package.json +1 -1
package/Server.js
CHANGED
|
@@ -38,9 +38,9 @@ class Server {
|
|
|
38
38
|
const serverHost = await this.OnServerHost();
|
|
39
39
|
config.serverHost = serverHost;
|
|
40
40
|
this.config = config;
|
|
41
|
-
await this.database.OnStart(
|
|
42
|
-
await this.http.OnStart(
|
|
43
|
-
await this.websocket.OnStart(
|
|
41
|
+
await this.database.OnStart(config.database);
|
|
42
|
+
await this.http.OnStart(config.http);
|
|
43
|
+
await this.websocket.OnStart(config.websocket);
|
|
44
44
|
this.state = true;
|
|
45
45
|
}
|
|
46
46
|
/** 停止服务 */
|
package/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAkC;AAClC,gDAAwB;AACxB,qCAAoH;AACpH,uCAA2C;AAE3C,UAAU;AACV,MAAa,MAAM;IAIR,MAAM,KAAK,QAAQ,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,EAAE,CAAC;IAAC,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAAA,CAAC;IAc1H,WAAW;IACX;QAJA,WAAW;QACH,UAAK,GAAY,KAAK,CAAC;QAK3B,OAAO;QACP,MAAM,OAAO,GAAG,IAAA,iBAAW,GAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,iBAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,iBAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO;QACP,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,mBAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,wBAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IACD,WAAW;IACJ,KAAK,CAAC,OAAO,CAAC,MAAoB;QAErC,SAAS;QACT,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7C,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAkC;AAClC,gDAAwB;AACxB,qCAAoH;AACpH,uCAA2C;AAE3C,UAAU;AACV,MAAa,MAAM;IAIR,MAAM,KAAK,QAAQ,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,EAAE,CAAC;IAAC,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAAA,CAAC;IAc1H,WAAW;IACX;QAJA,WAAW;QACH,UAAK,GAAY,KAAK,CAAC;QAK3B,OAAO;QACP,MAAM,OAAO,GAAG,IAAA,iBAAW,GAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,iBAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,iBAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO;QACP,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,mBAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,wBAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IACD,WAAW;IACJ,KAAK,CAAC,OAAO,CAAC,MAAoB;QAErC,SAAS;QACT,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7C,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,WAAW;IACJ,KAAK,CAAC,MAAM;QAEf,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,eAAe;IACP,KAAK,CAAC,YAAY;QAEtB,6CAA6C;QAC7C,OAAO,wBAAc,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC;CACJ;AA5DD,wBA4DC"}
|
package/base/AbstractModule.d.ts
CHANGED
|
@@ -1,22 +1,35 @@
|
|
|
1
1
|
import { Express } from "express-serve-static-core";
|
|
2
2
|
import { Server } from "../Server";
|
|
3
3
|
import { AbstractObject } from "./AbstractObject";
|
|
4
|
+
import { AbstractRouter, RouterData } from "./AbstractRouter";
|
|
4
5
|
/** 抽象模块基类 */
|
|
5
|
-
export declare abstract class AbstarctModule<T extends ModuleConfig> extends AbstractObject {
|
|
6
|
-
/** 服务实例 */
|
|
7
|
-
protected readonly server: Server;
|
|
6
|
+
export declare abstract class AbstarctModule<T extends ModuleConfig, R extends AbstractRouter> extends AbstractObject {
|
|
8
7
|
/** Express实例 */
|
|
9
8
|
protected readonly express: Express;
|
|
10
|
-
/** 服务地址 */
|
|
11
|
-
protected serverHost: string;
|
|
12
9
|
/** 配置数据 */
|
|
13
10
|
protected abstract config: T;
|
|
11
|
+
/** 路由池 */
|
|
12
|
+
protected readonly routers: Map<string, R>;
|
|
14
13
|
/** 构造函数 */
|
|
15
14
|
constructor(server: Server, express: Express);
|
|
16
15
|
/** 启动 */
|
|
17
|
-
abstract OnStart(
|
|
16
|
+
abstract OnStart(config: T): Promise<void>;
|
|
18
17
|
/** 停止 */
|
|
19
18
|
abstract OnStop(): Promise<void>;
|
|
19
|
+
/** 获取服务地址 */
|
|
20
|
+
OnGetServerHost(): string;
|
|
21
|
+
/** 获取所有路由字典 */
|
|
22
|
+
OnGetRouters(): Map<string, R>;
|
|
23
|
+
/** 获取路由Key列表 */
|
|
24
|
+
OnGetRouterKeys(): Array<string>;
|
|
25
|
+
/** 获取附带地址的路由Key列表 */
|
|
26
|
+
OnGetRouterKeysWithHost(): Array<string>;
|
|
27
|
+
/** 通过路径获取路由 */
|
|
28
|
+
OnGetRouter(path: string): R;
|
|
29
|
+
/** 注册路由 */
|
|
30
|
+
abstract OnRegistRouter(routerData: RouterData): R;
|
|
31
|
+
/** 注销路由 */
|
|
32
|
+
abstract OnDegistRouter(path: string): boolean;
|
|
20
33
|
OnDestroy(): void;
|
|
21
34
|
}
|
|
22
35
|
/** 模块配置 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/base/AbstractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/base/AbstractModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,aAAa;AACb,8BAAsB,cAAc,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,cAAc,CAAE,SAAQ,cAAc;IAEzG,gBAAgB;IAChB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACpC,WAAW;IACX,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7B,UAAU;IACV,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAE3C,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAMnD,SAAS;aACO,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACjD,SAAS;aACO,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IACvC,aAAa;IACN,eAAe,IAAI,MAAM;IAIhC,eAAe;IACR,YAAY,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAIrC,gBAAgB;IACT,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvC,qBAAqB;IACd,uBAAuB,IAAI,KAAK,CAAC,MAAM,CAAC;IAI/C,eAAe;IACR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;IAKnC,WAAW;aACK,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,CAAC;IACzD,WAAW;aACK,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAE9C,SAAS,IAAI,IAAI;CAO3B;AACD,WAAW;AACX,MAAM,WAAW,YAAY;CAG5B"}
|
package/base/AbstractModule.js
CHANGED
|
@@ -6,12 +6,36 @@ const AbstractObject_1 = require("./AbstractObject");
|
|
|
6
6
|
class AbstarctModule extends AbstractObject_1.AbstractObject {
|
|
7
7
|
/** 构造函数 */
|
|
8
8
|
constructor(server, express) {
|
|
9
|
-
super();
|
|
10
|
-
this.server = server;
|
|
9
|
+
super(server);
|
|
11
10
|
this.express = express;
|
|
11
|
+
this.routers = new Map();
|
|
12
|
+
}
|
|
13
|
+
/** 获取服务地址 */
|
|
14
|
+
OnGetServerHost() {
|
|
15
|
+
return this.server?.config?.serverHost || "";
|
|
16
|
+
}
|
|
17
|
+
/** 获取所有路由字典 */
|
|
18
|
+
OnGetRouters() {
|
|
19
|
+
return this.routers;
|
|
20
|
+
}
|
|
21
|
+
/** 获取路由Key列表 */
|
|
22
|
+
OnGetRouterKeys() {
|
|
23
|
+
return Array.from(this.routers.keys()).map(key => key);
|
|
24
|
+
}
|
|
25
|
+
/** 获取附带地址的路由Key列表 */
|
|
26
|
+
OnGetRouterKeysWithHost() {
|
|
27
|
+
return Array.from(this.routers.keys()).map(key => this.OnGetServerHost() + key);
|
|
28
|
+
}
|
|
29
|
+
/** 通过路径获取路由 */
|
|
30
|
+
OnGetRouter(path) {
|
|
31
|
+
if (this.routers.has(path)) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
return this.routers.get(path);
|
|
12
35
|
}
|
|
13
36
|
OnDestroy() {
|
|
14
37
|
super.OnDestroy();
|
|
38
|
+
this.routers.clear();
|
|
15
39
|
this.OnStop();
|
|
16
40
|
}
|
|
17
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/base/AbstractModule.ts"],"names":[],"mappings":";;;AAEA,qDAAkD;
|
|
1
|
+
{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/base/AbstractModule.ts"],"names":[],"mappings":";;;AAEA,qDAAkD;AAGlD,aAAa;AACb,MAAsB,cAAiE,SAAQ,+BAAc;IASzG,WAAW;IACX,YAAmB,MAAc,EAAE,OAAgB;QAE/C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAa,CAAC;IACxC,CAAC;IAKD,aAAa;IACN,eAAe;QAElB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,eAAe;IACR,YAAY;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,gBAAgB;IACT,eAAe;QAElB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IACD,qBAAqB;IACd,uBAAuB;QAE1B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,eAAe;IACR,WAAW,CAAC,IAAY;QAE3B,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAMM,SAAS;QAEZ,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;CAEJ;AA1DD,wCA0DC"}
|
package/base/AbstractObject.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Server } from "../Server";
|
|
1
2
|
/** 抽象对象基类 — 提供 ID、生命周期、日志 */
|
|
2
3
|
export declare abstract class AbstractObject {
|
|
3
4
|
/** 对象唯一 ID */
|
|
@@ -6,8 +7,10 @@ export declare abstract class AbstractObject {
|
|
|
6
7
|
readonly className: string;
|
|
7
8
|
/** 是否已销毁 */
|
|
8
9
|
private _destroyed;
|
|
10
|
+
/** 服务实例 */
|
|
11
|
+
protected readonly server: Server;
|
|
9
12
|
/** 构造函数 */
|
|
10
|
-
constructor();
|
|
13
|
+
constructor(server: Server);
|
|
11
14
|
/** 销毁对象，防止重复销毁 */
|
|
12
15
|
OnDestroy(): void;
|
|
13
16
|
/** 是否已销毁 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractObject.d.ts","sourceRoot":"","sources":["../../src/base/AbstractObject.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AbstractObject.d.ts","sourceRoot":"","sources":["../../src/base/AbstractObject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,6BAA6B;AAC7B,8BAAsB,cAAc;IAEhC,cAAc;IACd,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAS;IACT,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,YAAY;IACZ,OAAO,CAAC,UAAU,CAAkB;IACpC,WAAW;IACX,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,WAAW;gBACQ,MAAM,EAAE,MAAM;IASjC,kBAAkB;IACX,SAAS,IAAI,IAAI;IAMxB,YAAY;IACZ,IAAW,WAAW,IAAI,OAAO,CAGhC;IAED,kBAAkB;IAClB,SAAS,CAAC,WAAW,IAAI,IAAI;IAO7B,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAKnC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAKvC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAKvC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;CAI3C"}
|
package/base/AbstractObject.js
CHANGED
|
@@ -8,11 +8,12 @@ const crypto_1 = __importDefault(require("crypto"));
|
|
|
8
8
|
/** 抽象对象基类 — 提供 ID、生命周期、日志 */
|
|
9
9
|
class AbstractObject {
|
|
10
10
|
/** 构造函数 */
|
|
11
|
-
constructor() {
|
|
11
|
+
constructor(server) {
|
|
12
12
|
/** 是否已销毁 */
|
|
13
13
|
this._destroyed = false;
|
|
14
14
|
this.id = crypto_1.default.randomUUID();
|
|
15
15
|
this.className = this.constructor.name;
|
|
16
|
+
this.server = server;
|
|
16
17
|
}
|
|
17
18
|
// ==================== 生命周期 ====================
|
|
18
19
|
/** 销毁对象，防止重复销毁 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractObject.js","sourceRoot":"","sources":["../../src/base/AbstractObject.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;
|
|
1
|
+
{"version":3,"file":"AbstractObject.js","sourceRoot":"","sources":["../../src/base/AbstractObject.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAG5B,6BAA6B;AAC7B,MAAsB,cAAc;IAWhC,WAAW;IACX,YAAmB,MAAc;QANjC,YAAY;QACJ,eAAU,GAAY,KAAK,CAAC;QAOhC,IAAI,CAAC,EAAE,GAAG,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,iDAAiD;IAEjD,kBAAkB;IACX,SAAS;QAEZ,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,YAAY;IACZ,IAAW,WAAW;QAElB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,kBAAkB;IACR,WAAW;QAEjB,IAAI,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAED,+CAA+C;IAErC,GAAG,CAAC,GAAG,IAAW;QAExB,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACnD,CAAC;IAES,OAAO,CAAC,GAAG,IAAW;QAE5B,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAES,OAAO,CAAC,GAAG,IAAW;QAE5B,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAES,QAAQ,CAAC,GAAG,IAAW;QAE7B,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACrD,CAAC;CACJ;AA7DD,wCA6DC"}
|
package/base/AbstractRouter.d.ts
CHANGED
|
@@ -3,14 +3,20 @@ import { InterfaceUtility } from "../utility";
|
|
|
3
3
|
import { Server } from "../Server";
|
|
4
4
|
/** 抽象路由基类 */
|
|
5
5
|
export declare abstract class AbstractRouter extends AbstractObject {
|
|
6
|
-
/**
|
|
7
|
-
protected readonly
|
|
6
|
+
/** 服务地址 */
|
|
7
|
+
protected readonly serverHost: string;
|
|
8
|
+
/** 路由路径 */
|
|
9
|
+
protected readonly path: string;
|
|
8
10
|
/** 构造函数 */
|
|
9
|
-
constructor(server: Server);
|
|
11
|
+
constructor(server: Server, path: string);
|
|
10
12
|
/** 校验规则 */
|
|
11
13
|
abstract OnCheck(...args: Array<any>): Promise<boolean>;
|
|
12
14
|
/** 逻辑处理 */
|
|
13
15
|
abstract OnHandler(...args: Array<any>): Promise<void>;
|
|
16
|
+
/** 获取服务地址 */
|
|
17
|
+
OnGetServerHost(): string;
|
|
18
|
+
/** 获取服务路由路径 */
|
|
19
|
+
OnGetServerPath(): string;
|
|
14
20
|
OnDestroy(): void;
|
|
15
21
|
}
|
|
16
22
|
/** 路由数据 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractRouter.d.ts","sourceRoot":"","sources":["../../src/base/AbstractRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAiB,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,aAAa;AACb,8BAAsB,cAAe,SAAQ,cAAc;IAEvD,WAAW;IACX,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractRouter.d.ts","sourceRoot":"","sources":["../../src/base/AbstractRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAiB,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,aAAa;AACb,8BAAsB,cAAe,SAAQ,cAAc;IAEvD,WAAW;IACX,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IACtC,WAAW;IACX,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEhC,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAK/C,WAAW;aACK,OAAO,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9D,WAAW;aACK,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7D,aAAa;IACN,eAAe,IAAI,MAAM;IAIhC,eAAe;IACR,eAAe,IAAI,MAAM;IAIzB,SAAS,IAAI,IAAI;CAK3B;AACD,WAAW;AACX,MAAM,WAAW,UAAU;IAEvB,SAAS;IACT,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;CAChD;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,UAAU,CAA2B,CAAC;AACxE,WAAW;AACX,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,IAElB,CAAC,SAAS,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,KAAG,IAAI,CAO3F"}
|
package/base/AbstractRouter.js
CHANGED
|
@@ -7,9 +7,17 @@ const utility_1 = require("../utility");
|
|
|
7
7
|
/** 抽象路由基类 */
|
|
8
8
|
class AbstractRouter extends AbstractObject_1.AbstractObject {
|
|
9
9
|
/** 构造函数 */
|
|
10
|
-
constructor(server) {
|
|
11
|
-
super();
|
|
12
|
-
this.
|
|
10
|
+
constructor(server, path) {
|
|
11
|
+
super(server);
|
|
12
|
+
this.path = path;
|
|
13
|
+
}
|
|
14
|
+
/** 获取服务地址 */
|
|
15
|
+
OnGetServerHost() {
|
|
16
|
+
return this.server?.config?.serverHost || "";
|
|
17
|
+
}
|
|
18
|
+
/** 获取服务路由路径 */
|
|
19
|
+
OnGetServerPath() {
|
|
20
|
+
return this.OnGetServerHost() + this.path;
|
|
13
21
|
}
|
|
14
22
|
OnDestroy() {
|
|
15
23
|
super.OnDestroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractRouter.js","sourceRoot":"","sources":["../../src/base/AbstractRouter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AbstractRouter.js","sourceRoot":"","sources":["../../src/base/AbstractRouter.ts"],"names":[],"mappings":";;;AAiDA,gCASC;AA1DD,qDAAkD;AAClD,wCAA6D;AAG7D,aAAa;AACb,MAAsB,cAAe,SAAQ,+BAAc;IAOvD,WAAW;IACX,YAAmB,MAAc,EAAE,IAAY;QAE3C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAKD,aAAa;IACN,eAAe;QAElB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,eAAe;IACR,eAAe;QAElB,OAAO,IAAI,CAAC,eAAe,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAC9C,CAAC;IACM,SAAS;QAEZ,KAAK,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC;CAEJ;AAhCD,wCAgCC;AASD,gCAAgC;AACnB,QAAA,aAAa,GAAsB,IAAI,KAAK,EAAc,CAAC;AACxE,WAAW;AACX,SAAgB,UAAU,CAAC,IAAY;IAEnC,OAAO,UAA4D,WAAc;QAE7E,IAAI,uBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC;QAChE,MAAM,uBAAuB,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAC7D,qBAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import * as MYSQL from "mysql2/promise";
|
|
2
2
|
import { Express } from "express-serve-static-core";
|
|
3
|
-
import { AbstarctModule, ModuleConfig } from "../../base";
|
|
3
|
+
import { AbstarctModule, ModuleConfig, RouterData } from "../../base";
|
|
4
4
|
import { Server } from "../../Server";
|
|
5
|
+
import { DataBaseRouter } from "./DataBaseRouter";
|
|
5
6
|
/** 数据库模块 */
|
|
6
|
-
export declare class DataBaseModule extends AbstarctModule<DataBaseConfig> {
|
|
7
|
+
export declare class DataBaseModule extends AbstarctModule<DataBaseConfig, DataBaseRouter> {
|
|
7
8
|
protected config: DataBaseConfig;
|
|
8
9
|
/** MySQL数据库池 */
|
|
9
10
|
private pool;
|
|
10
11
|
/** 构造函数 */
|
|
11
12
|
constructor(server: Server, express: Express);
|
|
12
|
-
OnStart(
|
|
13
|
+
OnStart(config: DataBaseConfig): Promise<void>;
|
|
13
14
|
OnStop(): Promise<void>;
|
|
15
|
+
OnRegistRouter(routerData: RouterData): DataBaseRouter;
|
|
16
|
+
OnDegistRouter(path: string): boolean;
|
|
14
17
|
OnDestroy(): void;
|
|
15
18
|
/**
|
|
16
19
|
* 执行SQL查询（基础方法）
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataBaseModule.d.ts","sourceRoot":"","sources":["../../../src/module/database/DataBaseModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"DataBaseModule.d.ts","sourceRoot":"","sources":["../../../src/module/database/DataBaseModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,7 @@ class DataBaseModule extends base_1.AbstarctModule {
|
|
|
43
43
|
constructor(server, express) {
|
|
44
44
|
super(server, express);
|
|
45
45
|
}
|
|
46
|
-
async OnStart(
|
|
47
|
-
this.serverHost = serverHost;
|
|
46
|
+
async OnStart(config) {
|
|
48
47
|
this.config = config;
|
|
49
48
|
this.pool = MYSQL.createPool(config);
|
|
50
49
|
const connection = await this.pool.getConnection();
|
|
@@ -54,12 +53,19 @@ class DataBaseModule extends base_1.AbstarctModule {
|
|
|
54
53
|
const result = await table.syncAllFromDir(config.tableRelativePath);
|
|
55
54
|
if (!result.success) {
|
|
56
55
|
console.log(result.message);
|
|
56
|
+
return;
|
|
57
57
|
}
|
|
58
|
-
this.logInfo(
|
|
58
|
+
this.logInfo(`🌏 ${config.host}:${config.port}`);
|
|
59
59
|
}
|
|
60
60
|
async OnStop() {
|
|
61
61
|
await this.pool?.end();
|
|
62
62
|
}
|
|
63
|
+
OnRegistRouter(routerData) {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
OnDegistRouter(path) {
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
63
69
|
OnDestroy() {
|
|
64
70
|
super.OnDestroy();
|
|
65
71
|
this.OnStop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataBaseModule.js","sourceRoot":"","sources":["../../../src/module/database/DataBaseModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"DataBaseModule.js","sourceRoot":"","sources":["../../../src/module/database/DataBaseModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { AbstractRouter } from "../../base";
|
|
2
|
+
import { Server } from "../../Server";
|
|
3
|
+
/** 数据库路由 */
|
|
4
|
+
export declare class DataBaseRouter extends AbstractRouter {
|
|
5
|
+
/** 构造函数 */
|
|
6
|
+
constructor(server: Server, path: string);
|
|
7
|
+
OnCheck(...args: Array<any>): Promise<boolean>;
|
|
8
|
+
OnHandler(...args: Array<any>): Promise<void>;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=DataBaseRouter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DataBaseRouter.d.ts","sourceRoot":"","sources":["../../../src/module/database/DataBaseRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,YAAY;AACZ,qBAAa,cAAe,SAAQ,cAAc;IAE9C,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAKlC,OAAO,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAI9C,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAK7D"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DataBaseRouter = void 0;
|
|
4
|
+
const base_1 = require("../../base");
|
|
5
|
+
/** 数据库路由 */
|
|
6
|
+
class DataBaseRouter extends base_1.AbstractRouter {
|
|
7
|
+
/** 构造函数 */
|
|
8
|
+
constructor(server, path) {
|
|
9
|
+
super(server, path);
|
|
10
|
+
}
|
|
11
|
+
async OnCheck(...args) {
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
async OnHandler(...args) {
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.DataBaseRouter = DataBaseRouter;
|
|
18
|
+
//# sourceMappingURL=DataBaseRouter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DataBaseRouter.js","sourceRoot":"","sources":["../../../src/module/database/DataBaseRouter.ts"],"names":[],"mappings":";;;AAAA,qCAA4C;AAG5C,YAAY;AACZ,MAAa,cAAe,SAAQ,qBAAc;IAE9C,WAAW;IACX,YAAmB,MAAc,EAAE,IAAY;QAE3C,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,GAAG,IAAgB;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,KAAK,CAAC,SAAS,CAAC,GAAG,IAAgB;IAG1C,CAAC;CAEJ;AAjBD,wCAiBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/module/database/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/module/database/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
|
package/module/database/index.js
CHANGED
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./DataBaseModule"), exports);
|
|
18
|
+
__exportStar(require("./DataBaseRouter"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,mDAAiC"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { Express } from "express-serve-static-core";
|
|
2
2
|
import { AbstarctModule, RouterData } from "../../base";
|
|
3
|
+
import { HttpRouter } from "./HttpRouter";
|
|
3
4
|
import { Server } from "../../Server";
|
|
4
5
|
/** HTTP模块 */
|
|
5
|
-
export declare class HttpModule extends AbstarctModule<HttpConfig> {
|
|
6
|
+
export declare class HttpModule extends AbstarctModule<HttpConfig, HttpRouter> {
|
|
6
7
|
protected config: HttpConfig;
|
|
7
8
|
/** HTTP服务实例 */
|
|
8
9
|
private httpServer;
|
|
9
|
-
/** 路由池 */
|
|
10
|
-
private readonly routers;
|
|
11
10
|
/** 构造函数 */
|
|
12
11
|
constructor(server: Server, express: Express);
|
|
13
|
-
OnStart(
|
|
12
|
+
OnStart(config: HttpConfig): Promise<void>;
|
|
14
13
|
OnStop(): Promise<void>;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
OnRegistRouter(routerData: RouterData): HttpRouter;
|
|
15
|
+
OnDegistRouter(path: string): boolean;
|
|
16
|
+
/** 代理处理逻辑 */
|
|
17
|
+
private OnProxyHandler;
|
|
18
18
|
}
|
|
19
19
|
/** HTTP配置接口 */
|
|
20
20
|
export interface HttpConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpModule.d.ts","sourceRoot":"","sources":["../../../src/module/http/HttpModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"HttpModule.d.ts","sourceRoot":"","sources":["../../../src/module/http/HttpModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,aAAa;AACb,qBAAa,UAAW,SAAQ,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC;IAElE,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,eAAe;IACf,OAAO,CAAC,UAAU,CAAc;IAEhC,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAItC,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAS1C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU;IAalD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO5C,aAAa;IACb,OAAO,CAAC,cAAc;CAOzB;AACD,eAAe;AACf,MAAM,WAAW,UAAU;IAIvB,UAAU;IACV,IAAI,EAAE,MAAM,CAAC;CAChB"}
|
|
@@ -8,45 +8,58 @@ class HttpModule extends base_1.AbstarctModule {
|
|
|
8
8
|
/** 构造函数 */
|
|
9
9
|
constructor(server, express) {
|
|
10
10
|
super(server, express);
|
|
11
|
-
this.routers = new Map();
|
|
12
11
|
}
|
|
13
|
-
async OnStart(
|
|
14
|
-
this.serverHost = serverHost;
|
|
12
|
+
async OnStart(config) {
|
|
15
13
|
this.config = config;
|
|
16
14
|
this.httpServer = this.express.listen(config.port);
|
|
17
|
-
this.logInfo(`🌏 http://${
|
|
15
|
+
this.logInfo(`🌏 http://${this.OnGetServerHost()}:${config.port}`);
|
|
18
16
|
// 注册路由
|
|
19
17
|
const routerRegistry = base_1.RouteRegistry.filter(routerData => routerData.type.prototype instanceof HttpRouter_1.HttpRouter);
|
|
20
18
|
for (const routerData of routerRegistry) {
|
|
21
|
-
this.
|
|
19
|
+
this.OnRegistRouter(routerData);
|
|
22
20
|
}
|
|
23
21
|
}
|
|
24
22
|
async OnStop() {
|
|
25
|
-
this.routers.clear();
|
|
26
23
|
this.httpServer?.close();
|
|
27
24
|
}
|
|
28
|
-
|
|
29
|
-
OnRegist(routerData) {
|
|
25
|
+
OnRegistRouter(routerData) {
|
|
30
26
|
if (null == routerData) {
|
|
31
27
|
this.logError("路由数据为空");
|
|
32
|
-
return
|
|
28
|
+
return null;
|
|
33
29
|
}
|
|
34
30
|
const path = routerData.path;
|
|
35
31
|
const type = routerData.type;
|
|
36
32
|
const name = routerData.type.name;
|
|
37
33
|
if (this.routers.has(path)) {
|
|
38
34
|
this.logError(`重复注册${path}路由}`);
|
|
39
|
-
return
|
|
35
|
+
return null;
|
|
40
36
|
}
|
|
41
|
-
const router = new type(this.server);
|
|
37
|
+
const router = new type(this.server, path);
|
|
42
38
|
this.routers.set(path, router);
|
|
43
|
-
this.express.all(path,
|
|
44
|
-
this.log(
|
|
45
|
-
return
|
|
39
|
+
this.express.all(path, this.OnProxyHandler.bind(this));
|
|
40
|
+
this.log(`路由注册 ${name} - ${path}`);
|
|
41
|
+
return router;
|
|
46
42
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
OnDegistRouter(path) {
|
|
44
|
+
if (!this.routers.has(path)) {
|
|
45
|
+
this.logError(path + "路由数据不存在");
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
const result = this.routers.delete(path);
|
|
49
|
+
if (result) {
|
|
50
|
+
this.log(`路由注销 - ${path}`);
|
|
51
|
+
}
|
|
52
|
+
return result;
|
|
53
|
+
}
|
|
54
|
+
/** 代理处理逻辑 */
|
|
55
|
+
OnProxyHandler(request, response) {
|
|
56
|
+
const path = request.path;
|
|
57
|
+
const router = this.routers.get(path);
|
|
58
|
+
if (null == router) {
|
|
59
|
+
response.status(404).end();
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
router.OnHandler(request, response);
|
|
50
63
|
}
|
|
51
64
|
}
|
|
52
65
|
exports.HttpModule = HttpModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpModule.js","sourceRoot":"","sources":["../../../src/module/http/HttpModule.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"HttpModule.js","sourceRoot":"","sources":["../../../src/module/http/HttpModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { Server } from "../../Server";
|
|
|
4
4
|
/** 抽象HTTP路由 */
|
|
5
5
|
export declare abstract class HttpRouter extends AbstractRouter {
|
|
6
6
|
/** 构造函数 */
|
|
7
|
-
constructor(server: Server);
|
|
7
|
+
constructor(server: Server, path: string);
|
|
8
8
|
/** 逻辑处理 */
|
|
9
9
|
OnHandler(request: HttpRequest, response: HttpResponse): Promise<void>;
|
|
10
10
|
/** 鉴权处理 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRouter.d.ts","sourceRoot":"","sources":["../../../src/module/http/HttpRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,eAAe;AACf,8BAAsB,UAAW,SAAQ,cAAc;IAEnD,WAAW;gBACQ,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"HttpRouter.d.ts","sourceRoot":"","sources":["../../../src/module/http/HttpRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,eAAe;AACf,8BAAsB,UAAW,SAAQ,cAAc;IAEnD,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAI/C,WAAW;IACE,SAAS,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BnF,WAAW;aACK,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IACvG,kBAAkB;IAClB,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC5G,mBAAmB;IACnB,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7G,kBAAkB;IAClB,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC5G,qBAAqB;IACrB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC/G,sBAAsB;IACtB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAChH,mBAAmB;IACnB,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7G,oBAAoB;IACpB,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9G,oBAAoB;IACpB,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAEvG,SAAS,IAAI,IAAI;CAI3B;AACD,eAAe;AACf,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;AAClC,eAAe;AACf,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC"}
|
|
@@ -6,8 +6,8 @@ const utility_1 = require("../../utility");
|
|
|
6
6
|
/** 抽象HTTP路由 */
|
|
7
7
|
class HttpRouter extends base_1.AbstractRouter {
|
|
8
8
|
/** 构造函数 */
|
|
9
|
-
constructor(server) {
|
|
10
|
-
super(server);
|
|
9
|
+
constructor(server, path) {
|
|
10
|
+
super(server, path);
|
|
11
11
|
}
|
|
12
12
|
/** 逻辑处理 */
|
|
13
13
|
async OnHandler(request, response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRouter.js","sourceRoot":"","sources":["../../../src/module/http/HttpRouter.ts"],"names":[],"mappings":";;;AACA,qCAA4C;AAC5C,2CAA8D;AAG9D,eAAe;AACf,MAAsB,UAAW,SAAQ,qBAAc;IAEnD,WAAW;IACX,YAAmB,MAAc;
|
|
1
|
+
{"version":3,"file":"HttpRouter.js","sourceRoot":"","sources":["../../../src/module/http/HttpRouter.ts"],"names":[],"mappings":";;;AACA,qCAA4C;AAC5C,2CAA8D;AAG9D,eAAe;AACf,MAAsB,UAAW,SAAQ,qBAAc;IAEnD,WAAW;IACX,YAAmB,MAAc,EAAE,IAAY;QAE3C,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC;IACD,WAAW;IACJ,KAAK,CAAC,SAAS,CAAC,OAAoB,EAAE,QAAsB;QAE/D,IAAI,IAAI,IAAI,OAAO,IAAI,uBAAa,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC3F,6BAA6B;QAC7B,uDAAuD;QACvD,8DAA8D;QAC9D,IAAI;QACJ,mEAAmE;QACnE,oBAAoB;QACpB,IAAI;QAEJ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,EAAE,CAAC;YAAC,QAAQ,CAAC,MAAM,CAAC,wBAAc,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QACpG,iBAAiB;QACjB,QAAQ,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,EACpC,CAAC;YACG,KAAK,wBAAc,CAAC,cAAc,CAAC,GAAG;gBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACjG,KAAK,wBAAc,CAAC,cAAc,CAAC,IAAI;gBAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACnG,KAAK,wBAAc,CAAC,cAAc,CAAC,GAAG;gBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACjG,KAAK,wBAAc,CAAC,cAAc,CAAC,MAAM;gBAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACvG,KAAK,wBAAc,CAAC,cAAc,CAAC,OAAO;gBAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACzG,KAAK,wBAAc,CAAC,cAAc,CAAC,IAAI;gBAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACnG,KAAK,wBAAc,CAAC,cAAc,CAAC,KAAK;gBAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACrG,KAAK,wBAAc,CAAC,cAAc,CAAC,KAAK;gBAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAAC,MAAM;YACrG,OAAO,CAAC,CAAC,OAAO;QACpB,CAAC;IACL,CAAC;IAoBM,SAAS;QAEZ,KAAK,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC;CACJ;AA1DD,gCA0DC"}
|
|
@@ -5,8 +5,6 @@ import { WebSocketRouter } from './WebSocketRouter';
|
|
|
5
5
|
import { Server } from "../../Server";
|
|
6
6
|
/** WebSocket客户端 */
|
|
7
7
|
export declare class WebSocketClient extends AbstractObject {
|
|
8
|
-
/** 服务实例 */
|
|
9
|
-
private readonly server;
|
|
10
8
|
/** 路由实例 */
|
|
11
9
|
private readonly router;
|
|
12
10
|
/** 连接Key */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,mBAAmB;AACnB,qBAAa,eAAgB,SAAQ,cAAc;IAE/C,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,mBAAmB;AACnB,qBAAa,eAAgB,SAAQ,cAAc;IAE/C,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,YAAY;IACZ,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,aAAa;IACb,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,cAAc;IACd,OAAO,CAAC,sBAAsB,CAAS;IACvC,YAAY;IACZ,OAAO,CAAC,cAAc,CAAiB;IACvC,mBAAmB;IACnB,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAS;IAEpD,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe;IAkBpI,cAAc;IACP,iBAAiB,IAAI,IAAI;IAIhC,eAAe;IACf,OAAO,CAAC,4BAA4B;IAUpC,eAAe;IACf,OAAO,CAAC,2BAA2B;IAMnC,oBAAoB;IACpB,OAAO,CAAC,eAAe;IAMvB,oBAAoB;IACpB,OAAO,CAAC,gBAAgB;IAOxB,oBAAoB;IACpB,OAAO,CAAC,gBAAgB;IAOxB,oBAAoB;IACpB,OAAO,CAAC,kBAAkB;IAO1B,oBAAoB;IACpB,OAAO,CAAC,kBAAkB;IAkB1B,sBAAsB;IACtB,OAAO,CAAC,eAAe;IAIvB,sBAAsB;IACtB,OAAO,CAAC,eAAe;IAIvB,YAAY;IACL,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAQpD,cAAc;IACP,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,UAAU,GAAG,IAAI;IAI/C,cAAc;IACP,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,UAAU,EAAE,WAAW,GAAE,OAAe,GAAG,IAAI;IAS3E,SAAS,IAAI,IAAI;CAK3B"}
|
|
@@ -6,8 +6,7 @@ const base_1 = require("../../base");
|
|
|
6
6
|
class WebSocketClient extends base_1.AbstractObject {
|
|
7
7
|
/** 构造函数 */
|
|
8
8
|
constructor(server, router, key, url, websocket, request) {
|
|
9
|
-
super();
|
|
10
|
-
this.server = server;
|
|
9
|
+
super(server);
|
|
11
10
|
this.router = router;
|
|
12
11
|
this.key = key;
|
|
13
12
|
this.url = url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketClient.ts"],"names":[],"mappings":";;;AAEA,qCAA4C;AAI5C,mBAAmB;AACnB,MAAa,eAAgB,SAAQ,qBAAc;
|
|
1
|
+
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,21 @@
|
|
|
1
1
|
import { Express } from "express-serve-static-core";
|
|
2
2
|
import { AbstarctModule, RouterData } from "../../base";
|
|
3
|
+
import { WebSocketRouter } from "./WebSocketRouter";
|
|
3
4
|
import { Server } from "../../Server";
|
|
4
5
|
/** WebSocket模块 */
|
|
5
|
-
export declare class WebSocketModule extends AbstarctModule<WebSocketConfig> {
|
|
6
|
+
export declare class WebSocketModule extends AbstarctModule<WebSocketConfig, WebSocketRouter> {
|
|
6
7
|
config: WebSocketConfig;
|
|
7
8
|
/** HTTP服务实例 */
|
|
8
9
|
private httpServer;
|
|
9
10
|
/** WebSocket服务 */
|
|
10
11
|
private websocketServer?;
|
|
11
|
-
/** 路由池 */
|
|
12
|
-
private readonly routers;
|
|
13
12
|
/** 构造函数 */
|
|
14
13
|
constructor(server: Server, express: Express);
|
|
15
|
-
OnStart(
|
|
14
|
+
OnStart(config: WebSocketConfig): Promise<void>;
|
|
16
15
|
OnStop(): Promise<void>;
|
|
17
16
|
OnDestroy(): void;
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
OnRegistRouter(routerData: RouterData): WebSocketRouter;
|
|
18
|
+
OnDegistRouter(path: string): boolean;
|
|
20
19
|
/** 连接事件 */
|
|
21
20
|
private onConnectEvent;
|
|
22
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketModule.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSocketModule.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,kBAAkB;AAClB,qBAAa,eAAgB,SAAQ,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC;IAE1E,MAAM,EAAE,eAAe,CAAC;IAC/B,eAAe;IACf,OAAO,CAAC,UAAU,CAAc;IAChC,kBAAkB;IAClB,OAAO,CAAC,eAAe,CAAC,CAAqB;IAE7C,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAItC,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B,SAAS,IAAI,IAAI;IAKjB,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,eAAe;IAYvD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO5C,WAAW;YACG,cAAc;CAQ/B;AACD,oBAAoB;AACpB,MAAM,WAAW,eAAe;IAG5B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe;IACf,0BAA0B,EAAE,MAAM,CAAC;CACtC"}
|
|
@@ -46,24 +46,21 @@ class WebSocketModule extends base_1.AbstarctModule {
|
|
|
46
46
|
/** 构造函数 */
|
|
47
47
|
constructor(server, express) {
|
|
48
48
|
super(server, express);
|
|
49
|
-
this.routers = new Map();
|
|
50
49
|
}
|
|
51
|
-
async OnStart(
|
|
52
|
-
this.serverHost = serverHost;
|
|
50
|
+
async OnStart(config) {
|
|
53
51
|
this.config = config;
|
|
54
52
|
this.httpServer = http_1.default.createServer(this.express);
|
|
55
53
|
this.websocketServer = new WS.WebSocketServer({ server: this.httpServer });
|
|
56
54
|
this.websocketServer.on('connection', this.onConnectEvent.bind(this));
|
|
57
55
|
this.httpServer.listen(config.port);
|
|
58
|
-
this.logInfo(`🌏
|
|
56
|
+
this.logInfo(`🌏 ws://${this.OnGetServerHost()}:${config.port}`);
|
|
59
57
|
// 注册路由
|
|
60
58
|
const routerRegistry = base_1.RouteRegistry.filter(routerData => routerData.type.prototype instanceof WebSocketRouter_1.WebSocketRouter);
|
|
61
59
|
for (const routerData of routerRegistry) {
|
|
62
|
-
this.
|
|
60
|
+
this.OnRegistRouter(routerData);
|
|
63
61
|
}
|
|
64
62
|
}
|
|
65
63
|
async OnStop() {
|
|
66
|
-
this.routers.clear();
|
|
67
64
|
this.websocketServer?.close();
|
|
68
65
|
this.httpServer?.close();
|
|
69
66
|
}
|
|
@@ -71,29 +68,43 @@ class WebSocketModule extends base_1.AbstarctModule {
|
|
|
71
68
|
super.OnDestroy();
|
|
72
69
|
this.OnStop();
|
|
73
70
|
}
|
|
74
|
-
|
|
75
|
-
OnRegist(routerData) {
|
|
71
|
+
OnRegistRouter(routerData) {
|
|
76
72
|
if (null == routerData) {
|
|
77
73
|
this.logError("路由数据为空");
|
|
78
|
-
return
|
|
74
|
+
return null;
|
|
79
75
|
}
|
|
80
76
|
const path = routerData.path;
|
|
81
77
|
const type = routerData.type;
|
|
82
78
|
const name = routerData.type.name;
|
|
83
79
|
if (this.routers.has(path)) {
|
|
84
80
|
this.logError(`重复注册${path}路由}`);
|
|
85
|
-
return
|
|
81
|
+
return null;
|
|
86
82
|
}
|
|
87
|
-
const router = new type(this.server);
|
|
83
|
+
const router = new type(this.server, path);
|
|
88
84
|
this.routers.set(path, router);
|
|
89
|
-
this.log(`路由 ${name} -
|
|
90
|
-
return
|
|
85
|
+
this.log(`路由 ${name} - ${path}`);
|
|
86
|
+
return router;
|
|
87
|
+
}
|
|
88
|
+
OnDegistRouter(path) {
|
|
89
|
+
if (!this.routers.has(path)) {
|
|
90
|
+
this.logError(path + "路由数据不存在,路由注销失败");
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
const result = this.routers.delete(path);
|
|
94
|
+
if (result) {
|
|
95
|
+
this.log(`路由注销 - ${path}`);
|
|
96
|
+
}
|
|
97
|
+
return result;
|
|
91
98
|
}
|
|
92
99
|
/** 连接事件 */
|
|
93
100
|
async onConnectEvent(websocket, request) {
|
|
94
101
|
const path = request.url;
|
|
102
|
+
if (!this.routers.has(path)) {
|
|
103
|
+
this.logError(path + "路由数据不存在,客户端创建失败");
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
95
106
|
const router = this.routers.get(path);
|
|
96
|
-
await router
|
|
107
|
+
await router?.OnHandler(websocket, request);
|
|
97
108
|
}
|
|
98
109
|
}
|
|
99
110
|
exports.WebSocketModule = WebSocketModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketModule.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA6C;AAC7C,uCAAyB;AACzB,qCAAuE;AACvE,uDAAoD;AAGpD,kBAAkB;AAClB,MAAa,eAAgB,SAAQ,
|
|
1
|
+
{"version":3,"file":"WebSocketModule.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,15 @@ export declare abstract class WebSocketRouter extends AbstractRouter {
|
|
|
8
8
|
/** 客户端池 */
|
|
9
9
|
private readonly clients;
|
|
10
10
|
/** 构造函数 */
|
|
11
|
-
constructor(server: Server);
|
|
11
|
+
constructor(server: Server, path: string);
|
|
12
12
|
/** 逻辑处理 */
|
|
13
13
|
OnHandler(websocket: WS.WebSocket, request: IncomingMessage): Promise<void>;
|
|
14
14
|
/** 添加客户端 */
|
|
15
15
|
private OnAddClient;
|
|
16
16
|
/** 移除客户端 */
|
|
17
17
|
OnRemoveClient(key: string): boolean;
|
|
18
|
+
/** 移除所有客户端 */
|
|
19
|
+
OnRemoveAllClient(): void;
|
|
18
20
|
/** 获取客户端 */
|
|
19
21
|
OnGetClient(key: string): WebSocketClient;
|
|
20
22
|
/** 获取所有客户端 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketRouter.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,wBAAwB;AACxB,8BAAsB,eAAgB,SAAQ,cAAc;IAExD,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;
|
|
1
|
+
{"version":3,"file":"WebSocketRouter.d.ts","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,wBAAwB;AACxB,8BAAsB,eAAgB,SAAQ,cAAc;IAExD,WAAW;IACX,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IAEvD,WAAW;gBACQ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAM/C,WAAW;IACE,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBxF,YAAY;IACZ,OAAO,CAAC,WAAW;IAKnB,YAAY;IACL,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAK3C,cAAc;IACP,iBAAiB,IAAI,IAAI;IAKhC,YAAY;IACL,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe;IAIhD,cAAc;IACP,YAAY,IAAI,KAAK,CAAC,eAAe,CAAC;IAK7C,WAAW;aACK,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IACnE,SAAS;aACO,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IACjF,SAAS;aACO,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IACpF,SAAS;aACO,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACxF,SAAS,IAAI,IAAI;CAM3B"}
|
|
@@ -7,8 +7,8 @@ const utility_1 = require("../../utility");
|
|
|
7
7
|
/** 抽象WebSocket路由(会话) */
|
|
8
8
|
class WebSocketRouter extends base_1.AbstractRouter {
|
|
9
9
|
/** 构造函数 */
|
|
10
|
-
constructor(server) {
|
|
11
|
-
super(server);
|
|
10
|
+
constructor(server, path) {
|
|
11
|
+
super(server, path);
|
|
12
12
|
this.clients = new Map();
|
|
13
13
|
}
|
|
14
14
|
/** 逻辑处理 */
|
|
@@ -47,6 +47,13 @@ class WebSocketRouter extends base_1.AbstractRouter {
|
|
|
47
47
|
}
|
|
48
48
|
return this.clients.delete(key);
|
|
49
49
|
}
|
|
50
|
+
/** 移除所有客户端 */
|
|
51
|
+
OnRemoveAllClient() {
|
|
52
|
+
for (const client of this.OnGetClients()) {
|
|
53
|
+
client.OnDestroy();
|
|
54
|
+
}
|
|
55
|
+
this.clients.clear();
|
|
56
|
+
}
|
|
50
57
|
/** 获取客户端 */
|
|
51
58
|
OnGetClient(key) {
|
|
52
59
|
return this.clients.get(key);
|
|
@@ -57,10 +64,7 @@ class WebSocketRouter extends base_1.AbstractRouter {
|
|
|
57
64
|
}
|
|
58
65
|
OnDestroy() {
|
|
59
66
|
super.OnDestroy();
|
|
60
|
-
|
|
61
|
-
client.OnDestroy();
|
|
62
|
-
}
|
|
63
|
-
this.clients.clear();
|
|
67
|
+
this.OnRemoveAllClient();
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
exports.WebSocketRouter = WebSocketRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketRouter.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketRouter.ts"],"names":[],"mappings":";;;AAEA,qCAA4C;AAC5C,uDAAoD;AACpD,2CAA8D;AAG9D,wBAAwB;AACxB,MAAsB,eAAgB,SAAQ,qBAAc;
|
|
1
|
+
{"version":3,"file":"WebSocketRouter.js","sourceRoot":"","sources":["../../../src/module/websocket/WebSocketRouter.ts"],"names":[],"mappings":"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"}
|