@shivaedev/contract 0.25.0 → 0.27.0
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/CHANGELOG.md +30 -0
- package/README.md +8 -3
- package/dist/clientActivity.d.ts +17 -0
- package/dist/clientActivity.d.ts.map +1 -0
- package/dist/clientActivity.js +8 -0
- package/dist/clientActivity.js.map +1 -0
- package/dist/clientOptions.d.ts +3 -2
- package/dist/clientOptions.d.ts.map +1 -1
- package/dist/internal/clientActivity.d.ts +23 -0
- package/dist/internal/clientActivity.d.ts.map +1 -0
- package/dist/internal/clientActivity.js +68 -0
- package/dist/internal/clientActivity.js.map +1 -0
- package/dist/internal/clientOperations.d.ts.map +1 -1
- package/dist/internal/clientOperations.js +5 -3
- package/dist/internal/clientOperations.js.map +1 -1
- package/dist/internal/livePending.d.ts +7 -0
- package/dist/internal/livePending.d.ts.map +1 -0
- package/dist/internal/livePending.js +27 -0
- package/dist/internal/livePending.js.map +1 -0
- package/dist/internal/queryReactivity.d.ts +1 -1
- package/dist/internal/queryReactivity.d.ts.map +1 -1
- package/dist/internal/queryReactivity.js +24 -9
- package/dist/internal/queryReactivity.js.map +1 -1
- package/dist/internal/rpcClient.d.ts +6 -7
- package/dist/internal/rpcClient.d.ts.map +1 -1
- package/dist/internal/rpcClient.js +29 -7
- package/dist/internal/rpcClient.js.map +1 -1
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +12 -18
- package/dist/live.js.map +1 -1
- package/dist/makeLiveServer.d.ts.map +1 -1
- package/dist/makeLiveServer.js +2 -2
- package/dist/makeLiveServer.js.map +1 -1
- package/package.json +3 -3
- package/src/clientActivity.ts +24 -0
- package/src/clientOptions.ts +9 -7
- package/src/internal/clientActivity.ts +78 -0
- package/src/internal/clientOperations.ts +5 -3
- package/src/internal/livePending.ts +28 -0
- package/src/internal/queryReactivity.ts +29 -9
- package/src/internal/rpcClient.ts +37 -6
- package/src/live.ts +15 -18
- package/src/makeLiveServer.ts +2 -2
package/dist/live.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,QAAQ,EAAU,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAoB,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,QAAQ,EAAU,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAoB,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;AAM9F,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;IAGnB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAC5C,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,YAAY,GAAG,MAAM,GAAG,cAAc,GAAG,QAAQ,CAAC;IACvE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AACD,MAAM,WAAW,WAAW,CAAC,CAAC,EAAE,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IACzC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,SAAS,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,KAAK,SAAS,GAAG,EAAE,CAAC,CAAC;IAChG,QAAQ,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,EAAE,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C;AAID,wBAAgB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;EA4GhH"}
|
package/dist/live.js
CHANGED
|
@@ -3,6 +3,7 @@ import * as Atom from "effect/reactivity/Atom";
|
|
|
3
3
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
4
4
|
import { invalidationKeys, Key, readKeys } from "@shivaedev/changes/keys.ts";
|
|
5
5
|
import { invalidateLive } from "#internal/liveInvalidation.ts";
|
|
6
|
+
import { livePending } from "#internal/livePending.ts";
|
|
6
7
|
import { liveRetry } from "#internal/liveRetry.ts";
|
|
7
8
|
import { retryOnChange } from "#internal/retryOnChange.ts";
|
|
8
9
|
export const LiveHint = Schema.Union([
|
|
@@ -23,17 +24,19 @@ export function live(runtime, options) {
|
|
|
23
24
|
function update(value) {
|
|
24
25
|
get.set(status, { ...get.once(status), ...value });
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
pending.clear();
|
|
27
|
+
function flush() {
|
|
28
|
+
const queued = pending.take();
|
|
29
|
+
if (!get.once(paused)) {
|
|
30
|
+
invalidateLive(reactivity, queued, () => active && !get.once(paused));
|
|
31
|
+
}
|
|
32
32
|
}
|
|
33
|
+
const timer = runtime.fn((delay) => Effect.andThen(Effect.sleep(delay), Effect.sync(flush)));
|
|
34
|
+
get.mount(timer);
|
|
35
|
+
const pending = livePending((window) => get.set(timer, window), () => get.set(timer, Atom.Interrupt));
|
|
33
36
|
let active = true;
|
|
34
37
|
get.addFinalizer(() => {
|
|
35
38
|
active = false;
|
|
36
|
-
clear();
|
|
39
|
+
pending.clear();
|
|
37
40
|
if (get.registry.getNodes().has(status)) {
|
|
38
41
|
update({ connection: "connecting", failure: Option.none(), needsResync: true, pending: 0 });
|
|
39
42
|
}
|
|
@@ -47,22 +50,13 @@ export function live(runtime, options) {
|
|
|
47
50
|
invalidateLive(reactivity, keys, () => active && !get.once(paused));
|
|
48
51
|
return;
|
|
49
52
|
}
|
|
50
|
-
|
|
51
|
-
pending.add(key);
|
|
52
|
-
}
|
|
53
|
-
timer ??= setTimeout(() => {
|
|
54
|
-
const queued = [...pending];
|
|
55
|
-
clear();
|
|
56
|
-
if (!get.once(paused)) {
|
|
57
|
-
invalidateLive(reactivity, queued, () => active && !get.once(paused));
|
|
58
|
-
}
|
|
59
|
-
}, delay);
|
|
53
|
+
pending.add(keys, window);
|
|
60
54
|
}
|
|
61
55
|
function resync() {
|
|
62
56
|
if (get.once(status).connection === "failed") {
|
|
63
57
|
return;
|
|
64
58
|
}
|
|
65
|
-
clear();
|
|
59
|
+
pending.clear();
|
|
66
60
|
if (get.once(paused)) {
|
|
67
61
|
update({ needsResync: true });
|
|
68
62
|
return;
|
package/dist/live.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAmB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IACvI,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;CACjD,CAAC,CAAC;AAmBH,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,MAAM,UAAU,IAAI,CAAsB,OAA2C,EAAE,OAA0B;IAChH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAiB,OAAO,CAAC,cAAc,IAAI,WAAW,CAAC,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7H,MAAM,UAAU,GAAG,OAAO;SACxB,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAChD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1I,KAAK,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/F,SAAS,MAAM,CAAC,KAA6B;YAC5C,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAmB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IACvI,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;CACjD,CAAC,CAAC;AAmBH,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,MAAM,UAAU,IAAI,CAAsB,OAA2C,EAAE,OAA0B;IAChH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAiB,OAAO,CAAC,cAAc,IAAI,WAAW,CAAC,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7H,MAAM,UAAU,GAAG,OAAO;SACxB,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAChD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1I,KAAK,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/F,SAAS,MAAM,CAAC,KAA6B;YAC5C,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,SAAS,KAAK;YACb,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,CAAC;QACF,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,KAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7G,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjB,MAAM,OAAO,GAAG,WAAW,CAC1B,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,EAClC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CACpC,CAAC;QACF,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE;YACrB,MAAM,GAAG,KAAK,CAAC;YACf,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,MAAM,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7F,CAAC;QACF,CAAC,CAAC,CAAC;QACH,SAAS,OAAO,CAAC,WAA2B;YAC3C,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAC/D,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBACjB,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBACpE,OAAO;YACR,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,SAAS,MAAM;YACd,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAC9C,OAAO;YACR,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9B,OAAO;YACR,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9G,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC7F,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,qGAAqG;QACrG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjB,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,EAAE,CAAC;YACV,CAAC;QACF,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAClC,4EAA4E;YAC5E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACzB,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,SAAS,SAAS;YACjB,IAAI,SAAS,IAAI,OAAO,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;gBAClD,MAAM,EAAE,CAAC;YACV,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YACnC,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,SAAS,OAAO,CAAC,IAAc;gBAC9B,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACvD,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACtB,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC7F,CAAC;qBAAM,IAAI,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC9C,SAAS,EAAE,CAAC;gBACb,CAAC;qBAAM,CAAC;oBACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;gBACD,SAAS,GAAG,IAAI,CAAC;gBACjB,OAAO,GAAG,KAAK,CAAC;YACjB,CAAC;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CACzB,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAC7D,MAAM,CAAC,MAAM,CACb,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,CAAC,SAAS,CACf,OAAO,EACP,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAClB,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACvF,CAAC,EACD,OAAO,CAAC,UAAU,CAClB,CAAC;IACH,CAAC,CAAC,CACF;SACA,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;AAGjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc;;mBAIN,SAAS,GAAG,EAAE,YAAY,UAAU,KAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;;SAsD/D,CAAC,EAAE,CAAC,gBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;SACnH,CAAC,EAAE,CAAC,gBACR,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,WAC5B,UAAU,GAAG,SAAS,QACzB,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GACpB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;;gCAgBpD,CAAC"}
|
package/dist/makeLiveServer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Queue, Stream } from "effect";
|
|
1
|
+
import { Effect, Queue, Random, Stream } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { readKeys } from "@shivaedev/changes/keys.ts";
|
|
4
4
|
import { compareQueries } from "#internal/compareQueries.ts";
|
|
@@ -7,7 +7,7 @@ import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
|
7
7
|
export const makeLiveServer = Effect.gen(function* () {
|
|
8
8
|
const reactivity = yield* Reactivity.Reactivity;
|
|
9
9
|
let openStreams = 0;
|
|
10
|
-
const resyncKey = `@shivaedev/contract/resync/${
|
|
10
|
+
const resyncKey = `@shivaedev/contract/resync/${yield* Random.nextInt}`;
|
|
11
11
|
function open(keys, context) {
|
|
12
12
|
return Stream.unwrap(Effect.gen(function* () {
|
|
13
13
|
const { offer, queue } = yield* liveHintQueue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeLiveServer.js","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"makeLiveServer.js","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/contract",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.27.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -49,10 +49,10 @@
|
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@effect/platform-node": "4.0.6",
|
|
51
51
|
"@effect/vitest": "4.0.6",
|
|
52
|
-
"@shivaedev/quality": "0.48.
|
|
52
|
+
"@shivaedev/quality": "0.48.2",
|
|
53
53
|
"@shivaedev/test": "0.12.0",
|
|
54
54
|
"@shivaedev/test-sql": "0.15.0",
|
|
55
|
-
"@shivaedev/test-story": "0.
|
|
55
|
+
"@shivaedev/test-story": "0.28.0",
|
|
56
56
|
"@types/node": "24.19.2",
|
|
57
57
|
"effect": "4.0.6",
|
|
58
58
|
"esbuild": "0.28.2",
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { Effect, Stream } from "effect";
|
|
2
|
+
|
|
3
|
+
export interface ClientActivityState {
|
|
4
|
+
readonly liveHints: number;
|
|
5
|
+
readonly liveInvalidations: number;
|
|
6
|
+
readonly refreshingAtoms: number;
|
|
7
|
+
readonly rpcCalls: number;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export type ClientActivity = Stream.Stream<ClientActivityState> & { readonly current: Effect.Effect<ClientActivityState> };
|
|
11
|
+
|
|
12
|
+
export const Activity = Symbol.for("@shivaedev/contract/ClientActivity");
|
|
13
|
+
|
|
14
|
+
export interface ActiveClient {
|
|
15
|
+
readonly [Activity]: ClientActivity;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function clientActivity(client: ActiveClient): ClientActivity {
|
|
19
|
+
return client[Activity];
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export function isClientIdle(state: ClientActivityState): boolean {
|
|
23
|
+
return state.rpcCalls === 0 && state.liveInvalidations === 0 && state.refreshingAtoms === 0;
|
|
24
|
+
}
|
package/src/clientOptions.ts
CHANGED
|
@@ -6,12 +6,13 @@ import type { RpcClientError } from "effect/rpc/RpcClientError";
|
|
|
6
6
|
import type * as Socket from "effect/socket/Socket";
|
|
7
7
|
import type { LiveBound } from "#automaticLive.ts";
|
|
8
8
|
import type { Bound } from "#bind.ts";
|
|
9
|
+
import type { ActiveClient } from "#clientActivity.ts";
|
|
9
10
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
10
11
|
|
|
11
12
|
export interface ClientOptions {
|
|
12
13
|
readonly headers?: Readonly<Record<string, string>>;
|
|
13
14
|
readonly live?: boolean;
|
|
14
|
-
readonly protocol?: Layer.Layer<RpcClient.Protocol
|
|
15
|
+
readonly protocol?: Layer.Layer<RpcClient.Protocol> | ((identity: string | undefined) => Layer.Layer<RpcClient.Protocol>);
|
|
15
16
|
readonly url: string;
|
|
16
17
|
readonly webSocketConstructor?: Layer.Layer<Socket.WebSocketConstructor>;
|
|
17
18
|
}
|
|
@@ -28,9 +29,10 @@ export type MadeClient<
|
|
|
28
29
|
TRpcs extends Rpc.Any,
|
|
29
30
|
TStreams extends readonly StreamShape[],
|
|
30
31
|
TExtra extends Rpc.Any,
|
|
31
|
-
> = Layer.Layer<ClientService<TName, TRpcs | TExtra>> &
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
> = Layer.Layer<ClientService<TName, TRpcs | TExtra>> &
|
|
33
|
+
ActiveClient & {
|
|
34
|
+
readonly api: Bound<TName, TQueries, TCommands, TRpcs, ClientService<TName, TRpcs | TExtra>, TStreams> & LiveBound;
|
|
35
|
+
readonly Client: AtomRpc.AtomRpcClient<ClientService<TName, TRpcs | TExtra>, `${TName}/Client`, TRpcs | TExtra>;
|
|
36
|
+
readonly client: Effect.Effect<RpcClient.RpcClient<TRpcs | TExtra, RpcClientError>, never, Scope.Scope | Rpc.MiddlewareClient<TRpcs | TExtra>>;
|
|
37
|
+
readonly runtime: Atom.AtomRuntime<ClientService<TName, TRpcs | TExtra>>;
|
|
38
|
+
};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import type { ClientActivityState } from "#clientActivity.ts";
|
|
5
|
+
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
6
|
+
|
|
7
|
+
type ActivityTracker = ReturnType<typeof makeActivity>;
|
|
8
|
+
export const clientActivities = new WeakMap<object, ActivityTracker>();
|
|
9
|
+
|
|
10
|
+
export function makeActivity() {
|
|
11
|
+
const state = Effect.runSync(SubscriptionRef.make<ClientActivityState>({ liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }));
|
|
12
|
+
const activity = Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) });
|
|
13
|
+
function change(key: keyof ClientActivityState, delta: number) {
|
|
14
|
+
Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
|
|
15
|
+
}
|
|
16
|
+
function begin(key: "rpcCalls" | "liveInvalidations") {
|
|
17
|
+
change(key, 1);
|
|
18
|
+
return () => change(key, -1);
|
|
19
|
+
}
|
|
20
|
+
function track<A, E, R>(effect: Effect.Effect<A, E, R>) {
|
|
21
|
+
return Effect.acquireUseRelease(
|
|
22
|
+
Effect.sync(() => begin("rpcCalls")),
|
|
23
|
+
() => effect,
|
|
24
|
+
(end) => Effect.sync(end),
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
function watch<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) {
|
|
28
|
+
let watched = Atom.transform(
|
|
29
|
+
atom,
|
|
30
|
+
(get) => {
|
|
31
|
+
get.once(queryCoalesceWindow(watched));
|
|
32
|
+
get.subscribe(queryCoalesceWindow(watched), (duration) => get.set(queryCoalesceWindow(atom), duration), { immediate: true });
|
|
33
|
+
let busy = false;
|
|
34
|
+
let active = true;
|
|
35
|
+
let published = false;
|
|
36
|
+
function observe(result: AsyncResult.AsyncResult<A, E>) {
|
|
37
|
+
if (!active) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const next = result.waiting || AsyncResult.isInitial(result);
|
|
41
|
+
if (busy !== next) {
|
|
42
|
+
busy = next;
|
|
43
|
+
change("refreshingAtoms", next ? 1 : -1);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
get.addFinalizer(() => {
|
|
47
|
+
active = false;
|
|
48
|
+
if (busy) {
|
|
49
|
+
change("refreshingAtoms", -1);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
function publish(result: AsyncResult.AsyncResult<A, E>) {
|
|
53
|
+
published = true;
|
|
54
|
+
observe(result);
|
|
55
|
+
get.setSelf(result);
|
|
56
|
+
}
|
|
57
|
+
// An extra query listener would make abandoned screen work look observed.
|
|
58
|
+
const context = new Proxy(get, { get: (target, key, receiver) => (key === "setSelf" ? publish : Reflect.get(target, key, receiver)) });
|
|
59
|
+
const value = atom.read(context);
|
|
60
|
+
if (!published) {
|
|
61
|
+
observe(value);
|
|
62
|
+
}
|
|
63
|
+
return value;
|
|
64
|
+
},
|
|
65
|
+
{ initialValueTarget: atom },
|
|
66
|
+
);
|
|
67
|
+
if (atom.keepAlive) {
|
|
68
|
+
watched = Atom.keepAlive(watched);
|
|
69
|
+
} else if (atom.idleTTL !== undefined) {
|
|
70
|
+
watched = Atom.setIdleTTL(watched, atom.idleTTL);
|
|
71
|
+
}
|
|
72
|
+
if (Atom.isSerializable(atom)) {
|
|
73
|
+
Object.assign(watched, { [Atom.SerializableTypeId]: atom[Atom.SerializableTypeId] });
|
|
74
|
+
}
|
|
75
|
+
return watched;
|
|
76
|
+
}
|
|
77
|
+
return { activity, hint: () => change("liveHints", 1), queued: () => begin("liveInvalidations"), track, watch };
|
|
78
|
+
}
|
|
@@ -9,6 +9,7 @@ import type { QueryOptions } from "#bind.ts";
|
|
|
9
9
|
import type { CommandShape, QueryShape } from "#operation.ts";
|
|
10
10
|
import { MissingReadPolicy } from "#readPolicyErrors.ts";
|
|
11
11
|
import type { BindingOwner } from "./bindingOwner.ts";
|
|
12
|
+
import { clientActivities } from "./clientActivity.ts";
|
|
12
13
|
import { queryReactivity } from "./queryReactivity.ts";
|
|
13
14
|
|
|
14
15
|
type ErasedClient = AtomRpc.AtomRpcClient<unknown, string, Rpc.Rpc<string, Schema.Top, Schema.Top, Schema.Top>>;
|
|
@@ -24,7 +25,7 @@ function run<A, E>(service: ErasedClient, effect: Effect.Effect<A, E, unknown>,
|
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export function boundQuery(service: ErasedClient, tag: string, query: QueryShape, automatic: ReturnType<typeof automaticLive>, owner?: BindingOwner) {
|
|
27
|
-
const reactive = queryReactivity(service.runtime);
|
|
28
|
+
const reactive = queryReactivity(service.runtime, clientActivities.get(service)?.queued);
|
|
28
29
|
const cached = new WeakMap<ReturnType<typeof service.query>, ReturnType<typeof service.query>>();
|
|
29
30
|
return {
|
|
30
31
|
query: (payload: unknown, options: QueryOptions = {}) => {
|
|
@@ -50,8 +51,9 @@ export function boundQuery(service: ErasedClient, tag: string, query: QueryShape
|
|
|
50
51
|
Schema.toEquivalence(query.success),
|
|
51
52
|
query.live === "rerun-and-compare" ? Schema.decodeUnknownSync(Schema.toType(query.success)) : undefined,
|
|
52
53
|
);
|
|
53
|
-
|
|
54
|
-
|
|
54
|
+
const tracked = clientActivities.get(service)?.watch(result) ?? result;
|
|
55
|
+
cached.set(atom, tracked);
|
|
56
|
+
return tracked;
|
|
55
57
|
},
|
|
56
58
|
run: (payload: unknown) =>
|
|
57
59
|
run(
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { Duration } from "effect";
|
|
2
|
+
|
|
3
|
+
export function livePending(start: (window: Duration.Input) => void, stop: () => void) {
|
|
4
|
+
const pending = new Set<string>();
|
|
5
|
+
let scheduled = false;
|
|
6
|
+
return {
|
|
7
|
+
add(keys: readonly string[], window: Duration.Input) {
|
|
8
|
+
for (const key of keys) {
|
|
9
|
+
pending.add(key);
|
|
10
|
+
}
|
|
11
|
+
if (!scheduled) {
|
|
12
|
+
scheduled = true;
|
|
13
|
+
start(window);
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
clear() {
|
|
17
|
+
stop();
|
|
18
|
+
scheduled = false;
|
|
19
|
+
pending.clear();
|
|
20
|
+
},
|
|
21
|
+
take() {
|
|
22
|
+
const queued = [...pending];
|
|
23
|
+
scheduled = false;
|
|
24
|
+
pending.clear();
|
|
25
|
+
return queued;
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
}
|
|
@@ -6,7 +6,7 @@ import * as Reactivity from "effect/reactivity/Reactivity";
|
|
|
6
6
|
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
7
7
|
import { liveBatches, liveKeys } from "./liveInvalidation.ts";
|
|
8
8
|
|
|
9
|
-
export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E
|
|
9
|
+
export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E>, queue?: () => () => void) {
|
|
10
10
|
const service = runtime.atom(Effect.service(Reactivity.Reactivity));
|
|
11
11
|
type Query = Atom.Atom<AsyncResult.AsyncResult<unknown, unknown>>;
|
|
12
12
|
const cached = new WeakMap<Query, Query>();
|
|
@@ -31,14 +31,33 @@ export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E>) {
|
|
|
31
31
|
}
|
|
32
32
|
const reactivity = context.value;
|
|
33
33
|
let pending: (() => boolean) | undefined;
|
|
34
|
-
let
|
|
34
|
+
let queued: (() => void) | undefined;
|
|
35
|
+
function dequeue() {
|
|
36
|
+
if (!scheduled && pending === undefined) {
|
|
37
|
+
queued?.();
|
|
38
|
+
queued = undefined;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
let scheduled = false;
|
|
42
|
+
const timer = runtime.fn(({ delay, active }: { readonly delay: number; readonly active: () => boolean }) =>
|
|
43
|
+
Effect.andThen(
|
|
44
|
+
Effect.sleep(delay),
|
|
45
|
+
Effect.sync(() => {
|
|
46
|
+
scheduled = false;
|
|
47
|
+
refresh(active);
|
|
48
|
+
}),
|
|
49
|
+
),
|
|
50
|
+
);
|
|
51
|
+
get.mount(timer);
|
|
35
52
|
function clear() {
|
|
36
|
-
|
|
37
|
-
|
|
53
|
+
get.set(timer, Atom.Interrupt);
|
|
54
|
+
scheduled = false;
|
|
38
55
|
pending = undefined;
|
|
56
|
+
dequeue();
|
|
39
57
|
}
|
|
40
58
|
function refresh(active: () => boolean) {
|
|
41
59
|
if (!active()) {
|
|
60
|
+
dequeue();
|
|
42
61
|
return;
|
|
43
62
|
}
|
|
44
63
|
if (get.once(source).waiting) {
|
|
@@ -46,6 +65,7 @@ export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E>) {
|
|
|
46
65
|
} else {
|
|
47
66
|
pending = undefined;
|
|
48
67
|
get.refresh(source);
|
|
68
|
+
dequeue();
|
|
49
69
|
}
|
|
50
70
|
}
|
|
51
71
|
function changed() {
|
|
@@ -58,11 +78,10 @@ export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E>) {
|
|
|
58
78
|
if (delay === 0) {
|
|
59
79
|
clear();
|
|
60
80
|
get.refresh(source);
|
|
61
|
-
} else {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}, delay);
|
|
81
|
+
} else if (!scheduled) {
|
|
82
|
+
queued ??= queue?.();
|
|
83
|
+
scheduled = true;
|
|
84
|
+
get.set(timer, { active: batch.active, delay });
|
|
66
85
|
}
|
|
67
86
|
}
|
|
68
87
|
get.addFinalizer(clear);
|
|
@@ -83,6 +102,7 @@ export function queryReactivity<R, E>(runtime: Atom.AtomRuntime<R, E>) {
|
|
|
83
102
|
if (active()) {
|
|
84
103
|
get.refresh(source);
|
|
85
104
|
}
|
|
105
|
+
dequeue();
|
|
86
106
|
}
|
|
87
107
|
});
|
|
88
108
|
return get.once(source);
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { type Context, Effect, Layer, Schedule } from "effect";
|
|
1
|
+
import { Clock, type Context, Effect, Layer, Schedule, Stream } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
4
4
|
import { type Rpc, RpcClient, RpcGroup, RpcSerialization } from "effect/rpc";
|
|
5
5
|
import * as Socket from "effect/socket/Socket";
|
|
6
|
+
import { Activity } from "#clientActivity.ts";
|
|
6
7
|
import type { ClientOptions } from "#clientOptions.ts";
|
|
8
|
+
import { clientActivities, makeActivity } from "./clientActivity.ts";
|
|
7
9
|
|
|
8
10
|
export interface RpcSource {
|
|
9
11
|
readonly annotations: Context.Context<never>;
|
|
@@ -11,6 +13,7 @@ export interface RpcSource {
|
|
|
11
13
|
}
|
|
12
14
|
|
|
13
15
|
export function rpcClient(name: string, source: RpcSource, options: ClientOptions) {
|
|
16
|
+
const activity = makeActivity();
|
|
14
17
|
const group = RpcGroup.make(...source.requests.values()).annotateMerge(source.annotations);
|
|
15
18
|
function sharedProtocol(identity?: string) {
|
|
16
19
|
return socketProtocol({
|
|
@@ -20,14 +23,40 @@ export function rpcClient(name: string, source: RpcSource, options: ClientOption
|
|
|
20
23
|
webSocketConstructor: options.webSocketConstructor,
|
|
21
24
|
});
|
|
22
25
|
}
|
|
23
|
-
const
|
|
26
|
+
const customProtocol = options.protocol;
|
|
27
|
+
const protocolFor = typeof customProtocol === "function" ? customProtocol : sharedProtocol;
|
|
28
|
+
const protocol = typeof customProtocol === "function" ? customProtocol(undefined) : (customProtocol ?? sharedProtocol());
|
|
29
|
+
function observeClient<T extends (...args: never[]) => unknown>(client: T): T {
|
|
30
|
+
return new Proxy(client, {
|
|
31
|
+
apply(target, receiver, args) {
|
|
32
|
+
const result = Reflect.apply(target, receiver, args);
|
|
33
|
+
if (String(args[0]).endsWith(".$changes") && Stream.isStream(result)) {
|
|
34
|
+
// Publish after the consumer handles the hint so idle cannot race its invalidation.
|
|
35
|
+
return result.pipe(
|
|
36
|
+
Stream.flatMap((hint) => Stream.concat(Stream.succeed(hint), Stream.fromEffect(Effect.sync(activity.hint)).pipe(Stream.drain))),
|
|
37
|
+
);
|
|
38
|
+
}
|
|
39
|
+
return Effect.isEffect(result) && !args[2]?.asQueue ? activity.track(result) : result;
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
const make = RpcClient.make(group, { flatten: true }).pipe(Effect.map(observeClient));
|
|
24
44
|
const Client = AtomRpc.Service<unknown>()(`${name}/Client`, {
|
|
25
45
|
group,
|
|
26
|
-
|
|
46
|
+
makeEffect: make,
|
|
47
|
+
protocol: typeof customProtocol === "object" ? customProtocol : (get) => protocolFor(get(socketIdentity)),
|
|
27
48
|
});
|
|
28
|
-
|
|
29
|
-
const
|
|
30
|
-
|
|
49
|
+
clientActivities.set(Client, activity);
|
|
50
|
+
const directClient = Effect.flatMap(Layer.build(protocol), (context) =>
|
|
51
|
+
make.pipe(
|
|
52
|
+
Effect.map((flat) =>
|
|
53
|
+
Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload: never, callOptions: never) => flat(tag, payload, callOptions)])),
|
|
54
|
+
),
|
|
55
|
+
Effect.provideContext(context),
|
|
56
|
+
),
|
|
57
|
+
);
|
|
58
|
+
const layer = Layer.effect(Client, make).pipe(Layer.provide(protocol));
|
|
59
|
+
return Object.assign(layer, { [Activity]: activity.activity, Client, client: directClient, runtime: Client.runtime });
|
|
31
60
|
}
|
|
32
61
|
|
|
33
62
|
export const socketIdentity = Atom.make<string | undefined>(undefined);
|
|
@@ -49,6 +78,8 @@ const socketProtocol = Atom.family(
|
|
|
49
78
|
),
|
|
50
79
|
),
|
|
51
80
|
Layer.provide(RpcSerialization.layerNdjson),
|
|
81
|
+
// Socket deadlines follow network time even when application time is simulated.
|
|
82
|
+
Layer.provide(Layer.succeed(Clock.Clock, Clock.Clock.defaultValue())),
|
|
52
83
|
);
|
|
53
84
|
return Layer.effectContext(Effect.flatMap(Effect.scope, (scope) => Layer.buildWithMemoMap(protocol, socketMemoMap, scope)));
|
|
54
85
|
},
|
package/src/live.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
|
4
4
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
5
5
|
import { invalidationKeys, Key, type KeyContext, readKeys } from "@shivaedev/changes/keys.ts";
|
|
6
6
|
import { invalidateLive } from "#internal/liveInvalidation.ts";
|
|
7
|
+
import { livePending } from "#internal/livePending.ts";
|
|
7
8
|
import { liveRetry } from "#internal/liveRetry.ts";
|
|
8
9
|
import { retryOnChange } from "#internal/retryOnChange.ts";
|
|
9
10
|
|
|
@@ -45,17 +46,22 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
45
46
|
function update(value: Partial<LiveStatus<E>>) {
|
|
46
47
|
get.set(status, { ...get.once(status), ...value });
|
|
47
48
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
pending.clear();
|
|
49
|
+
function flush() {
|
|
50
|
+
const queued = pending.take();
|
|
51
|
+
if (!get.once(paused)) {
|
|
52
|
+
invalidateLive(reactivity, queued, () => active && !get.once(paused));
|
|
53
|
+
}
|
|
54
54
|
}
|
|
55
|
+
const timer = runtime.fn((delay: Duration.Input) => Effect.andThen(Effect.sleep(delay), Effect.sync(flush)));
|
|
56
|
+
get.mount(timer);
|
|
57
|
+
const pending = livePending(
|
|
58
|
+
(window) => get.set(timer, window),
|
|
59
|
+
() => get.set(timer, Atom.Interrupt),
|
|
60
|
+
);
|
|
55
61
|
let active = true;
|
|
56
62
|
get.addFinalizer(() => {
|
|
57
63
|
active = false;
|
|
58
|
-
clear();
|
|
64
|
+
pending.clear();
|
|
59
65
|
if (get.registry.getNodes().has(status)) {
|
|
60
66
|
update({ connection: "connecting", failure: Option.none(), needsResync: true, pending: 0 });
|
|
61
67
|
}
|
|
@@ -69,22 +75,13 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
69
75
|
invalidateLive(reactivity, keys, () => active && !get.once(paused));
|
|
70
76
|
return;
|
|
71
77
|
}
|
|
72
|
-
|
|
73
|
-
pending.add(key);
|
|
74
|
-
}
|
|
75
|
-
timer ??= setTimeout(() => {
|
|
76
|
-
const queued = [...pending];
|
|
77
|
-
clear();
|
|
78
|
-
if (!get.once(paused)) {
|
|
79
|
-
invalidateLive(reactivity, queued, () => active && !get.once(paused));
|
|
80
|
-
}
|
|
81
|
-
}, delay);
|
|
78
|
+
pending.add(keys, window);
|
|
82
79
|
}
|
|
83
80
|
function resync() {
|
|
84
81
|
if (get.once(status).connection === "failed") {
|
|
85
82
|
return;
|
|
86
83
|
}
|
|
87
|
-
clear();
|
|
84
|
+
pending.clear();
|
|
88
85
|
if (get.once(paused)) {
|
|
89
86
|
update({ needsResync: true });
|
|
90
87
|
return;
|
package/src/makeLiveServer.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Queue, Stream } from "effect";
|
|
1
|
+
import { Effect, Queue, Random, Stream } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { type Key, type KeyContext, readKeys } from "@shivaedev/changes/keys.ts";
|
|
4
4
|
import { compareQueries } from "#internal/compareQueries.ts";
|
|
@@ -11,7 +11,7 @@ import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
|
11
11
|
export const makeLiveServer = Effect.gen(function* () {
|
|
12
12
|
const reactivity = yield* Reactivity.Reactivity;
|
|
13
13
|
let openStreams = 0;
|
|
14
|
-
const resyncKey = `@shivaedev/contract/resync/${
|
|
14
|
+
const resyncKey = `@shivaedev/contract/resync/${yield* Random.nextInt}`;
|
|
15
15
|
function open(keys: readonly Key[], context?: KeyContext): Stream.Stream<LiveHint> {
|
|
16
16
|
return Stream.unwrap(
|
|
17
17
|
Effect.gen(function* () {
|