@spider-mesh/core 1.0.61 → 1.0.62
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/builtin-transporter/BuiltinTransporter.js +7 -13
- package/build/src/builtin-transporter/BuiltinTransporter.js.map +1 -1
- package/build/src/builtin-transporter/RxjsTcpSocket.d.ts +3 -1
- package/build/src/builtin-transporter/RxjsTcpSocket.js +2 -4
- package/build/src/builtin-transporter/RxjsTcpSocket.js.map +1 -1
- package/package.json +1 -1
|
@@ -23,14 +23,10 @@ export class BuiltinTransporter {
|
|
|
23
23
|
socket.$incoming_data
|
|
24
24
|
.pipe(takeUntil(socket.$status.pipe(filter(s => s == 'closed' || s == 'error'))), map(buf => Encoder.decode(buf)), filter(Boolean), filter(msg => msg.sender_node_id != this.node_id), filter(msg => msg.namespace == this.namespace))
|
|
25
25
|
.subscribe(async (msg) => {
|
|
26
|
-
if (msg.topic == `#hello`)
|
|
27
|
-
|
|
28
|
-
status && !status.peer_updated && this.#tcp_hello(status.socket);
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
26
|
+
if (msg.topic == `#hello`)
|
|
27
|
+
return await this.#add_node(socket, msg.data);
|
|
31
28
|
this.#listeners.get(msg.topic)?.forEach(cb => cb(msg.sender_node_id, msg.data));
|
|
32
29
|
});
|
|
33
|
-
!socket.opened_by_remote_side && this.#tcp_hello(socket);
|
|
34
30
|
}
|
|
35
31
|
async start() {
|
|
36
32
|
const tcp_server = await RxjsTcpServer.start();
|
|
@@ -48,7 +44,7 @@ export class BuiltinTransporter {
|
|
|
48
44
|
const [host, port] = l.trim().split(':');
|
|
49
45
|
if (host && port)
|
|
50
46
|
return { host, port: Number(port) };
|
|
51
|
-
}), filter(Boolean), mergeMap(({ host, port }) => RxjsTcpSocket.connect({ host, port
|
|
47
|
+
}), filter(Boolean), mergeMap(({ host, port }) => RxjsTcpSocket.connect({ host, port, timeout: 60000, retry_times: 10000 })), filter(Boolean));
|
|
52
48
|
tcp_server.$online.subscribe(({ port, $connection: $tcp_connections, $error }) => {
|
|
53
49
|
this.#running_tcp_port = port;
|
|
54
50
|
merge($tcp_connections, $udp_connections, $peer_connections).pipe(takeUntil($error), map(socket => this.#on_new_connection(socket))).subscribe();
|
|
@@ -71,7 +67,8 @@ export class BuiltinTransporter {
|
|
|
71
67
|
const socket = node_socket.opened_by_remote_side ? (await RxjsTcpSocket.connect({
|
|
72
68
|
host,
|
|
73
69
|
port: new_node.port,
|
|
74
|
-
keepAlive: true
|
|
70
|
+
keepAlive: true,
|
|
71
|
+
timeout: 1000
|
|
75
72
|
}) || node_socket) : node_socket;
|
|
76
73
|
socket.$status.pipe(filter(status => status == 'closed' || status == 'error'), first()).subscribe(() => {
|
|
77
74
|
const node = this.#nodes_map.get(new_node_id);
|
|
@@ -82,12 +79,9 @@ export class BuiltinTransporter {
|
|
|
82
79
|
this.$nodes_status.next({ node_id: new_node_id, online: false });
|
|
83
80
|
});
|
|
84
81
|
this.#nodes_map.set(new_node_id, { ...new_node, host, socket, peers: new_node.peers.map(p => ({ ...p, peers: [] })) });
|
|
85
|
-
|
|
82
|
+
this.$nodes_status.next({ node_id: new_node_id, online: true });
|
|
86
83
|
}
|
|
87
|
-
|
|
88
|
-
peer_updated,
|
|
89
|
-
socket: this.#nodes_map.get(new_node_id).socket
|
|
90
|
-
};
|
|
84
|
+
!peer_updated && this.#tcp_hello(this.#nodes_map.get(new_node_id).socket);
|
|
91
85
|
}
|
|
92
86
|
async #tcp_hello(tcp_socket) {
|
|
93
87
|
if (!this.#running_tcp_port)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltinTransporter.js","sourceRoot":"","sources":["../../../src/builtin-transporter/BuiltinTransporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAO,MAAM,MAAM,CAAA;AAC7H,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA6BxC,MAAM,OAAO,kBAAkB;IAaP;IACA;IAZJ,aAAa,GAAG,IAAI,OAAO,EAAwC,CAAA;IAEnF,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACrB,UAAU,GAAG,IAAI,GAAiD,CAAA;IAClE,UAAU,GAAG,IAAI,GAA2B,CAAA;IAC5C,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAA;IAC7C,aAAa,GAAG,IAAI,OAAO,EAAQ,CAAA;IAEnC,iBAAiB,GAAkB,IAAI,CAAA;IAEvC,YACoB,OAAe,EACf,SAAiB;QADjB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEL,kBAAkB,CAAC,MAAqB;QACpC,MAAM,CAAC,cAAc;aAChB,IAAI,CACD,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAC1E,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAc,GAAG,CAAC,CAAC,EAC5C,MAAM,CAAC,OAAO,CAAC,EACf,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,EACjD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,CACjD;aACA,SAAS,CACN,KAAK,EAAC,GAAG,EAAC,EAAE;YACR,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ
|
|
1
|
+
{"version":3,"file":"BuiltinTransporter.js","sourceRoot":"","sources":["../../../src/builtin-transporter/BuiltinTransporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ export declare class RxjsTcpSocket<T = any> {
|
|
|
9
9
|
$status: BehaviorSubject<"error" | "connecting" | "ready" | "closed">;
|
|
10
10
|
rawSocket: Socket;
|
|
11
11
|
constructor(opened_by_remote_side: boolean);
|
|
12
|
-
static connect<T = any>(options: TcpNetConnectOpts
|
|
12
|
+
static connect<T = any>(options: TcpNetConnectOpts & {
|
|
13
|
+
retry_times?: number;
|
|
14
|
+
}): Promise<RxjsTcpSocket<T>>;
|
|
13
15
|
static join<T = any>(socket: Socket): Promise<RxjsTcpSocket<T>>;
|
|
14
16
|
write(data: Buffer): Promise<void>;
|
|
15
17
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createConnection } from "net";
|
|
2
2
|
import { BehaviorSubject, Subject, filter, firstValueFrom, map, takeUntil } from "rxjs";
|
|
3
|
-
import { sleep } from "../helpers/sleep.js";
|
|
4
3
|
import { DEBUG } from "../const.js";
|
|
5
4
|
import frame from 'frame-stream';
|
|
6
5
|
export class RxjsTcpSocket {
|
|
@@ -12,7 +11,8 @@ export class RxjsTcpSocket {
|
|
|
12
11
|
constructor(opened_by_remote_side) {
|
|
13
12
|
this.opened_by_remote_side = opened_by_remote_side;
|
|
14
13
|
}
|
|
15
|
-
static connect(options
|
|
14
|
+
static connect(options) {
|
|
15
|
+
const retry_times = options.retry_times || 5;
|
|
16
16
|
const $this = new this(false);
|
|
17
17
|
return new Promise(async (s) => {
|
|
18
18
|
for (let i = 1; i <= retry_times; i++) {
|
|
@@ -33,8 +33,6 @@ export class RxjsTcpSocket {
|
|
|
33
33
|
$this.$status.next('closed');
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
DEBUG && console.log(`[${new Date().toLocaleTimeString()}] Socket error, retrying in ${retry_ms} ms`);
|
|
37
|
-
await sleep(retry_ms);
|
|
38
36
|
}
|
|
39
37
|
s(null);
|
|
40
38
|
$this.$status.next('error');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RxjsTcpSocket.js","sourceRoot":"","sources":["../../../src/builtin-transporter/RxjsTcpSocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,gBAAgB,EAAU,MAAM,KAAK,CAAA;AACjE,OAAO,EAAE,eAAe,EAAc,OAAO,EAAE,MAAM,EAAE,cAAc,EAAa,GAAG,EAAY,SAAS,EAAE,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"RxjsTcpSocket.js","sourceRoot":"","sources":["../../../src/builtin-transporter/RxjsTcpSocket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spider-mesh/core",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.62",
|
|
5
5
|
"description": "Lightweight microservice framework for typescript, auto discovery, load-balancing, fault-torrent, multiple transporters",
|
|
6
6
|
"main": "./build/src/index.js",
|
|
7
7
|
"types": "./build/src/index.d.ts",
|