@livestore/webmesh 0.3.0-dev.16 → 0.3.0-dev.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/channel/message-channel-internal.d.ts.map +1 -1
- package/dist/channel/message-channel.d.ts.map +1 -1
- package/dist/channel/proxy-channel.d.ts.map +1 -1
- package/dist/common.d.ts.map +1 -1
- package/dist/node.d.ts.map +1 -1
- package/dist/node.js +1 -1
- package/dist/node.js.map +1 -1
- package/dist/node.test.js +15 -0
- package/dist/node.test.js.map +1 -1
- package/dist/websocket-connection.d.ts +1 -1
- package/dist/websocket-connection.d.ts.map +1 -1
- package/dist/websocket-connection.js +11 -18
- package/dist/websocket-connection.js.map +1 -1
- package/dist/websocket-server.d.ts.map +1 -1
- package/dist/websocket-server.js +17 -3
- package/dist/websocket-server.js.map +1 -1
- package/package.json +3 -3
- package/src/node.test.ts +15 -0
- package/src/node.ts +1 -1
- package/src/websocket-connection.ts +19 -22
- package/src/websocket-server.ts +20 -3
package/src/websocket-server.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { UnexpectedError } from '@livestore/common'
|
|
1
2
|
import type { Scope } from '@livestore/utils/effect'
|
|
2
|
-
import { Effect } from '@livestore/utils/effect'
|
|
3
|
+
import { Effect, FiberSet } from '@livestore/utils/effect'
|
|
3
4
|
import * as WebSocket from 'ws'
|
|
4
5
|
|
|
5
6
|
import { makeMeshNode } from './node.js'
|
|
@@ -13,10 +14,26 @@ export const makeWebSocketServer = ({
|
|
|
13
14
|
Effect.gen(function* () {
|
|
14
15
|
const server = new WebSocket.WebSocketServer({ noServer: true })
|
|
15
16
|
|
|
17
|
+
yield* Effect.addFinalizer(() =>
|
|
18
|
+
Effect.async<void, UnexpectedError>((cb) => {
|
|
19
|
+
server.close((cause) => {
|
|
20
|
+
if (cause) {
|
|
21
|
+
cb(Effect.fail(UnexpectedError.make({ cause })))
|
|
22
|
+
} else {
|
|
23
|
+
server.removeAllListeners()
|
|
24
|
+
server.clients.forEach((client) => client.terminate())
|
|
25
|
+
cb(Effect.succeed(undefined))
|
|
26
|
+
}
|
|
27
|
+
})
|
|
28
|
+
}).pipe(Effect.orDie),
|
|
29
|
+
)
|
|
30
|
+
|
|
16
31
|
const node = yield* makeMeshNode(relayNodeName)
|
|
17
32
|
|
|
18
33
|
const runtime = yield* Effect.runtime<never>()
|
|
19
34
|
|
|
35
|
+
const fiberSet = yield* FiberSet.make()
|
|
36
|
+
|
|
20
37
|
// TODO handle node disconnects (i.e. remove respective connection)
|
|
21
38
|
server.on('connection', (socket) => {
|
|
22
39
|
Effect.gen(function* () {
|
|
@@ -29,11 +46,11 @@ export const makeWebSocketServer = ({
|
|
|
29
46
|
Effect.gen(function* () {
|
|
30
47
|
yield* node.removeConnection(from)
|
|
31
48
|
yield* Effect.log(`WS Relay ${relayNodeName}: removed connection from '${from}'`)
|
|
32
|
-
}).pipe(Effect.provide(runtime), Effect.runFork),
|
|
49
|
+
}).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runFork),
|
|
33
50
|
)
|
|
34
51
|
|
|
35
52
|
yield* Effect.never
|
|
36
|
-
}).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), Effect.runFork)
|
|
53
|
+
}).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), FiberSet.run(fiberSet), Effect.runFork)
|
|
37
54
|
})
|
|
38
55
|
|
|
39
56
|
return server
|