@livestore/utils 0.3.0-dev.11 → 0.3.0-dev.13
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.json +1 -1
- package/dist/bun/mod.d.ts +5 -0
- package/dist/bun/mod.d.ts.map +1 -0
- package/dist/bun/mod.js +9 -0
- package/dist/bun/mod.js.map +1 -0
- package/dist/effect/Effect.d.ts +4 -2
- package/dist/effect/Effect.d.ts.map +1 -1
- package/dist/effect/Effect.js +9 -1
- package/dist/effect/Effect.js.map +1 -1
- package/dist/effect/Schema/index.d.ts +1 -0
- package/dist/effect/Schema/index.d.ts.map +1 -1
- package/dist/effect/Schema/index.js +10 -0
- package/dist/effect/Schema/index.js.map +1 -1
- package/dist/effect/WebChannel/WebChannel.d.ts +61 -0
- package/dist/effect/WebChannel/WebChannel.d.ts.map +1 -0
- package/dist/effect/WebChannel/WebChannel.js +209 -0
- package/dist/effect/WebChannel/WebChannel.js.map +1 -0
- package/dist/effect/WebChannel/broadcastChannelWithAck.d.ts +5 -6
- package/dist/effect/WebChannel/broadcastChannelWithAck.d.ts.map +1 -1
- package/dist/effect/WebChannel/broadcastChannelWithAck.js +12 -8
- package/dist/effect/WebChannel/broadcastChannelWithAck.js.map +1 -1
- package/dist/effect/WebChannel/common.d.ts +16 -1
- package/dist/effect/WebChannel/common.d.ts.map +1 -1
- package/dist/effect/WebChannel/common.js +30 -1
- package/dist/effect/WebChannel/common.js.map +1 -1
- package/dist/effect/WebChannel.d.ts +5 -12
- package/dist/effect/WebChannel.d.ts.map +1 -1
- package/dist/effect/WebChannel.js +16 -31
- package/dist/effect/WebChannel.js.map +1 -1
- package/dist/effect/index.d.ts +2 -2
- package/dist/effect/index.d.ts.map +1 -1
- package/dist/effect/index.js +2 -2
- package/dist/effect/index.js.map +1 -1
- package/dist/env.d.ts +1 -0
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +2 -0
- package/dist/env.js.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/node/ChildProcessRunner/ChildProcessRunner.d.ts.map +1 -1
- package/dist/node/ChildProcessRunner/ChildProcessRunner.js +21 -10
- package/dist/node/ChildProcessRunner/ChildProcessRunner.js.map +1 -1
- package/dist/node/mod.d.ts +0 -1
- package/dist/node/mod.d.ts.map +1 -1
- package/dist/node/mod.js +4 -6
- package/dist/node/mod.js.map +1 -1
- package/package.json +33 -25
- package/src/bun/mod.ts +12 -0
- package/src/effect/Effect.ts +14 -2
- package/src/effect/Schema/index.ts +15 -0
- package/src/effect/WebChannel/WebChannel.ts +357 -0
- package/src/effect/WebChannel/broadcastChannelWithAck.ts +86 -82
- package/src/effect/WebChannel/common.ts +56 -2
- package/src/effect/index.ts +4 -1
- package/src/env.ts +4 -0
- package/src/index.ts +4 -2
- package/src/node/ChildProcessRunner/ChildProcessRunner.ts +39 -28
- package/src/node/mod.ts +6 -6
- package/tsconfig.json +1 -1
- package/src/effect/WebChannel.ts +0 -305
package/dist/node/mod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAA;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,0DAA0D;AAE1D,OAAO,KAAK,GAAG,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/utils",
|
|
3
|
-
"version": "0.3.0-dev.
|
|
3
|
+
"version": "0.3.0-dev.13",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
6
|
-
"./dist/global.js"
|
|
6
|
+
"./dist/global.js",
|
|
7
|
+
"./dist/node-vitest/polyfill.js"
|
|
7
8
|
],
|
|
8
9
|
"exports": {
|
|
9
10
|
".": {
|
|
@@ -29,6 +30,10 @@
|
|
|
29
30
|
"types": "./dist/node/mod.d.ts",
|
|
30
31
|
"default": "./dist/node/mod.js"
|
|
31
32
|
},
|
|
33
|
+
"./bun": {
|
|
34
|
+
"types": "./dist/bun/mod.d.ts",
|
|
35
|
+
"default": "./dist/bun/mod.js"
|
|
36
|
+
},
|
|
32
37
|
"./node-vitest": {
|
|
33
38
|
"types": "./dist/node-vitest/mod.d.ts",
|
|
34
39
|
"default": "./dist/node-vitest/mod.js"
|
|
@@ -53,6 +58,9 @@
|
|
|
53
58
|
"./node": [
|
|
54
59
|
"./dist/node/mod.d.ts"
|
|
55
60
|
],
|
|
61
|
+
"./bun": [
|
|
62
|
+
"./dist/bun/mod.d.ts"
|
|
63
|
+
],
|
|
56
64
|
"./node-vitest": [
|
|
57
65
|
"./dist/node-vitest/mod.d.ts"
|
|
58
66
|
],
|
|
@@ -63,41 +71,41 @@
|
|
|
63
71
|
},
|
|
64
72
|
"dependencies": {
|
|
65
73
|
"msgpackr": "1.11.2",
|
|
66
|
-
"nanoid": "5.0
|
|
67
|
-
"pretty-bytes": "6.1.1"
|
|
68
|
-
"@livestore/db-schema": "0.3.0-dev.11"
|
|
74
|
+
"nanoid": "5.1.0",
|
|
75
|
+
"pretty-bytes": "6.1.1"
|
|
69
76
|
},
|
|
70
77
|
"devDependencies": {
|
|
71
|
-
"@effect/cli": "^0.
|
|
72
|
-
"@effect/experimental": "^0.
|
|
73
|
-
"@effect/opentelemetry": "^0.
|
|
74
|
-
"@effect/platform": "^0.
|
|
75
|
-
"@effect/platform-browser": "^0.
|
|
76
|
-
"@effect/platform-bun": "^0.
|
|
77
|
-
"@effect/platform-node": "^0.
|
|
78
|
-
"@effect/vitest": "^0.
|
|
78
|
+
"@effect/cli": "^0.56.1",
|
|
79
|
+
"@effect/experimental": "^0.41.1",
|
|
80
|
+
"@effect/opentelemetry": "^0.44.1",
|
|
81
|
+
"@effect/platform": "^0.77.1",
|
|
82
|
+
"@effect/platform-browser": "^0.56.1",
|
|
83
|
+
"@effect/platform-bun": "^0.57.1",
|
|
84
|
+
"@effect/platform-node": "^0.73.1",
|
|
85
|
+
"@effect/vitest": "^0.18.1",
|
|
79
86
|
"@opentelemetry/api": "^1.9.0",
|
|
80
87
|
"@opentelemetry/exporter-metrics-otlp-http": "^0.57.0",
|
|
81
|
-
"@opentelemetry/exporter-trace-otlp-http": "^0.57.
|
|
88
|
+
"@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
|
|
82
89
|
"@opentelemetry/sdk-metrics": "^1.30.0",
|
|
83
90
|
"@opentelemetry/sdk-trace-base": "^1.30.1",
|
|
84
91
|
"@opentelemetry/sdk-trace-node": "^1.30.0",
|
|
92
|
+
"@types/bun": "^1.1.12",
|
|
85
93
|
"@types/node": "^22.10.5",
|
|
86
|
-
"@types/web": "^0.0.
|
|
87
|
-
"effect": "^3.
|
|
94
|
+
"@types/web": "^0.0.203",
|
|
95
|
+
"effect": "^3.13.1",
|
|
88
96
|
"vitest": "^2.1.4"
|
|
89
97
|
},
|
|
90
98
|
"peerDependencies": {
|
|
91
|
-
"@effect/cli": "~0.
|
|
92
|
-
"@effect/experimental": "~0.
|
|
93
|
-
"@effect/opentelemetry": "~0.
|
|
94
|
-
"@effect/platform": "~0.
|
|
95
|
-
"@effect/platform-browser": "~0.
|
|
96
|
-
"@effect/platform-bun": "~0.
|
|
97
|
-
"@effect/platform-node": "~0.
|
|
98
|
-
"@effect/vitest": "~0.
|
|
99
|
+
"@effect/cli": "~0.56.1",
|
|
100
|
+
"@effect/experimental": "~0.41.1",
|
|
101
|
+
"@effect/opentelemetry": "~0.44.1",
|
|
102
|
+
"@effect/platform": "~0.77.1",
|
|
103
|
+
"@effect/platform-browser": "~0.56.1",
|
|
104
|
+
"@effect/platform-bun": "~0.57.1",
|
|
105
|
+
"@effect/platform-node": "~0.73.1",
|
|
106
|
+
"@effect/vitest": "~0.18.1",
|
|
99
107
|
"@opentelemetry/api": "~1.9.0",
|
|
100
|
-
"effect": "~3.
|
|
108
|
+
"effect": "~3.13.1"
|
|
101
109
|
},
|
|
102
110
|
"publishConfig": {
|
|
103
111
|
"access": "public"
|
package/src/bun/mod.ts
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { $ } from 'bun'
|
|
2
|
+
import { Effect } from 'effect'
|
|
3
|
+
|
|
4
|
+
export * as PlatformBun from '@effect/platform-bun'
|
|
5
|
+
|
|
6
|
+
export const cmd = (_: string) =>
|
|
7
|
+
Effect.promise(() => {
|
|
8
|
+
console.log(`Running command: ${_}`)
|
|
9
|
+
return $`${{ raw: _ }}`
|
|
10
|
+
})
|
|
11
|
+
|
|
12
|
+
export { $ } from 'bun'
|
package/src/effect/Effect.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as OtelTracer from '@effect/opentelemetry/Tracer'
|
|
2
|
-
import type { Context, Duration,
|
|
3
|
-
import { Cause, Deferred, Effect, Fiber, FiberRef, HashSet, Logger, pipe } from 'effect'
|
|
2
|
+
import type { Context, Duration, Stream } from 'effect'
|
|
3
|
+
import { Cause, Deferred, Effect, Fiber, FiberRef, HashSet, Logger, pipe, Scope } from 'effect'
|
|
4
4
|
import type { UnknownException } from 'effect/Cause'
|
|
5
5
|
import { log } from 'effect/Console'
|
|
6
6
|
import type { LazyArg } from 'effect/Function'
|
|
@@ -25,6 +25,18 @@ export * from 'effect/Effect'
|
|
|
25
25
|
// console.error(message, ...rest)
|
|
26
26
|
// })
|
|
27
27
|
|
|
28
|
+
/** Same as `Effect.scopeWith` but with a `CloseableScope` instead of a `Scope`. */
|
|
29
|
+
export const scopeWithCloseable = <R, E, A>(
|
|
30
|
+
fn: (scope: Scope.CloseableScope) => Effect.Effect<A, E, R | Scope.Scope>,
|
|
31
|
+
): Effect.Effect<A, E, R | Scope.Scope> =>
|
|
32
|
+
Effect.gen(function* () {
|
|
33
|
+
// const parentScope = yield* Scope.Scope
|
|
34
|
+
// const scope = yield* Scope.fork(parentScope, ExecutionStrategy.sequential)
|
|
35
|
+
const scope = yield* Scope.make()
|
|
36
|
+
yield* Effect.addFinalizer((exit) => Scope.close(scope, exit))
|
|
37
|
+
return yield* fn(scope).pipe(Scope.extend(scope))
|
|
38
|
+
})
|
|
39
|
+
|
|
28
40
|
export const tryAll = <Res>(
|
|
29
41
|
fn: () => Res,
|
|
30
42
|
): Res extends Effect.Effect<infer A, infer E, never>
|
|
@@ -56,3 +56,18 @@ export const JsonValue: Schema.Schema<JsonValue> = Schema.Union(
|
|
|
56
56
|
Schema.Array(Schema.suspend(() => JsonValue)),
|
|
57
57
|
Schema.Record({ key: Schema.String, value: Schema.suspend(() => JsonValue) }),
|
|
58
58
|
).annotations({ title: 'JsonValue' })
|
|
59
|
+
|
|
60
|
+
export const SearchParamsString = Schema.transform(
|
|
61
|
+
Schema.String,
|
|
62
|
+
Schema.Union(Schema.Record({ key: Schema.String, value: Schema.String }), Schema.String),
|
|
63
|
+
{
|
|
64
|
+
decode: (searchParamsString) => {
|
|
65
|
+
const searchParams = new URLSearchParams(searchParamsString)
|
|
66
|
+
return Object.fromEntries(searchParams.entries())
|
|
67
|
+
},
|
|
68
|
+
encode: (searchParams) => {
|
|
69
|
+
const searchParamsString = new URLSearchParams(Object.entries(searchParams)).toString()
|
|
70
|
+
return searchParamsString
|
|
71
|
+
},
|
|
72
|
+
},
|
|
73
|
+
)
|
|
@@ -0,0 +1,357 @@
|
|
|
1
|
+
import { Deferred, Either, Exit, Option, Queue, Scope } from 'effect'
|
|
2
|
+
|
|
3
|
+
import * as Effect from '../Effect.js'
|
|
4
|
+
import * as Schema from '../Schema/index.js'
|
|
5
|
+
import * as Stream from '../Stream.js'
|
|
6
|
+
import { DebugPingMessage, type InputSchema, type WebChannel, WebChannelSymbol } from './common.js'
|
|
7
|
+
import { listenToDebugPing, mapSchema } from './common.js'
|
|
8
|
+
|
|
9
|
+
export * from './broadcastChannelWithAck.js'
|
|
10
|
+
|
|
11
|
+
export * from './common.js'
|
|
12
|
+
|
|
13
|
+
export const shutdown = <MsgListen, MsgSend>(webChannel: WebChannel<MsgListen, MsgSend>): Effect.Effect<void> =>
|
|
14
|
+
Deferred.done(webChannel.closedDeferred, Exit.void)
|
|
15
|
+
|
|
16
|
+
export const noopChannel = <MsgListen, MsgSend>(): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope> =>
|
|
17
|
+
Effect.scopeWithCloseable((scope) =>
|
|
18
|
+
Effect.gen(function* () {
|
|
19
|
+
return {
|
|
20
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
21
|
+
send: () => Effect.void,
|
|
22
|
+
listen: Stream.never,
|
|
23
|
+
closedDeferred: yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void))),
|
|
24
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
25
|
+
schema: {
|
|
26
|
+
listen: Schema.Any,
|
|
27
|
+
send: Schema.Any,
|
|
28
|
+
} as any,
|
|
29
|
+
supportsTransferables: false,
|
|
30
|
+
}
|
|
31
|
+
}).pipe(Effect.withSpan(`WebChannel:noopChannel`)),
|
|
32
|
+
)
|
|
33
|
+
|
|
34
|
+
export const broadcastChannel = <MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>({
|
|
35
|
+
channelName,
|
|
36
|
+
schema: inputSchema,
|
|
37
|
+
}: {
|
|
38
|
+
channelName: string
|
|
39
|
+
schema: InputSchema<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>
|
|
40
|
+
}): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope> =>
|
|
41
|
+
Effect.scopeWithCloseable((scope) =>
|
|
42
|
+
Effect.gen(function* () {
|
|
43
|
+
const schema = mapSchema(inputSchema)
|
|
44
|
+
|
|
45
|
+
const channel = new BroadcastChannel(channelName)
|
|
46
|
+
|
|
47
|
+
yield* Effect.addFinalizer(() => Effect.try(() => channel.close()).pipe(Effect.ignoreLogged))
|
|
48
|
+
|
|
49
|
+
const send = (message: MsgSend) =>
|
|
50
|
+
Effect.gen(function* () {
|
|
51
|
+
const messageEncoded = yield* Schema.encode(schema.send)(message)
|
|
52
|
+
channel.postMessage(messageEncoded)
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
// TODO also listen to `messageerror` in parallel
|
|
56
|
+
const listen = Stream.fromEventListener<MessageEvent>(channel, 'message').pipe(
|
|
57
|
+
Stream.map((_) => Schema.decodeEither(schema.listen)(_.data)),
|
|
58
|
+
listenToDebugPing(channelName),
|
|
59
|
+
)
|
|
60
|
+
|
|
61
|
+
const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
|
|
62
|
+
const supportsTransferables = false
|
|
63
|
+
|
|
64
|
+
return {
|
|
65
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
66
|
+
send,
|
|
67
|
+
listen,
|
|
68
|
+
closedDeferred,
|
|
69
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
70
|
+
schema,
|
|
71
|
+
supportsTransferables,
|
|
72
|
+
}
|
|
73
|
+
}).pipe(Effect.withSpan(`WebChannel:broadcastChannel(${channelName})`)),
|
|
74
|
+
)
|
|
75
|
+
|
|
76
|
+
export const windowChannel = <MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>({
|
|
77
|
+
window,
|
|
78
|
+
targetOrigin = '*',
|
|
79
|
+
schema: inputSchema,
|
|
80
|
+
}: {
|
|
81
|
+
window: Window
|
|
82
|
+
targetOrigin?: string
|
|
83
|
+
schema: InputSchema<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>
|
|
84
|
+
}): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope> =>
|
|
85
|
+
Effect.scopeWithCloseable((scope) =>
|
|
86
|
+
Effect.gen(function* () {
|
|
87
|
+
const schema = mapSchema(inputSchema)
|
|
88
|
+
|
|
89
|
+
const send = (message: MsgSend) =>
|
|
90
|
+
Effect.gen(function* () {
|
|
91
|
+
const [messageEncoded, transferables] = yield* Schema.encodeWithTransferables(schema.send)(message)
|
|
92
|
+
window.postMessage(messageEncoded, targetOrigin, transferables)
|
|
93
|
+
})
|
|
94
|
+
|
|
95
|
+
const listen = Stream.fromEventListener<MessageEvent>(window, 'message').pipe(
|
|
96
|
+
Stream.map((_) => Schema.decodeEither(schema.listen)(_.data)),
|
|
97
|
+
listenToDebugPing('window'),
|
|
98
|
+
)
|
|
99
|
+
|
|
100
|
+
const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
|
|
101
|
+
const supportsTransferables = true
|
|
102
|
+
|
|
103
|
+
return {
|
|
104
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
105
|
+
send,
|
|
106
|
+
listen,
|
|
107
|
+
closedDeferred,
|
|
108
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
109
|
+
schema,
|
|
110
|
+
supportsTransferables,
|
|
111
|
+
}
|
|
112
|
+
}).pipe(Effect.withSpan(`WebChannel:windowChannel`)),
|
|
113
|
+
)
|
|
114
|
+
|
|
115
|
+
export const messagePortChannel: {
|
|
116
|
+
<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>(args: {
|
|
117
|
+
port: MessagePort
|
|
118
|
+
schema: InputSchema<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>
|
|
119
|
+
debugId?: string | number
|
|
120
|
+
}): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope>
|
|
121
|
+
} = ({ port, schema: inputSchema, debugId }) =>
|
|
122
|
+
Effect.scopeWithCloseable((scope) =>
|
|
123
|
+
Effect.gen(function* () {
|
|
124
|
+
const schema = mapSchema(inputSchema)
|
|
125
|
+
|
|
126
|
+
const label = debugId === undefined ? 'messagePort' : `messagePort:${debugId}`
|
|
127
|
+
|
|
128
|
+
const send = (message: any) =>
|
|
129
|
+
Effect.gen(function* () {
|
|
130
|
+
const [messageEncoded, transferables] = yield* Schema.encodeWithTransferables(schema.send)(message)
|
|
131
|
+
port.postMessage(messageEncoded, transferables)
|
|
132
|
+
})
|
|
133
|
+
|
|
134
|
+
const listen = Stream.fromEventListener<MessageEvent>(port, 'message').pipe(
|
|
135
|
+
// Stream.tap((_) => Effect.log(`${label}:message`, _.data)),
|
|
136
|
+
Stream.map((_) => Schema.decodeEither(schema.listen)(_.data)),
|
|
137
|
+
listenToDebugPing(label),
|
|
138
|
+
)
|
|
139
|
+
|
|
140
|
+
// NOTE unfortunately MessagePorts don't emit a `close` event when the other end is closed
|
|
141
|
+
|
|
142
|
+
port.start()
|
|
143
|
+
|
|
144
|
+
const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
|
|
145
|
+
const supportsTransferables = true
|
|
146
|
+
|
|
147
|
+
yield* Effect.addFinalizer(() => Effect.try(() => port.close()).pipe(Effect.ignoreLogged))
|
|
148
|
+
|
|
149
|
+
return {
|
|
150
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
151
|
+
send,
|
|
152
|
+
listen,
|
|
153
|
+
closedDeferred,
|
|
154
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
155
|
+
schema,
|
|
156
|
+
supportsTransferables,
|
|
157
|
+
}
|
|
158
|
+
}).pipe(Effect.withSpan(`WebChannel:messagePortChannel`)),
|
|
159
|
+
)
|
|
160
|
+
|
|
161
|
+
export const messagePortChannelWithAck: {
|
|
162
|
+
<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>(args: {
|
|
163
|
+
port: MessagePort
|
|
164
|
+
schema: InputSchema<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>
|
|
165
|
+
debugId?: string | number
|
|
166
|
+
}): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope>
|
|
167
|
+
} = ({ port, schema: inputSchema, debugId }) =>
|
|
168
|
+
Effect.scopeWithCloseable((scope) =>
|
|
169
|
+
Effect.gen(function* () {
|
|
170
|
+
const schema = mapSchema(inputSchema)
|
|
171
|
+
|
|
172
|
+
const label = debugId === undefined ? 'messagePort' : `messagePort:${debugId}`
|
|
173
|
+
|
|
174
|
+
type RequestId = string
|
|
175
|
+
const requestAckMap = new Map<RequestId, Deferred.Deferred<void>>()
|
|
176
|
+
|
|
177
|
+
const ChannelRequest = Schema.TaggedStruct('ChannelRequest', {
|
|
178
|
+
id: Schema.String,
|
|
179
|
+
payload: Schema.Union(schema.listen, schema.send),
|
|
180
|
+
})
|
|
181
|
+
const ChannelRequestAck = Schema.TaggedStruct('ChannelRequestAck', {
|
|
182
|
+
reqId: Schema.String,
|
|
183
|
+
})
|
|
184
|
+
const ChannelMessage = Schema.Union(ChannelRequest, ChannelRequestAck)
|
|
185
|
+
type ChannelMessage = typeof ChannelMessage.Type
|
|
186
|
+
|
|
187
|
+
const debugInfo = {
|
|
188
|
+
sendTotal: 0,
|
|
189
|
+
sendPending: 0,
|
|
190
|
+
listenTotal: 0,
|
|
191
|
+
id: debugId,
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
const send = (message: any) =>
|
|
195
|
+
Effect.gen(function* () {
|
|
196
|
+
debugInfo.sendTotal++
|
|
197
|
+
debugInfo.sendPending++
|
|
198
|
+
|
|
199
|
+
const id = crypto.randomUUID()
|
|
200
|
+
const [messageEncoded, transferables] = yield* Schema.encodeWithTransferables(ChannelMessage)({
|
|
201
|
+
_tag: 'ChannelRequest',
|
|
202
|
+
id,
|
|
203
|
+
payload: message,
|
|
204
|
+
})
|
|
205
|
+
|
|
206
|
+
const ack = yield* Deferred.make<void>()
|
|
207
|
+
requestAckMap.set(id, ack)
|
|
208
|
+
|
|
209
|
+
port.postMessage(messageEncoded, transferables)
|
|
210
|
+
|
|
211
|
+
yield* ack
|
|
212
|
+
|
|
213
|
+
requestAckMap.delete(id)
|
|
214
|
+
|
|
215
|
+
debugInfo.sendPending--
|
|
216
|
+
})
|
|
217
|
+
|
|
218
|
+
// TODO re-implement this via `port.onmessage`
|
|
219
|
+
// https://github.com/livestorejs/livestore/issues/262
|
|
220
|
+
const listen = Stream.fromEventListener<MessageEvent>(port, 'message').pipe(
|
|
221
|
+
// Stream.onStart(Effect.log(`${label}:listen:start`)),
|
|
222
|
+
// Stream.tap((_) => Effect.log(`${label}:message`, _.data)),
|
|
223
|
+
Stream.map((_) => Schema.decodeEither(ChannelMessage)(_.data)),
|
|
224
|
+
Stream.tap((msg) =>
|
|
225
|
+
Effect.gen(function* () {
|
|
226
|
+
if (msg._tag === 'Right') {
|
|
227
|
+
if (msg.right._tag === 'ChannelRequestAck') {
|
|
228
|
+
yield* Deferred.succeed(requestAckMap.get(msg.right.reqId)!, void 0)
|
|
229
|
+
} else if (msg.right._tag === 'ChannelRequest') {
|
|
230
|
+
debugInfo.listenTotal++
|
|
231
|
+
port.postMessage(Schema.encodeSync(ChannelMessage)({ _tag: 'ChannelRequestAck', reqId: msg.right.id }))
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}),
|
|
235
|
+
),
|
|
236
|
+
Stream.filterMap((msg) =>
|
|
237
|
+
msg._tag === 'Left'
|
|
238
|
+
? Option.some(msg as any)
|
|
239
|
+
: msg.right._tag === 'ChannelRequest'
|
|
240
|
+
? Option.some(Either.right(msg.right.payload))
|
|
241
|
+
: Option.none(),
|
|
242
|
+
),
|
|
243
|
+
(_) => _ as Stream.Stream<Either.Either<any, any>>,
|
|
244
|
+
listenToDebugPing(label),
|
|
245
|
+
)
|
|
246
|
+
|
|
247
|
+
port.start()
|
|
248
|
+
|
|
249
|
+
const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
|
|
250
|
+
const supportsTransferables = true
|
|
251
|
+
|
|
252
|
+
yield* Effect.addFinalizer(() => Effect.try(() => port.close()).pipe(Effect.ignoreLogged))
|
|
253
|
+
|
|
254
|
+
return {
|
|
255
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
256
|
+
send,
|
|
257
|
+
listen,
|
|
258
|
+
closedDeferred,
|
|
259
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
260
|
+
schema,
|
|
261
|
+
supportsTransferables,
|
|
262
|
+
debugInfo,
|
|
263
|
+
}
|
|
264
|
+
}).pipe(Effect.withSpan(`WebChannel:messagePortChannelWithAck`)),
|
|
265
|
+
)
|
|
266
|
+
|
|
267
|
+
export type QueueChannelProxy<MsgListen, MsgSend> = {
|
|
268
|
+
/** Only meant to be used externally */
|
|
269
|
+
webChannel: WebChannel<MsgListen, MsgSend>
|
|
270
|
+
/**
|
|
271
|
+
* Meant to be listened to (e.g. via `Stream.fromQueue`) for messages that have been sent
|
|
272
|
+
* via `webChannel.send()`.
|
|
273
|
+
*/
|
|
274
|
+
sendQueue: Queue.Dequeue<MsgSend>
|
|
275
|
+
/**
|
|
276
|
+
* Meant to be pushed to (e.g. via `Queue.offer`) for messages that will be received
|
|
277
|
+
* via `webChannel.listen()`.
|
|
278
|
+
*/
|
|
279
|
+
listenQueue: Queue.Enqueue<MsgListen>
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* From the outside the `sendQueue` is only accessible read-only,
|
|
284
|
+
* and the `listenQueue` is only accessible write-only.
|
|
285
|
+
*/
|
|
286
|
+
export const queueChannelProxy = <MsgListen, MsgSend>({
|
|
287
|
+
schema: inputSchema,
|
|
288
|
+
}: {
|
|
289
|
+
schema:
|
|
290
|
+
| Schema.Schema<MsgListen | MsgSend, any>
|
|
291
|
+
| { listen: Schema.Schema<MsgListen, any>; send: Schema.Schema<MsgSend, any> }
|
|
292
|
+
}): Effect.Effect<QueueChannelProxy<MsgListen, MsgSend>, never, Scope.Scope> =>
|
|
293
|
+
Effect.scopeWithCloseable((scope) =>
|
|
294
|
+
Effect.gen(function* () {
|
|
295
|
+
const sendQueue = yield* Queue.unbounded<MsgSend>().pipe(Effect.acquireRelease(Queue.shutdown))
|
|
296
|
+
const listenQueue = yield* Queue.unbounded<MsgListen>().pipe(Effect.acquireRelease(Queue.shutdown))
|
|
297
|
+
|
|
298
|
+
const send = (message: MsgSend) => Queue.offer(sendQueue, message)
|
|
299
|
+
|
|
300
|
+
const listen = Stream.fromQueue(listenQueue).pipe(Stream.map(Either.right), listenToDebugPing('queueChannel'))
|
|
301
|
+
|
|
302
|
+
const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
|
|
303
|
+
const supportsTransferables = true
|
|
304
|
+
|
|
305
|
+
const schema = mapSchema(inputSchema)
|
|
306
|
+
|
|
307
|
+
const webChannel = {
|
|
308
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
309
|
+
send,
|
|
310
|
+
listen,
|
|
311
|
+
closedDeferred,
|
|
312
|
+
shutdown: Scope.close(scope, Exit.succeed('shutdown')),
|
|
313
|
+
schema,
|
|
314
|
+
supportsTransferables,
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
return { webChannel, sendQueue, listenQueue }
|
|
318
|
+
}).pipe(Effect.withSpan(`WebChannel:queueChannelProxy`)),
|
|
319
|
+
)
|
|
320
|
+
|
|
321
|
+
/**
|
|
322
|
+
* Eagerly starts listening to a channel by buffering incoming messages in a queue.
|
|
323
|
+
*/
|
|
324
|
+
export const toOpenChannel = (channel: WebChannel<any, any>): Effect.Effect<WebChannel<any, any>, never, Scope.Scope> =>
|
|
325
|
+
Effect.gen(function* () {
|
|
326
|
+
const queue = yield* Queue.unbounded<Either.Either<any, any>>().pipe(Effect.acquireRelease(Queue.shutdown))
|
|
327
|
+
|
|
328
|
+
yield* channel.listen.pipe(
|
|
329
|
+
Stream.tapChunk((chunk) => Queue.offerAll(queue, chunk)),
|
|
330
|
+
Stream.runDrain,
|
|
331
|
+
Effect.forkScoped,
|
|
332
|
+
)
|
|
333
|
+
|
|
334
|
+
// We're currently limiting the chunk size to 1 to not drop messages in scearnios where
|
|
335
|
+
// the listen stream get subscribed to, only take N messages and then unsubscribe.
|
|
336
|
+
// Without this limit, messages would be dropped.
|
|
337
|
+
const listen = Stream.fromQueue(queue, { maxChunkSize: 1 })
|
|
338
|
+
|
|
339
|
+
return {
|
|
340
|
+
[WebChannelSymbol]: WebChannelSymbol,
|
|
341
|
+
send: channel.send,
|
|
342
|
+
listen,
|
|
343
|
+
closedDeferred: channel.closedDeferred,
|
|
344
|
+
shutdown: channel.shutdown,
|
|
345
|
+
schema: channel.schema,
|
|
346
|
+
supportsTransferables: channel.supportsTransferables,
|
|
347
|
+
debugInfo: {
|
|
348
|
+
innerDebugInfo: channel.debugInfo,
|
|
349
|
+
listenQueueSize: queue,
|
|
350
|
+
},
|
|
351
|
+
}
|
|
352
|
+
})
|
|
353
|
+
|
|
354
|
+
export const sendDebugPing = (channel: WebChannel<any, any>) =>
|
|
355
|
+
Effect.gen(function* () {
|
|
356
|
+
yield* channel.send(DebugPingMessage.make({ message: 'ping' }))
|
|
357
|
+
})
|