@livequery/nestjs 2.0.55 → 2.0.57
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/build/src/ApiGateway.d.ts +3 -2
- package/build/src/ApiGateway.js +16 -17
- package/build/src/ApiGateway.js.map +1 -1
- package/build/src/ApiGatewayLinker.js +21 -26
- package/build/src/ApiGatewayLinker.js.map +1 -1
- package/build/src/LivequeryWebsocketSync.js +9 -9
- package/build/src/LivequeryWebsocketSync.js.map +1 -1
- package/build/src/RxjsUdp.d.ts +15 -10
- package/build/src/RxjsUdp.js +76 -72
- package/build/src/RxjsUdp.js.map +1 -1
- package/build/src/const.d.ts +5 -6
- package/build/src/const.js +7 -7
- package/build/src/const.js.map +1 -1
- package/package.json +4 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
|
|
2
|
+
import { NodeMetadata } from './RxjsUdp.js';
|
|
2
3
|
export type Routing = {
|
|
3
4
|
[ref: string]: {
|
|
4
5
|
dpaths: string[];
|
|
@@ -14,7 +15,7 @@ export type Routing = {
|
|
|
14
15
|
};
|
|
15
16
|
};
|
|
16
17
|
};
|
|
17
|
-
export type ServiceApiMetadata = {
|
|
18
|
+
export type ServiceApiMetadata = NodeMetadata<{
|
|
18
19
|
role: 'service' | 'gateway';
|
|
19
20
|
name: string;
|
|
20
21
|
port: number;
|
|
@@ -26,7 +27,7 @@ export type ServiceApiMetadata = {
|
|
|
26
27
|
wsauth?: string;
|
|
27
28
|
linked: string[];
|
|
28
29
|
target?: string;
|
|
29
|
-
}
|
|
30
|
+
}>;
|
|
30
31
|
export type ServiceApiStatus = {
|
|
31
32
|
id: string;
|
|
32
33
|
online: boolean;
|
package/build/src/ApiGateway.js
CHANGED
|
@@ -2,9 +2,10 @@ import { __decorate, __metadata, __param } from "tslib";
|
|
|
2
2
|
import { Controller, Delete, Get, Optional, Patch, Post, Put, Request, Res, } from '@nestjs/common';
|
|
3
3
|
import * as http from 'http';
|
|
4
4
|
import { LivequeryWebsocketSync } from './LivequeryWebsocketSync.js';
|
|
5
|
-
import { LIVEQUERY_API_GATEWAY_DEBUG } from './const.js';
|
|
6
|
-
import { RxjsUdp } from './RxjsUdp.js';
|
|
7
5
|
import { mergeMap, filter, debounceTime, groupBy } from 'rxjs/operators';
|
|
6
|
+
import { BehaviorSubject } from 'rxjs';
|
|
7
|
+
import { RxjsUdp } from './RxjsUdp.js';
|
|
8
|
+
import { API_GATEWAY_NAMESPACE, LIVEQUERY_API_GATEWAY_DEBUG, NODE_ID } from './const.js';
|
|
8
9
|
let ApiGateway = class ApiGateway {
|
|
9
10
|
lws;
|
|
10
11
|
#services = new Map;
|
|
@@ -12,26 +13,24 @@ let ApiGateway = class ApiGateway {
|
|
|
12
13
|
constructor(lws) {
|
|
13
14
|
this.lws = lws;
|
|
14
15
|
const udp = new RxjsUdp();
|
|
15
|
-
udp.
|
|
16
|
+
udp.link(new BehaviorSubject({
|
|
17
|
+
name: 'API gateway',
|
|
18
|
+
paths: [],
|
|
19
|
+
port: 0,
|
|
20
|
+
role: 'gateway',
|
|
21
|
+
linked: [...this.#services.keys()],
|
|
22
|
+
host: '',
|
|
23
|
+
node_id: NODE_ID,
|
|
24
|
+
namespace: API_GATEWAY_NAMESPACE
|
|
25
|
+
})).pipe(filter(m => m.role == 'service'), filter(m => !this.#services.has(m.node_id)), groupBy(m => m.node_id), mergeMap($ => $.pipe(debounceTime(1000), mergeMap(async (e) => {
|
|
16
26
|
await this.#join(e);
|
|
17
27
|
})))).subscribe();
|
|
18
|
-
setTimeout(() => {
|
|
19
|
-
udp.broadcast({
|
|
20
|
-
payload: {
|
|
21
|
-
name: 'API gateway',
|
|
22
|
-
paths: [],
|
|
23
|
-
port: 0,
|
|
24
|
-
role: 'gateway',
|
|
25
|
-
linked: [...this.#services.keys()]
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
|
-
}, 1000);
|
|
29
28
|
}
|
|
30
29
|
async #join(metadata) {
|
|
31
30
|
const host = metadata.host;
|
|
32
31
|
const hostname = `${host}:${metadata.port}`;
|
|
33
|
-
const subscription = metadata.websocket && this.lws?.connect(`ws://${hostname}${metadata.websocket}`, metadata.wsauth, () => this.#disconnect(metadata.
|
|
34
|
-
this.#services.set(metadata.
|
|
32
|
+
const subscription = metadata.websocket && this.lws?.connect(`ws://${hostname}${metadata.websocket}`, metadata.wsauth, () => this.#disconnect(metadata.node_id));
|
|
33
|
+
this.#services.set(metadata.node_id, { metadata, subscription, host });
|
|
35
34
|
LIVEQUERY_API_GATEWAY_DEBUG && console.info(`[${new Date().toLocaleString()}] Service API online: ${metadata.name} at ${host}:${metadata.port}`);
|
|
36
35
|
for (const { method, path } of metadata.paths || []) {
|
|
37
36
|
const refs = path.split('/').map(r => {
|
|
@@ -53,7 +52,7 @@ let ApiGateway = class ApiGateway {
|
|
|
53
52
|
last_requested_index: 0
|
|
54
53
|
};
|
|
55
54
|
}
|
|
56
|
-
methods[METHOD].hosts.push({ uri: hostname, instance_id: metadata.
|
|
55
|
+
methods[METHOD].hosts.push({ uri: hostname, instance_id: metadata.node_id });
|
|
57
56
|
return;
|
|
58
57
|
}
|
|
59
58
|
const ref = refs[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiGateway.js","sourceRoot":"","sources":["../../src/ApiGateway.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,gBAAgB,CAAA;AACnG,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ApiGateway.js","sourceRoot":"","sources":["../../src/ApiGateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,45 +4,40 @@ import { Controller, Inject, Injectable, Optional } from "@nestjs/common";
|
|
|
4
4
|
import { ModulesContainer } from "@nestjs/core";
|
|
5
5
|
import { listPaths } from "./helpers/listPaths.js";
|
|
6
6
|
import { LivequeryWebsocketSync, WEBSOCKET_PATH } from "./LivequeryWebsocketSync.js";
|
|
7
|
-
import {
|
|
8
|
-
import { filter, combineLatestWith, debounceTime, groupBy } from 'rxjs/operators';
|
|
7
|
+
import { map, filter, debounceTime, mergeMap, firstValueFrom, ReplaySubject } from "rxjs";
|
|
9
8
|
import { RxjsUdp } from "./RxjsUdp.js";
|
|
9
|
+
import { API_GATEWAY_NAMESPACE, NODE_ID } from "./const.js";
|
|
10
10
|
let ApiGatewayLinker = class ApiGatewayLinker {
|
|
11
11
|
static { ApiGatewayLinker_1 = this; }
|
|
12
12
|
modulesContainer;
|
|
13
|
-
static $me = new
|
|
13
|
+
static $me = new ReplaySubject(1);
|
|
14
14
|
constructor(LivequeryWebsocketSync, modulesContainer) {
|
|
15
15
|
this.modulesContainer = modulesContainer;
|
|
16
16
|
const paths = [...this.modulesContainer.values()].map(m => (listPaths([...m.controllers.keys()].map(c => c)))).flat(2);
|
|
17
|
-
const $
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
const metadata$ = ApiGatewayLinker_1.$me.pipe(map(({ name, port }) => {
|
|
18
|
+
const metadata = {
|
|
19
|
+
node_id: NODE_ID,
|
|
20
|
+
host: '',
|
|
21
|
+
namespace: API_GATEWAY_NAMESPACE,
|
|
22
|
+
name,
|
|
23
|
+
port,
|
|
20
24
|
role: 'service',
|
|
21
25
|
paths,
|
|
22
26
|
linked: [],
|
|
23
27
|
wsauth: LivequeryWebsocketSync?.auth,
|
|
24
|
-
websocket: LivequeryWebsocketSync ? WEBSOCKET_PATH : undefined
|
|
25
|
-
name,
|
|
26
|
-
port,
|
|
28
|
+
websocket: LivequeryWebsocketSync ? WEBSOCKET_PATH : undefined
|
|
27
29
|
};
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
port,
|
|
38
|
-
role: 'service',
|
|
39
|
-
paths,
|
|
40
|
-
linked: [],
|
|
41
|
-
wsauth: LivequeryWebsocketSync?.auth,
|
|
42
|
-
websocket: LivequeryWebsocketSync ? WEBSOCKET_PATH : undefined
|
|
43
|
-
}
|
|
30
|
+
return metadata;
|
|
31
|
+
}));
|
|
32
|
+
const udp$ = new RxjsUdp();
|
|
33
|
+
udp$.link(metadata$).pipe(filter(node => node.role == 'gateway'), debounceTime(1000), mergeMap(async (node) => {
|
|
34
|
+
const metadata = await firstValueFrom(metadata$);
|
|
35
|
+
await udp$.broadcast({
|
|
36
|
+
hi: false,
|
|
37
|
+
node: metadata,
|
|
38
|
+
sender_id: metadata.node_id
|
|
44
39
|
});
|
|
45
|
-
});
|
|
40
|
+
})).subscribe();
|
|
46
41
|
}
|
|
47
42
|
static async broadcast(name, port) {
|
|
48
43
|
this.$me.next({ name, port });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiGatewayLinker.js","sourceRoot":"","sources":["../../src/ApiGatewayLinker.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ApiGatewayLinker.js","sourceRoot":"","sources":["../../src/ApiGatewayLinker.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAW,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAO,aAAa,EAAC,MAAM,MAAM,CAAC;AACvG,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;;IAMJ;IAJb,MAAM,CAAC,GAAG,GAAG,IAAI,aAAa,CAAiC,CAAC,CAAC,CAAA;IAEzE,YAC0B,sBAA8C,EACnD,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAEnD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CACvD,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEV,MAAM,SAAS,GAAG,kBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YAC/D,MAAM,QAAQ,GAAuB;gBACjC,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,EAAE;gBACR,SAAS,EAAE,qBAAqB;gBAChC,IAAI;gBACJ,IAAI;gBACJ,IAAI,EAAE,SAAS;gBACf,KAAK;gBACL,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,sBAAsB,EAAE,IAAI;gBACpC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;aACjE,CAAA;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC,CAA6C,CAAA;QAC/C,MAAM,IAAI,GAAG,IAAI,OAAO,EAAE,CAAA;QAE1B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CACrB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,EACtC,YAAY,CAAC,IAAI,CAAC,EAClB,QAAQ,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAClB,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,SAAS,CAAC;gBACjB,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,QAAQ,CAAC,OAAO;aAC9B,CAAC,CAAA;QACN,CAAC,CAAC,CACL,CAAC,SAAS,EAAE,CAAA;IACjB,CAAC;IAGD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAAY;QAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IACjC,CAAC;;AA9CQ,gBAAgB;IAF5B,UAAU,EAAE;IACZ,UAAU,EAAE;IAMJ,WAAA,QAAQ,EAAE,CAAA;IAAE,WAAA,MAAM,EAAE,CAAA;qCAAyB,sBAAsB;QACjC,gBAAgB;GAN9C,gBAAgB,CA+C5B"}
|
|
@@ -4,14 +4,14 @@ import { Subject, tap, switchMap, retry, timer, BehaviorSubject, takeWhile } fro
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { of, fromEvent, map, finalize, merge, EMPTY, filter, mergeAll } from 'rxjs';
|
|
6
6
|
import { randomUUID } from "crypto";
|
|
7
|
-
import {
|
|
7
|
+
import { NODE_ID } from "./const.js";
|
|
8
8
|
const ENDPOINT_RESTARTED = 'ENDPOINT_RESTARTED';
|
|
9
9
|
export const WEBSOCKET_PATH = process.env.REALTIME_UPDATE_SOCKET_PATH || '/livequery/realtime-updates';
|
|
10
10
|
let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
11
11
|
#connections = new Map();
|
|
12
12
|
#subscriptions = new Map();
|
|
13
13
|
#pipes = new Map();
|
|
14
|
-
id =
|
|
14
|
+
id = NODE_ID;
|
|
15
15
|
auth = randomUUID();
|
|
16
16
|
constructor() {
|
|
17
17
|
super();
|
|
@@ -20,7 +20,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
20
20
|
...this.#subscriptions.get(ref) || new Map(),
|
|
21
21
|
...this.#subscriptions.get(`${ref}/${data.id}`) || new Map()
|
|
22
22
|
].reduce((p, [client_id, { gateway_id }]) => {
|
|
23
|
-
const connection_id = gateway_id ==
|
|
23
|
+
const connection_id = gateway_id == NODE_ID ? client_id : gateway_id;
|
|
24
24
|
const old = p.get(connection_id);
|
|
25
25
|
const socket = old ? old.socket : this.#connections.get(connection_id);
|
|
26
26
|
if (!socket)
|
|
@@ -60,7 +60,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
60
60
|
const gateway$ = new BehaviorSubject({ id: '', stop: false });
|
|
61
61
|
return of(0).pipe(takeWhile(() => !gateway$.getValue().stop), map(() => new WebSocket(url)), switchMap((ws) => {
|
|
62
62
|
return merge(fromEvent(ws, 'open').pipe(tap(() => {
|
|
63
|
-
const payload = { event: 'start', data: { id:
|
|
63
|
+
const payload = { event: 'start', data: { id: NODE_ID, auth } };
|
|
64
64
|
ws.send(JSON.stringify(payload));
|
|
65
65
|
})), fromEvent(ws, 'close').pipe(map(() => { throw 'CLOSED'; })), fromEvent(ws, 'error').pipe(map(e => { throw e; })), fromEvent(ws, 'message').pipe(map((event) => {
|
|
66
66
|
const data = event.data;
|
|
@@ -114,7 +114,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
114
114
|
socket.gateway = auth == this.auth;
|
|
115
115
|
socket.refs = new Set();
|
|
116
116
|
this.#connections.set(id, socket);
|
|
117
|
-
const payload = { event: 'hello', gid:
|
|
117
|
+
const payload = { event: 'hello', gid: NODE_ID };
|
|
118
118
|
socket.send(JSON.stringify(payload));
|
|
119
119
|
}
|
|
120
120
|
unref(socket, body) {
|
|
@@ -135,7 +135,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
135
135
|
this.#subscriptions.delete(ref);
|
|
136
136
|
}
|
|
137
137
|
this.#connections.get(client_id)?.refs?.delete(ref);
|
|
138
|
-
if (routing.listener_node_id !=
|
|
138
|
+
if (routing.listener_node_id != NODE_ID) {
|
|
139
139
|
const gateway = this.#connections.get(routing.listener_node_id);
|
|
140
140
|
if (gateway) {
|
|
141
141
|
const payload = { event: 'unsubscribe', data: { ref, client_id } };
|
|
@@ -170,8 +170,8 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
170
170
|
if (client_id == gateway_id)
|
|
171
171
|
continue;
|
|
172
172
|
const socket = this.#connections.get(client_id);
|
|
173
|
-
if (gateway_id ==
|
|
174
|
-
if (listener_node_id !=
|
|
173
|
+
if (gateway_id == NODE_ID && (!socket || socket.refs?.has(ref))) {
|
|
174
|
+
if (listener_node_id != NODE_ID) {
|
|
175
175
|
const target = this.#connections.get(listener_node_id);
|
|
176
176
|
if (target) {
|
|
177
177
|
const e = {
|
|
@@ -189,7 +189,7 @@ let LivequeryWebsocketSync = class LivequeryWebsocketSync extends Subject {
|
|
|
189
189
|
map.set(client_id, { gateway_id, listener_node_id });
|
|
190
190
|
this.#subscriptions.set(ref, map);
|
|
191
191
|
this.#connections.get(client_id)?.refs?.add(ref);
|
|
192
|
-
if (gateway_id !=
|
|
192
|
+
if (gateway_id != NODE_ID) {
|
|
193
193
|
const target = this.#connections.get(gateway_id);
|
|
194
194
|
if (target) {
|
|
195
195
|
const payload = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LivequeryWebsocketSync.js","sourceRoot":"","sources":["../../src/LivequeryWebsocketSync.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAA4B,MAAM,MAAM,CAAC;AAInH,OAAO,SAAS,MAAM,IAAI,CAAA;AAC1B,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAEnF,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"LivequeryWebsocketSync.js","sourceRoot":"","sources":["../../src/LivequeryWebsocketSync.ts"],"names":[],"mappings":"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"}
|
package/build/src/RxjsUdp.d.ts
CHANGED
|
@@ -1,16 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export type
|
|
3
|
-
sender_id: string;
|
|
4
|
-
relay_id: string;
|
|
1
|
+
import { BehaviorSubject, ReplaySubject } from "rxjs";
|
|
2
|
+
export type NodeMetadata<T = {}> = T & {
|
|
5
3
|
host: string;
|
|
4
|
+
node_id: string;
|
|
6
5
|
namespace: string;
|
|
7
6
|
};
|
|
8
|
-
export
|
|
7
|
+
export type MdnsMessage<T extends NodeMetadata> = {
|
|
8
|
+
hi: boolean;
|
|
9
|
+
node: T;
|
|
10
|
+
sender_id: string;
|
|
11
|
+
forwarder_id?: string;
|
|
12
|
+
receiver_id?: string;
|
|
13
|
+
};
|
|
14
|
+
export declare class RxjsUdp {
|
|
9
15
|
#private;
|
|
10
|
-
static readonly id: `${string}-${string}-${string}-${string}-${string}`;
|
|
11
16
|
constructor();
|
|
12
|
-
broadcast(
|
|
13
|
-
|
|
14
|
-
host
|
|
15
|
-
}
|
|
17
|
+
broadcast<T extends NodeMetadata>(data: MdnsMessage<T>, ips?: string[]): Promise<void>;
|
|
18
|
+
link<T extends NodeMetadata>(metadata$: BehaviorSubject<T> | ReplaySubject<T>): import("rxjs").Observable<import("rxjs").TruthyTypesOf<T & {
|
|
19
|
+
host: any;
|
|
20
|
+
}>>;
|
|
16
21
|
}
|
package/build/src/RxjsUdp.js
CHANGED
|
@@ -1,84 +1,88 @@
|
|
|
1
1
|
import { createSocket } from "dgram";
|
|
2
|
-
import { EMPTY, filter, fromEvent, map, merge, mergeMap, Observable, of, retry, tap, timer } from "rxjs";
|
|
3
|
-
import { API_GATEWAY_NAMESPACE, API_GATEWAY_UDP_ADDRESS, LIVEQUERY_API_GATEWAY_RAW_DEBUG, UDP_MULTICAST_ADDRESS, UDP_LOCAL_PORT, UDP_PUBLIC_PORT } from "./const.js";
|
|
4
|
-
import { randomUUID } from "crypto";
|
|
5
2
|
import { networkInterfaces } from "os";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
return new Array(255).fill(0).map((_, i) => [...s, i].join('.'));
|
|
3
|
+
import { API_GATEWAY_WHITELIST_ADDRESS, API_GATEWAY_MULTICAST_PORT, API_GATEWAY_MULTICAST_ADDRESS } from "./const.js";
|
|
4
|
+
import { debounceTime, from, map } from "rxjs";
|
|
5
|
+
import { firstValueFrom, fromEvent } from "rxjs";
|
|
6
|
+
import { switchMap, mergeMap, filter } from "rxjs/operators";
|
|
7
|
+
import { unpack, pack } from 'msgpackr';
|
|
8
|
+
export class RxjsUdp {
|
|
9
|
+
#udp4 = createSocket({
|
|
10
|
+
type: 'udp4',
|
|
11
|
+
reuseAddr: true
|
|
12
|
+
});
|
|
13
|
+
#localAddress = new Set(Object.values(networkInterfaces()).flat(2).map(e => e?.address).filter(Boolean));
|
|
14
|
+
#broadcastAddress = new Set([
|
|
15
|
+
API_GATEWAY_MULTICAST_ADDRESS,
|
|
16
|
+
...(API_GATEWAY_WHITELIST_ADDRESS || '').split(',').map(e => {
|
|
17
|
+
const ppps = e.trim().split('.');
|
|
18
|
+
if (ppps.length == 4)
|
|
19
|
+
return e.trim();
|
|
20
|
+
if (ppps.length == 3)
|
|
21
|
+
return new Array(256).fill(0).map((h, index) => {
|
|
22
|
+
return `${e.trim()}.${index}`;
|
|
23
|
+
});
|
|
28
24
|
return [];
|
|
29
25
|
}).flat(2)
|
|
30
|
-
];
|
|
26
|
+
]);
|
|
31
27
|
constructor() {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
this.#
|
|
35
|
-
this.#udp.local.addMembership(UDP_MULTICAST_ADDRESS);
|
|
36
|
-
});
|
|
37
|
-
this.#udp.public.bind(UDP_PUBLIC_PORT, '0.0.0.0');
|
|
38
|
-
const subscription = merge(fromEvent(this.#udp.public, 'message').pipe(map(([raw, rinfo]) => {
|
|
39
|
-
if (!this.#whitelist_ips.includes(rinfo.address))
|
|
40
|
-
return;
|
|
41
|
-
const msg = JSON.parse(raw.toString('utf-8'));
|
|
42
|
-
msg.relay_id = RxjsUdp.id;
|
|
43
|
-
msg.host = rinfo.address;
|
|
44
|
-
return { msg, public: true };
|
|
45
|
-
})), fromEvent(this.#udp.local, 'message').pipe(map(([raw, rinfo]) => {
|
|
46
|
-
if (!this.#local_addresses.includes(rinfo.address))
|
|
47
|
-
return;
|
|
48
|
-
const msg = JSON.parse(raw.toString('utf-8'));
|
|
49
|
-
if (msg.relay_id == RxjsUdp.id)
|
|
50
|
-
return;
|
|
51
|
-
return { msg, public: false };
|
|
52
|
-
}))).pipe(filter(Boolean), filter(({ msg }) => msg.namespace == API_GATEWAY_NAMESPACE), tap(msg => LIVEQUERY_API_GATEWAY_RAW_DEBUG && console.log(msg)), tap(({ msg }) => msg.sender_id != RxjsUdp.id && o.next(msg)), filter(from => from.public), mergeMap(({ msg }) => {
|
|
53
|
-
const buffer = Buffer.from(JSON.stringify(msg));
|
|
54
|
-
return of(0).pipe(mergeMap(() => new Promise((s, r) => {
|
|
55
|
-
this.#udp.public.send(buffer, UDP_LOCAL_PORT, UDP_MULTICAST_ADDRESS, (e, b) => {
|
|
56
|
-
e ? r(e) : s();
|
|
57
|
-
});
|
|
58
|
-
})), retry({
|
|
59
|
-
delay: (e, n) => {
|
|
60
|
-
return n < 10 ? timer(n * 100) : EMPTY;
|
|
61
|
-
}
|
|
62
|
-
}));
|
|
63
|
-
})).subscribe();
|
|
64
|
-
return () => subscription.unsubscribe();
|
|
28
|
+
this.#udp4.on('listening', () => {
|
|
29
|
+
this.#udp4.setMulticastInterface("127.0.0.1");
|
|
30
|
+
this.#udp4.addMembership(API_GATEWAY_MULTICAST_ADDRESS, "127.0.0.1");
|
|
65
31
|
});
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const hosts = host ? [host] : this.#whitelist_ips;
|
|
69
|
-
const data = JSON.stringify({
|
|
70
|
-
namespace: API_GATEWAY_NAMESPACE,
|
|
71
|
-
relay_id: '',
|
|
72
|
-
host: '',
|
|
73
|
-
sender_id: RxjsUdp.id,
|
|
74
|
-
...payload,
|
|
32
|
+
this.#udp4.on('error', (e) => {
|
|
33
|
+
throw e;
|
|
75
34
|
});
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
35
|
+
this.#udp4.bind(API_GATEWAY_MULTICAST_PORT, '0.0.0.0');
|
|
36
|
+
}
|
|
37
|
+
async broadcast(data, ips = [...this.#broadcastAddress]) {
|
|
38
|
+
const msg = pack(data);
|
|
39
|
+
for (const ip of ips) {
|
|
40
|
+
this.#udp4.send(msg, 0, msg.length, API_GATEWAY_MULTICAST_PORT, ip, e => {
|
|
41
|
+
e && console.error('UDP Broadcast error', e);
|
|
80
42
|
});
|
|
81
43
|
}
|
|
82
44
|
}
|
|
45
|
+
link(metadata$) {
|
|
46
|
+
return from(firstValueFrom(metadata$)).pipe(debounceTime(1000), mergeMap(async (metadata) => {
|
|
47
|
+
this.broadcast({
|
|
48
|
+
node: metadata,
|
|
49
|
+
hi: true,
|
|
50
|
+
sender_id: metadata.node_id
|
|
51
|
+
});
|
|
52
|
+
return metadata;
|
|
53
|
+
}), switchMap(metadata => fromEvent(this.#udp4, 'message').pipe(map(([raw, r]) => ({ raw, r, metadata })))), mergeMap(async ({ raw, r, metadata }) => {
|
|
54
|
+
try {
|
|
55
|
+
const msg = unpack(raw);
|
|
56
|
+
if (msg.node.node_id == metadata.node_id)
|
|
57
|
+
return;
|
|
58
|
+
if (msg.sender_id == metadata.node_id)
|
|
59
|
+
return;
|
|
60
|
+
if (msg.forwarder_id == metadata.node_id)
|
|
61
|
+
return;
|
|
62
|
+
if (msg.node.namespace != metadata.namespace)
|
|
63
|
+
return;
|
|
64
|
+
const node = { ...msg.node, host: msg.node.host || r.address };
|
|
65
|
+
const is_remote = !this.#localAddress.has(r.address);
|
|
66
|
+
is_remote && !msg.forwarder_id && await this.broadcast({
|
|
67
|
+
...msg,
|
|
68
|
+
node,
|
|
69
|
+
forwarder_id: metadata.node_id
|
|
70
|
+
}, [API_GATEWAY_MULTICAST_ADDRESS]);
|
|
71
|
+
if (msg.receiver_id && msg.receiver_id != metadata.node_id)
|
|
72
|
+
return;
|
|
73
|
+
if (msg.hi) {
|
|
74
|
+
const node = await firstValueFrom(metadata$);
|
|
75
|
+
await this.broadcast({
|
|
76
|
+
node,
|
|
77
|
+
hi: false,
|
|
78
|
+
sender_id: node.node_id,
|
|
79
|
+
receiver_id: msg.sender_id
|
|
80
|
+
}, [is_remote ? r.address : API_GATEWAY_MULTICAST_ADDRESS]);
|
|
81
|
+
}
|
|
82
|
+
return node;
|
|
83
|
+
}
|
|
84
|
+
catch (e) { }
|
|
85
|
+
}), filter(Boolean));
|
|
86
|
+
}
|
|
83
87
|
}
|
|
84
88
|
//# sourceMappingURL=RxjsUdp.js.map
|
package/build/src/RxjsUdp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RxjsUdp.js","sourceRoot":"","sources":["../../src/RxjsUdp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"RxjsUdp.js","sourceRoot":"","sources":["../../src/RxjsUdp.ts"],"names":[],"mappings":"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"}
|
package/build/src/const.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
export declare const LIVEQUERY_MAGIC_KEY: string;
|
|
2
1
|
export declare const API_GATEWAY_NAMESPACE: string;
|
|
3
|
-
export declare const
|
|
2
|
+
export declare const LIVEQUERY_MAGIC_KEY: string;
|
|
3
|
+
export declare const API_GATEWAY_MULTICAST_PORT: number;
|
|
4
|
+
export declare const API_GATEWAY_MULTICAST_ADDRESS: string;
|
|
5
|
+
export declare const API_GATEWAY_WHITELIST_ADDRESS: string;
|
|
6
|
+
export declare const NODE_ID: `${string}-${string}-${string}-${string}-${string}`;
|
|
4
7
|
export declare const LIVEQUERY_API_GATEWAY_DEBUG: string | boolean;
|
|
5
|
-
export declare const LIVEQUERY_API_GATEWAY_RAW_DEBUG: string;
|
|
6
|
-
export declare const UDP_PUBLIC_PORT: number;
|
|
7
|
-
export declare const UDP_LOCAL_PORT: number;
|
|
8
|
-
export declare const UDP_MULTICAST_ADDRESS: string;
|
package/build/src/const.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
import { randomUUID } from "crypto";
|
|
2
2
|
export const API_GATEWAY_NAMESPACE = process.env.API_GATEWAY_NAMESPACE || 'default';
|
|
3
|
-
export const
|
|
4
|
-
export const
|
|
5
|
-
export const
|
|
6
|
-
export const
|
|
7
|
-
export const
|
|
8
|
-
export const
|
|
3
|
+
export const LIVEQUERY_MAGIC_KEY = `${process.env.LIVEQUERY_MAGIC_KEY || 'livequery'}/`;
|
|
4
|
+
export const API_GATEWAY_MULTICAST_PORT = Number(process.env.UDP_PUBLIC_PORT || 11001);
|
|
5
|
+
export const API_GATEWAY_MULTICAST_ADDRESS = process.env.UDP_MULTICAST_ADDRESS || "239.0.1.1";
|
|
6
|
+
export const API_GATEWAY_WHITELIST_ADDRESS = process.env.UDP_WHITELIST_ADDRESS || '';
|
|
7
|
+
export const NODE_ID = randomUUID();
|
|
8
|
+
export const LIVEQUERY_API_GATEWAY_DEBUG = process.env.LIVEQUERY_API_GATEWAY_DEBUG || false;
|
|
9
9
|
//# sourceMappingURL=const.js.map
|
package/build/src/const.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../src/const.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../../src/const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS,CAAA;AACnF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,WAAW,GAAG,CAAA;AACvF,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,KAAK,CAAC,CAAA;AACtF,MAAM,CAAC,MAAM,6BAA6B,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,CAAA;AAC7F,MAAM,CAAC,MAAM,6BAA6B,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAA;AACpF,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;AACnC,MAAM,CAAC,MAAM,2BAA2B,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,KAAK,CAAA"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "git@github.com:livequery/nestjs.git"
|
|
7
7
|
},
|
|
8
|
-
"version": "2.0.
|
|
8
|
+
"version": "2.0.57",
|
|
9
9
|
"description": "Nestjs decorators for @livequery ecosystem",
|
|
10
10
|
"main": "./build/src/index.js",
|
|
11
11
|
"types": "./build/src/index.d.ts",
|
|
@@ -42,5 +42,8 @@
|
|
|
42
42
|
"@nestjs/platform-ws": "^11.0.10",
|
|
43
43
|
"@nestjs/websockets": "^10.3.7",
|
|
44
44
|
"express": "^4.21.2"
|
|
45
|
+
},
|
|
46
|
+
"dependencies": {
|
|
47
|
+
"msgpackr": "^1.11.9"
|
|
45
48
|
}
|
|
46
49
|
}
|