@haku-sci/utils 2.7.2 → 8.0.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.
|
@@ -17,7 +17,6 @@ export declare class WssMicroservice {
|
|
|
17
17
|
private static wss;
|
|
18
18
|
private static publicHost;
|
|
19
19
|
private static publicPort;
|
|
20
|
-
private static ssl;
|
|
21
20
|
static bootstrap(options?: WssBootstrapOptions): Promise<WebSocketServer>;
|
|
22
21
|
static get url(): string;
|
|
23
22
|
private static resolveSsl;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WssMicroservice = void 0;
|
|
4
4
|
const ws_1 = require("ws");
|
|
5
|
-
const http = require("http");
|
|
6
5
|
const https = require("https");
|
|
7
6
|
const fs_1 = require("fs");
|
|
8
7
|
const common_1 = require("@nestjs/common");
|
|
@@ -16,21 +15,17 @@ class WssMicroservice {
|
|
|
16
15
|
if (!server) {
|
|
17
16
|
const address = process.env.ADDRESS || '0.0.0.0';
|
|
18
17
|
const port = Number(process.env.WSS_PORT) || options.port || 3001;
|
|
19
|
-
|
|
20
|
-
server = ssl ? https.createServer(ssl) : http.createServer();
|
|
18
|
+
server = https.createServer(await this.resolveSsl());
|
|
21
19
|
server.on('request', (req, res) => this.handleHttpRequest(req, res));
|
|
22
20
|
server.listen(port, address);
|
|
23
21
|
this.logger.log(`address to be listened to: ${address}`);
|
|
24
22
|
this.logger.log(`port to be listened to: ${port}`);
|
|
25
|
-
this.logger.log(`ssl: ${ssl ? 'enabled' : 'disabled'}`);
|
|
26
23
|
this.publicHost = process.env.WSS_URL || address;
|
|
27
24
|
this.publicPort = Number(process.env.WSS_PUBLIC_PORT) || port;
|
|
28
|
-
this.ssl = !!ssl;
|
|
29
25
|
}
|
|
30
26
|
else {
|
|
31
27
|
this.publicHost = process.env.WSS_URL;
|
|
32
28
|
this.publicPort = Number(process.env.WSS_PUBLIC_PORT) || options.port;
|
|
33
|
-
this.ssl = !!options.ssl || server instanceof https.Server;
|
|
34
29
|
}
|
|
35
30
|
this.wss = new ws_1.WebSocketServer({ server });
|
|
36
31
|
this.wss.on('connection', (ws, req) => this.handleConnection(ws, req, options));
|
|
@@ -41,7 +36,7 @@ class WssMicroservice {
|
|
|
41
36
|
if (!this.publicHost) {
|
|
42
37
|
throw new Error('WssMicroservice.url requested before bootstrap() (or WSS_URL is not set)');
|
|
43
38
|
}
|
|
44
|
-
return
|
|
39
|
+
return `wss://${this.publicHost}:${this.publicPort}`;
|
|
45
40
|
}
|
|
46
41
|
static async resolveSsl() {
|
|
47
42
|
const keyPath = process.env.WSS_SSL_KEY_PATH;
|
|
@@ -51,7 +46,7 @@ class WssMicroservice {
|
|
|
51
46
|
}
|
|
52
47
|
if (process.env.DEBUG !== 'true')
|
|
53
48
|
return null;
|
|
54
|
-
const domain = `${await utils.microServiceName()}.
|
|
49
|
+
const domain = `${await utils.microServiceName()}.${process.env.DOMAIN_NAME}`;
|
|
55
50
|
return {
|
|
56
51
|
key: (0, fs_1.readFileSync)(`./certificates/${domain}-key.pem`),
|
|
57
52
|
cert: (0, fs_1.readFileSync)(`./certificates/${domain}.pem`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wss-microservice.service.js","sourceRoot":"","sources":["../../src/wss/wss-microservice.service.ts"],"names":[],"mappings":";;;AAAA,2BAAgD;
|
|
1
|
+
{"version":3,"file":"wss-microservice.service.js","sourceRoot":"","sources":["../../src/wss/wss-microservice.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ const ticket_service_1 = require("./ticket.service");
|
|
|
16
16
|
const wss_microservice_service_1 = require("./wss-microservice.service");
|
|
17
17
|
let WssController = class WssController {
|
|
18
18
|
async get(data) {
|
|
19
|
-
const {
|
|
20
|
-
const ticket = ticket_service_1.TicketService.create(
|
|
19
|
+
const { id, properties } = data;
|
|
20
|
+
const ticket = ticket_service_1.TicketService.create(id, properties);
|
|
21
21
|
return `${wss_microservice_service_1.WssMicroservice.url}?ticket=${ticket}`;
|
|
22
22
|
}
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wss.controller.js","sourceRoot":"","sources":["../../src/wss/wss.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAuD;AACvD,qDAAiD;AACjD,yEAA6D;AAGtD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAElB,AAAN,KAAK,CAAC,GAAG,CAAC,IAAyB;QACjC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"wss.controller.js","sourceRoot":"","sources":["../../src/wss/wss.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAuD;AACvD,qDAAiD;AACjD,yEAA6D;AAGtD,IAAM,aAAa,GAAnB,MAAM,aAAa;IAElB,AAAN,KAAK,CAAC,GAAG,CAAC,IAAyB;QACjC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,MAAM,GAAG,8BAAa,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACpD,OAAO,GAAG,0CAAe,CAAC,GAAG,WAAW,MAAM,EAAE,CAAC;IACnD,CAAC;CACF,CAAA;AAPY,sCAAa;AAElB;IADL,IAAA,8BAAc,EAAC,KAAK,CAAC;;;;wCAKrB;wBANU,aAAa;IADzB,IAAA,mBAAU,EAAC,KAAK,CAAC;GACL,aAAa,CAOzB"}
|