@builder6/core 0.15.7 → 0.16.1
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/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/websockets/hybrid-adapter.d.ts +14 -0
- package/dist/websockets/hybrid-adapter.js +54 -0
- package/dist/websockets/hybrid-adapter.js.map +1 -0
- package/dist/websockets/index.d.ts +2 -0
- package/dist/websockets/index.js +19 -0
- package/dist/websockets/index.js.map +1 -0
- package/dist/websockets/io-adapter.d.ts +7 -0
- package/dist/websockets/io-adapter.js +23 -0
- package/dist/websockets/io-adapter.js.map +1 -0
- package/dist/websockets/ws-adapter.d.ts +36 -0
- package/dist/websockets/ws-adapter.js +194 -0
- package/dist/websockets/ws-adapter.js.map +1 -0
- package/package.json +4 -3
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -19,4 +19,5 @@ __exportStar(require("./config"), exports);
|
|
|
19
19
|
__exportStar(require("./mongodb"), exports);
|
|
20
20
|
__exportStar(require("./plugin"), exports);
|
|
21
21
|
__exportStar(require("./logger/pinoConfig"), exports);
|
|
22
|
+
__exportStar(require("./websockets"), exports);
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,sDAAoC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,sDAAoC;AACpC,+CAA6B"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { AbstractWsAdapter } from '@nestjs/websockets';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
3
|
+
import { INestApplicationContext } from '@nestjs/common';
|
|
4
|
+
export declare class HybridAdapter extends AbstractWsAdapter {
|
|
5
|
+
private wsAdapter;
|
|
6
|
+
private ioAdapter;
|
|
7
|
+
constructor(app: INestApplicationContext);
|
|
8
|
+
create(port: number, options?: any): any;
|
|
9
|
+
bindClientConnect(server: any, callback: any): void;
|
|
10
|
+
bindMessageHandlers(client: any, handlers: any[], transform: (data: any) => Observable<any>): void;
|
|
11
|
+
close(server: any): Promise<void>;
|
|
12
|
+
private isSocketIoServer;
|
|
13
|
+
private isSocketIoClient;
|
|
14
|
+
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HybridAdapter = void 0;
|
|
4
|
+
const websockets_1 = require("@nestjs/websockets");
|
|
5
|
+
const ws_adapter_1 = require("./ws-adapter");
|
|
6
|
+
const platform_socket_io_1 = require("@nestjs/platform-socket.io");
|
|
7
|
+
class HybridAdapter extends websockets_1.AbstractWsAdapter {
|
|
8
|
+
constructor(app) {
|
|
9
|
+
super(app);
|
|
10
|
+
this.wsAdapter = new ws_adapter_1.WsAdapter(app);
|
|
11
|
+
this.ioAdapter = new platform_socket_io_1.IoAdapter(app);
|
|
12
|
+
}
|
|
13
|
+
create(port, options) {
|
|
14
|
+
const path = options?.path || '';
|
|
15
|
+
if (path.includes('socket.io')) {
|
|
16
|
+
return this.ioAdapter.create(port, options);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
return this.wsAdapter.create(port, options);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
bindClientConnect(server, callback) {
|
|
23
|
+
if (this.isSocketIoServer(server)) {
|
|
24
|
+
return this.ioAdapter.bindClientConnect(server, callback);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
return this.wsAdapter.bindClientConnect(server, callback);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
bindMessageHandlers(client, handlers, transform) {
|
|
31
|
+
if (this.isSocketIoClient(client)) {
|
|
32
|
+
return this.ioAdapter.bindMessageHandlers(client, handlers, transform);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
return this.wsAdapter.bindMessageHandlers(client, handlers, transform);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
close(server) {
|
|
39
|
+
if (this.isSocketIoServer(server)) {
|
|
40
|
+
return this.ioAdapter.close?.(server);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
return this.wsAdapter.close?.(server);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
isSocketIoServer(server) {
|
|
47
|
+
return !!server?.sockets;
|
|
48
|
+
}
|
|
49
|
+
isSocketIoClient(client) {
|
|
50
|
+
return typeof client?.join === 'function';
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.HybridAdapter = HybridAdapter;
|
|
54
|
+
//# sourceMappingURL=hybrid-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hybrid-adapter.js","sourceRoot":"","sources":["../../src/websockets/hybrid-adapter.ts"],"names":[],"mappings":";;;AACA,mDAG4B;AAK5B,6CAAyC;AAEzC,mEAAuD;AAKvD,MAAa,aAAc,SAAQ,8BAAiB;IAIlD,YAAY,GAA4B;QACtC,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,8BAAS,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,OAAa;QAChC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,MAAW,EAAE,QAAa;QAE1C,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,mBAAmB,CACjB,MAAW,EACX,QAAe,EACf,SAAyC;QAEzC,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAW;QACf,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,MAAW;QAClC,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3B,CAAC;IAEO,gBAAgB,CAAC,MAAW;QAClC,OAAO,OAAO,MAAM,EAAE,IAAI,KAAK,UAAU,CAAC;IAC5C,CAAC;CACF;AAvDD,sCAuDC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./hybrid-adapter"), exports);
|
|
18
|
+
__exportStar(require("./ws-adapter"), exports);
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,+CAA6B"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { IoAdapter } from '@nestjs/platform-socket.io';
|
|
2
|
+
import { ServerOptions } from 'socket.io';
|
|
3
|
+
export declare class RedisIoAdapter extends IoAdapter {
|
|
4
|
+
private adapterConstructor;
|
|
5
|
+
connectToRedis(): Promise<void>;
|
|
6
|
+
createIOServer(port: number, options?: ServerOptions): any;
|
|
7
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RedisIoAdapter = void 0;
|
|
4
|
+
const platform_socket_io_1 = require("@nestjs/platform-socket.io");
|
|
5
|
+
const redis_adapter_1 = require("@socket.io/redis-adapter");
|
|
6
|
+
const redis_1 = require("redis");
|
|
7
|
+
class RedisIoAdapter extends platform_socket_io_1.IoAdapter {
|
|
8
|
+
async connectToRedis() {
|
|
9
|
+
const pubClient = (0, redis_1.createClient)({
|
|
10
|
+
url: process.env.B6_CLUSTER_TRANSPORTER || process.env.B6_TRANSPORTER,
|
|
11
|
+
});
|
|
12
|
+
const subClient = pubClient.duplicate();
|
|
13
|
+
await Promise.all([pubClient.connect(), subClient.connect()]);
|
|
14
|
+
this.adapterConstructor = (0, redis_adapter_1.createAdapter)(pubClient, subClient);
|
|
15
|
+
}
|
|
16
|
+
createIOServer(port, options) {
|
|
17
|
+
const server = super.createIOServer(port, options);
|
|
18
|
+
server.adapter(this.adapterConstructor);
|
|
19
|
+
return server;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.RedisIoAdapter = RedisIoAdapter;
|
|
23
|
+
//# sourceMappingURL=io-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"io-adapter.js","sourceRoot":"","sources":["../../src/websockets/io-adapter.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AAEvD,4DAAyD;AACzD,iCAAqC;AAErC,MAAa,cAAe,SAAQ,8BAAS;IAG3C,KAAK,CAAC,cAAc;QAClB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC;YAC7B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;SACtE,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;QAExC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,kBAAkB,GAAG,IAAA,6BAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,OAAuB;QAClD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAnBD,wCAmBC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { INestApplicationContext, Logger } from '@nestjs/common';
|
|
2
|
+
import { AbstractWsAdapter } from '@nestjs/websockets';
|
|
3
|
+
import { MessageMappingProperties } from '@nestjs/websockets/gateway-metadata-explorer';
|
|
4
|
+
import * as http from 'http';
|
|
5
|
+
import { Observable } from 'rxjs';
|
|
6
|
+
type WsServerRegistryEntry = any[];
|
|
7
|
+
type WsData = string | Buffer | ArrayBuffer | Buffer[];
|
|
8
|
+
type WsMessageParser = (data: WsData) => {
|
|
9
|
+
event: string;
|
|
10
|
+
data: any;
|
|
11
|
+
} | void;
|
|
12
|
+
type WsAdapterOptions = {
|
|
13
|
+
messageParser?: WsMessageParser;
|
|
14
|
+
};
|
|
15
|
+
export declare class WsAdapter extends AbstractWsAdapter {
|
|
16
|
+
protected readonly logger: Logger;
|
|
17
|
+
protected readonly httpServersRegistry: Map<number, any>;
|
|
18
|
+
protected readonly wsServersRegistry: Map<number, WsServerRegistryEntry>;
|
|
19
|
+
protected messageParser: WsMessageParser;
|
|
20
|
+
constructor(appOrHttpServer?: INestApplicationContext | object, options?: WsAdapterOptions);
|
|
21
|
+
create(port: number, options?: Record<string, any> & {
|
|
22
|
+
namespace?: string;
|
|
23
|
+
server?: any;
|
|
24
|
+
path?: string;
|
|
25
|
+
}): any;
|
|
26
|
+
bindMessageHandlers(client: any, handlers: MessageMappingProperties[], transform: (data: any) => Observable<any>): void;
|
|
27
|
+
bindMessageHandler(buffer: any, handlersMap: Map<string, MessageMappingProperties>, transform: (data: any) => Observable<any>): Observable<any>;
|
|
28
|
+
bindErrorHandler(server: any): any;
|
|
29
|
+
bindClientDisconnect(client: any, callback: Function): void;
|
|
30
|
+
close(server: any): Promise<void>;
|
|
31
|
+
dispose(): Promise<void>;
|
|
32
|
+
setMessageParser(parser: WsMessageParser): void;
|
|
33
|
+
protected ensureHttpServerExists(port: number, httpServer?: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
|
|
34
|
+
protected addWsServerToRegistry<T extends Record<'path', string> = any>(wsServer: T, port: number, path: string): void;
|
|
35
|
+
}
|
|
36
|
+
export {};
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.WsAdapter = void 0;
|
|
37
|
+
const common_1 = require("@nestjs/common");
|
|
38
|
+
const load_package_util_1 = require("@nestjs/common/utils/load-package.util");
|
|
39
|
+
const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
|
|
40
|
+
const websockets_1 = require("@nestjs/websockets");
|
|
41
|
+
const constants_1 = require("@nestjs/websockets/constants");
|
|
42
|
+
const http = __importStar(require("http"));
|
|
43
|
+
const rxjs_1 = require("rxjs");
|
|
44
|
+
const operators_1 = require("rxjs/operators");
|
|
45
|
+
let wsPackage = {};
|
|
46
|
+
var READY_STATE;
|
|
47
|
+
(function (READY_STATE) {
|
|
48
|
+
READY_STATE[READY_STATE["CONNECTING_STATE"] = 0] = "CONNECTING_STATE";
|
|
49
|
+
READY_STATE[READY_STATE["OPEN_STATE"] = 1] = "OPEN_STATE";
|
|
50
|
+
READY_STATE[READY_STATE["CLOSING_STATE"] = 2] = "CLOSING_STATE";
|
|
51
|
+
READY_STATE[READY_STATE["CLOSED_STATE"] = 3] = "CLOSED_STATE";
|
|
52
|
+
})(READY_STATE || (READY_STATE = {}));
|
|
53
|
+
const UNDERLYING_HTTP_SERVER_PORT = 0;
|
|
54
|
+
class WsAdapter extends websockets_1.AbstractWsAdapter {
|
|
55
|
+
constructor(appOrHttpServer, options) {
|
|
56
|
+
super(appOrHttpServer);
|
|
57
|
+
this.logger = new common_1.Logger(WsAdapter.name);
|
|
58
|
+
this.httpServersRegistry = new Map();
|
|
59
|
+
this.wsServersRegistry = new Map();
|
|
60
|
+
this.messageParser = (data) => {
|
|
61
|
+
return JSON.parse(data.toString());
|
|
62
|
+
};
|
|
63
|
+
wsPackage = (0, load_package_util_1.loadPackage)('ws', 'WsAdapter', () => require('ws'));
|
|
64
|
+
if (options?.messageParser) {
|
|
65
|
+
this.messageParser = options.messageParser;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
create(port, options) {
|
|
69
|
+
const { server, path, ...wsOptions } = options;
|
|
70
|
+
if (wsOptions?.namespace) {
|
|
71
|
+
const error = new Error('"WsAdapter" does not support namespaces. If you need namespaces in your project, consider using the "@nestjs/platform-socket.io" package instead.');
|
|
72
|
+
this.logger.error(error);
|
|
73
|
+
throw error;
|
|
74
|
+
}
|
|
75
|
+
if (port === UNDERLYING_HTTP_SERVER_PORT && this.httpServer) {
|
|
76
|
+
this.ensureHttpServerExists(port, this.httpServer);
|
|
77
|
+
const wsServer = this.bindErrorHandler(new wsPackage.Server({
|
|
78
|
+
noServer: true,
|
|
79
|
+
...wsOptions,
|
|
80
|
+
}));
|
|
81
|
+
this.addWsServerToRegistry(wsServer, port, path);
|
|
82
|
+
return wsServer;
|
|
83
|
+
}
|
|
84
|
+
if (server) {
|
|
85
|
+
return server;
|
|
86
|
+
}
|
|
87
|
+
if (path && port !== UNDERLYING_HTTP_SERVER_PORT) {
|
|
88
|
+
const httpServer = this.ensureHttpServerExists(port);
|
|
89
|
+
httpServer?.listen(port);
|
|
90
|
+
const wsServer = this.bindErrorHandler(new wsPackage.Server({
|
|
91
|
+
noServer: true,
|
|
92
|
+
...wsOptions,
|
|
93
|
+
}));
|
|
94
|
+
this.addWsServerToRegistry(wsServer, port, path);
|
|
95
|
+
return wsServer;
|
|
96
|
+
}
|
|
97
|
+
const wsServer = this.bindErrorHandler(new wsPackage.Server({
|
|
98
|
+
port,
|
|
99
|
+
path,
|
|
100
|
+
...wsOptions,
|
|
101
|
+
}));
|
|
102
|
+
return wsServer;
|
|
103
|
+
}
|
|
104
|
+
bindMessageHandlers(client, handlers, transform) {
|
|
105
|
+
const handlersMap = new Map();
|
|
106
|
+
handlers.forEach(handler => handlersMap.set(handler.message, handler));
|
|
107
|
+
const close$ = (0, rxjs_1.fromEvent)(client, constants_1.CLOSE_EVENT).pipe((0, operators_1.share)(), (0, operators_1.first)());
|
|
108
|
+
const source$ = (0, rxjs_1.fromEvent)(client, 'message').pipe((0, operators_1.mergeMap)(data => this.bindMessageHandler(data, handlersMap, transform).pipe((0, operators_1.filter)(result => !(0, shared_utils_1.isNil)(result)))), (0, operators_1.takeUntil)(close$));
|
|
109
|
+
const onMessage = (response) => {
|
|
110
|
+
if (client.readyState !== READY_STATE.OPEN_STATE) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
client.send(JSON.stringify(response));
|
|
114
|
+
};
|
|
115
|
+
source$.subscribe(onMessage);
|
|
116
|
+
}
|
|
117
|
+
bindMessageHandler(buffer, handlersMap, transform) {
|
|
118
|
+
try {
|
|
119
|
+
const message = this.messageParser(buffer.data);
|
|
120
|
+
if (!message) {
|
|
121
|
+
return rxjs_1.EMPTY;
|
|
122
|
+
}
|
|
123
|
+
const messageHandler = handlersMap.get(message.event);
|
|
124
|
+
const { callback } = messageHandler;
|
|
125
|
+
return transform(callback(message.data, message.event));
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return rxjs_1.EMPTY;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
bindErrorHandler(server) {
|
|
132
|
+
server.on(constants_1.CONNECTION_EVENT, (ws) => ws.on(constants_1.ERROR_EVENT, (err) => this.logger.error(err)));
|
|
133
|
+
server.on(constants_1.ERROR_EVENT, (err) => this.logger.error(err));
|
|
134
|
+
return server;
|
|
135
|
+
}
|
|
136
|
+
bindClientDisconnect(client, callback) {
|
|
137
|
+
client.on(constants_1.CLOSE_EVENT, callback);
|
|
138
|
+
}
|
|
139
|
+
async close(server) {
|
|
140
|
+
const closeEventSignal = new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve(undefined))));
|
|
141
|
+
for (const ws of server.clients) {
|
|
142
|
+
ws.terminate();
|
|
143
|
+
}
|
|
144
|
+
await closeEventSignal;
|
|
145
|
+
}
|
|
146
|
+
async dispose() {
|
|
147
|
+
const closeEventSignals = Array.from(this.httpServersRegistry)
|
|
148
|
+
.filter(([port]) => port !== UNDERLYING_HTTP_SERVER_PORT)
|
|
149
|
+
.map(([_, server]) => new Promise(resolve => server.close(resolve)));
|
|
150
|
+
await Promise.all(closeEventSignals);
|
|
151
|
+
this.httpServersRegistry.clear();
|
|
152
|
+
this.wsServersRegistry.clear();
|
|
153
|
+
}
|
|
154
|
+
setMessageParser(parser) {
|
|
155
|
+
this.messageParser = parser;
|
|
156
|
+
}
|
|
157
|
+
ensureHttpServerExists(port, httpServer = http.createServer()) {
|
|
158
|
+
if (this.httpServersRegistry.has(port)) {
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
this.httpServersRegistry.set(port, httpServer);
|
|
162
|
+
httpServer.on('upgrade', (request, socket, head) => {
|
|
163
|
+
try {
|
|
164
|
+
const baseUrl = 'ws://' + request.headers.host + '/';
|
|
165
|
+
const pathname = new URL(request.url, baseUrl).pathname;
|
|
166
|
+
const wsServersCollection = this.wsServersRegistry.get(port);
|
|
167
|
+
let isRequestDelegated = false;
|
|
168
|
+
for (const wsServer of wsServersCollection) {
|
|
169
|
+
if (pathname === wsServer.path) {
|
|
170
|
+
wsServer.handleUpgrade(request, socket, head, (ws) => {
|
|
171
|
+
wsServer.emit('connection', ws, request);
|
|
172
|
+
});
|
|
173
|
+
isRequestDelegated = true;
|
|
174
|
+
break;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (!isRequestDelegated) {
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
catch (err) {
|
|
181
|
+
console.error('WebSocket upgrade error: ', err);
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
return httpServer;
|
|
185
|
+
}
|
|
186
|
+
addWsServerToRegistry(wsServer, port, path) {
|
|
187
|
+
const entries = this.wsServersRegistry.get(port) ?? [];
|
|
188
|
+
entries.push(wsServer);
|
|
189
|
+
wsServer.path = (0, shared_utils_1.normalizePath)(path);
|
|
190
|
+
this.wsServersRegistry.set(port, entries);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
exports.WsAdapter = WsAdapter;
|
|
194
|
+
//# sourceMappingURL=ws-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ws-adapter.js","sourceRoot":"","sources":["../../src/websockets/ws-adapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -8,7 +8,8 @@
|
|
|
8
8
|
],
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@aws-sdk/client-cloudwatch-logs": "^3.721.0",
|
|
11
|
-
"@builder6/query-mongodb": "0.
|
|
11
|
+
"@builder6/query-mongodb": "0.16.1",
|
|
12
|
+
"@socket.io/redis-adapter": "^8.3.0",
|
|
12
13
|
"moleculer": "^0.14.35",
|
|
13
14
|
"pino-http": "^10.3.0",
|
|
14
15
|
"pino-pretty": "^13.0.0"
|
|
@@ -21,5 +22,5 @@
|
|
|
21
22
|
"publishConfig": {
|
|
22
23
|
"access": "public"
|
|
23
24
|
},
|
|
24
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "bad6f6a795f3068e5ea85800425e0fa62cdcde8b"
|
|
25
26
|
}
|