@shivaedev/contract 0.34.0 → 0.35.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 +12 -0
- package/README.md +6 -2
- package/dist/HostVersion.d.ts +31 -0
- package/dist/HostVersion.d.ts.map +1 -0
- package/dist/HostVersion.js +7 -0
- package/dist/HostVersion.js.map +1 -0
- package/dist/adapters/activityState.d.ts +3 -2
- package/dist/adapters/activityState.d.ts.map +1 -1
- package/dist/adapters/activityState.js +4 -1
- package/dist/adapters/activityState.js.map +1 -1
- package/dist/adapters/clientConnection.d.ts +8 -0
- package/dist/adapters/clientConnection.d.ts.map +1 -0
- package/dist/adapters/clientConnection.js +22 -0
- package/dist/adapters/clientConnection.js.map +1 -0
- package/dist/automaticLive.d.ts.map +1 -1
- package/dist/automaticLive.js +3 -1
- package/dist/automaticLive.js.map +1 -1
- package/dist/clientActivity.d.ts +6 -0
- package/dist/clientActivity.d.ts.map +1 -1
- package/dist/clientActivity.js +1 -1
- package/dist/clientActivity.js.map +1 -1
- package/dist/internal/automaticQuery.d.ts +2 -2
- package/dist/internal/automaticQuery.d.ts.map +1 -1
- package/dist/internal/automaticQuery.js +12 -10
- package/dist/internal/automaticQuery.js.map +1 -1
- package/dist/internal/clientActivity.d.ts +7 -1
- package/dist/internal/clientActivity.d.ts.map +1 -1
- package/dist/internal/clientActivity.js +13 -3
- package/dist/internal/clientActivity.js.map +1 -1
- package/dist/internal/liveRetry.d.ts +2 -2
- package/dist/internal/liveRetry.d.ts.map +1 -1
- package/dist/internal/liveRetry.js +6 -3
- package/dist/internal/liveRetry.js.map +1 -1
- package/dist/internal/rpcClient.d.ts +2 -0
- package/dist/internal/rpcClient.d.ts.map +1 -1
- package/dist/internal/rpcClient.js +1 -1
- package/dist/internal/rpcClient.js.map +1 -1
- package/dist/live.d.ts +1 -0
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +14 -3
- package/dist/live.js.map +1 -1
- package/package.json +7 -7
- package/src/HostVersion.ts +7 -0
- package/src/adapters/activityState.ts +10 -3
- package/src/adapters/clientConnection.ts +37 -0
- package/src/automaticLive.ts +3 -1
- package/src/clientActivity.ts +9 -2
- package/src/internal/automaticQuery.ts +13 -11
- package/src/internal/clientActivity.ts +13 -3
- package/src/internal/liveRetry.ts +9 -2
- package/src/internal/rpcClient.ts +1 -1
- package/src/live.ts +15 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.35.0 - 2026-11-04
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Client activity and its screen signal carry the same shared connection status.
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- Resume signals interrupt live retry backoff and reconnect immediately, resetting the next retry delay.
|
|
12
|
+
- Bound commands with a declared `BadRequest` return payload construction and encoding failures as that typed rejection, including struct-level validation details.
|
|
13
|
+
- Live binding discovery traverses nested object and array properties, preserves explicit binding lists, and visits shared objects and cycles once.
|
|
14
|
+
|
|
3
15
|
## 0.34.0 - 2026-11-04
|
|
4
16
|
|
|
5
17
|
### Added
|
package/README.md
CHANGED
|
@@ -294,9 +294,13 @@ The dependency rule is deliberately asymmetric:
|
|
|
294
294
|
|
|
295
295
|
Client invalidation follows RPC success. Database hosts from `@shivaedev/server` also publish declared command invalidations automatically after the handler succeeds, excluding keys already announced by repository commits, using `transact` from [`sql`](https://github.com/ShivaeDev/platform/tree/main/packages/sql); commit-bound changes belong to [`changes`](https://github.com/ShivaeDev/platform/tree/main/packages/changes).
|
|
296
296
|
|
|
297
|
+
### Host build announcements
|
|
298
|
+
|
|
299
|
+
`HostVersion` from `@shivaedev/contract/HostVersion.ts` declares the native `platform.hostVersion.watch` string stream shared by the application host and React's deploy controller. The host announces its configured build ID on subscription, including after a host replacement reconnects. It uses the same shared WebSocket connection as other `makeClient` bindings with matching transport options. Applications normally use the controller from `@shivaedev/react/client/deployUpdate.ts` rather than consuming this stream directly.
|
|
300
|
+
|
|
297
301
|
### Client activity
|
|
298
302
|
|
|
299
|
-
`clientActivity(client)` from `@shivaedev/contract/clientActivity.ts` returns a native Effect `Stream` with a `current` Effect for a client made by `makeClient`. Its state reports `rpcCalls` for finite calls, `liveInvalidations` for queued live refreshes, `refreshingAtoms` for mounted query atoms awaiting values, and a `liveHints` sequence for received subscription updates. Long-lived streams do not count as finite calls. `isClientIdle(state)` is true when all three work counts are zero. Observe its stream or pass `activityScreenSignal(clientActivity(client))` to a test-story screen driver's `pending` option and call `settle()` before screen assertions. `activityScreenSignal(activity)` projects the stream and its `current` Effect into `{ pending, hints }`, with `pending` true while finite work remains and `hints` carrying the received live-hint count. The returned shape is structural and carries no test-story dependency. Coalesced work stays pending until its refresh completes.
|
|
303
|
+
`clientActivity(client)` from `@shivaedev/contract/clientActivity.ts` returns a native Effect `Stream` with a `current` Effect for a client made by `makeClient`. Its state includes `connectionStatus`, a `"live" | "reconnecting"` value aggregated across mounted queries from all bindings of the same client service, with changes debounced for 300 ms on the client runtime’s Clock. Refused subscriptions do not count as reconnecting. The stream also exposes its native `connectionStatus` atom for React readers. Its state reports `rpcCalls` for finite calls, `liveInvalidations` for queued live refreshes, `refreshingAtoms` for mounted query atoms awaiting values, and a `liveHints` sequence for received subscription updates. Long-lived streams do not count as finite calls. `isClientIdle(state)` is true when all three work counts are zero. Observe its stream or pass `activityScreenSignal(clientActivity(client))` to a test-story screen driver's `pending` option and call `settle()` before screen assertions. `activityScreenSignal(activity)` projects the stream and its `current` Effect into `{ pending, hints, connectionStatus }`, with `pending` true while finite work remains and `hints` carrying the received live-hint count. The returned shape is structural and carries no test-story dependency. Coalesced work stays pending until its refresh completes.
|
|
300
304
|
|
|
301
305
|
### Query completion
|
|
302
306
|
|
|
@@ -522,7 +526,7 @@ const status = registry.get(updates.status);
|
|
|
522
526
|
|
|
523
527
|
While paused, live coordination keeps observing hints and suppresses automatic refresh. `status.pending` saturates at 256 observations. Unpausing reconciles the explicit scope and resets the count. A resume signal also requests reconciliation: an injected native source and visible browser `online` and `visibilitychange` events request it, while hidden events do not.
|
|
524
528
|
|
|
525
|
-
`status` exposes `connection`, `failure`, `needsResync` and `pending`. Expected stream rejections settle with `connection: "failed"` and their typed cause in `failure`. Typed rejections do not retry on a timer. An initial `QueryReadDenied` refusal stays settled through matching change invalidations and resume events; changing the query input or viewer identity starts a new subscription. A denial delivered on an established subscription also sets `connection: "failed"`, but the stream remains open and a later authorized hint restores the query and live status. Other expected rejections can reopen on matching invalidations. Low-level `live()` listens to `retryKeys`, defaulting to its `resyncKeys`, for matching invalidations. Transport errors and server defects reconnect with jittered exponential backoff, starting at `retryDelay` (one second by default) and capped at a nominal 30 seconds. A reconnection reconciles changes missed while disconnected, and successful delivery clears the stream failure. Native query atoms keep previous successful data during a read failure and reject stale responses after invalidation. Query failures remain in their own `AsyncResult`; stream failures appear in `status.failure`.
|
|
529
|
+
`status` exposes `connection`, `failure`, `needsResync` and `pending`. Expected stream rejections settle with `connection: "failed"` and their typed cause in `failure`. Typed rejections do not retry on a timer. An initial `QueryReadDenied` refusal stays settled through matching change invalidations and resume events; changing the query input or viewer identity starts a new subscription. A denial delivered on an established subscription also sets `connection: "failed"`, but the stream remains open and a later authorized hint restores the query and live status. Other expected rejections can reopen on matching invalidations. Low-level `live()` listens to `retryKeys`, defaulting to its `resyncKeys`, for matching invalidations. Transport errors and server defects reconnect with jittered exponential backoff, starting at `retryDelay` (one second by default) and capped at a nominal 30 seconds. A resume signal interrupts that delay, retries immediately and resets the backoff schedule. Healthy hint subscriptions reconcile without reopening; pushed subscriptions reopen to obtain their current value. A reconnection reconciles changes missed while disconnected, and successful delivery clears the stream failure. Native query atoms keep previous successful data during a read failure and reject stale responses after invalidation. Query failures remain in their own `AsyncResult`; stream failures appear in `status.failure`.
|
|
526
530
|
|
|
527
531
|
A `$changes` request is authorized as a whole: one denied member rejects or ends the entire batch, including its other queries. Split queries with independent permissions into separate `$changes` requests. Automatic bound query atoms already subscribe separately.
|
|
528
532
|
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export declare const HostVersion: import("#contract.ts").Contract<"platform.hostVersion", readonly [], readonly [], import("effect/rpc/Rpc").Rpc<"platform.hostVersion.$changes", Schema.Struct<{
|
|
3
|
+
queries: Schema.$Array<Schema.Union<readonly never[]>>;
|
|
4
|
+
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Union<readonly [Schema.Struct<{
|
|
5
|
+
readonly _tag: Schema.Literal<"Changed">;
|
|
6
|
+
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
7
|
+
readonly _tag: Schema.Literal<"Bucket">;
|
|
8
|
+
readonly collection: Schema.String;
|
|
9
|
+
readonly field: Schema.String;
|
|
10
|
+
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
11
|
+
}>, Schema.Struct<{
|
|
12
|
+
readonly _tag: Schema.Literal<"List">;
|
|
13
|
+
readonly collection: Schema.String;
|
|
14
|
+
}>, Schema.Struct<{
|
|
15
|
+
readonly _tag: Schema.Literal<"Item">;
|
|
16
|
+
readonly collection: Schema.String;
|
|
17
|
+
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
18
|
+
}>]>>;
|
|
19
|
+
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
20
|
+
}>, Schema.Struct<{
|
|
21
|
+
readonly _tag: Schema.Literal<"Resync">;
|
|
22
|
+
}>]>, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired, ...never[]]>>, Schema.Never, import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
23
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
24
|
+
readonly payload: unknown;
|
|
25
|
+
}) => import("effect/Effect").Effect<A, E | import("./readPolicyErrors.ts").MissingReadPolicy | import("./readPolicyErrors.ts").QueryReadDenied | import("./WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
26
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
27
|
+
"~ClientError": never;
|
|
28
|
+
error: Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired]>;
|
|
29
|
+
requiredForClient: false;
|
|
30
|
+
}, never> | import("effect/rpc/Rpc").Rpc<"platform.hostVersion.watch", Schema.Void, import("effect/rpc/RpcSchema").Stream<Schema.String, Schema.Never>, Schema.Never, never, never>, readonly [NoInfer<import("#operation.ts").Streaming<"watch", Schema.Void, Schema.String, {}>>], undefined>;
|
|
31
|
+
//# sourceMappingURL=HostVersion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HostVersion.d.ts","sourceRoot":"","sources":["../src/HostVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;+RAEtB,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { contract } from "#contract.ts";
|
|
3
|
+
import { stream } from "#operation.ts";
|
|
4
|
+
export const HostVersion = contract("platform.hostVersion", {
|
|
5
|
+
streams: [stream("watch", { reads: () => [], success: Schema.String })],
|
|
6
|
+
});
|
|
7
|
+
//# sourceMappingURL=HostVersion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HostVersion.js","sourceRoot":"","sources":["../src/HostVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC,sBAAsB,EAAE;IAC3D,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;CACvE,CAAC,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import type { ClientActivityState } from "#clientActivity.ts";
|
|
2
|
+
import type { ClientActivityState, ConnectionStatus } from "#clientActivity.ts";
|
|
3
3
|
export declare function activityState(): {
|
|
4
4
|
activity: import("effect/Stream").Stream<ClientActivityState, never, never> & {
|
|
5
5
|
current: Effect.Effect<ClientActivityState, never, never>;
|
|
6
6
|
};
|
|
7
|
-
change: (key: keyof ClientActivityState, delta: number) => void;
|
|
7
|
+
change: (key: Exclude<keyof ClientActivityState, "connectionStatus">, delta: number) => void;
|
|
8
|
+
setConnection: (connectionStatus: ConnectionStatus) => void;
|
|
8
9
|
};
|
|
9
10
|
//# sourceMappingURL=activityState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityState.d.ts","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"activityState.d.ts","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,wBAAgB,aAAa;IAK3B,QAAQ;;;IACR,MAAM,QAAQ,OAAO,CAAC,MAAM,mBAAmB,EAAE,kBAAkB,CAAC,SAAS,MAAM;IAGnF,aAAa,qBAAqB,gBAAgB;EAMnD"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { Effect, SubscriptionRef } from "effect";
|
|
2
2
|
export function activityState() {
|
|
3
|
-
const state = Effect.runSync(SubscriptionRef.make({ liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }));
|
|
3
|
+
const state = Effect.runSync(SubscriptionRef.make({ connectionStatus: "live", liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }));
|
|
4
4
|
return {
|
|
5
5
|
activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
|
|
6
6
|
change: (key, delta) => {
|
|
7
7
|
Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
|
|
8
8
|
},
|
|
9
|
+
setConnection: (connectionStatus) => {
|
|
10
|
+
Effect.runSync(SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })));
|
|
11
|
+
},
|
|
9
12
|
};
|
|
10
13
|
}
|
|
11
14
|
//# sourceMappingURL=activityState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAGjD,MAAM,UAAU,aAAa;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAGjD,MAAM,UAAU,aAAa;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAC3B,eAAe,CAAC,IAAI,CAAsB,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAC5I,CAAC;IACF,OAAO;QACN,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAChG,MAAM,EAAE,CAAC,GAA2D,EAAE,KAAa,EAAE,EAAE;YACtF,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3G,CAAC;QACD,aAAa,EAAE,CAAC,gBAAkC,EAAE,EAAE;YACrD,MAAM,CAAC,OAAO,CACb,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,KAAK,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CACxI,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
2
|
+
import type { ConnectionStatus } from "#clientActivity.ts";
|
|
3
|
+
import type { LiveStatus } from "#live.ts";
|
|
4
|
+
export declare function clientConnection(factory: Atom.RuntimeFactory, publish: (status: ConnectionStatus) => void): {
|
|
5
|
+
status: Atom.Atom<ConnectionStatus>;
|
|
6
|
+
statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>, ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=clientConnection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI;;;EA8BzG"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Stream } from "effect";
|
|
2
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
export function clientConnection(factory, publish) {
|
|
5
|
+
const statuses = Atom.make(new Map());
|
|
6
|
+
const current = Atom.map(statuses, (values) => [...values.values()].some(({ connection }) => connection === "connecting" || connection === "reconnecting") ? "reconnecting" : "live");
|
|
7
|
+
const runtime = factory(Layer.empty);
|
|
8
|
+
const status = Atom.make((get) => {
|
|
9
|
+
const context = AsyncResult.value(get(runtime));
|
|
10
|
+
if (Option.isNone(context)) {
|
|
11
|
+
return "live";
|
|
12
|
+
}
|
|
13
|
+
const cancel = Effect.runCallbackWith(context.value)(get.stream(current).pipe(Stream.changes, Stream.debounce("300 millis"), Stream.runForEach((value) => Effect.sync(() => {
|
|
14
|
+
publish(value);
|
|
15
|
+
get.setSelf(value);
|
|
16
|
+
})), Effect.ensuring(Effect.sync(() => publish("live")))));
|
|
17
|
+
get.addFinalizer(cancel);
|
|
18
|
+
return "live";
|
|
19
|
+
});
|
|
20
|
+
return { status, statuses };
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=clientConnection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientConnection.js","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAI/C,MAAM,UAAU,gBAAgB,CAAC,OAA4B,EAAE,OAA2C;IACzG,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CACvB,QAAQ,EACR,CAAC,MAAM,EAAoB,EAAE,CAC5B,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,KAAK,YAAY,IAAI,UAAU,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CACtI,CAAC;IACF,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAoB,EAAE;QAClD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CACnD,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC7B,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACf,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,CACF,EACD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CACnD,CACD,CAAC;QACF,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC;IACf,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAU,KAAK,MAAM,EAAU,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAU,KAAK,MAAM,EAAU,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAQ9D,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,UAAU,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAgB,MAAM,YAAY,CAAC;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD,eAAO,MAAM,cAAc,eAAmD,CAAC;AAC/E,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE;QAC1B,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;QACtD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACxC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;KAChD,CAAC;CACF;AAID,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAChD,OAAO,EACP,MAAM,EACN,GAAG,CAAC,GAAG,CACN,GAAG,MAAM,WAAW,EACpB,MAAM,CAAC,MAAM,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAA;KAAE,CAAC,CAAC,CAAA;CAAE,CAAC,EAC3G,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAC5D,MAAM,CAAC,KAAK,CACZ,CACD,CAAC;AAEF,wBAAgB,aAAa,CAC5B,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,YAAY,EACrB,OAAO,UAAO,EACd,YAAY,CAAC,EAAE,YAAY;YAkBZ,CAAC,EAAE,CAAC,QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aACnC,cAAc,QACnB,SAAS,GAAG,EAAE,cACR,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,WACjC,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,YACpB,OAAO,CAAC,KAAK;;;;;;;;EA2CxB"}
|
package/dist/automaticLive.js
CHANGED
|
@@ -2,6 +2,7 @@ import { Effect, Stream } from "effect";
|
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
|
|
4
4
|
import { automaticQuery } from "#internal/automaticQuery.ts";
|
|
5
|
+
import { clientActivities } from "#internal/clientActivity.ts";
|
|
5
6
|
import { queryDelivery } from "#internal/queryDelivery.ts";
|
|
6
7
|
import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
|
|
7
8
|
import { queryProgress } from "#internal/querySignals.ts";
|
|
@@ -39,6 +40,7 @@ export function automaticLive(service, name, owner, resume, enabled = true, resu
|
|
|
39
40
|
const subscription = live(service.runtime, {
|
|
40
41
|
initialResync: false,
|
|
41
42
|
keyContext: owner?.context,
|
|
43
|
+
reopenOnResume: decode !== undefined,
|
|
42
44
|
resume: signal,
|
|
43
45
|
resyncKeys: decode === undefined ? localQueryKeys(keys) : [],
|
|
44
46
|
retryKeys: keys,
|
|
@@ -47,12 +49,12 @@ export function automaticLive(service, name, owner, resume, enabled = true, resu
|
|
|
47
49
|
const gated = automaticQuery({
|
|
48
50
|
assertOwner,
|
|
49
51
|
atom,
|
|
52
|
+
clientStatuses: clientActivities.get(service)?.statuses,
|
|
50
53
|
coalesceWindow,
|
|
51
54
|
equivalent,
|
|
52
55
|
paused,
|
|
53
56
|
pushed: decode !== undefined,
|
|
54
57
|
ready,
|
|
55
|
-
signal,
|
|
56
58
|
signals,
|
|
57
59
|
source,
|
|
58
60
|
statuses,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAe,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGpE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAK/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAmB,IAAI,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAwC,YAAY,EAAE,MAAM,YAAY,CAAC;AAKhF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAW/E,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAa5F,MAAM,UAAU,aAAa,CAC5B,OAAsB,EACtB,IAAY,EACZ,KAAoB,EACpB,MAAqB,EACrB,OAAO,GAAG,IAAI,EACd,YAA2B;IAE3B,SAAS,WAAW,CAAC,GAAqB;QACzC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC3E,CAAC;IACF,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAiB,WAAW,CAAC,CAAC,CAAC;IAC9E,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,YAAY,IAAI,CAAC,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1I,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACpC,WAAW,CAAC,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,SAAS,KAAK,CACb,IAA8C,EAC9C,SAAyB,EACzB,IAAoB,EACpB,UAA0C,EAC1C,MAA8B,EAC9B,OAAuB;QAEvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC7F,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAC1C,aAAa,EAAE,KAAK;YACpB,UAAU,EAAE,KAAK,EAAE,OAAO;YAC1B,cAAc,EAAE,MAAM,KAAK,SAAS;YACpC,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YAC5D,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACrI,QAAQ,CAAC,MAAM,EACf,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CACjD;SACD,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,cAAc,CAAC;YAC5B,WAAW;YACX,IAAI;YACJ,cAAc,EAAE,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ;YACvD,cAAc;YACd,UAAU;YACV,MAAM;YACN,MAAM,EAAE,MAAM,KAAK,SAAS;YAC5B,KAAK;YACL,OAAO;YACP,MAAM;YACN,QAAQ;YACR,YAAY;SACZ,CAAC,CAAC;QACH,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;AAC1G,CAAC"}
|
package/dist/clientActivity.d.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import { Effect, Stream } from "effect";
|
|
2
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
export type ConnectionStatus = "live" | "reconnecting";
|
|
2
4
|
export interface ClientActivityState {
|
|
5
|
+
readonly connectionStatus: ConnectionStatus;
|
|
3
6
|
readonly liveHints: number;
|
|
4
7
|
readonly liveInvalidations: number;
|
|
5
8
|
readonly refreshingAtoms: number;
|
|
6
9
|
readonly rpcCalls: number;
|
|
7
10
|
}
|
|
8
11
|
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
12
|
+
readonly connectionStatus: Atom.Atom<ConnectionStatus>;
|
|
9
13
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
10
14
|
};
|
|
11
15
|
export declare const Activity: unique symbol;
|
|
@@ -15,10 +19,12 @@ export interface ActiveClient {
|
|
|
15
19
|
export declare function clientActivity(client: ActiveClient): ClientActivity;
|
|
16
20
|
export declare function isClientIdle(state: ClientActivityState): boolean;
|
|
17
21
|
export declare function activityScreenSignal(activity: ClientActivity): Stream.Stream<{
|
|
22
|
+
connectionStatus: ConnectionStatus;
|
|
18
23
|
hints: number;
|
|
19
24
|
pending: boolean;
|
|
20
25
|
}, never, never> & {
|
|
21
26
|
current: Effect.Effect<{
|
|
27
|
+
connectionStatus: ConnectionStatus;
|
|
22
28
|
hints: number;
|
|
23
29
|
pending: boolean;
|
|
24
30
|
}, never, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,cAAc,CAAC;AAEvD,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IACjE,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;CACrD,CAAC;AAEF,eAAO,MAAM,QAAQ,eAAmD,CAAC;AAEzE,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;CACpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAEnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;EAK5D"}
|
package/dist/clientActivity.js
CHANGED
|
@@ -8,7 +8,7 @@ export function isClientIdle(state) {
|
|
|
8
8
|
}
|
|
9
9
|
export function activityScreenSignal(activity) {
|
|
10
10
|
function screenState(state) {
|
|
11
|
-
return { hints: state.liveHints, pending: !isClientIdle(state) };
|
|
11
|
+
return { connectionStatus: state.connectionStatus, hints: state.liveHints, pending: !isClientIdle(state) };
|
|
12
12
|
}
|
|
13
13
|
return Object.assign(Stream.map(activity, screenState), { current: Effect.map(activity.current, screenState) });
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAkBxC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAMzE,MAAM,UAAU,cAAc,CAAC,MAAoB;IAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAA0B;IACtD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,KAAK,CAAC,eAAe,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAwB;IAC5D,SAAS,WAAW,CAAC,KAA0B;QAC9C,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5G,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AACjH,CAAC"}
|
|
@@ -7,17 +7,17 @@ import type { QuerySignals } from "#querySignals.ts";
|
|
|
7
7
|
interface GateOptions<A, E> {
|
|
8
8
|
readonly assertOwner: (get: Atom.AtomContext) => void;
|
|
9
9
|
readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
10
|
+
readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
|
|
10
11
|
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
11
12
|
readonly equivalent: (left: A, right: A) => boolean;
|
|
12
13
|
readonly paused: Atom.Writable<boolean>;
|
|
13
14
|
readonly pushed: boolean;
|
|
14
15
|
readonly ready: Atom.Writable<boolean>;
|
|
15
|
-
readonly signal: Atom.Atom<unknown>;
|
|
16
16
|
readonly signals: Atom.Writable<QuerySignals>;
|
|
17
17
|
readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
18
18
|
readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
19
19
|
readonly subscription: LiveBound[typeof LiveConnection];
|
|
20
20
|
}
|
|
21
|
-
export declare function automaticQuery<A, E>({ atom, assertOwner, coalesceWindow, equivalent, paused, pushed, ready,
|
|
21
|
+
export declare function automaticQuery<A, E>({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, signals, source, statuses, subscription, }: GateOptions<A, E>): Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
22
22
|
export {};
|
|
23
23
|
//# sourceMappingURL=automaticQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticQuery.d.ts","sourceRoot":"","sources":["../../src/internal/automaticQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAqB,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,WAAW,CAAC,CAAC,EAAE,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"automaticQuery.d.ts","sourceRoot":"","sources":["../../src/internal/automaticQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAqB,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,WAAW,CAAC,CAAC,EAAE,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAC7F,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3E,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,cAAc,CAAC,CAAC;CACxD;AACD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,EACpC,IAAI,EACJ,WAAW,EACX,cAAc,EACd,cAAc,EACd,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,YAAY,GACZ,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,4CA+GnB"}
|
|
@@ -5,7 +5,7 @@ import { queryFailure } from "#internal/queryFailure.ts";
|
|
|
5
5
|
import { queryResult } from "#internal/queryResult.ts";
|
|
6
6
|
import { recordCompletion, recordSubscription } from "#internal/querySignals.ts";
|
|
7
7
|
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
8
|
-
export function automaticQuery({ atom, assertOwner, coalesceWindow, equivalent, paused, pushed, ready,
|
|
8
|
+
export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, signals, source, statuses, subscription, }) {
|
|
9
9
|
const gated = Atom.readable((get) => {
|
|
10
10
|
assertOwner(get);
|
|
11
11
|
get.mount(signals);
|
|
@@ -24,7 +24,9 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, equivalent,
|
|
|
24
24
|
get.set(signals, recordSubscription(get.once(signals), value));
|
|
25
25
|
dispatcher.scheduleTask(() => {
|
|
26
26
|
if (active) {
|
|
27
|
-
|
|
27
|
+
for (const state of clientStatuses === undefined ? [statuses] : [statuses, clientStatuses]) {
|
|
28
|
+
registry.update(state, (current) => new Map([...current, [token, value]]));
|
|
29
|
+
}
|
|
28
30
|
}
|
|
29
31
|
}, 0);
|
|
30
32
|
if (value.connection === "live") {
|
|
@@ -34,12 +36,14 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, equivalent,
|
|
|
34
36
|
}
|
|
35
37
|
get.addFinalizer(() => {
|
|
36
38
|
active = false;
|
|
37
|
-
|
|
38
|
-
registry.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
for (const state of clientStatuses === undefined ? [statuses] : [statuses, clientStatuses]) {
|
|
40
|
+
if (registry.getNodes().has(state)) {
|
|
41
|
+
registry.update(state, (current) => {
|
|
42
|
+
const next = new Map(current);
|
|
43
|
+
next.delete(token);
|
|
44
|
+
return next;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
43
47
|
}
|
|
44
48
|
});
|
|
45
49
|
get.addFinalizer(registry.subscribe(subscription.status, observe, { immediate: true }));
|
|
@@ -87,8 +91,6 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, equivalent,
|
|
|
87
91
|
}
|
|
88
92
|
}
|
|
89
93
|
if (pushed) {
|
|
90
|
-
get.once(signal);
|
|
91
|
-
get.subscribe(signal, resume);
|
|
92
94
|
get.subscribe(paused, (value) => {
|
|
93
95
|
if (!value) {
|
|
94
96
|
resume();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../../src/internal/automaticQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAiB9D,MAAM,UAAU,cAAc,CAAO,EACpC,IAAI,EACJ,WAAW,EACX,cAAc,EACd,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,
|
|
1
|
+
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../../src/internal/automaticQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,18 +4,24 @@ import type * as Atom from "effect/reactivity/Atom";
|
|
|
4
4
|
export declare const clientActivities: WeakMap<object, {
|
|
5
5
|
activity: import("effect/Stream").Stream<import("../clientActivity.ts").ClientActivityState, never, never> & {
|
|
6
6
|
current: Effect.Effect<import("../clientActivity.ts").ClientActivityState, never, never>;
|
|
7
|
+
} & {
|
|
8
|
+
connectionStatus: Atom.Atom<import("../clientActivity.ts").ConnectionStatus>;
|
|
7
9
|
};
|
|
8
10
|
hint: () => void;
|
|
9
11
|
queued: () => () => void;
|
|
12
|
+
statuses: Atom.Writable<ReadonlyMap<object, import("../live.ts").LiveStatus<unknown>>, ReadonlyMap<object, import("../live.ts").LiveStatus<unknown>>>;
|
|
10
13
|
track: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
11
14
|
watch: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
12
15
|
}>;
|
|
13
|
-
export declare function makeActivity(): {
|
|
16
|
+
export declare function makeActivity(factory: Atom.RuntimeFactory): {
|
|
14
17
|
activity: import("effect/Stream").Stream<import("../clientActivity.ts").ClientActivityState, never, never> & {
|
|
15
18
|
current: Effect.Effect<import("../clientActivity.ts").ClientActivityState, never, never>;
|
|
19
|
+
} & {
|
|
20
|
+
connectionStatus: Atom.Atom<import("../clientActivity.ts").ConnectionStatus>;
|
|
16
21
|
};
|
|
17
22
|
hint: () => void;
|
|
18
23
|
queued: () => () => void;
|
|
24
|
+
statuses: Atom.Writable<ReadonlyMap<object, import("../live.ts").LiveStatus<unknown>>, ReadonlyMap<object, import("../live.ts").LiveStatus<unknown>>>;
|
|
19
25
|
track: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
20
26
|
watch: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
21
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../../src/internal/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../../src/internal/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;;;YASb,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAOvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAhBE,CAAC;AAEvE,wBAAgB,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc;;;;;;;;;YAOzC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAOvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EA+CnE"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import { activityState } from "#adapters/activityState.ts";
|
|
4
|
+
import { clientConnection } from "#adapters/clientConnection.ts";
|
|
4
5
|
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
5
6
|
import { wrapAtom } from "./wrapAtom.js";
|
|
6
7
|
export const clientActivities = new WeakMap();
|
|
7
|
-
export function makeActivity() {
|
|
8
|
-
const { activity, change } = activityState();
|
|
8
|
+
export function makeActivity(factory) {
|
|
9
|
+
const { activity, change, setConnection } = activityState();
|
|
10
|
+
const connection = clientConnection(factory, setConnection);
|
|
9
11
|
function begin(key) {
|
|
10
12
|
change(key, 1);
|
|
11
13
|
return () => change(key, -1);
|
|
@@ -15,6 +17,7 @@ export function makeActivity() {
|
|
|
15
17
|
}
|
|
16
18
|
function watch(atom) {
|
|
17
19
|
const watched = wrapAtom(atom, (get) => {
|
|
20
|
+
get.mount(connection.status);
|
|
18
21
|
get.once(queryCoalesceWindow(watched));
|
|
19
22
|
get.subscribe(queryCoalesceWindow(watched), (duration) => get.set(queryCoalesceWindow(atom), duration), { immediate: true });
|
|
20
23
|
let busy = false;
|
|
@@ -51,6 +54,13 @@ export function makeActivity() {
|
|
|
51
54
|
});
|
|
52
55
|
return watched;
|
|
53
56
|
}
|
|
54
|
-
return {
|
|
57
|
+
return {
|
|
58
|
+
activity: Object.assign(activity, { connectionStatus: connection.status }),
|
|
59
|
+
hint: () => change("liveHints", 1),
|
|
60
|
+
queued: () => begin("liveInvalidations"),
|
|
61
|
+
statuses: connection.statuses,
|
|
62
|
+
track,
|
|
63
|
+
watch,
|
|
64
|
+
};
|
|
55
65
|
}
|
|
56
66
|
//# sourceMappingURL=clientActivity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../../src/internal/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEvE,MAAM,UAAU,YAAY;
|
|
1
|
+
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../../src/internal/clientActivity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Cause, type Duration, Effect, Option } from "effect";
|
|
2
|
-
export declare function liveRetry<E, R>(attempt: Effect.Effect<void, E, R>, ended: (failure: Option.Option<Cause.Cause<E>>, retry: boolean) => void, delay?: Duration.Input): Effect.Effect<void, never, R>;
|
|
1
|
+
import { Cause, type Duration, Effect, Option, Queue } from "effect";
|
|
2
|
+
export declare function liveRetry<E, R>(attempt: Effect.Effect<void, E, R>, ended: (failure: Option.Option<Cause.Cause<E>>, retry: boolean) => void, delay?: Duration.Input, resume?: Queue.Queue<void>): Effect.Effect<void, never, R>;
|
|
3
3
|
//# sourceMappingURL=liveRetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveRetry.d.ts","sourceRoot":"","sources":["../../src/internal/liveRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"liveRetry.d.ts","sourceRoot":"","sources":["../../src/internal/liveRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAa,KAAK,EAAY,MAAM,QAAQ,CAAC;AAE1F,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAClC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,EACvE,KAAK,GAAE,QAAQ,CAAC,KAAkB,EAClC,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iCAwB1B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Cause, Effect, Option, Predicate, Schedule } from "effect";
|
|
2
|
-
export function liveRetry(attempt, ended, delay = "1 second") {
|
|
1
|
+
import { Cause, Effect, Option, Predicate, Queue, Schedule } from "effect";
|
|
2
|
+
export function liveRetry(attempt, ended, delay = "1 second", resume) {
|
|
3
3
|
const next = Effect.matchCause(attempt, {
|
|
4
4
|
onFailure: (failure) => {
|
|
5
5
|
const error = Cause.findErrorOption(failure);
|
|
@@ -12,9 +12,12 @@ export function liveRetry(attempt, ended, delay = "1 second") {
|
|
|
12
12
|
return true;
|
|
13
13
|
},
|
|
14
14
|
});
|
|
15
|
-
|
|
15
|
+
const run = Effect.repeat(next, {
|
|
16
16
|
schedule: Schedule.jittered(Schedule.min([Schedule.exponential(delay, 2), Schedule.spaced("30 seconds")])),
|
|
17
17
|
while: (retry) => retry,
|
|
18
18
|
}).pipe(Effect.asVoid);
|
|
19
|
+
return resume === undefined
|
|
20
|
+
? run
|
|
21
|
+
: Effect.suspend(() => Effect.raceFirst(Effect.as(run, false), Effect.as(Queue.take(resume), true))).pipe(Effect.repeat({ while: (restarted) => restarted }), Effect.asVoid);
|
|
19
22
|
}
|
|
20
23
|
//# sourceMappingURL=liveRetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveRetry.js","sourceRoot":"","sources":["../../src/internal/liveRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"liveRetry.js","sourceRoot":"","sources":["../../src/internal/liveRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE1F,MAAM,UAAU,SAAS,CACxB,OAAkC,EAClC,KAAuE,EACvE,KAAK,GAAmB,UAAU,EAClC,MAA0B;IAE1B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE;QACvC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;YACxF,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,KAAK,CAAC;QACd,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACf,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC;QACb,CAAC;KACD,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC1G,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;KACvB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,OAAO,MAAM,KAAK,SAAS;QAC1B,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACvG,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,EAClD,MAAM,CAAC,MAAM,CACb,CAAC;AACL,CAAC"}
|
|
@@ -11,6 +11,8 @@ export interface RpcSource {
|
|
|
11
11
|
export declare function rpcClient(name: string, source: RpcSource, options: ClientOptions): Layer.Layer<unknown, never, never> & {
|
|
12
12
|
[Activity]: Stream.Stream<import("#clientActivity.ts").ClientActivityState, never, never> & {
|
|
13
13
|
current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
|
|
14
|
+
} & {
|
|
15
|
+
connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
|
|
14
16
|
};
|
|
15
17
|
Client: AtomRpc.AtomRpcClient<unknown, `${string}/Client`, Rpc.Any>;
|
|
16
18
|
client: Effect.Effect<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAyC,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIvD,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;CAChD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa
|
|
1
|
+
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAyC,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIvD,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;CAChD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa;;;;;;;;+BAwCF,KAAK,eAAe,KAAK;;;EAOvG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { Activity } from "#clientActivity.ts";
|
|
|
7
7
|
import { authenticateSocket } from "#socketAuthentication.ts";
|
|
8
8
|
import { clientActivities, makeActivity } from "./clientActivity.js";
|
|
9
9
|
export function rpcClient(name, source, options) {
|
|
10
|
-
const activity = makeActivity();
|
|
10
|
+
const activity = makeActivity(options.runtime ?? Atom.runtime);
|
|
11
11
|
const group = RpcGroup.make(...source.requests.values()).annotateMerge(source.annotations);
|
|
12
12
|
function sharedProtocol(identity) {
|
|
13
13
|
return socketProtocol({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAY,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOrE,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,MAAiB,EAAE,OAAsB;IAChF,MAAM,QAAQ,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"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"}
|
package/dist/live.d.ts
CHANGED
|
@@ -35,6 +35,7 @@ export interface LiveOptions<E, R> {
|
|
|
35
35
|
readonly coalesceWindow?: Duration.Input;
|
|
36
36
|
readonly initialResync?: boolean;
|
|
37
37
|
readonly keyContext?: KeyContext | undefined;
|
|
38
|
+
readonly reopenOnResume?: boolean;
|
|
38
39
|
readonly resume?: Atom.Atom<unknown>;
|
|
39
40
|
readonly resyncKeys: readonly Key[] | ((registry: AtomRegistry.AtomRegistry) => readonly Key[]);
|
|
40
41
|
readonly retryDelay?: Duration.Input;
|
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,EAAE,QAAQ,EAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAU,MAAM,EAAS,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrF,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAA0C,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAMzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,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,GAAG,eAAe,CAAC,CAAC,CAAC;IAClE,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,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,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,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;CACvD;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;;;;;EA8GhH"}
|
package/dist/live.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Cause, Duration, Effect, Option, Schema } from "effect";
|
|
1
|
+
import { Cause, Duration, Effect, Option, Queue, Schema } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
4
4
|
import { Key } from "@shivaedev/changes/keys.ts";
|
|
@@ -20,6 +20,7 @@ export function live(runtime, options) {
|
|
|
20
20
|
const connection = runtime
|
|
21
21
|
.atom((get) => Effect.gen(function* () {
|
|
22
22
|
get.mount(status);
|
|
23
|
+
const resumed = yield* Queue.unbounded();
|
|
23
24
|
const reactivity = yield* Reactivity.Reactivity;
|
|
24
25
|
const retryKeys = options.retryKeys ?? (typeof options.resyncKeys === "function" ? options.resyncKeys(get.registry) : options.resyncKeys);
|
|
25
26
|
yield* retryOnChange(status, clientReadKeys(retryKeys, options.keyContext), () => get.refreshSelf());
|
|
@@ -74,10 +75,20 @@ export function live(runtime, options) {
|
|
|
74
75
|
resync();
|
|
75
76
|
}
|
|
76
77
|
});
|
|
78
|
+
function resume() {
|
|
79
|
+
const current = get.once(status).connection;
|
|
80
|
+
if (current === "failed") {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
resync();
|
|
84
|
+
if (options.reopenOnResume === true || current === "reconnecting") {
|
|
85
|
+
Queue.offerUnsafe(resumed, undefined);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
77
88
|
if (options.resume !== undefined) {
|
|
78
89
|
// A subscription alone does not initialize a derived signal's dependencies.
|
|
79
90
|
get.once(options.resume);
|
|
80
|
-
get.subscribe(options.resume,
|
|
91
|
+
get.subscribe(options.resume, resume);
|
|
81
92
|
}
|
|
82
93
|
const attempt = liveAttempt(options.stream, {
|
|
83
94
|
changed,
|
|
@@ -99,7 +110,7 @@ export function live(runtime, options) {
|
|
|
99
110
|
});
|
|
100
111
|
yield* liveRetry(attempt, (failure, retry) => {
|
|
101
112
|
update({ connection: retry ? "reconnecting" : "failed", failure, needsResync: true });
|
|
102
|
-
}, options.retryDelay);
|
|
113
|
+
}, options.retryDelay, resumed);
|
|
103
114
|
}))
|
|
104
115
|
.pipe(Atom.setIdleTTL(0));
|
|
105
116
|
return { coalesceWindow, connection, paused, status };
|
package/dist/live.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../src/live.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.35.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -51,14 +51,14 @@
|
|
|
51
51
|
"@effect/platform-node": "4.0.6",
|
|
52
52
|
"@effect/vitest": "4.0.6",
|
|
53
53
|
"@shivaedev/errors": "0.8.0",
|
|
54
|
-
"@shivaedev/identity": "0.23.
|
|
55
|
-
"@shivaedev/quality": "0.
|
|
56
|
-
"@shivaedev/server": "0.
|
|
54
|
+
"@shivaedev/identity": "0.23.1",
|
|
55
|
+
"@shivaedev/quality": "0.59.0",
|
|
56
|
+
"@shivaedev/server": "0.23.0",
|
|
57
57
|
"@shivaedev/sql": "0.36.1",
|
|
58
58
|
"@shivaedev/test": "0.14.0",
|
|
59
|
-
"@shivaedev/test-kits": "0.2.
|
|
60
|
-
"@shivaedev/test-sql": "0.
|
|
61
|
-
"@shivaedev/test-story": "0.37.
|
|
59
|
+
"@shivaedev/test-kits": "0.2.2",
|
|
60
|
+
"@shivaedev/test-sql": "0.19.0",
|
|
61
|
+
"@shivaedev/test-story": "0.37.1",
|
|
62
62
|
"@types/node": "24.19.2",
|
|
63
63
|
"effect": "4.0.6",
|
|
64
64
|
"esbuild": "0.28.2",
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
-
import type { ClientActivityState } from "#clientActivity.ts";
|
|
2
|
+
import type { ClientActivityState, ConnectionStatus } from "#clientActivity.ts";
|
|
3
3
|
|
|
4
4
|
export function activityState() {
|
|
5
|
-
const state = Effect.runSync(
|
|
5
|
+
const state = Effect.runSync(
|
|
6
|
+
SubscriptionRef.make<ClientActivityState>({ connectionStatus: "live", liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }),
|
|
7
|
+
);
|
|
6
8
|
return {
|
|
7
9
|
activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
|
|
8
|
-
change: (key: keyof ClientActivityState, delta: number) => {
|
|
10
|
+
change: (key: Exclude<keyof ClientActivityState, "connectionStatus">, delta: number) => {
|
|
9
11
|
Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
|
|
10
12
|
},
|
|
13
|
+
setConnection: (connectionStatus: ConnectionStatus) => {
|
|
14
|
+
Effect.runSync(
|
|
15
|
+
SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })),
|
|
16
|
+
);
|
|
17
|
+
},
|
|
11
18
|
};
|
|
12
19
|
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Stream } from "effect";
|
|
2
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import type { ConnectionStatus } from "#clientActivity.ts";
|
|
5
|
+
import type { LiveStatus } from "#live.ts";
|
|
6
|
+
|
|
7
|
+
export function clientConnection(factory: Atom.RuntimeFactory, publish: (status: ConnectionStatus) => void) {
|
|
8
|
+
const statuses = Atom.make<ReadonlyMap<object, LiveStatus<unknown>>>(new Map());
|
|
9
|
+
const current = Atom.map(
|
|
10
|
+
statuses,
|
|
11
|
+
(values): ConnectionStatus =>
|
|
12
|
+
[...values.values()].some(({ connection }) => connection === "connecting" || connection === "reconnecting") ? "reconnecting" : "live",
|
|
13
|
+
);
|
|
14
|
+
const runtime = factory(Layer.empty);
|
|
15
|
+
const status = Atom.make((get): ConnectionStatus => {
|
|
16
|
+
const context = AsyncResult.value(get(runtime));
|
|
17
|
+
if (Option.isNone(context)) {
|
|
18
|
+
return "live";
|
|
19
|
+
}
|
|
20
|
+
const cancel = Effect.runCallbackWith(context.value)(
|
|
21
|
+
get.stream(current).pipe(
|
|
22
|
+
Stream.changes,
|
|
23
|
+
Stream.debounce("300 millis"),
|
|
24
|
+
Stream.runForEach((value) =>
|
|
25
|
+
Effect.sync(() => {
|
|
26
|
+
publish(value);
|
|
27
|
+
get.setSelf(value);
|
|
28
|
+
}),
|
|
29
|
+
),
|
|
30
|
+
Effect.ensuring(Effect.sync(() => publish("live"))),
|
|
31
|
+
),
|
|
32
|
+
);
|
|
33
|
+
get.addFinalizer(cancel);
|
|
34
|
+
return "live";
|
|
35
|
+
});
|
|
36
|
+
return { status, statuses };
|
|
37
|
+
}
|
package/src/automaticLive.ts
CHANGED
|
@@ -8,6 +8,7 @@ import type { Key } from "@shivaedev/changes/keys.ts";
|
|
|
8
8
|
import type { BindingOwner } from "#adapters/bindingOwner.ts";
|
|
9
9
|
import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
|
|
10
10
|
import { automaticQuery } from "#internal/automaticQuery.ts";
|
|
11
|
+
import { clientActivities } from "#internal/clientActivity.ts";
|
|
11
12
|
import { queryDelivery } from "#internal/queryDelivery.ts";
|
|
12
13
|
import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
|
|
13
14
|
import { queryProgress } from "#internal/querySignals.ts";
|
|
@@ -86,6 +87,7 @@ export function automaticLive(
|
|
|
86
87
|
const subscription = live(service.runtime, {
|
|
87
88
|
initialResync: false,
|
|
88
89
|
keyContext: owner?.context,
|
|
90
|
+
reopenOnResume: decode !== undefined,
|
|
89
91
|
resume: signal,
|
|
90
92
|
resyncKeys: decode === undefined ? localQueryKeys(keys) : [],
|
|
91
93
|
retryKeys: keys,
|
|
@@ -97,12 +99,12 @@ export function automaticLive(
|
|
|
97
99
|
const gated = automaticQuery({
|
|
98
100
|
assertOwner,
|
|
99
101
|
atom,
|
|
102
|
+
clientStatuses: clientActivities.get(service)?.statuses,
|
|
100
103
|
coalesceWindow,
|
|
101
104
|
equivalent,
|
|
102
105
|
paused,
|
|
103
106
|
pushed: decode !== undefined,
|
|
104
107
|
ready,
|
|
105
|
-
signal,
|
|
106
108
|
signals,
|
|
107
109
|
source,
|
|
108
110
|
statuses,
|
package/src/clientActivity.ts
CHANGED
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
import { Effect, Stream } from "effect";
|
|
2
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
|
|
4
|
+
export type ConnectionStatus = "live" | "reconnecting";
|
|
2
5
|
|
|
3
6
|
export interface ClientActivityState {
|
|
7
|
+
readonly connectionStatus: ConnectionStatus;
|
|
4
8
|
readonly liveHints: number;
|
|
5
9
|
readonly liveInvalidations: number;
|
|
6
10
|
readonly refreshingAtoms: number;
|
|
7
11
|
readonly rpcCalls: number;
|
|
8
12
|
}
|
|
9
13
|
|
|
10
|
-
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
14
|
+
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
15
|
+
readonly connectionStatus: Atom.Atom<ConnectionStatus>;
|
|
16
|
+
readonly current: Effect.Effect<ClientActivityState>;
|
|
17
|
+
};
|
|
11
18
|
|
|
12
19
|
export const Activity = Symbol.for("@shivaedev/contract/ClientActivity");
|
|
13
20
|
|
|
@@ -25,7 +32,7 @@ export function isClientIdle(state: ClientActivityState): boolean {
|
|
|
25
32
|
|
|
26
33
|
export function activityScreenSignal(activity: ClientActivity) {
|
|
27
34
|
function screenState(state: ClientActivityState) {
|
|
28
|
-
return { hints: state.liveHints, pending: !isClientIdle(state) };
|
|
35
|
+
return { connectionStatus: state.connectionStatus, hints: state.liveHints, pending: !isClientIdle(state) };
|
|
29
36
|
}
|
|
30
37
|
return Object.assign(Stream.map(activity, screenState), { current: Effect.map(activity.current, screenState) });
|
|
31
38
|
}
|
|
@@ -12,12 +12,12 @@ import type { QuerySignals } from "#querySignals.ts";
|
|
|
12
12
|
interface GateOptions<A, E> {
|
|
13
13
|
readonly assertOwner: (get: Atom.AtomContext) => void;
|
|
14
14
|
readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
15
|
+
readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
|
|
15
16
|
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
16
17
|
readonly equivalent: (left: A, right: A) => boolean;
|
|
17
18
|
readonly paused: Atom.Writable<boolean>;
|
|
18
19
|
readonly pushed: boolean;
|
|
19
20
|
readonly ready: Atom.Writable<boolean>;
|
|
20
|
-
readonly signal: Atom.Atom<unknown>;
|
|
21
21
|
readonly signals: Atom.Writable<QuerySignals>;
|
|
22
22
|
readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
23
23
|
readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
@@ -27,11 +27,11 @@ export function automaticQuery<A, E>({
|
|
|
27
27
|
atom,
|
|
28
28
|
assertOwner,
|
|
29
29
|
coalesceWindow,
|
|
30
|
+
clientStatuses,
|
|
30
31
|
equivalent,
|
|
31
32
|
paused,
|
|
32
33
|
pushed,
|
|
33
34
|
ready,
|
|
34
|
-
signal,
|
|
35
35
|
signals,
|
|
36
36
|
source,
|
|
37
37
|
statuses,
|
|
@@ -56,7 +56,9 @@ export function automaticQuery<A, E>({
|
|
|
56
56
|
get.set(signals, recordSubscription(get.once(signals), value));
|
|
57
57
|
dispatcher.scheduleTask(() => {
|
|
58
58
|
if (active) {
|
|
59
|
-
|
|
59
|
+
for (const state of clientStatuses === undefined ? [statuses] : [statuses, clientStatuses]) {
|
|
60
|
+
registry.update(state, (current) => new Map([...current, [token, value]]));
|
|
61
|
+
}
|
|
60
62
|
}
|
|
61
63
|
}, 0);
|
|
62
64
|
if (value.connection === "live") {
|
|
@@ -66,12 +68,14 @@ export function automaticQuery<A, E>({
|
|
|
66
68
|
}
|
|
67
69
|
get.addFinalizer(() => {
|
|
68
70
|
active = false;
|
|
69
|
-
|
|
70
|
-
registry.
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
71
|
+
for (const state of clientStatuses === undefined ? [statuses] : [statuses, clientStatuses]) {
|
|
72
|
+
if (registry.getNodes().has(state)) {
|
|
73
|
+
registry.update(state, (current) => {
|
|
74
|
+
const next = new Map(current);
|
|
75
|
+
next.delete(token);
|
|
76
|
+
return next;
|
|
77
|
+
});
|
|
78
|
+
}
|
|
75
79
|
}
|
|
76
80
|
});
|
|
77
81
|
get.addFinalizer(registry.subscribe(subscription.status, observe, { immediate: true }));
|
|
@@ -122,8 +126,6 @@ export function automaticQuery<A, E>({
|
|
|
122
126
|
}
|
|
123
127
|
}
|
|
124
128
|
if (pushed) {
|
|
125
|
-
get.once(signal);
|
|
126
|
-
get.subscribe(signal, resume);
|
|
127
129
|
get.subscribe(paused, (value) => {
|
|
128
130
|
if (!value) {
|
|
129
131
|
resume();
|
|
@@ -2,14 +2,16 @@ import { Effect } from "effect";
|
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import { activityState } from "#adapters/activityState.ts";
|
|
5
|
+
import { clientConnection } from "#adapters/clientConnection.ts";
|
|
5
6
|
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
6
7
|
import { wrapAtom } from "./wrapAtom.ts";
|
|
7
8
|
|
|
8
9
|
type ActivityTracker = ReturnType<typeof makeActivity>;
|
|
9
10
|
export const clientActivities = new WeakMap<object, ActivityTracker>();
|
|
10
11
|
|
|
11
|
-
export function makeActivity() {
|
|
12
|
-
const { activity, change } = activityState();
|
|
12
|
+
export function makeActivity(factory: Atom.RuntimeFactory) {
|
|
13
|
+
const { activity, change, setConnection } = activityState();
|
|
14
|
+
const connection = clientConnection(factory, setConnection);
|
|
13
15
|
function begin(key: "rpcCalls" | "liveInvalidations") {
|
|
14
16
|
change(key, 1);
|
|
15
17
|
return () => change(key, -1);
|
|
@@ -23,6 +25,7 @@ export function makeActivity() {
|
|
|
23
25
|
}
|
|
24
26
|
function watch<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) {
|
|
25
27
|
const watched = wrapAtom(atom, (get) => {
|
|
28
|
+
get.mount(connection.status);
|
|
26
29
|
get.once(queryCoalesceWindow(watched));
|
|
27
30
|
get.subscribe(queryCoalesceWindow(watched), (duration) => get.set(queryCoalesceWindow(atom), duration), { immediate: true });
|
|
28
31
|
let busy = false;
|
|
@@ -59,5 +62,12 @@ export function makeActivity() {
|
|
|
59
62
|
});
|
|
60
63
|
return watched;
|
|
61
64
|
}
|
|
62
|
-
return {
|
|
65
|
+
return {
|
|
66
|
+
activity: Object.assign(activity, { connectionStatus: connection.status }),
|
|
67
|
+
hint: () => change("liveHints", 1),
|
|
68
|
+
queued: () => begin("liveInvalidations"),
|
|
69
|
+
statuses: connection.statuses,
|
|
70
|
+
track,
|
|
71
|
+
watch,
|
|
72
|
+
};
|
|
63
73
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { Cause, type Duration, Effect, Option, Predicate, Schedule } from "effect";
|
|
1
|
+
import { Cause, type Duration, Effect, Option, Predicate, Queue, Schedule } from "effect";
|
|
2
2
|
|
|
3
3
|
export function liveRetry<E, R>(
|
|
4
4
|
attempt: Effect.Effect<void, E, R>,
|
|
5
5
|
ended: (failure: Option.Option<Cause.Cause<E>>, retry: boolean) => void,
|
|
6
6
|
delay: Duration.Input = "1 second",
|
|
7
|
+
resume?: Queue.Queue<void>,
|
|
7
8
|
) {
|
|
8
9
|
const next = Effect.matchCause(attempt, {
|
|
9
10
|
onFailure: (failure) => {
|
|
@@ -17,8 +18,14 @@ export function liveRetry<E, R>(
|
|
|
17
18
|
return true;
|
|
18
19
|
},
|
|
19
20
|
});
|
|
20
|
-
|
|
21
|
+
const run = Effect.repeat(next, {
|
|
21
22
|
schedule: Schedule.jittered(Schedule.min([Schedule.exponential(delay, 2), Schedule.spaced("30 seconds")])),
|
|
22
23
|
while: (retry) => retry,
|
|
23
24
|
}).pipe(Effect.asVoid);
|
|
25
|
+
return resume === undefined
|
|
26
|
+
? run
|
|
27
|
+
: Effect.suspend(() => Effect.raceFirst(Effect.as(run, false), Effect.as(Queue.take(resume), true))).pipe(
|
|
28
|
+
Effect.repeat({ while: (restarted) => restarted }),
|
|
29
|
+
Effect.asVoid,
|
|
30
|
+
);
|
|
24
31
|
}
|
|
@@ -14,7 +14,7 @@ export interface RpcSource {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export function rpcClient(name: string, source: RpcSource, options: ClientOptions) {
|
|
17
|
-
const activity = makeActivity();
|
|
17
|
+
const activity = makeActivity(options.runtime ?? Atom.runtime);
|
|
18
18
|
const group = RpcGroup.make(...source.requests.values()).annotateMerge(source.annotations);
|
|
19
19
|
function sharedProtocol(identity?: string) {
|
|
20
20
|
return socketProtocol({
|
package/src/live.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Cause, Duration, Effect, Option, Schema, type Stream } from "effect";
|
|
1
|
+
import { Cause, Duration, Effect, Option, Queue, Schema, type Stream } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
4
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
@@ -27,6 +27,7 @@ export interface LiveOptions<E, R> {
|
|
|
27
27
|
readonly coalesceWindow?: Duration.Input;
|
|
28
28
|
readonly initialResync?: boolean;
|
|
29
29
|
readonly keyContext?: KeyContext | undefined;
|
|
30
|
+
readonly reopenOnResume?: boolean;
|
|
30
31
|
readonly resume?: Atom.Atom<unknown>;
|
|
31
32
|
readonly resyncKeys: readonly Key[] | ((registry: AtomRegistry.AtomRegistry) => readonly Key[]);
|
|
32
33
|
readonly retryDelay?: Duration.Input;
|
|
@@ -44,6 +45,7 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
44
45
|
.atom((get) =>
|
|
45
46
|
Effect.gen(function* () {
|
|
46
47
|
get.mount(status);
|
|
48
|
+
const resumed = yield* Queue.unbounded<void>();
|
|
47
49
|
const reactivity = yield* Reactivity.Reactivity;
|
|
48
50
|
const retryKeys = options.retryKeys ?? (typeof options.resyncKeys === "function" ? options.resyncKeys(get.registry) : options.resyncKeys);
|
|
49
51
|
yield* retryOnChange(status, clientReadKeys(retryKeys, options.keyContext), () => get.refreshSelf());
|
|
@@ -101,10 +103,20 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
101
103
|
resync();
|
|
102
104
|
}
|
|
103
105
|
});
|
|
106
|
+
function resume() {
|
|
107
|
+
const current = get.once(status).connection;
|
|
108
|
+
if (current === "failed") {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
resync();
|
|
112
|
+
if (options.reopenOnResume === true || current === "reconnecting") {
|
|
113
|
+
Queue.offerUnsafe(resumed, undefined);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
104
116
|
if (options.resume !== undefined) {
|
|
105
117
|
// A subscription alone does not initialize a derived signal's dependencies.
|
|
106
118
|
get.once(options.resume);
|
|
107
|
-
get.subscribe(options.resume,
|
|
119
|
+
get.subscribe(options.resume, resume);
|
|
108
120
|
}
|
|
109
121
|
const attempt = liveAttempt(options.stream, {
|
|
110
122
|
changed,
|
|
@@ -129,6 +141,7 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
129
141
|
update({ connection: retry ? "reconnecting" : "failed", failure, needsResync: true });
|
|
130
142
|
},
|
|
131
143
|
options.retryDelay,
|
|
144
|
+
resumed,
|
|
132
145
|
);
|
|
133
146
|
}),
|
|
134
147
|
)
|