@spider-mesh/ws 2.0.37 → 2.0.40
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/README.md +42 -11
- package/build/examples/websocket-client.js +1 -1
- package/build/examples/websocket-client.js.map +1 -1
- package/build/examples/websocket-e2e-client.js +1 -1
- package/build/examples/websocket-e2e-client.js.map +1 -1
- package/build/examples/websocket-e2e-matrix-client.js +1 -1
- package/build/examples/websocket-e2e-matrix-client.js.map +1 -1
- package/build/examples/websocket-e2e-matrix-provider.js +1 -1
- package/build/examples/websocket-e2e-matrix-provider.js.map +1 -1
- package/build/examples/websocket-e2e-provider.js +1 -1
- package/build/examples/websocket-e2e-provider.js.map +1 -1
- package/build/examples/websocket-e2e-reverse-client.js +1 -1
- package/build/examples/websocket-e2e-reverse-client.js.map +1 -1
- package/build/examples/websocket-e2e-reverse-server.js +1 -1
- package/build/examples/websocket-e2e-reverse-server.js.map +1 -1
- package/build/examples/websocket-e2e-round-robin-client.js +1 -1
- package/build/examples/websocket-e2e-round-robin-client.js.map +1 -1
- package/build/examples/websocket-provider.js +1 -1
- package/build/examples/websocket-provider.js.map +1 -1
- package/build/examples/websocket-smoke-test.js +4 -8
- package/build/examples/websocket-smoke-test.js.map +1 -1
- package/build/src/BaseWebsocketTransporter.d.ts +39 -0
- package/build/src/BaseWebsocketTransporter.js +278 -0
- package/build/src/BaseWebsocketTransporter.js.map +1 -0
- package/build/src/GlobalWebsocketTransporter.d.ts +6 -0
- package/build/src/GlobalWebsocketTransporter.js +17 -0
- package/build/src/GlobalWebsocketTransporter.js.map +1 -0
- package/build/src/WebsocketTransporter.d.ts +4 -24
- package/build/src/WebsocketTransporter.js +8 -247
- package/build/src/WebsocketTransporter.js.map +1 -1
- package/build/src/browser.d.ts +1 -0
- package/build/src/browser.js +2 -0
- package/build/src/browser.js.map +1 -0
- package/build/src/index.d.ts +1 -1
- package/build/src/index.js +2 -1
- package/build/src/index.js.map +1 -1
- package/build/src/node.d.ts +1 -0
- package/build/src/node.js +2 -0
- package/build/src/node.js.map +1 -0
- package/build/src/react-native.d.ts +1 -0
- package/build/src/react-native.js +2 -0
- package/build/src/react-native.js.map +1 -0
- package/build/src/websocketProtocol.d.ts +2 -2
- package/build/src/websocketProtocol.js +2 -0
- package/build/src/websocketProtocol.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +18 -8
package/README.md
CHANGED
|
@@ -44,14 +44,23 @@ Do not use this package as the default import source for runtime-agnostic APIs.
|
|
|
44
44
|
bun add @spider-mesh/core @spider-mesh/ws rxjs reflect-metadata
|
|
45
45
|
```
|
|
46
46
|
|
|
47
|
+
Keep `@spider-mesh/ws` and `@spider-mesh/core` on matching published versions so transporter/runtime contracts stay aligned.
|
|
48
|
+
|
|
49
|
+
`SpiderMeshNode` metadata consumed by this package no longer includes `ips` or `online`.
|
|
50
|
+
Relay hello frames now mirror the core node metadata directly and discovery broadcast uses a single argument:
|
|
51
|
+
|
|
52
|
+
```ts
|
|
53
|
+
broadcast(data: MdnsMessage<NodeMetadata>): Promise<void>
|
|
54
|
+
```
|
|
55
|
+
|
|
47
56
|
This package is ESM-only.
|
|
48
57
|
|
|
49
58
|
## Export Surface
|
|
50
59
|
|
|
51
|
-
|
|
60
|
+
Transporter entries:
|
|
52
61
|
|
|
53
62
|
```ts
|
|
54
|
-
import { WebsocketTransporter } from '@spider-mesh/ws'
|
|
63
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
55
64
|
```
|
|
56
65
|
|
|
57
66
|
Relay server entry:
|
|
@@ -64,20 +73,34 @@ Recommended full import shape:
|
|
|
64
73
|
|
|
65
74
|
```ts
|
|
66
75
|
import { SpiderMesh, Microservice, RemoteServiceLinker } from '@spider-mesh/core'
|
|
67
|
-
import { WebsocketTransporter } from '@spider-mesh/ws'
|
|
76
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
68
77
|
import { WebsocketRelayServer } from '@spider-mesh/ws/relay-server'
|
|
69
78
|
```
|
|
70
79
|
|
|
71
80
|
## Runtime Support
|
|
72
81
|
|
|
73
|
-
| Runtime |
|
|
82
|
+
| Runtime | Transporter Entry | Relay Server Entry |
|
|
74
83
|
| --- | --- | --- |
|
|
75
|
-
| Node.js |
|
|
76
|
-
| Bun |
|
|
77
|
-
| Browser |
|
|
78
|
-
| React Native |
|
|
84
|
+
| Node.js | `@spider-mesh/ws/node` | `@spider-mesh/ws/relay-server` |
|
|
85
|
+
| Bun | `@spider-mesh/ws/node` | `@spider-mesh/ws/relay-server` |
|
|
86
|
+
| Browser | Supported via `@spider-mesh/ws/browser` | Not supported |
|
|
87
|
+
| React Native | Supported via `@spider-mesh/ws/react-native` | Not supported |
|
|
88
|
+
|
|
89
|
+
The package root `@spider-mesh/ws` is not exported. Import a runtime-specific subpath explicitly.
|
|
90
|
+
|
|
91
|
+
`@spider-mesh/ws/node` uses the `ws` client implementation for Node.js and Bun.
|
|
92
|
+
|
|
93
|
+
`@spider-mesh/ws/browser` and `@spider-mesh/ws/react-native` use the native `globalThis.WebSocket` client API.
|
|
79
94
|
|
|
80
|
-
|
|
95
|
+
`@spider-mesh/ws/relay-server` remains Node.js or Bun only.
|
|
96
|
+
|
|
97
|
+
Import the runtime-specific transporter from the matching subpath:
|
|
98
|
+
|
|
99
|
+
```ts
|
|
100
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
101
|
+
import { WebsocketTransporter as BrowserWebsocketTransporter } from '@spider-mesh/ws/browser'
|
|
102
|
+
import { WebsocketTransporter as ReactNativeWebsocketTransporter } from '@spider-mesh/ws/react-native'
|
|
103
|
+
```
|
|
81
104
|
|
|
82
105
|
## Architecture
|
|
83
106
|
|
|
@@ -113,7 +136,7 @@ console.log(`WebSocket relay listening on ws://127.0.0.1:${server.port}`)
|
|
|
113
136
|
|
|
114
137
|
```ts
|
|
115
138
|
import { Microservice, SpiderMesh } from '@spider-mesh/core'
|
|
116
|
-
import { WebsocketTransporter } from '@spider-mesh/ws'
|
|
139
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
117
140
|
|
|
118
141
|
const transporter = new WebsocketTransporter({
|
|
119
142
|
heartbeatIntervalMs: 5000,
|
|
@@ -137,7 +160,7 @@ new SpiderMesh({ transporters: [transporter] })
|
|
|
137
160
|
|
|
138
161
|
```ts
|
|
139
162
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core'
|
|
140
|
-
import { WebsocketTransporter } from '@spider-mesh/ws'
|
|
163
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
141
164
|
|
|
142
165
|
const transporter = new WebsocketTransporter({
|
|
143
166
|
heartbeatIntervalMs: 5000,
|
|
@@ -168,14 +191,22 @@ console.log(await greeter.hello('world'))
|
|
|
168
191
|
- `reconnectIntervalMs`: delay before reconnect attempts after disconnect
|
|
169
192
|
- `unsubscribeDelayMs`: delay before unsubscribe is sent after the last local subscriber leaves a topic
|
|
170
193
|
|
|
194
|
+
It also exposes `status$` as `BehaviorSubject<Map<string, string>>` so callers can observe per-relay connection state transitions such as `connecting`, `connected`, `error`, and `not_connected`.
|
|
195
|
+
|
|
171
196
|
Example:
|
|
172
197
|
|
|
173
198
|
```ts
|
|
199
|
+
import { WebsocketTransporter } from '@spider-mesh/ws/node'
|
|
200
|
+
|
|
174
201
|
const transporter = new WebsocketTransporter({
|
|
175
202
|
heartbeatIntervalMs: 5000,
|
|
176
203
|
reconnectIntervalMs: 1000,
|
|
177
204
|
unsubscribeDelayMs: 10000,
|
|
178
205
|
})
|
|
206
|
+
|
|
207
|
+
transporter.status$.subscribe(statuses => {
|
|
208
|
+
console.log(statuses.get('ws://127.0.0.1:8787'))
|
|
209
|
+
})
|
|
179
210
|
```
|
|
180
211
|
|
|
181
212
|
## Behavioral Notes
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core';
|
|
2
|
-
import { WebsocketTransporter } from '../src/
|
|
2
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
3
3
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
4
4
|
const transporter = new WebsocketTransporter({
|
|
5
5
|
heartbeatIntervalMs: 5000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../../examples/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../../examples/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AAEzD,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC;IACzC,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,IAAI;CAC5B,CAAC,CAAA;AACF,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAM1B,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAC5D,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAkB,IAAI,EAAE;IAC5D,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,IAAI;CAChB,CAAC,CAAA;AAEF,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;AAEpB,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AACxB,CAAC,CAAC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { firstValueFrom, timeout } from 'rxjs';
|
|
2
2
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const transporterOptions = {
|
|
6
6
|
heartbeatIntervalMs: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AACzD,MAAM,kBAAkB,GAAG;IACvB,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,GAAG;CAC3B,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;AAChE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC1B,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;AAM7C,KAAK,UAAU,IAAI;IACf,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IAC5D,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAkB,IAAI,EAAE;QAC5D,OAAO,EAAE,iBAAiB;QAC1B,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACX,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,EAAE,KAAK,CAAC,CAAA;IAET,IAAI,CAAC;QACD,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACzE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACvF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;YAAS,CAAC;QACP,YAAY,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;AACL,CAAC;AAED,MAAM,IAAI,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Observable, firstValueFrom, lastValueFrom, timeout, toArray } from 'rxjs';
|
|
2
2
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const transporterOptions = {
|
|
6
6
|
heartbeatIntervalMs: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-matrix-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-matrix-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-matrix-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-matrix-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { concat, of, throwError } from 'rxjs';
|
|
3
3
|
import { delay } from 'rxjs/operators';
|
|
4
4
|
import { Microservice, SpiderMesh } from '@spider-mesh/core';
|
|
5
|
-
import { WebsocketTransporter } from '../src/
|
|
5
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
6
6
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
7
7
|
const transporter = new WebsocketTransporter({
|
|
8
8
|
heartbeatIntervalMs: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-matrix-provider.js","sourceRoot":"","sources":["../../examples/websocket-e2e-matrix-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-matrix-provider.js","sourceRoot":"","sources":["../../examples/websocket-e2e-matrix-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AAEzD,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC;IACzC,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,GAAG;CAC3B,CAAC,CAAA;AACF,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAG1B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAClB,SAAS,CAAC,IAAY;QAClB,OAAO,QAAQ,IAAI,EAAE,CAAA;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QACzB,OAAO,SAAS,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,cAAc,CAAC,IAAY;QACvB,OAAO,MAAM,CACT,EAAE,CAAC,mBAAmB,IAAI,IAAI,CAAC,EAC/B,EAAE,CAAC,mBAAmB,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAClD,CAAA;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAC9B,OAAO,MAAM,CACT,EAAE,CAAC,oBAAoB,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAChD,EAAE,CAAC,oBAAoB,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CACnD,CAAA;IACL,CAAC;IAED,SAAS;QACL,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;IAClC,CAAC;IAED,eAAe;QACX,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAC1D,CAAC;CACJ,CAAA;AAlCK,gBAAgB;IADrB,YAAY,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;GACjD,gBAAgB,CAkCrB;AAED,IAAI,gBAAgB,EAAE,CAAA;AACtB,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAE/C,OAAO,CAAC,GAAG,CAAC,0CAA0C,KAAK,EAAE,CAAC,CAAA;AAE9D,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Microservice, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const providerId = process.env.PROVIDER_ID || 'provider';
|
|
6
6
|
const transporter = new WebsocketTransporter({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-provider.js","sourceRoot":"","sources":["../../examples/websocket-e2e-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-provider.js","sourceRoot":"","sources":["../../examples/websocket-e2e-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AACzD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,UAAU,CAAA;AAExD,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC;IACzC,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,GAAG;CAC3B,CAAC,CAAA;AACF,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAG1B,IAAM,eAAe,GAArB,MAAM,eAAe;IACjB,KAAK,CAAC,KAAK,CAAC,IAAY;QACpB,OAAO,SAAS,IAAI,SAAS,UAAU,EAAE,CAAA;IAC7C,CAAC;CACJ,CAAA;AAJK,eAAe;IADpB,YAAY,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;GAC1C,eAAe,CAIpB;AAED,IAAI,eAAe,EAAE,CAAA;AACrB,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAE/C,OAAO,CAAC,GAAG,CAAC,mCAAmC,KAAK,KAAK,UAAU,GAAG,CAAC,CAAA;AAEvE,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Microservice, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const transporterOptions = {
|
|
6
6
|
heartbeatIntervalMs: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-reverse-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-reverse-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-reverse-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-reverse-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AACzD,MAAM,kBAAkB,GAAG;IACvB,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,GAAG;CAC3B,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;AAChE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC1B,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;AAGrD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACxB,KAAK,CAAC,eAAe,CAAC,IAAY;QAC9B,OAAO,SAAS,IAAI,cAAc,CAAA;IACtC,CAAC;CACJ,CAAA;AAJK,sBAAsB;IAD3B,YAAY,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;GAChD,sBAAsB,CAI3B;AAED,IAAI,sBAAsB,EAAE,CAAA;AAC5B,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAE/C,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { firstValueFrom, timeout } from 'rxjs';
|
|
2
2
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const transporterOptions = {
|
|
6
6
|
heartbeatIntervalMs: 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-reverse-server.js","sourceRoot":"","sources":["../../examples/websocket-e2e-reverse-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-reverse-server.js","sourceRoot":"","sources":["../../examples/websocket-e2e-reverse-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AAEzD,MAAM,kBAAkB,GAAG;IACvB,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,GAAG;CAC3B,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;AAChE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC1B,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;AAMrD,KAAK,UAAU,IAAI;IACf,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IAC5D,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAyB,IAAI,EAAE;QACrE,OAAO,EAAE,wBAAwB;QACjC,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACX,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,EAAE,KAAK,CAAC,CAAA;IAET,IAAI,CAAC;QACD,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;YAAS,CAAC;QACP,YAAY,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;AACL,CAAC;AAED,MAAM,IAAI,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { firstValueFrom, timeout } from 'rxjs';
|
|
2
2
|
import { RemoteServiceLinker, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
async function main() {
|
|
6
6
|
const transporter = new WebsocketTransporter({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-e2e-round-robin-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-round-robin-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-e2e-round-robin-client.js","sourceRoot":"","sources":["../../examples/websocket-e2e-round-robin-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AAMzD,KAAK,UAAU,IAAI;IACf,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC;QACzC,mBAAmB,EAAE,IAAI;QACzB,mBAAmB,EAAE,GAAG;KAC3B,CAAC,CAAA;IACF,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC1B,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IAErD,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IAC5D,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAkB,IAAI,EAAE;QAC5D,OAAO,EAAE,iBAAiB;QAC1B,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACX,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,EAAE,KAAK,CAAC,CAAA;IAET,IAAI,CAAC;QACD,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;QAE1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9B,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;SACrE,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;YAAS,CAAC;QACP,YAAY,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;AACL,CAAC;AAED,MAAM,IAAI,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { Microservice, SpiderMesh } from '@spider-mesh/core';
|
|
3
|
-
import { WebsocketTransporter } from '../src/
|
|
3
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
4
4
|
const wsUrl = process.env.WS_URL || 'ws://127.0.0.1:8787';
|
|
5
5
|
const transporter = new WebsocketTransporter({
|
|
6
6
|
heartbeatIntervalMs: 5000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-provider.js","sourceRoot":"","sources":["../../examples/websocket-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-provider.js","sourceRoot":"","sources":["../../examples/websocket-provider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,qBAAqB,CAAA;AAEzD,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC;IACzC,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,IAAI;CAC5B,CAAC,CAAA;AACF,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAG1B,IAAM,eAAe,GAArB,MAAM,eAAe;IACjB,KAAK,CAAC,KAAK,CAAC,IAAY;QACpB,OAAO,SAAS,IAAI,gBAAgB,CAAA;IACxC,CAAC;CACJ,CAAA;AAJK,eAAe;IADpB,YAAY,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;GAC7B,eAAe,CAIpB;AAED,IAAI,eAAe,EAAE,CAAA;AACrB,IAAI,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAE/C,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { firstValueFrom, filter, timeout } from 'rxjs';
|
|
2
2
|
import WebSocket from 'ws';
|
|
3
3
|
import { WebsocketRelayServer } from '../src/relay-server.js';
|
|
4
|
-
import { WebsocketTransporter } from '../src/
|
|
4
|
+
import { WebsocketTransporter } from '../src/node.js';
|
|
5
5
|
import { encodeRelayFrame } from '../src/websocketProtocol.js';
|
|
6
6
|
const port = 8800 + Math.floor(Math.random() * 200);
|
|
7
7
|
const baseWsUrl = `ws://127.0.0.1:${port}`;
|
|
@@ -13,7 +13,6 @@ const server = new WebsocketRelayServer({
|
|
|
13
13
|
isServerConnection: (_socket, request) => new URL(request.url || '/', baseWsUrl).searchParams.get('role') === 'server',
|
|
14
14
|
});
|
|
15
15
|
const nodeA = {
|
|
16
|
-
ips: ['127.0.0.1'],
|
|
17
16
|
host: '127.0.0.1',
|
|
18
17
|
namespace: 'test',
|
|
19
18
|
version: 1,
|
|
@@ -23,7 +22,6 @@ const nodeA = {
|
|
|
23
22
|
transporters: { websocket: {} },
|
|
24
23
|
};
|
|
25
24
|
const nodeB = {
|
|
26
|
-
ips: ['127.0.0.1'],
|
|
27
25
|
host: '127.0.0.1',
|
|
28
26
|
namespace: 'test',
|
|
29
27
|
version: 1,
|
|
@@ -33,7 +31,6 @@ const nodeB = {
|
|
|
33
31
|
transporters: { websocket: {} },
|
|
34
32
|
};
|
|
35
33
|
const nodeC = {
|
|
36
|
-
ips: ['127.0.0.1'],
|
|
37
34
|
host: '127.0.0.1',
|
|
38
35
|
namespace: 'test',
|
|
39
36
|
version: 1,
|
|
@@ -81,9 +78,9 @@ async function main() {
|
|
|
81
78
|
const discoveryC = firstValueFrom(transporterC.pipe(filter((event) => !!event?.discovered?.node_id && event.discovered.node_id === nodeB.node_id), timeout(5000)));
|
|
82
79
|
const noDiscoveryOnClient = expectNoEvent(transporterB.pipe(filter((event) => !!event?.discovered?.node_id && (event.discovered.node_id === nodeA.node_id || event.discovered.node_id === nodeC.node_id))));
|
|
83
80
|
await Promise.all([
|
|
84
|
-
transporterA.broadcast(createDiscoveryMessage(nodeA)
|
|
85
|
-
transporterB.broadcast(createDiscoveryMessage(nodeB)
|
|
86
|
-
transporterC.broadcast(createDiscoveryMessage(nodeC)
|
|
81
|
+
transporterA.broadcast(createDiscoveryMessage(nodeA)),
|
|
82
|
+
transporterB.broadcast(createDiscoveryMessage(nodeB)),
|
|
83
|
+
transporterC.broadcast(createDiscoveryMessage(nodeC)),
|
|
87
84
|
]);
|
|
88
85
|
await Promise.all([discoveryA, discoveryC, noDiscoveryOnClient]);
|
|
89
86
|
const rpcMessage = firstValueFrom(transporterB.pipe(filter(event => event?.rpc?.packet?.request_id === 'smoke-request'), timeout(5000)));
|
|
@@ -151,7 +148,6 @@ async function main() {
|
|
|
151
148
|
me: {
|
|
152
149
|
...nodeA,
|
|
153
150
|
node_id: rawNodeId,
|
|
154
|
-
online: true,
|
|
155
151
|
},
|
|
156
152
|
}));
|
|
157
153
|
const staleOfflineEvent = firstValueFrom(transporterC.pipe(filter(event => event?.offline === rawNodeId), timeout(5000)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-smoke-test.js","sourceRoot":"","sources":["../../examples/websocket-smoke-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAmB,MAAM,MAAM,CAAA;AACvE,OAAO,SAAS,MAAM,IAAI,CAAA;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"websocket-smoke-test.js","sourceRoot":"","sources":["../../examples/websocket-smoke-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { BehaviorSubject, Observable, Subject } from 'rxjs';
|
|
2
|
+
import type { DiscoveryTransporter, MdnsMessage, NodeMetadata, PubsubTransporter, RpcPacket, RpcTransporter, SpiderMeshNode } from '@spider-mesh/core';
|
|
3
|
+
export type WebsocketTransporterOptions = {
|
|
4
|
+
heartbeatIntervalMs?: number;
|
|
5
|
+
reconnectIntervalMs?: number;
|
|
6
|
+
unsubscribeDelayMs?: number;
|
|
7
|
+
};
|
|
8
|
+
export type WebSocketLike = {
|
|
9
|
+
readyState: number;
|
|
10
|
+
binaryType?: BinaryType;
|
|
11
|
+
close(): void;
|
|
12
|
+
send(data: Uint8Array, options?: {
|
|
13
|
+
binary?: boolean;
|
|
14
|
+
}): void;
|
|
15
|
+
ping?(): void;
|
|
16
|
+
terminate?(): void;
|
|
17
|
+
};
|
|
18
|
+
export type WebsocketConnectionStatus = 'connecting' | 'connected' | 'error' | 'not_connected';
|
|
19
|
+
export declare abstract class BaseWebsocketTransporter extends Subject<any> implements RpcTransporter, DiscoveryTransporter, PubsubTransporter {
|
|
20
|
+
#private;
|
|
21
|
+
protected options: WebsocketTransporterOptions;
|
|
22
|
+
readonly status$: BehaviorSubject<Map<string, string>>;
|
|
23
|
+
constructor(options?: WebsocketTransporterOptions);
|
|
24
|
+
get metadata(): {};
|
|
25
|
+
connect(url: string | string[]): void;
|
|
26
|
+
close(url?: string | string[]): void;
|
|
27
|
+
send(packet: RpcPacket, node: SpiderMeshNode): Promise<void>;
|
|
28
|
+
broadcast(data: MdnsMessage<NodeMetadata>): Promise<void>;
|
|
29
|
+
publish<T>(topic: string, data: T): Promise<void>;
|
|
30
|
+
listen<T>(topic: string): Observable<T>;
|
|
31
|
+
protected abstract createSocket(url: string): Promise<WebSocketLike> | WebSocketLike;
|
|
32
|
+
private on_request;
|
|
33
|
+
private on_response;
|
|
34
|
+
private on_cancel;
|
|
35
|
+
private on_rpc;
|
|
36
|
+
private on_hello;
|
|
37
|
+
private on_offline;
|
|
38
|
+
private on_publish;
|
|
39
|
+
}
|
|
@@ -0,0 +1,278 @@
|
|
|
1
|
+
import { decode, encode } from '@msgpack/msgpack';
|
|
2
|
+
import { BehaviorSubject, defer, finalize, from, fromEvent, ignoreElements, map, merge, ReplaySubject, retry, share, Subject, switchMap, take, tap, throwError, timer } from 'rxjs';
|
|
3
|
+
import { decodeRelayFrame, encodeRelayFrame, normalizeRelayRawData } from './websocketProtocol.js';
|
|
4
|
+
const WEBSOCKET_CONNECTING = 0;
|
|
5
|
+
const WEBSOCKET_OPEN = 1;
|
|
6
|
+
export class BaseWebsocketTransporter extends Subject {
|
|
7
|
+
options;
|
|
8
|
+
#connections = new Map();
|
|
9
|
+
#topics = new Map();
|
|
10
|
+
#nodes = new Map();
|
|
11
|
+
#me$ = new ReplaySubject(1);
|
|
12
|
+
status$ = new BehaviorSubject(new Map());
|
|
13
|
+
constructor(options = {}) {
|
|
14
|
+
super();
|
|
15
|
+
this.options = options;
|
|
16
|
+
}
|
|
17
|
+
get metadata() {
|
|
18
|
+
return {};
|
|
19
|
+
}
|
|
20
|
+
connect(url) {
|
|
21
|
+
for (const relayUrl of new Set(Array.isArray(url) ? url : [url])) {
|
|
22
|
+
if (this.#connections.has(relayUrl))
|
|
23
|
+
continue;
|
|
24
|
+
this.#setConnectionStatus(relayUrl, 'connecting');
|
|
25
|
+
this.#connections.set(relayUrl, {
|
|
26
|
+
subscription: this.#createConnectionLoop(relayUrl).subscribe(),
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
close(url) {
|
|
31
|
+
const urls = url ? [...new Set(Array.isArray(url) ? url : [url])] : [...this.#connections.keys()];
|
|
32
|
+
for (const relayUrl of urls) {
|
|
33
|
+
this.#connections.get(relayUrl)?.subscription.unsubscribe();
|
|
34
|
+
this.#connections.delete(relayUrl);
|
|
35
|
+
this.#setConnectionStatus(relayUrl, 'not_connected');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async send(packet, node) {
|
|
39
|
+
const socket = this.#selectRpcSocket(node);
|
|
40
|
+
await this.#sendFrame(socket, {
|
|
41
|
+
type: packet.kind,
|
|
42
|
+
target_id: node.node_id,
|
|
43
|
+
payload: this.#encodeRpcPacket(packet),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
async broadcast(data) {
|
|
47
|
+
const localNode = {
|
|
48
|
+
...data.node,
|
|
49
|
+
node_id: data.sender_id,
|
|
50
|
+
};
|
|
51
|
+
this.#me$.next(localNode);
|
|
52
|
+
}
|
|
53
|
+
async publish(topic, data) {
|
|
54
|
+
await this.#sendFrameToAll({
|
|
55
|
+
type: 'publish',
|
|
56
|
+
topic,
|
|
57
|
+
payload: encode(data),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
listen(topic) {
|
|
61
|
+
let entry = this.#topics.get(topic);
|
|
62
|
+
if (!entry) {
|
|
63
|
+
const subject = new Subject();
|
|
64
|
+
const stream = defer(() => {
|
|
65
|
+
void this.#announceSubscriptions().catch(() => undefined);
|
|
66
|
+
return subject.asObservable().pipe(finalize(() => {
|
|
67
|
+
if (this.#topics.get(topic)?.subject !== subject)
|
|
68
|
+
return;
|
|
69
|
+
this.#topics.delete(topic);
|
|
70
|
+
void this.#announceUnsubscribe([topic]).catch(() => undefined);
|
|
71
|
+
}));
|
|
72
|
+
}).pipe(share({
|
|
73
|
+
resetOnRefCountZero: () => timer(this.options.unsubscribeDelayMs || 10000),
|
|
74
|
+
}));
|
|
75
|
+
entry = { subject, stream };
|
|
76
|
+
this.#topics.set(topic, entry);
|
|
77
|
+
}
|
|
78
|
+
return entry.stream;
|
|
79
|
+
}
|
|
80
|
+
#createConnectionLoop(url) {
|
|
81
|
+
return defer(() => {
|
|
82
|
+
this.#setConnectionStatus(url, 'connecting');
|
|
83
|
+
return from(Promise.resolve(this.createSocket(url)));
|
|
84
|
+
}).pipe(switchMap(socket => {
|
|
85
|
+
const closed$ = fromEvent(socket, 'close').pipe(take(1), tap(() => {
|
|
86
|
+
this.#setConnectionStatus(url, 'not_connected');
|
|
87
|
+
}), switchMap(() => throwError(() => new Error(`WebSocket disconnected: ${url}`))));
|
|
88
|
+
const errored$ = fromEvent(socket, 'error').pipe(take(1), tap(() => {
|
|
89
|
+
this.#setConnectionStatus(url, 'error');
|
|
90
|
+
}), switchMap(() => throwError(() => new Error(`WebSocket disconnected: ${url}`))));
|
|
91
|
+
const disconnection$ = merge(closed$, errored$).pipe(take(1));
|
|
92
|
+
const disconnect = () => {
|
|
93
|
+
const connection = this.#connections.get(url);
|
|
94
|
+
if (connection && connection.socket === socket) {
|
|
95
|
+
delete connection.socket;
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
return merge(fromEvent(socket, 'open').pipe(take(1), map(() => socket)), disconnection$).pipe(take(1), tap(() => {
|
|
99
|
+
const connection = this.#connections.get(url);
|
|
100
|
+
if (connection) {
|
|
101
|
+
connection.socket = socket;
|
|
102
|
+
}
|
|
103
|
+
this.#setConnectionStatus(url, 'connected');
|
|
104
|
+
}), switchMap(() => merge(this.#me$.pipe(tap(localNode => {
|
|
105
|
+
void this.#announceLocalNode(localNode).catch(() => undefined);
|
|
106
|
+
void this.#announceSubscriptions().catch(() => undefined);
|
|
107
|
+
}), ignoreElements()), fromEvent(socket, 'message').pipe(tap(event => {
|
|
108
|
+
const raw = this.#getMessageData(event);
|
|
109
|
+
const frame = this.#parseFrame(raw);
|
|
110
|
+
if (!frame)
|
|
111
|
+
return;
|
|
112
|
+
const handler = this[`on_${frame.type}`];
|
|
113
|
+
if (!handler)
|
|
114
|
+
return;
|
|
115
|
+
handler.call(this, url, frame);
|
|
116
|
+
}), ignoreElements()), disconnection$, timer(0, this.options.heartbeatIntervalMs || 30000).pipe(tap(() => {
|
|
117
|
+
if (socket.readyState === WEBSOCKET_OPEN) {
|
|
118
|
+
socket.ping?.();
|
|
119
|
+
}
|
|
120
|
+
}), ignoreElements()))), finalize(() => {
|
|
121
|
+
disconnect();
|
|
122
|
+
if (socket.readyState === WEBSOCKET_OPEN) {
|
|
123
|
+
socket.close();
|
|
124
|
+
}
|
|
125
|
+
else if (socket.readyState === WEBSOCKET_CONNECTING) {
|
|
126
|
+
socket.terminate?.();
|
|
127
|
+
socket.close();
|
|
128
|
+
}
|
|
129
|
+
}));
|
|
130
|
+
})).pipe(retry({
|
|
131
|
+
delay: () => timer(this.options.reconnectIntervalMs || 1000),
|
|
132
|
+
}));
|
|
133
|
+
}
|
|
134
|
+
on_request(_url, frame) {
|
|
135
|
+
this.on_rpc(frame);
|
|
136
|
+
}
|
|
137
|
+
on_response(_url, frame) {
|
|
138
|
+
this.on_rpc(frame);
|
|
139
|
+
}
|
|
140
|
+
on_cancel(_url, frame) {
|
|
141
|
+
this.on_rpc(frame);
|
|
142
|
+
}
|
|
143
|
+
on_rpc(frame) {
|
|
144
|
+
const packet = this.#decodeRpcPacket(frame);
|
|
145
|
+
if (!packet)
|
|
146
|
+
return;
|
|
147
|
+
this.next({
|
|
148
|
+
rpc: {
|
|
149
|
+
node_id: frame.sender_id,
|
|
150
|
+
packet
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
on_hello(url, frame) {
|
|
155
|
+
const node = frame.me;
|
|
156
|
+
this.#nodes.set(node.node_id, {
|
|
157
|
+
node,
|
|
158
|
+
relayUrl: url,
|
|
159
|
+
});
|
|
160
|
+
this.next({ discovered: node });
|
|
161
|
+
}
|
|
162
|
+
on_offline(url, frame) {
|
|
163
|
+
const current = this.#nodes.get(frame.node_id);
|
|
164
|
+
if (current?.relayUrl === url) {
|
|
165
|
+
this.#nodes.delete(frame.node_id);
|
|
166
|
+
}
|
|
167
|
+
this.next({ offline: frame.node_id });
|
|
168
|
+
}
|
|
169
|
+
on_publish(_url, frame) {
|
|
170
|
+
const topic = this.#topics.get(frame.topic);
|
|
171
|
+
if (!topic)
|
|
172
|
+
return;
|
|
173
|
+
try {
|
|
174
|
+
topic.subject.next(decode(frame.payload));
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
topic.subject.next(frame.payload);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
#selectRpcSocket(node) {
|
|
181
|
+
const relayUrl = this.#nodes.get(node.node_id)?.relayUrl;
|
|
182
|
+
const routedSocket = relayUrl ? this.#connections.get(relayUrl)?.socket : null;
|
|
183
|
+
if (routedSocket?.readyState === WEBSOCKET_OPEN) {
|
|
184
|
+
return routedSocket;
|
|
185
|
+
}
|
|
186
|
+
for (const { socket } of this.#connections.values()) {
|
|
187
|
+
if (socket?.readyState === WEBSOCKET_OPEN) {
|
|
188
|
+
return socket;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
throw new Error('WebSocket is not connected');
|
|
192
|
+
}
|
|
193
|
+
#resolveNode(nodeId) {
|
|
194
|
+
if (nodeId) {
|
|
195
|
+
const knownNode = this.#nodes.get(nodeId);
|
|
196
|
+
if (knownNode) {
|
|
197
|
+
return knownNode.node;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
return {
|
|
201
|
+
host: '',
|
|
202
|
+
namespace: '',
|
|
203
|
+
node_id: nodeId || '',
|
|
204
|
+
services: {},
|
|
205
|
+
transporters: {},
|
|
206
|
+
nodes: {},
|
|
207
|
+
version: 0,
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
async #announceLocalNode(localNode) {
|
|
211
|
+
await this.#sendFrameToAll({
|
|
212
|
+
type: 'hello',
|
|
213
|
+
me: localNode,
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
async #announceSubscriptions() {
|
|
217
|
+
await this.#sendFrameToAll({
|
|
218
|
+
type: 'subscribe',
|
|
219
|
+
topics: [...this.#topics.keys()],
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
async #announceUnsubscribe(topics) {
|
|
223
|
+
if (topics.length === 0)
|
|
224
|
+
return;
|
|
225
|
+
await this.#sendFrameToAll({
|
|
226
|
+
type: 'unsubscribe',
|
|
227
|
+
topics,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
#encodeRpcPacket(packet) {
|
|
231
|
+
const { kind: _, ...payload } = packet;
|
|
232
|
+
return encode(payload);
|
|
233
|
+
}
|
|
234
|
+
#decodeRpcPacket(frame) {
|
|
235
|
+
try {
|
|
236
|
+
return {
|
|
237
|
+
kind: frame.type,
|
|
238
|
+
...decode(frame.payload),
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
catch {
|
|
242
|
+
return null;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
async #sendFrame(socket, frame) {
|
|
246
|
+
if (!socket || socket.readyState !== WEBSOCKET_OPEN) {
|
|
247
|
+
throw new Error('WebSocket is not connected');
|
|
248
|
+
}
|
|
249
|
+
socket.send(encodeRelayFrame(frame), { binary: true });
|
|
250
|
+
}
|
|
251
|
+
async #sendFrameToAll(frame) {
|
|
252
|
+
const sockets = [...this.#connections.values()]
|
|
253
|
+
.map(connection => connection.socket)
|
|
254
|
+
.filter((socket) => socket?.readyState === WEBSOCKET_OPEN);
|
|
255
|
+
if (sockets.length === 0) {
|
|
256
|
+
return;
|
|
257
|
+
}
|
|
258
|
+
await Promise.all(sockets.map(socket => this.#sendFrame(socket, frame)));
|
|
259
|
+
}
|
|
260
|
+
#parseFrame(raw) {
|
|
261
|
+
return decodeRelayFrame(normalizeRelayRawData(raw));
|
|
262
|
+
}
|
|
263
|
+
#getMessageData(event) {
|
|
264
|
+
return Array.isArray(event)
|
|
265
|
+
? event[0]
|
|
266
|
+
: (event && typeof event === 'object' && 'data' in event ? event.data : event);
|
|
267
|
+
}
|
|
268
|
+
#setConnectionStatus(url, status) {
|
|
269
|
+
const currentStatus = this.status$.value.get(url);
|
|
270
|
+
if (currentStatus === status) {
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
const nextStatuses = new Map(this.status$.value);
|
|
274
|
+
nextStatuses.set(url, status);
|
|
275
|
+
this.status$.next(nextStatuses);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
//# sourceMappingURL=BaseWebsocketTransporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseWebsocketTransporter.js","sourceRoot":"","sources":["../../src/BaseWebsocketTransporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { BaseWebsocketTransporter, type WebSocketLike, type WebsocketTransporterOptions } from './BaseWebsocketTransporter.js';
|
|
2
|
+
export { type WebsocketConnectionStatus, type WebsocketTransporterOptions } from './BaseWebsocketTransporter.js';
|
|
3
|
+
export declare class WebsocketTransporter extends BaseWebsocketTransporter {
|
|
4
|
+
constructor(options?: WebsocketTransporterOptions);
|
|
5
|
+
protected createSocket(url: string): WebSocketLike;
|
|
6
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { BaseWebsocketTransporter } from './BaseWebsocketTransporter.js';
|
|
2
|
+
export class WebsocketTransporter extends BaseWebsocketTransporter {
|
|
3
|
+
constructor(options = {}) {
|
|
4
|
+
super(options);
|
|
5
|
+
}
|
|
6
|
+
createSocket(url) {
|
|
7
|
+
if (typeof globalThis.WebSocket !== 'function') {
|
|
8
|
+
throw new Error('globalThis.WebSocket is not available in this runtime');
|
|
9
|
+
}
|
|
10
|
+
const socket = new globalThis.WebSocket(url);
|
|
11
|
+
if ('binaryType' in socket) {
|
|
12
|
+
socket.binaryType = 'arraybuffer';
|
|
13
|
+
}
|
|
14
|
+
return socket;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=GlobalWebsocketTransporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GlobalWebsocketTransporter.js","sourceRoot":"","sources":["../../src/GlobalWebsocketTransporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAwD,MAAM,+BAA+B,CAAA;AAI9H,MAAM,OAAO,oBAAqB,SAAQ,wBAAwB;IAC9D,YAAY,UAAuC,EAAE;QACjD,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAES,YAAY,CAAC,GAAW;QAC9B,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;QAC5E,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,GAAG,CAA6B,CAAA;QAExE,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,UAAU,GAAG,aAAa,CAAA;QACrC,CAAC;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ"}
|
|
@@ -1,26 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export
|
|
4
|
-
heartbeatIntervalMs?: number;
|
|
5
|
-
reconnectIntervalMs?: number;
|
|
6
|
-
unsubscribeDelayMs?: number;
|
|
7
|
-
};
|
|
8
|
-
export declare class WebsocketTransporter extends Subject<any> implements RpcTransporter, DiscoveryTransporter, PubsubTransporter {
|
|
9
|
-
#private;
|
|
10
|
-
protected options: WebsocketTransporterOptions;
|
|
1
|
+
import { BaseWebsocketTransporter, type WebSocketLike, type WebsocketTransporterOptions } from './BaseWebsocketTransporter.js';
|
|
2
|
+
export { type WebsocketConnectionStatus, type WebsocketTransporterOptions } from './BaseWebsocketTransporter.js';
|
|
3
|
+
export declare class WebsocketTransporter extends BaseWebsocketTransporter {
|
|
11
4
|
constructor(options?: WebsocketTransporterOptions);
|
|
12
|
-
|
|
13
|
-
connect(url: string | string[]): void;
|
|
14
|
-
close(url?: string | string[]): void;
|
|
15
|
-
send(packet: RpcPacket, node: SpiderMeshNode): Promise<void>;
|
|
16
|
-
broadcast(data: MdnsMessage<NodeMetadata>, _ips: string[]): Promise<void>;
|
|
17
|
-
publish<T>(topic: string, data: T): Promise<void>;
|
|
18
|
-
listen<T>(topic: string): Observable<T>;
|
|
19
|
-
private on_request;
|
|
20
|
-
private on_response;
|
|
21
|
-
private on_cancel;
|
|
22
|
-
private on_rpc;
|
|
23
|
-
private on_hello;
|
|
24
|
-
private on_offline;
|
|
25
|
-
private on_publish;
|
|
5
|
+
protected createSocket(url: string): WebSocketLike;
|
|
26
6
|
}
|
|
@@ -1,254 +1,15 @@
|
|
|
1
|
-
import { decode, encode } from '@msgpack/msgpack';
|
|
2
|
-
import { defer, finalize, fromEvent, ignoreElements, map, merge, of, ReplaySubject, retry, share, Subject, switchMap, take, tap, throwError, timer } from 'rxjs';
|
|
3
1
|
import WebSocket from 'ws';
|
|
4
|
-
import {
|
|
5
|
-
export class WebsocketTransporter extends
|
|
6
|
-
options;
|
|
7
|
-
#connections = new Map();
|
|
8
|
-
#topics = new Map();
|
|
9
|
-
#nodes = new Map();
|
|
10
|
-
#me$ = new ReplaySubject(1);
|
|
2
|
+
import { BaseWebsocketTransporter } from './BaseWebsocketTransporter.js';
|
|
3
|
+
export class WebsocketTransporter extends BaseWebsocketTransporter {
|
|
11
4
|
constructor(options = {}) {
|
|
12
|
-
super();
|
|
13
|
-
this.options = options;
|
|
5
|
+
super(options);
|
|
14
6
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
for (const relayUrl of new Set(Array.isArray(url) ? url : [url])) {
|
|
20
|
-
if (this.#connections.has(relayUrl))
|
|
21
|
-
continue;
|
|
22
|
-
this.#connections.set(relayUrl, {
|
|
23
|
-
subscription: this.#createConnectionLoop(relayUrl).subscribe(),
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
close(url) {
|
|
28
|
-
const urls = url ? [...new Set(Array.isArray(url) ? url : [url])] : [...this.#connections.keys()];
|
|
29
|
-
for (const relayUrl of urls) {
|
|
30
|
-
this.#connections.get(relayUrl)?.subscription.unsubscribe();
|
|
31
|
-
this.#connections.delete(relayUrl);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
async send(packet, node) {
|
|
35
|
-
const socket = this.#selectRpcSocket(node);
|
|
36
|
-
await this.#sendFrame(socket, {
|
|
37
|
-
type: packet.kind,
|
|
38
|
-
target_id: node.node_id,
|
|
39
|
-
payload: this.#encodeRpcPacket(packet),
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
async broadcast(data, _ips) {
|
|
43
|
-
const localNode = {
|
|
44
|
-
...data.node,
|
|
45
|
-
node_id: data.sender_id,
|
|
46
|
-
};
|
|
47
|
-
this.#me$.next(localNode);
|
|
48
|
-
}
|
|
49
|
-
async publish(topic, data) {
|
|
50
|
-
await this.#sendFrameToAll({
|
|
51
|
-
type: 'publish',
|
|
52
|
-
topic,
|
|
53
|
-
payload: encode(data),
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
listen(topic) {
|
|
57
|
-
let entry = this.#topics.get(topic);
|
|
58
|
-
if (!entry) {
|
|
59
|
-
const subject = new Subject();
|
|
60
|
-
const stream = defer(() => {
|
|
61
|
-
void this.#announceSubscriptions().catch(() => undefined);
|
|
62
|
-
return subject.asObservable().pipe(finalize(() => {
|
|
63
|
-
if (this.#topics.get(topic)?.subject !== subject)
|
|
64
|
-
return;
|
|
65
|
-
this.#topics.delete(topic);
|
|
66
|
-
void this.#announceUnsubscribe([topic]).catch(() => undefined);
|
|
67
|
-
}));
|
|
68
|
-
}).pipe(share({
|
|
69
|
-
resetOnRefCountZero: () => timer(this.options.unsubscribeDelayMs || 10000),
|
|
70
|
-
}));
|
|
71
|
-
entry = { subject, stream };
|
|
72
|
-
this.#topics.set(topic, entry);
|
|
73
|
-
}
|
|
74
|
-
return entry.stream;
|
|
75
|
-
}
|
|
76
|
-
#createConnectionLoop(url) {
|
|
77
|
-
return of(1).pipe(map(() => new WebSocket(url)), switchMap(socket => {
|
|
78
|
-
const disconnect = () => {
|
|
79
|
-
const connection = this.#connections.get(url);
|
|
80
|
-
if (connection?.socket === socket) {
|
|
81
|
-
delete connection.socket;
|
|
82
|
-
}
|
|
83
|
-
};
|
|
84
|
-
return merge(fromEvent(socket, 'open').pipe(take(1), map(() => socket)), merge(fromEvent(socket, 'close'), fromEvent(socket, 'error')).pipe(take(1), switchMap(() => throwError(() => new Error(`WebSocket disconnected: ${url}`))))).pipe(take(1), tap(() => {
|
|
85
|
-
const connection = this.#connections.get(url);
|
|
86
|
-
if (connection) {
|
|
87
|
-
connection.socket = socket;
|
|
88
|
-
}
|
|
89
|
-
}), switchMap(() => merge(this.#me$.pipe(tap(localNode => {
|
|
90
|
-
void this.#announceLocalNode(localNode).catch(() => undefined);
|
|
91
|
-
void this.#announceSubscriptions().catch(() => undefined);
|
|
92
|
-
}), ignoreElements()), fromEvent(socket, 'message').pipe(tap(event => {
|
|
93
|
-
const raw = Array.isArray(event)
|
|
94
|
-
? event[0]
|
|
95
|
-
: (event && typeof event === 'object' && 'data' in event ? event.data : event);
|
|
96
|
-
const frame = this.#parseFrame(raw);
|
|
97
|
-
if (!frame)
|
|
98
|
-
return;
|
|
99
|
-
const handler = this[`on_${frame.type}`];
|
|
100
|
-
if (!handler)
|
|
101
|
-
return;
|
|
102
|
-
handler.call(this, url, frame);
|
|
103
|
-
}), ignoreElements()), merge(fromEvent(socket, 'close'), fromEvent(socket, 'error')).pipe(take(1), switchMap(() => throwError(() => new Error(`WebSocket disconnected: ${url}`)))), timer(0, this.options.heartbeatIntervalMs || 30000).pipe(tap(() => {
|
|
104
|
-
if (socket.readyState === WebSocket.OPEN) {
|
|
105
|
-
socket.ping();
|
|
106
|
-
}
|
|
107
|
-
}), ignoreElements()))), finalize(() => {
|
|
108
|
-
disconnect();
|
|
109
|
-
if (socket.readyState === WebSocket.OPEN) {
|
|
110
|
-
socket.close();
|
|
111
|
-
}
|
|
112
|
-
else if (socket.readyState === WebSocket.CONNECTING) {
|
|
113
|
-
socket.terminate();
|
|
114
|
-
}
|
|
115
|
-
}));
|
|
116
|
-
})).pipe(retry({
|
|
117
|
-
delay: () => timer(this.options.reconnectIntervalMs || 1000),
|
|
118
|
-
}));
|
|
119
|
-
}
|
|
120
|
-
on_request(_url, frame) {
|
|
121
|
-
this.on_rpc(frame);
|
|
122
|
-
}
|
|
123
|
-
on_response(_url, frame) {
|
|
124
|
-
this.on_rpc(frame);
|
|
125
|
-
}
|
|
126
|
-
on_cancel(_url, frame) {
|
|
127
|
-
this.on_rpc(frame);
|
|
128
|
-
}
|
|
129
|
-
on_rpc(frame) {
|
|
130
|
-
const packet = this.#decodeRpcPacket(frame);
|
|
131
|
-
if (!packet)
|
|
132
|
-
return;
|
|
133
|
-
this.next({
|
|
134
|
-
rpc: {
|
|
135
|
-
node_id: frame.sender_id,
|
|
136
|
-
packet
|
|
137
|
-
}
|
|
138
|
-
});
|
|
139
|
-
}
|
|
140
|
-
on_hello(url, frame) {
|
|
141
|
-
const node = frame.me;
|
|
142
|
-
this.#nodes.set(node.node_id, {
|
|
143
|
-
node,
|
|
144
|
-
relayUrl: url,
|
|
145
|
-
});
|
|
146
|
-
this.next({ discovered: node });
|
|
147
|
-
}
|
|
148
|
-
on_offline(url, frame) {
|
|
149
|
-
const current = this.#nodes.get(frame.node_id);
|
|
150
|
-
if (current?.relayUrl === url) {
|
|
151
|
-
this.#nodes.delete(frame.node_id);
|
|
152
|
-
}
|
|
153
|
-
this.next({ offline: frame.node_id });
|
|
154
|
-
}
|
|
155
|
-
on_publish(_url, frame) {
|
|
156
|
-
const topic = this.#topics.get(frame.topic);
|
|
157
|
-
if (!topic)
|
|
158
|
-
return;
|
|
159
|
-
try {
|
|
160
|
-
topic.subject.next(decode(frame.payload));
|
|
7
|
+
createSocket(url) {
|
|
8
|
+
const socket = new WebSocket(url);
|
|
9
|
+
if ('binaryType' in socket) {
|
|
10
|
+
socket.binaryType = 'arraybuffer';
|
|
161
11
|
}
|
|
162
|
-
|
|
163
|
-
topic.subject.next(frame.payload);
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
#selectRpcSocket(node) {
|
|
167
|
-
const relayUrl = this.#nodes.get(node.node_id)?.relayUrl;
|
|
168
|
-
const routedSocket = relayUrl ? this.#connections.get(relayUrl)?.socket : null;
|
|
169
|
-
if (routedSocket?.readyState === WebSocket.OPEN) {
|
|
170
|
-
return routedSocket;
|
|
171
|
-
}
|
|
172
|
-
for (const { socket } of this.#connections.values()) {
|
|
173
|
-
if (socket?.readyState === WebSocket.OPEN) {
|
|
174
|
-
return socket;
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
throw new Error('WebSocket is not connected');
|
|
178
|
-
}
|
|
179
|
-
#resolveNode(nodeId) {
|
|
180
|
-
if (nodeId) {
|
|
181
|
-
const knownNode = this.#nodes.get(nodeId);
|
|
182
|
-
if (knownNode) {
|
|
183
|
-
return knownNode.node;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
return {
|
|
187
|
-
ips: [],
|
|
188
|
-
host: '',
|
|
189
|
-
namespace: '',
|
|
190
|
-
node_id: nodeId || '',
|
|
191
|
-
services: {},
|
|
192
|
-
transporters: {},
|
|
193
|
-
nodes: {},
|
|
194
|
-
version: 0,
|
|
195
|
-
};
|
|
196
|
-
}
|
|
197
|
-
async #announceLocalNode(localNode) {
|
|
198
|
-
await this.#sendFrameToAll({
|
|
199
|
-
type: 'hello',
|
|
200
|
-
me: {
|
|
201
|
-
...localNode,
|
|
202
|
-
online: true,
|
|
203
|
-
},
|
|
204
|
-
});
|
|
205
|
-
}
|
|
206
|
-
async #announceSubscriptions() {
|
|
207
|
-
await this.#sendFrameToAll({
|
|
208
|
-
type: 'subscribe',
|
|
209
|
-
topics: [...this.#topics.keys()],
|
|
210
|
-
});
|
|
211
|
-
}
|
|
212
|
-
async #announceUnsubscribe(topics) {
|
|
213
|
-
if (topics.length === 0)
|
|
214
|
-
return;
|
|
215
|
-
await this.#sendFrameToAll({
|
|
216
|
-
type: 'unsubscribe',
|
|
217
|
-
topics,
|
|
218
|
-
});
|
|
219
|
-
}
|
|
220
|
-
#encodeRpcPacket(packet) {
|
|
221
|
-
const { kind: _, ...payload } = packet;
|
|
222
|
-
return encode(payload);
|
|
223
|
-
}
|
|
224
|
-
#decodeRpcPacket(frame) {
|
|
225
|
-
try {
|
|
226
|
-
return {
|
|
227
|
-
kind: frame.type,
|
|
228
|
-
...decode(frame.payload),
|
|
229
|
-
};
|
|
230
|
-
}
|
|
231
|
-
catch {
|
|
232
|
-
return null;
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
async #sendFrame(socket, frame) {
|
|
236
|
-
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
|
237
|
-
throw new Error('WebSocket is not connected');
|
|
238
|
-
}
|
|
239
|
-
socket.send(encodeRelayFrame(frame), { binary: true });
|
|
240
|
-
}
|
|
241
|
-
async #sendFrameToAll(frame) {
|
|
242
|
-
const sockets = [...this.#connections.values()]
|
|
243
|
-
.map(connection => connection.socket)
|
|
244
|
-
.filter((socket) => socket?.readyState === WebSocket.OPEN);
|
|
245
|
-
if (sockets.length === 0) {
|
|
246
|
-
return;
|
|
247
|
-
}
|
|
248
|
-
await Promise.all(sockets.map(socket => this.#sendFrame(socket, frame)));
|
|
249
|
-
}
|
|
250
|
-
#parseFrame(raw) {
|
|
251
|
-
return decodeRelayFrame(normalizeRelayRawData(raw));
|
|
12
|
+
return socket;
|
|
252
13
|
}
|
|
253
14
|
}
|
|
254
15
|
//# sourceMappingURL=WebsocketTransporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketTransporter.js","sourceRoot":"","sources":["../../src/WebsocketTransporter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"WebsocketTransporter.js","sourceRoot":"","sources":["../../src/WebsocketTransporter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAC1B,OAAO,EAAE,wBAAwB,EAAwD,MAAM,+BAA+B,CAAA;AAI9H,MAAM,OAAO,oBAAqB,SAAQ,wBAAwB;IAC9D,YAAY,UAAuC,EAAE;QACjD,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAES,YAAY,CAAC,GAAW;QAC9B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,CAA6B,CAAA;QAE7D,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,UAAU,GAAG,aAAa,CAAA;QACrC,CAAC;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './GlobalWebsocketTransporter.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/browser.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA"}
|
package/build/src/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export
|
|
1
|
+
export {};
|
package/build/src/index.js
CHANGED
package/build/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,IAAI,KAAK,CAAC,uHAAuH,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './WebsocketTransporter.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/node.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './GlobalWebsocketTransporter.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"react-native.js","sourceRoot":"","sources":["../../src/react-native.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type WebSocket from 'ws';
|
|
2
1
|
import type { RpcPacket, SpiderMeshNode } from '@spider-mesh/core';
|
|
2
|
+
export type RelayRawData = Uint8Array | ArrayBuffer | ArrayBufferView | string | RelayRawData[];
|
|
3
3
|
export type RelayRpcFrame = {
|
|
4
4
|
type: RpcPacket['kind'];
|
|
5
5
|
payload: Uint8Array;
|
|
@@ -49,4 +49,4 @@ export type ReceivedRelayOfflineFrame = RelayOfflineFrame & {
|
|
|
49
49
|
export type ReceivedRelayFrame = ReceivedRelayRpcFrame | ReceivedRelayPublishFrame | ReceivedRelaySubscribeFrame | ReceivedRelayUnsubscribeFrame | ReceivedRelayHelloFrame | ReceivedRelayOfflineFrame;
|
|
50
50
|
export declare function encodeRelayFrame(frame: RelayFrame | ReceivedRelayFrame): Uint8Array<ArrayBuffer>;
|
|
51
51
|
export declare function decodeRelayFrame(raw: Uint8Array): RelayRpcFrame | RelayPublishFrame | RelaySubscribeFrame | RelayUnsubscribeFrame | RelayHelloFrame | RelayOfflineFrame | null;
|
|
52
|
-
export declare function normalizeRelayRawData(raw:
|
|
52
|
+
export declare function normalizeRelayRawData(raw: RelayRawData): Uint8Array;
|
|
@@ -17,6 +17,8 @@ export function normalizeRelayRawData(raw) {
|
|
|
17
17
|
return concatUint8Arrays(raw.map(chunk => normalizeRelayRawData(chunk)));
|
|
18
18
|
if (raw instanceof ArrayBuffer)
|
|
19
19
|
return new Uint8Array(raw);
|
|
20
|
+
if (typeof raw === 'string')
|
|
21
|
+
return new TextEncoder().encode(raw);
|
|
20
22
|
return asUint8Array(raw);
|
|
21
23
|
}
|
|
22
24
|
function concatUint8Arrays(chunks) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketProtocol.js","sourceRoot":"","sources":["../../src/websocketProtocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"websocketProtocol.js","sourceRoot":"","sources":["../../src/websocketProtocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAiDjD,MAAM,UAAU,gBAAgB,CAAC,KAAsC;IACnE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAe;IAC5C,IAAI,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,CAAoC,CAAA;IACzD,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAiB;IACnD,IAAI,GAAG,YAAY,UAAU;QAAE,OAAO,GAAG,CAAA;IACzC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChG,IAAI,GAAG,YAAY,WAAW;QAAE,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IAC1D,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACjE,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAoB;IAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IACrE,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAA;IACnC,IAAI,MAAM,GAAG,CAAC,CAAA;IAEd,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;IAC1B,CAAC;IAED,OAAO,MAAM,CAAA;AACjB,CAAC;AAED,SAAS,YAAY,CAAC,GAAsC;IACxD,IAAI,GAAG,YAAY,UAAU;QAAE,OAAO,GAAG,CAAA;IACzC,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAA;IAC9F,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../examples/websocket-client.ts","../examples/websocket-e2e-client.ts","../examples/websocket-e2e-matrix-client.ts","../examples/websocket-e2e-matrix-provider.ts","../examples/websocket-e2e-matrix-test.ts","../examples/websocket-e2e-provider.ts","../examples/websocket-e2e-reverse-client.ts","../examples/websocket-e2e-reverse-server.ts","../examples/websocket-e2e-reverse-test.ts","../examples/websocket-e2e-round-robin-client.ts","../examples/websocket-e2e-round-robin-test.ts","../examples/websocket-e2e-test.ts","../examples/websocket-provider.ts","../examples/websocket-server.ts","../examples/websocket-smoke-test.ts","../src/websocketrelayserver.ts","../src/websockettransporter.ts","../src/
|
|
1
|
+
{"root":["../examples/websocket-client.ts","../examples/websocket-e2e-client.ts","../examples/websocket-e2e-matrix-client.ts","../examples/websocket-e2e-matrix-provider.ts","../examples/websocket-e2e-matrix-test.ts","../examples/websocket-e2e-provider.ts","../examples/websocket-e2e-reverse-client.ts","../examples/websocket-e2e-reverse-server.ts","../examples/websocket-e2e-reverse-test.ts","../examples/websocket-e2e-round-robin-client.ts","../examples/websocket-e2e-round-robin-test.ts","../examples/websocket-e2e-test.ts","../examples/websocket-provider.ts","../examples/websocket-server.ts","../examples/websocket-smoke-test.ts","../src/basewebsockettransporter.ts","../src/globalwebsockettransporter.ts","../src/websocketrelayserver.ts","../src/websockettransporter.ts","../src/browser.ts","../src/node.ts","../src/react-native.ts","../src/relay-server.ts","../src/websocketprotocol.ts"],"version":"6.0.3"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spider-mesh/ws",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.40",
|
|
5
5
|
"description": "Built-in WebSocket transporter and relay server for Spider Mesh",
|
|
6
|
-
"main": "./build/src/index.js",
|
|
7
|
-
"types": "./build/src/index.d.ts",
|
|
8
6
|
"repository": {
|
|
9
7
|
"url": "https://github.com/spider-mesh/ws"
|
|
10
8
|
},
|
|
@@ -14,20 +12,32 @@
|
|
|
14
12
|
"yarn.lock"
|
|
15
13
|
],
|
|
16
14
|
"peerDependencies": {
|
|
17
|
-
"@spider-mesh/core": "^2.0.
|
|
15
|
+
"@spider-mesh/core": "^2.0.40"
|
|
18
16
|
},
|
|
19
17
|
"devDependencies": {
|
|
20
|
-
"@spider-mesh/core": "
|
|
18
|
+
"@spider-mesh/core": "^2.0.40",
|
|
21
19
|
"@types/bun": "^1.3.13",
|
|
22
20
|
"@types/node": "^25.6.0",
|
|
23
21
|
"@types/ws": "^8.18.1",
|
|
24
22
|
"typescript": "^6.0.3"
|
|
25
23
|
},
|
|
26
24
|
"exports": {
|
|
27
|
-
"
|
|
25
|
+
"./node": {
|
|
28
26
|
"import": {
|
|
29
|
-
"types": "./build/src/
|
|
30
|
-
"default": "./build/src/
|
|
27
|
+
"types": "./build/src/node.d.ts",
|
|
28
|
+
"default": "./build/src/node.js"
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
"./browser": {
|
|
32
|
+
"import": {
|
|
33
|
+
"types": "./build/src/browser.d.ts",
|
|
34
|
+
"default": "./build/src/browser.js"
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
"./react-native": {
|
|
38
|
+
"import": {
|
|
39
|
+
"types": "./build/src/react-native.d.ts",
|
|
40
|
+
"default": "./build/src/react-native.js"
|
|
31
41
|
}
|
|
32
42
|
},
|
|
33
43
|
"./relay-server": {
|