@shivaedev/contract 0.20.0 → 0.22.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 +37 -0
- package/README.md +20 -16
- package/dist/automaticLive.d.ts +4 -2
- package/dist/automaticLive.d.ts.map +1 -1
- package/dist/automaticLive.js +21 -26
- package/dist/automaticLive.js.map +1 -1
- package/dist/bind.d.ts +2 -1
- package/dist/bind.d.ts.map +1 -1
- package/dist/bind.js +1 -1
- package/dist/bind.js.map +1 -1
- package/dist/internal/aggregateLiveStatus.d.ts +3 -0
- package/dist/internal/aggregateLiveStatus.d.ts.map +1 -0
- package/dist/internal/aggregateLiveStatus.js +17 -0
- package/dist/internal/aggregateLiveStatus.js.map +1 -0
- package/dist/internal/liveHintQueue.d.ts +25 -0
- package/dist/internal/liveHintQueue.d.ts.map +1 -0
- package/dist/internal/liveHintQueue.js +21 -0
- package/dist/internal/liveHintQueue.js.map +1 -0
- package/dist/internal/queryFailure.d.ts +4 -0
- package/dist/internal/queryFailure.d.ts.map +1 -0
- package/dist/internal/queryFailure.js +18 -0
- package/dist/internal/queryFailure.js.map +1 -0
- package/dist/internal/rpcClient.d.ts.map +1 -1
- package/dist/internal/rpcClient.js +4 -2
- package/dist/internal/rpcClient.js.map +1 -1
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +3 -3
- package/dist/live.js.map +1 -1
- package/dist/makeLiveServer.d.ts +2 -1
- package/dist/makeLiveServer.d.ts.map +1 -1
- package/dist/makeLiveServer.js +9 -13
- package/dist/makeLiveServer.js.map +1 -1
- package/package.json +10 -11
- package/src/automaticLive.ts +34 -26
- package/src/bind.ts +3 -2
- package/src/internal/aggregateLiveStatus.ts +18 -0
- package/src/internal/liveHintQueue.ts +22 -0
- package/src/internal/queryFailure.ts +20 -0
- package/src/internal/rpcClient.ts +4 -2
- package/src/live.ts +2 -3
- package/src/makeLiveServer.ts +17 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,42 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.22.0 - 2026-10-30
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Export modules under `internal/` in `contract` and `react` and `server/internal/` in `jobs` through the existing `.ts` wildcard, so consumers can import those modules directly by their file paths.
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- Bound each `makeLiveServer` stream to 256 pending hints. On overflow, pending hints collapse into a single `Resync`, so stalled consumers reconcile current query results without accumulating a write backlog.
|
|
12
|
+
- A denied per-hint query policy recheck ends the live subscription with `QueryReadDenied` instead of dropping the hint. Automatic bound queries rerun through their authorized read so an open screen can render the denial from its query result.
|
|
13
|
+
- Jitter live subscription retries and the shared WebSocket reconnect backoff so clients recovering from the same host restart spread their query reruns over time.
|
|
14
|
+
|
|
15
|
+
### Breaking
|
|
16
|
+
|
|
17
|
+
- `makeLiveServer.subscribe` now has `QueryReadDenied` in its stream error channel. Custom RPC streams using it must include `QueryReadDenied` in their error schema and handle the failure. Contract-generated change streams already declare this error.
|
|
18
|
+
|
|
19
|
+
## 0.21.0 - 2026-10-30
|
|
20
|
+
|
|
21
|
+
### Changed
|
|
22
|
+
|
|
23
|
+
- Work Board file edits refresh authorized contract queries over Platform's shared WebSocket, including the Claude plugin's overview. Unrelated document reads retain their values.
|
|
24
|
+
- Forwarding proxy fixtures can disconnect and resume real client traffic at the same address.
|
|
25
|
+
- Automatic contract live connections expose a `paused` atom; resuming reconciles their mounted queries. Bindings can supply a `resumeWindow` for embedded browser lifecycle events.
|
|
26
|
+
- Live status notifications use the registry's asynchronous scheduler, so mounting a query during React rendering does not update another component.
|
|
27
|
+
- Require Effect 4.0.6 and align the Effect companion package peers and generated starter catalog to the same exact release. Install the 4.0.6 Effect stack together.
|
|
28
|
+
|
|
29
|
+
### Fixed
|
|
30
|
+
|
|
31
|
+
- Register hosted RPC cache-control handling through Effect 4.0.6's request-scoped pre-response API so responses keep `private, no-store`.
|
|
32
|
+
- Accept native RPC's `application/x-ndjson` media type while preserving `application/ndjson` callers at the transport guard.
|
|
33
|
+
- Keep subscriptions open after their HTTP request body completes; closing the socket still cancels them.
|
|
34
|
+
|
|
35
|
+
### Breaking
|
|
36
|
+
|
|
37
|
+
- Work Board removes its `subscribe` RPC. Consumers bind its contract queries with Platform's default WebSocket client instead of consuming Board-specific change hints.
|
|
38
|
+
- `WorkspaceConfig.indexing` supplies a progress snapshot Effect. Replace indexing Stream overrides with an Effect that reads current progress.
|
|
39
|
+
|
|
3
40
|
## 0.20.0 - 2026-10-29
|
|
4
41
|
|
|
5
42
|
### Added
|
package/README.md
CHANGED
|
@@ -320,6 +320,8 @@ Server adapters read the RPC's `KeyScope` annotation. For `"session"`, they must
|
|
|
320
320
|
|
|
321
321
|
### 4. Live invalidation and resume
|
|
322
322
|
|
|
323
|
+
The automatic live connection exposed at `api[LiveConnection]` includes a writable `paused` atom. Set it in the binding’s registry to pause refreshes; clearing it reconciles the mounted queries. Bindings on the same client runtime share this pause state.
|
|
324
|
+
|
|
323
325
|
Database hosts from `@shivaedev/server` serve the contract's reserved `<contract>.$changes` stream automatically. With the native WebSocket protocol, `bind` and a React `SessionBoundary` connect query atoms without an application subscribe operation or `live()` call. The boundary finds bound APIs returned directly by `connect` or as properties such as `client.api`. See [automatic changes](https://github.com/ShivaeDev/platform/blob/main/docs/framework/changes.md) for defaults.
|
|
324
326
|
|
|
325
327
|
A native shell supplies its lifecycle events through `bind`'s optional `resume` source:
|
|
@@ -340,7 +342,7 @@ const resume: ResumeSource = (notify) => {
|
|
|
340
342
|
const api = bind(Notes, NotesClient, { resume });
|
|
341
343
|
```
|
|
342
344
|
|
|
343
|
-
The application owns `onAppResume` and `onNetworkReturn`; each subscribes a callback and returns an unsubscribe function. The source joins the visible browser visibility and online defaults. Each notification reopens the live subscription and reconciles all reads tracked by the connection. The owning registry releases the source on disposal. Omitting `resume` keeps the browser defaults. Pass the same binding from React's `SessionBoundary.connect` to use it with automatic session subscriptions.
|
|
345
|
+
The application owns `onAppResume` and `onNetworkReturn`; each subscribes a callback and returns an unsubscribe function. The source joins the visible browser visibility and online defaults. Each notification reopens the live subscription and reconciles all reads tracked by the connection. The owning registry releases the source on disposal. Omitting `resume` keeps the browser defaults. Pass the same binding from React's `SessionBoundary.connect` to use it with automatic session subscriptions. An embedded browser can pass `resumeWindow` to observe that window’s visibility and online events.
|
|
344
346
|
|
|
345
347
|
For a direct subscription, configure the server and `NotesClient` with `RpcSerialization.layerNdjson` and use the client already typed from `Notes`:
|
|
346
348
|
|
|
@@ -443,6 +445,8 @@ Call the release functions and dispose the registry when the application's root
|
|
|
443
445
|
|
|
444
446
|
Import `makeLiveServer` from `@shivaedev/contract/makeLiveServer.ts` and create it once with the server's `Reactivity` service. After application authorization, return `hints.stream([orders.item(id)])` from the native streaming RPC handler. Each subscription starts with `Resync`; invalidating its read keys produces `Changed` with those declared keys. `hints.resync` sends `Resync` to every live stream owned by that helper, including streams for otherwise unrelated keys. Independent helpers keep their resync scopes separate even when they share Reactivity. The native stream owns registration and interruption. Keep this server helper separate from the browser's `live` coordinator.
|
|
445
447
|
|
|
448
|
+
Each stream queues at most 256 hints. Overflow discards the pending hints and retains one `Resync`; further hints are absorbed until that reconciliation hint is pulled. A stalled consumer can then read current query results without replaying the write backlog. This bounds the helper's queue by hint count, not by bytes: each hint's keys depend on the subscription. Transport buffers remain the transport's responsibility.
|
|
449
|
+
|
|
446
450
|
### Query policies, record keys and buckets
|
|
447
451
|
|
|
448
452
|
A query declares its decoded input, result, `readPolicy` and `reads` together. `readPolicy(payload, viewer)` returns an Effect boolean. `viewer` is the session's `Option<{ id: string }>`; the browser does not send the identity. Policies may use browser-safe Effect service tags whose implementations the server supplies.
|
|
@@ -485,21 +489,21 @@ expect(yield* heard(bob, [notes.item(1)], { within: "50 millis" })).toBe(false);
|
|
|
485
489
|
|
|
486
490
|
Import the module that defines the name; the package has no root entry.
|
|
487
491
|
|
|
488
|
-
| Module | Functions and schemas
|
|
489
|
-
| ------------------------ |
|
|
490
|
-
| `operation.ts` | `query(name, { payload?, success?, rejections?, readPolicy?, reads })`; `command(name, { payload?, success?, rejections?, invalidates })`; `stream(name, { payload?, success, rejections?, reads })`.
|
|
491
|
-
| `contract.ts` | `contract(name, { queries?, commands?, streams?, keyScope? })`, returning a native RPC group with `declaration: { name, queries, commands, streams, keyScope }`.
|
|
492
|
-
| `rejection.ts` | `fieldRejection(struct, fields?)`; lower-level `rejectionSet(specs)`, which constructs the rejection classes, union schema and failure helpers used by operations.
|
|
493
|
-
| `bind.ts` | `bind(contract, atomRpcService, { registry?, live?, resume? }?)`, requiring the registry for session-scoped contracts and exposing `{ query, run }` for queries, `{ run }` Effects for commands and `{ run }` native Streams for streams; `makeClient(contract, { url, protocol?, headers?, webSocketConstructor?, group?, registry?, live? })`, which builds the shared WebSocket client and binds it. |
|
|
494
|
-
| `queryCoalesceWindow.ts` | `queryCoalesceWindow(query)`, a writable atom for a bound query's live changed-hint window.
|
|
495
|
-
| `live.ts` | `LiveHint` schema; `live(runtime, { stream, resyncKeys, coalesceWindow?, initialResync?, keyContext?, resume?, retryDelay? })`, exposing `connection`, `coalesceWindow`, `paused` and `status`.
|
|
496
|
-
| `querySubscription.ts` | `querySubscription(requests, viewer)` checks each referenced query and captures its scopes and ongoing authorization.
|
|
497
|
-
| `makeLiveServer.ts` | `makeLiveServer`, an Effect requiring `Reactivity` that creates scoped server hint streams and a `resync` Effect.
|
|
498
|
-
| `readPolicy.ts` | `QueryReadPolicy`, `Viewer`, `authorizeReads(effect, request, viewer)`, `CurrentViewer`.
|
|
499
|
-
| `readPolicyErrors.ts` | `MissingReadPolicy` and `QueryReadDenied`.
|
|
500
|
-
| `serverMetadata.ts` | `KeyScope`, `QueryDefinition.definition`, `CommandInvalidation.invalidates`, `ChangesQueries.resolve(references)`, the Effect `queryKeys(queries, references)` and `changesRpc(name, queries)` for server adapters.
|
|
501
|
-
| `resume.ts` | `resumeSignal({ window?, native? })`, returning a native numeric signal atom.
|
|
502
|
-
| `testing.ts` | `watchHints(stream)` starts a scoped viewer subscription; `heard(viewer, keys, { within? }?)` waits for matching changed keys.
|
|
492
|
+
| Module | Functions and schemas |
|
|
493
|
+
| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
494
|
+
| `operation.ts` | `query(name, { payload?, success?, rejections?, readPolicy?, reads })`; `command(name, { payload?, success?, rejections?, invalidates })`; `stream(name, { payload?, success, rejections?, reads })`. |
|
|
495
|
+
| `contract.ts` | `contract(name, { queries?, commands?, streams?, keyScope? })`, returning a native RPC group with `declaration: { name, queries, commands, streams, keyScope }`. |
|
|
496
|
+
| `rejection.ts` | `fieldRejection(struct, fields?)`; lower-level `rejectionSet(specs)`, which constructs the rejection classes, union schema and failure helpers used by operations. |
|
|
497
|
+
| `bind.ts` | `bind(contract, atomRpcService, { registry?, live?, resume?, resumeWindow? }?)`, requiring the registry for session-scoped contracts and exposing `{ query, run }` for queries, `{ run }` Effects for commands and `{ run }` native Streams for streams; `makeClient(contract, { url, protocol?, headers?, webSocketConstructor?, group?, registry?, live? })`, which builds the shared WebSocket client and binds it. |
|
|
498
|
+
| `queryCoalesceWindow.ts` | `queryCoalesceWindow(query)`, a writable atom for a bound query's live changed-hint window. |
|
|
499
|
+
| `live.ts` | `LiveHint` schema; `live(runtime, { stream, resyncKeys, coalesceWindow?, initialResync?, keyContext?, resume?, retryDelay? })`, exposing `connection`, `coalesceWindow`, `paused` and `status`. |
|
|
500
|
+
| `querySubscription.ts` | `querySubscription(requests, viewer)` checks each referenced query and captures its scopes and ongoing authorization. |
|
|
501
|
+
| `makeLiveServer.ts` | `makeLiveServer`, an Effect requiring `Reactivity` that creates scoped server hint streams and a `resync` Effect. |
|
|
502
|
+
| `readPolicy.ts` | `QueryReadPolicy`, `Viewer`, `authorizeReads(effect, request, viewer)`, `CurrentViewer`. |
|
|
503
|
+
| `readPolicyErrors.ts` | `MissingReadPolicy` and `QueryReadDenied`. |
|
|
504
|
+
| `serverMetadata.ts` | `KeyScope`, `QueryDefinition.definition`, `CommandInvalidation.invalidates`, `ChangesQueries.resolve(references)`, the Effect `queryKeys(queries, references)` and `changesRpc(name, queries)` for server adapters. |
|
|
505
|
+
| `resume.ts` | `resumeSignal({ window?, native? })`, returning a native numeric signal atom. |
|
|
506
|
+
| `testing.ts` | `watchHints(stream)` starts a scoped viewer subscription; `heard(viewer, keys, { within? }?)` waits for matching changed keys. |
|
|
503
507
|
|
|
504
508
|
A query atom takes native query options as its optional second argument, for example `api.get.query({ id: 1 }, { timeToLive: "1 minute" })`. A native resume source receives a callback and returns a cleanup function.
|
|
505
509
|
|
package/dist/automaticLive.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
|
5
5
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
6
6
|
import type { BindingOwner } from "#internal/bindingOwner.ts";
|
|
7
7
|
import { type LiveStatus } from "#live.ts";
|
|
8
|
-
import { type ResumeSource } from "#resume.ts";
|
|
8
|
+
import { type ResumeSource, type ResumeWindow } from "#resume.ts";
|
|
9
9
|
import type { changesRpc, QueryReference } from "#serverMetadata.ts";
|
|
10
10
|
export declare const LiveConnection: unique symbol;
|
|
11
11
|
export interface LiveBound {
|
|
@@ -13,16 +13,18 @@ export interface LiveBound {
|
|
|
13
13
|
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
14
14
|
readonly connection: Atom.Atom<unknown>;
|
|
15
15
|
readonly identity?: Atom.Writable<string | undefined>;
|
|
16
|
+
readonly paused: Atom.Writable<boolean>;
|
|
16
17
|
readonly status: Atom.Atom<LiveStatus<unknown>>;
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
20
|
export type ChangesClient = AtomRpc.AtomRpcClient<unknown, string, ReturnType<typeof changesRpc>>;
|
|
20
|
-
export declare function automaticLive(service: ChangesClient, name: string, owner?: BindingOwner, resume?: ResumeSource, enabled?: boolean): {
|
|
21
|
+
export declare function automaticLive(service: ChangesClient, name: string, owner?: BindingOwner, resume?: ResumeSource, enabled?: boolean, resumeWindow?: ResumeWindow): {
|
|
21
22
|
query: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, reference: QueryReference, keys: readonly Key[], equivalent: (left: A, right: A) => boolean) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
22
23
|
subscription: {
|
|
23
24
|
coalesceWindow: Atom.Writable<Duration.Input, Duration.Input>;
|
|
24
25
|
connection: Atom.Atom<LiveStatus<unknown>>;
|
|
25
26
|
identity: Atom.Writable<string | undefined, string | undefined>;
|
|
27
|
+
paused: Atom.Writable<boolean, boolean>;
|
|
26
28
|
status: Atom.Writable<LiveStatus<unknown>, ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
27
29
|
};
|
|
28
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAK9D,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,UAAU,CAAC;AAEjD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAgB,MAAM,YAAY,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIrE,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,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAElG,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;;;;;;;;EAuF3C"}
|
package/dist/automaticLive.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { Effect,
|
|
1
|
+
import { Effect, Stream } from "effect";
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
|
|
5
|
+
import { queryFailure } from "#internal/queryFailure.ts";
|
|
4
6
|
import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
|
|
5
7
|
import { queryResult } from "#internal/queryResult.ts";
|
|
6
8
|
import { socketIdentity } from "#internal/rpcClient.ts";
|
|
@@ -8,31 +10,19 @@ import { live } from "#live.ts";
|
|
|
8
10
|
import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
9
11
|
import { resumeSignal } from "#resume.ts";
|
|
10
12
|
export const LiveConnection = Symbol.for("@shivaedev/contract/LiveConnection");
|
|
11
|
-
|
|
13
|
+
const pausedByRuntime = Atom.family((_runtime) => Atom.keepAlive(Atom.make(false)));
|
|
14
|
+
export function automaticLive(service, name, owner, resume, enabled = true, resumeWindow) {
|
|
12
15
|
function assertOwner(get) {
|
|
13
16
|
if (owner !== undefined && owner.registry !== get.registry) {
|
|
14
17
|
throw new Error("A session-scoped query belongs to its binding registry");
|
|
15
18
|
}
|
|
16
19
|
}
|
|
17
20
|
const coalesceWindow = Atom.keepAlive(Atom.make("20 millis"));
|
|
21
|
+
const paused = pausedByRuntime(service.runtime);
|
|
18
22
|
const statuses = Atom.make(new Map());
|
|
19
|
-
const status = Atom.map(statuses, (current) =>
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
if (values.some((value) => value.connection === "connecting")) {
|
|
23
|
-
connection = "connecting";
|
|
24
|
-
}
|
|
25
|
-
if (values.some((value) => value.connection === "reconnecting")) {
|
|
26
|
-
connection = "reconnecting";
|
|
27
|
-
}
|
|
28
|
-
return {
|
|
29
|
-
connection,
|
|
30
|
-
failure: values.find((value) => Option.isSome(value.failure))?.failure ?? Option.none(),
|
|
31
|
-
needsResync: values.some((value) => value.needsResync),
|
|
32
|
-
pending: values.reduce((sum, value) => sum + value.pending, 0),
|
|
33
|
-
};
|
|
34
|
-
});
|
|
35
|
-
const signal = resumeSignal({ ...(typeof window === "undefined" ? {} : { window }), ...(resume === undefined ? {} : { native: resume }) });
|
|
23
|
+
const status = Atom.map(statuses, (current) => aggregateLiveStatus([...current.values()]));
|
|
24
|
+
const target = resumeWindow ?? (typeof window === "undefined" ? undefined : window);
|
|
25
|
+
const signal = resumeSignal({ ...(target === undefined ? {} : { window: target }), ...(resume === undefined ? {} : { native: resume }) });
|
|
36
26
|
const connection = Atom.make((get) => {
|
|
37
27
|
assertOwner(get);
|
|
38
28
|
get.mount(service.runtime);
|
|
@@ -53,17 +43,24 @@ export function automaticLive(service, name, owner, resume, enabled = true) {
|
|
|
53
43
|
const gated = Atom.readable((get) => {
|
|
54
44
|
assertOwner(get);
|
|
55
45
|
const registry = get.registry;
|
|
46
|
+
const dispatcher = registry.schedulerAsync.makeDispatcher();
|
|
56
47
|
get.set(ready, false);
|
|
57
48
|
get.once(queryCoalesceWindow(gated));
|
|
58
49
|
get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(atom), value), { immediate: true });
|
|
59
50
|
const token = {};
|
|
51
|
+
let active = true;
|
|
60
52
|
function observe(value) {
|
|
61
|
-
|
|
53
|
+
dispatcher.scheduleTask(() => {
|
|
54
|
+
if (active) {
|
|
55
|
+
registry.update(statuses, (current) => new Map([...current, [token, value]]));
|
|
56
|
+
}
|
|
57
|
+
}, 0);
|
|
62
58
|
if (value.connection === "live") {
|
|
63
59
|
registry.set(ready, true);
|
|
64
60
|
}
|
|
65
61
|
}
|
|
66
62
|
get.addFinalizer(() => {
|
|
63
|
+
active = false;
|
|
67
64
|
if (registry.getNodes().has(statuses)) {
|
|
68
65
|
registry.update(statuses, (current) => {
|
|
69
66
|
const next = new Map(current);
|
|
@@ -91,11 +88,9 @@ export function automaticLive(service, name, owner, resume, enabled = true) {
|
|
|
91
88
|
start();
|
|
92
89
|
}
|
|
93
90
|
});
|
|
94
|
-
get.
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
});
|
|
91
|
+
const failed = queryFailure(() => started, (cause) => get.setSelf(AsyncResult.failure(cause)), () => get.refresh(atom));
|
|
92
|
+
get.subscribe(subscription.status, failed);
|
|
93
|
+
get.addFinalizer(registry.subscribe(paused, (value) => registry.set(subscription.paused, value), { immediate: true }));
|
|
99
94
|
get.mount(subscription.connection);
|
|
100
95
|
if (get.once(ready)) {
|
|
101
96
|
start();
|
|
@@ -109,6 +104,6 @@ export function automaticLive(service, name, owner, resume, enabled = true) {
|
|
|
109
104
|
}
|
|
110
105
|
return gated;
|
|
111
106
|
}
|
|
112
|
-
return { query, subscription: { coalesceWindow, connection, identity: socketIdentity, status } };
|
|
107
|
+
return { query, subscription: { coalesceWindow, connection, identity: socketIdentity, paused, status } };
|
|
113
108
|
}
|
|
114
109
|
//# sourceMappingURL=automaticLive.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"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"}
|
package/dist/bind.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ import type { ClientOptions, MadeClient } from "#clientOptions.ts";
|
|
|
12
12
|
import type { Contract, Tag } from "#contract.ts";
|
|
13
13
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
14
14
|
import type { MissingReadPolicy } from "#readPolicyErrors.ts";
|
|
15
|
-
import type { ResumeSource } from "#resume.ts";
|
|
15
|
+
import type { ResumeSource, ResumeWindow } from "#resume.ts";
|
|
16
16
|
export type Failure<R extends Rpc.Any> = R extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer TMiddleware, infer _Requires> ? Rpc.ErrorExit<R> | TMiddleware["error"]["Type"] | RpcClientError : never;
|
|
17
17
|
export type RunFailure<R extends Rpc.Any> = R extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer TMiddleware, infer _Requires> ? Failure<R> | TMiddleware["~ClientError"] : never;
|
|
18
18
|
export interface QueryOptions {
|
|
@@ -46,6 +46,7 @@ interface BindOptions {
|
|
|
46
46
|
readonly live?: boolean;
|
|
47
47
|
readonly registry?: AtomRegistry.AtomRegistry;
|
|
48
48
|
readonly resume?: ResumeSource;
|
|
49
|
+
readonly resumeWindow?: ResumeWindow;
|
|
49
50
|
}
|
|
50
51
|
export declare function bind<TName extends string, TQueries extends readonly QueryShape[], TCommands extends readonly CommandShape[], TRpcs extends Rpc.Any, TSelf, TId extends string, TClientRpcs extends Rpc.Any, TStreams extends readonly StreamShape[], TScope extends "session" | undefined>(contract: Contract<TName, TQueries, TCommands, TRpcs, TStreams, TScope>, service: AtomRpc.AtomRpcClient<TSelf, TId, TClientRpcs> & MatchingClient<NoInfer<TRpcs>, TClientRpcs>, ...options: "session" extends TScope ? [options: BindOptions & {
|
|
51
52
|
readonly registry: AtomRegistry.AtomRegistry;
|
package/dist/bind.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bind.d.ts","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAiB,KAAK,SAAS,EAAkB,MAAM,mBAAmB,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAY,GAAG,EAAE,MAAM,cAAc,CAAC;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"bind.d.ts","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"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"}
|
package/dist/bind.js
CHANGED
|
@@ -8,7 +8,7 @@ export function bind(contract, service, options) {
|
|
|
8
8
|
function bindApi(contract, service, options) {
|
|
9
9
|
const { name, queries, commands, streams, keyScope } = contract.declaration;
|
|
10
10
|
const owner = bindingOwner(keyScope, options?.registry);
|
|
11
|
-
const automatic = automaticLive(service, name, owner, options?.resume, options?.live);
|
|
11
|
+
const automatic = automaticLive(service, name, owner, options?.resume, options?.live, options?.resumeWindow);
|
|
12
12
|
return Object.assign(Object.fromEntries([
|
|
13
13
|
...queries.map((query) => [query.name, boundQuery(service, `${name}.${query.name}`, query, automatic, owner)]),
|
|
14
14
|
...commands.map((command) => [command.name, boundCommand(service, `${name}.${command.name}`, command, owner)]),
|
package/dist/bind.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bind.js","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAkB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGlF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAkB,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"bind.js","sourceRoot":"","sources":["../src/bind.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAkB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGlF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAkB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAgFnE,MAAM,UAAU,IAAI,CACnB,QAAmJ,EACnJ,OAAwD,EACxD,OAAqB;IAErB,OAAO,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,OAAO,CACf,QAAmJ,EACnJ,OAAwD,EACxD,OAAqB;IAErB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC;IAC5E,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CACnB,MAAM,CAAC,WAAW,CAAC;QAClB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAU,CAAC;QACvH,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAU,CAAC;QACvH,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAU,CAAC;KAClG,CAAC,EACF,EAAE,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,YAAY,EAAE,CAC5C,CAAC;AACH,CAAC;AAgBD,MAAM,UAAU,UAAU,CACzB,QAEC,EACD,OAGC;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,IAAI,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5F,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregateLiveStatus.d.ts","sourceRoot":"","sources":["../../src/internal/aggregateLiveStatus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAc/F"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Option } from "effect";
|
|
2
|
+
export function aggregateLiveStatus(values) {
|
|
3
|
+
let connection = "live";
|
|
4
|
+
if (values.some((value) => value.connection === "connecting")) {
|
|
5
|
+
connection = "connecting";
|
|
6
|
+
}
|
|
7
|
+
if (values.some((value) => value.connection === "reconnecting")) {
|
|
8
|
+
connection = "reconnecting";
|
|
9
|
+
}
|
|
10
|
+
return {
|
|
11
|
+
connection,
|
|
12
|
+
failure: values.find((value) => Option.isSome(value.failure))?.failure ?? Option.none(),
|
|
13
|
+
needsResync: values.some((value) => value.needsResync),
|
|
14
|
+
pending: values.reduce((sum, value) => sum + value.pending, 0),
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=aggregateLiveStatus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregateLiveStatus.js","sourceRoot":"","sources":["../../src/internal/aggregateLiveStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,MAAM,UAAU,mBAAmB,CAAC,MAAsC;IACzE,IAAI,UAAU,GAAsC,MAAM,CAAC;IAC3D,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,YAAY,CAAC,EAAE,CAAC;QAC/D,UAAU,GAAG,YAAY,CAAC;IAC3B,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,cAAc,CAAC,EAAE,CAAC;QACjE,UAAU,GAAG,cAAc,CAAC;IAC7B,CAAC;IACD,OAAO;QACN,UAAU;QACV,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;QACvF,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC;QACtD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;KAC9D,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Effect, Queue } from "effect";
|
|
2
|
+
import type { LiveHint } from "#live.ts";
|
|
3
|
+
export declare const liveHintQueue: Effect.Effect<{
|
|
4
|
+
offer: (hint: LiveHint) => void;
|
|
5
|
+
queue: Queue.Queue<{
|
|
6
|
+
readonly _tag: "Changed";
|
|
7
|
+
readonly keys: readonly ({
|
|
8
|
+
readonly _tag: "Bucket";
|
|
9
|
+
readonly collection: string;
|
|
10
|
+
readonly field: string;
|
|
11
|
+
readonly value: string | number;
|
|
12
|
+
} | {
|
|
13
|
+
readonly _tag: "List";
|
|
14
|
+
readonly collection: string;
|
|
15
|
+
} | {
|
|
16
|
+
readonly _tag: "Item";
|
|
17
|
+
readonly collection: string;
|
|
18
|
+
readonly id: string | number;
|
|
19
|
+
})[];
|
|
20
|
+
readonly queryIndexes?: readonly number[] | undefined;
|
|
21
|
+
} | {
|
|
22
|
+
readonly _tag: "Resync";
|
|
23
|
+
}, never>;
|
|
24
|
+
}, never, never>;
|
|
25
|
+
//# sourceMappingURL=liveHintQueue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"liveHintQueue.d.ts","sourceRoot":"","sources":["../../src/internal/liveHintQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,eAAO,MAAM,aAAa;kBAGJ,QAAQ;;;;;;;;;;;;;;;;;;;;gBAe5B,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Effect, Queue } from "effect";
|
|
2
|
+
export const liveHintQueue = Effect.gen(function* () {
|
|
3
|
+
const queue = yield* Queue.bounded(256);
|
|
4
|
+
let overflowed = false;
|
|
5
|
+
function offer(hint) {
|
|
6
|
+
if (overflowed && Queue.sizeUnsafe(queue) > 0) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
overflowed = false;
|
|
10
|
+
if (Queue.offerUnsafe(queue, hint)) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
while (Queue.takeUnsafe(queue) !== undefined) {
|
|
14
|
+
// Overflow discards targeted hints because the resync covers every subscribed read.
|
|
15
|
+
}
|
|
16
|
+
overflowed = true;
|
|
17
|
+
Queue.offerUnsafe(queue, { _tag: "Resync" });
|
|
18
|
+
}
|
|
19
|
+
return { offer, queue };
|
|
20
|
+
});
|
|
21
|
+
//# sourceMappingURL=liveHintQueue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"liveHintQueue.js","sourceRoot":"","sources":["../../src/internal/liveHintQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAW,GAAG,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,SAAS,KAAK,CAAC,IAAc;QAC5B,IAAI,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,OAAO;QACR,CAAC;QACD,UAAU,GAAG,KAAK,CAAC;QACnB,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO;QACR,CAAC;QACD,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9C,oFAAoF;QACrF,CAAC;QACD,UAAU,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Cause } from "effect";
|
|
2
|
+
import type { LiveStatus } from "#live.ts";
|
|
3
|
+
export declare function queryFailure(started: () => boolean, publish: (cause: Cause.Cause<unknown>) => void, recheck: () => void): ({ failure }: LiveStatus<unknown>) => void;
|
|
4
|
+
//# sourceMappingURL=queryFailure.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queryFailure.d.ts","sourceRoot":"","sources":["../../src/internal/queryFailure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,QAAQ,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI,iBAElG,UAAU,CAAC,OAAO,CAAC,UAcxC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Cause, Option, Predicate } from "effect";
|
|
2
|
+
export function queryFailure(started, publish, recheck) {
|
|
3
|
+
let rechecked;
|
|
4
|
+
return ({ failure }) => {
|
|
5
|
+
if (Option.isNone(failure)) {
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
8
|
+
if (!started()) {
|
|
9
|
+
publish(failure.value);
|
|
10
|
+
}
|
|
11
|
+
else if (failure.value !== rechecked
|
|
12
|
+
&& Option.exists(Cause.findErrorOption(failure.value), (error) => Predicate.isTagged(error, "QueryReadDenied"))) {
|
|
13
|
+
rechecked = failure.value;
|
|
14
|
+
recheck();
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=queryFailure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queryFailure.js","sourceRoot":"","sources":["../../src/internal/queryFailure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGlD,MAAM,UAAU,YAAY,CAAC,OAAsB,EAAE,OAA8C,EAAE,OAAmB;IACvH,IAAI,SAA2C,CAAC;IAChD,OAAO,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO;QACR,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAChB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;aAAM,IACN,OAAO,CAAC,KAAK,KAAK,SAAS;eACxB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAC9G,CAAC;YACF,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1B,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAC;AAC/D,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,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,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;;;;;;;;;;;EAkBhF;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Layer } from "effect";
|
|
1
|
+
import { Effect, Layer, Schedule } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
4
4
|
import { RpcClient, RpcGroup, RpcSerialization } from "effect/rpc";
|
|
@@ -25,7 +25,9 @@ export function rpcClient(name, source, options) {
|
|
|
25
25
|
export const socketIdentity = Atom.make(undefined);
|
|
26
26
|
const socketMemoMap = Layer.makeMemoMapUnsafe();
|
|
27
27
|
const socketProtocol = Atom.family((options) => {
|
|
28
|
-
const protocol = RpcClient.layerProtocolSocket(
|
|
28
|
+
const protocol = RpcClient.layerProtocolSocket({
|
|
29
|
+
retryPolicy: Schedule.jittered(Schedule.min([Schedule.exponential(500, 1.5), Schedule.spaced(5000)])),
|
|
30
|
+
}).pipe(Layer.provide(Socket.layerWebSocket(options.url, { headers: options.headers }).pipe(Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal))), Layer.provide(RpcSerialization.layerNdjson));
|
|
29
31
|
return Layer.effectContext(Effect.flatMap(Effect.scope, (scope) => Layer.buildWithMemoMap(protocol, socketMemoMap, scope)));
|
|
30
32
|
});
|
|
31
33
|
//# sourceMappingURL=rpcClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../../src/internal/rpcClient.ts"],"names":[],"mappings":"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"}
|
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,
|
|
1
|
+
{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,QAAQ,EAAU,MAAM,EAAY,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxF,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;AAG9F,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,CAAC;IAC5D,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,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;;;;;EAuGhH"}
|
package/dist/live.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Duration, Effect, Option, Schema, Stream } from "effect";
|
|
1
|
+
import { Duration, Effect, Option, Schedule, Schema, Stream } from "effect";
|
|
2
2
|
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";
|
|
@@ -101,9 +101,9 @@ export function live(runtime, options) {
|
|
|
101
101
|
connected = true;
|
|
102
102
|
isFirst = false;
|
|
103
103
|
}
|
|
104
|
-
return options.stream.pipe(Stream.runForEach((hint) => Effect.sync(() => observe(hint))), Effect.scoped, Effect.catchCause((failure) => Effect.sync(() => update({ failure: Option.some(failure) }))), Effect.andThen(Effect.sync(() => update({ connection: "reconnecting", needsResync: true })))
|
|
104
|
+
return options.stream.pipe(Stream.runForEach((hint) => Effect.sync(() => observe(hint))), Effect.scoped, Effect.catchCause((failure) => Effect.sync(() => update({ failure: Option.some(failure) }))), Effect.andThen(Effect.sync(() => update({ connection: "reconnecting", needsResync: true }))));
|
|
105
105
|
});
|
|
106
|
-
yield* Effect.
|
|
106
|
+
yield* Effect.repeat(attempt, Schedule.jittered(Schedule.spaced(options.retryDelay ?? "1 second")));
|
|
107
107
|
}))
|
|
108
108
|
.pipe(Atom.setIdleTTL(0));
|
|
109
109
|
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,EAAc,QAAQ,EAAE,MAAM,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/dist/makeLiveServer.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Effect, Stream } from "effect";
|
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { type Key, type KeyContext } from "@shivaedev/changes/keys.ts";
|
|
4
4
|
import type { QuerySubscription } from "#querySubscription.ts";
|
|
5
|
+
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
5
6
|
export declare const makeLiveServer: Effect.Effect<{
|
|
6
7
|
resync: Effect.Effect<number, never, never>;
|
|
7
8
|
stream: (keys: readonly Key[], context?: KeyContext) => Stream.Stream<{
|
|
@@ -41,6 +42,6 @@ export declare const makeLiveServer: Effect.Effect<{
|
|
|
41
42
|
readonly queryIndexes?: readonly number[] | undefined;
|
|
42
43
|
} | {
|
|
43
44
|
readonly _tag: "Resync";
|
|
44
|
-
},
|
|
45
|
+
}, QueryReadDenied, never>;
|
|
45
46
|
}, never, Reactivity.Reactivity>;
|
|
46
47
|
//# sourceMappingURL=makeLiveServer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;AAIjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc;;mBA4DV,SAAS,GAAG,EAAE,YAAY,UAAU;;;;;;;;;;;;;;;;;;;8BACzB,iBAAiB,YAAY,UAAU;;;;;;;;;;;;;;;;;;;gCAYjE,CAAC"}
|
package/dist/makeLiveServer.js
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { Effect, Queue, Stream } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { readKeys } from "@shivaedev/changes/keys.ts";
|
|
4
|
+
import { liveHintQueue } from "#internal/liveHintQueue.ts";
|
|
4
5
|
import { changedHint } from "#internal/queryHints.ts";
|
|
6
|
+
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
5
7
|
export const makeLiveServer = Effect.gen(function* () {
|
|
6
8
|
const reactivity = yield* Reactivity.Reactivity;
|
|
7
9
|
let openStreams = 0;
|
|
8
10
|
const resyncKey = `@shivaedev/contract/resync/${crypto.randomUUID()}`;
|
|
9
|
-
function open(keys, context
|
|
11
|
+
function open(keys, context) {
|
|
10
12
|
return Stream.unwrap(Effect.gen(function* () {
|
|
11
|
-
const queue = yield*
|
|
13
|
+
const { offer, queue } = yield* liveHintQueue;
|
|
12
14
|
const pending = new Map();
|
|
13
15
|
let scheduled = false;
|
|
14
16
|
let resync = false;
|
|
@@ -21,7 +23,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
21
23
|
queueMicrotask(() => {
|
|
22
24
|
scheduled = false;
|
|
23
25
|
if (active) {
|
|
24
|
-
|
|
26
|
+
offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
|
|
25
27
|
}
|
|
26
28
|
pending.clear();
|
|
27
29
|
resync = false;
|
|
@@ -47,15 +49,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
47
49
|
}
|
|
48
50
|
}));
|
|
49
51
|
yield* Queue.offer(queue, { _tag: "Resync" });
|
|
50
|
-
|
|
51
|
-
return Effect.map(subscription?.authorized ?? Effect.succeed(true), (allowed) => {
|
|
52
|
-
if (!allowed) {
|
|
53
|
-
return changedHint([], subscription?.scopes);
|
|
54
|
-
}
|
|
55
|
-
return hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription?.scopes);
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
return Stream.fromQueue(queue).pipe(Stream.mapEffect(authorizeHint), Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0));
|
|
52
|
+
return Stream.fromQueue(queue);
|
|
59
53
|
}));
|
|
60
54
|
}
|
|
61
55
|
const resync = Effect.sync(() => {
|
|
@@ -65,7 +59,9 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
65
59
|
return {
|
|
66
60
|
resync,
|
|
67
61
|
stream: (keys, context) => open(keys, context),
|
|
68
|
-
subscribe: (subscription, context) => open(subscription.keys, context,
|
|
62
|
+
subscribe: (subscription, context) => open(subscription.keys, context).pipe(Stream.mapEffect((hint) => Effect.flatMap(subscription.authorized, (allowed) => allowed
|
|
63
|
+
? Effect.succeed(hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription.scopes))
|
|
64
|
+
: Effect.fail(new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })))), Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0)),
|
|
69
65
|
};
|
|
70
66
|
});
|
|
71
67
|
//# sourceMappingURL=makeLiveServer.js.map
|
|
@@ -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;AAC/C,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAA6B,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,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.22.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -31,7 +31,6 @@
|
|
|
31
31
|
"types": "./dist/*.d.ts",
|
|
32
32
|
"default": "./dist/*.js"
|
|
33
33
|
},
|
|
34
|
-
"./internal/*": null,
|
|
35
34
|
"./package.json": "./package.json"
|
|
36
35
|
},
|
|
37
36
|
"files": [
|
|
@@ -44,25 +43,25 @@
|
|
|
44
43
|
"README.md"
|
|
45
44
|
],
|
|
46
45
|
"dependencies": {
|
|
47
|
-
"@shivaedev/changes": "0.5.
|
|
46
|
+
"@shivaedev/changes": "0.5.1",
|
|
48
47
|
"@shivaedev/types": "0.3.0"
|
|
49
48
|
},
|
|
50
49
|
"devDependencies": {
|
|
51
|
-
"@effect/platform-node": "4.0.
|
|
52
|
-
"@effect/vitest": "4.0.
|
|
53
|
-
"@shivaedev/quality": "0.
|
|
54
|
-
"@shivaedev/test": "0.
|
|
55
|
-
"@shivaedev/test-sql": "0.
|
|
56
|
-
"@shivaedev/test-story": "0.
|
|
50
|
+
"@effect/platform-node": "4.0.6",
|
|
51
|
+
"@effect/vitest": "4.0.6",
|
|
52
|
+
"@shivaedev/quality": "0.46.0",
|
|
53
|
+
"@shivaedev/test": "0.11.0",
|
|
54
|
+
"@shivaedev/test-sql": "0.12.0",
|
|
55
|
+
"@shivaedev/test-story": "0.25.0",
|
|
57
56
|
"@types/node": "24.19.2",
|
|
58
|
-
"effect": "4.0.
|
|
57
|
+
"effect": "4.0.6",
|
|
59
58
|
"esbuild": "0.28.2",
|
|
60
59
|
"happy-dom": "21.0.4",
|
|
61
60
|
"typescript": "7.0.2",
|
|
62
61
|
"vitest": "5.0.5"
|
|
63
62
|
},
|
|
64
63
|
"peerDependencies": {
|
|
65
|
-
"effect": "4.0.
|
|
64
|
+
"effect": "4.0.6"
|
|
66
65
|
},
|
|
67
66
|
"engines": {
|
|
68
67
|
"node": ">=24"
|
package/src/automaticLive.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { type Duration, Effect,
|
|
1
|
+
import { type Duration, Effect, Stream } from "effect";
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import type * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
5
5
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
6
|
+
import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
|
|
6
7
|
import type { BindingOwner } from "#internal/bindingOwner.ts";
|
|
8
|
+
import { queryFailure } from "#internal/queryFailure.ts";
|
|
7
9
|
import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
|
|
8
10
|
import { queryResult } from "#internal/queryResult.ts";
|
|
9
11
|
import { socketIdentity } from "#internal/rpcClient.ts";
|
|
@@ -20,37 +22,34 @@ export interface LiveBound {
|
|
|
20
22
|
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
21
23
|
readonly connection: Atom.Atom<unknown>;
|
|
22
24
|
readonly identity?: Atom.Writable<string | undefined>;
|
|
25
|
+
readonly paused: Atom.Writable<boolean>;
|
|
23
26
|
readonly status: Atom.Atom<LiveStatus<unknown>>;
|
|
24
27
|
};
|
|
25
28
|
}
|
|
26
29
|
|
|
30
|
+
const pausedByRuntime = Atom.family((_runtime: object) => Atom.keepAlive(Atom.make(false)));
|
|
31
|
+
|
|
27
32
|
export type ChangesClient = AtomRpc.AtomRpcClient<unknown, string, ReturnType<typeof changesRpc>>;
|
|
28
33
|
|
|
29
|
-
export function automaticLive(
|
|
34
|
+
export function automaticLive(
|
|
35
|
+
service: ChangesClient,
|
|
36
|
+
name: string,
|
|
37
|
+
owner?: BindingOwner,
|
|
38
|
+
resume?: ResumeSource,
|
|
39
|
+
enabled = true,
|
|
40
|
+
resumeWindow?: ResumeWindow,
|
|
41
|
+
) {
|
|
30
42
|
function assertOwner(get: Atom.AtomContext) {
|
|
31
43
|
if (owner !== undefined && owner.registry !== get.registry) {
|
|
32
44
|
throw new Error("A session-scoped query belongs to its binding registry");
|
|
33
45
|
}
|
|
34
46
|
}
|
|
35
47
|
const coalesceWindow = Atom.keepAlive(Atom.make<Duration.Input>("20 millis"));
|
|
48
|
+
const paused = pausedByRuntime(service.runtime);
|
|
36
49
|
const statuses = Atom.make<ReadonlyMap<object, LiveStatus<unknown>>>(new Map());
|
|
37
|
-
const status = Atom.map(statuses, (current)
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
if (values.some((value) => value.connection === "connecting")) {
|
|
41
|
-
connection = "connecting";
|
|
42
|
-
}
|
|
43
|
-
if (values.some((value) => value.connection === "reconnecting")) {
|
|
44
|
-
connection = "reconnecting";
|
|
45
|
-
}
|
|
46
|
-
return {
|
|
47
|
-
connection,
|
|
48
|
-
failure: values.find((value) => Option.isSome(value.failure))?.failure ?? Option.none(),
|
|
49
|
-
needsResync: values.some((value) => value.needsResync),
|
|
50
|
-
pending: values.reduce((sum, value) => sum + value.pending, 0),
|
|
51
|
-
};
|
|
52
|
-
});
|
|
53
|
-
const signal = resumeSignal({ ...(typeof window === "undefined" ? {} : { window }), ...(resume === undefined ? {} : { native: resume }) });
|
|
50
|
+
const status = Atom.map(statuses, (current) => aggregateLiveStatus([...current.values()]));
|
|
51
|
+
const target = resumeWindow ?? (typeof window === "undefined" ? undefined : window);
|
|
52
|
+
const signal = resumeSignal({ ...(target === undefined ? {} : { window: target }), ...(resume === undefined ? {} : { native: resume }) });
|
|
54
53
|
const connection = Atom.make((get) => {
|
|
55
54
|
assertOwner(get);
|
|
56
55
|
get.mount(service.runtime);
|
|
@@ -79,17 +78,24 @@ export function automaticLive(service: ChangesClient, name: string, owner?: Bind
|
|
|
79
78
|
(get) => {
|
|
80
79
|
assertOwner(get);
|
|
81
80
|
const registry = get.registry;
|
|
81
|
+
const dispatcher = registry.schedulerAsync.makeDispatcher();
|
|
82
82
|
get.set(ready, false);
|
|
83
83
|
get.once(queryCoalesceWindow(gated));
|
|
84
84
|
get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(atom), value), { immediate: true });
|
|
85
85
|
const token = {};
|
|
86
|
+
let active = true;
|
|
86
87
|
function observe(value: LiveStatus<unknown>) {
|
|
87
|
-
|
|
88
|
+
dispatcher.scheduleTask(() => {
|
|
89
|
+
if (active) {
|
|
90
|
+
registry.update(statuses, (current) => new Map([...current, [token, value]]));
|
|
91
|
+
}
|
|
92
|
+
}, 0);
|
|
88
93
|
if (value.connection === "live") {
|
|
89
94
|
registry.set(ready, true);
|
|
90
95
|
}
|
|
91
96
|
}
|
|
92
97
|
get.addFinalizer(() => {
|
|
98
|
+
active = false;
|
|
93
99
|
if (registry.getNodes().has(statuses)) {
|
|
94
100
|
registry.update(statuses, (current) => {
|
|
95
101
|
const next = new Map(current);
|
|
@@ -117,11 +123,13 @@ export function automaticLive(service: ChangesClient, name: string, owner?: Bind
|
|
|
117
123
|
start();
|
|
118
124
|
}
|
|
119
125
|
});
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
126
|
+
const failed = queryFailure(
|
|
127
|
+
() => started,
|
|
128
|
+
(cause) => get.setSelf(AsyncResult.failure(cause)),
|
|
129
|
+
() => get.refresh(atom),
|
|
130
|
+
);
|
|
131
|
+
get.subscribe(subscription.status, failed);
|
|
132
|
+
get.addFinalizer(registry.subscribe(paused, (value) => registry.set(subscription.paused, value), { immediate: true }));
|
|
125
133
|
get.mount(subscription.connection);
|
|
126
134
|
if (get.once(ready)) {
|
|
127
135
|
start();
|
|
@@ -137,5 +145,5 @@ export function automaticLive(service: ChangesClient, name: string, owner?: Bind
|
|
|
137
145
|
}
|
|
138
146
|
return gated;
|
|
139
147
|
}
|
|
140
|
-
return { query, subscription: { coalesceWindow, connection, identity: socketIdentity, status } };
|
|
148
|
+
return { query, subscription: { coalesceWindow, connection, identity: socketIdentity, paused, status } };
|
|
141
149
|
}
|
package/src/bind.ts
CHANGED
|
@@ -15,7 +15,7 @@ import { boundCommand, boundQuery, boundStream } from "#internal/clientOperation
|
|
|
15
15
|
import { type RpcSource, rpcClient } from "#internal/rpcClient.ts";
|
|
16
16
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
17
17
|
import type { MissingReadPolicy } from "#readPolicyErrors.ts";
|
|
18
|
-
import type { ResumeSource } from "#resume.ts";
|
|
18
|
+
import type { ResumeSource, ResumeWindow } from "#resume.ts";
|
|
19
19
|
|
|
20
20
|
export type Failure<R extends Rpc.Any> =
|
|
21
21
|
R extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer TMiddleware, infer _Requires>
|
|
@@ -74,6 +74,7 @@ interface BindOptions {
|
|
|
74
74
|
readonly live?: boolean;
|
|
75
75
|
readonly registry?: AtomRegistry.AtomRegistry;
|
|
76
76
|
readonly resume?: ResumeSource;
|
|
77
|
+
readonly resumeWindow?: ResumeWindow;
|
|
77
78
|
}
|
|
78
79
|
|
|
79
80
|
export function bind<
|
|
@@ -106,7 +107,7 @@ function bindApi(
|
|
|
106
107
|
) {
|
|
107
108
|
const { name, queries, commands, streams, keyScope } = contract.declaration;
|
|
108
109
|
const owner = bindingOwner(keyScope, options?.registry);
|
|
109
|
-
const automatic = automaticLive(service, name, owner, options?.resume, options?.live);
|
|
110
|
+
const automatic = automaticLive(service, name, owner, options?.resume, options?.live, options?.resumeWindow);
|
|
110
111
|
return Object.assign(
|
|
111
112
|
Object.fromEntries([
|
|
112
113
|
...queries.map((query) => [query.name, boundQuery(service, `${name}.${query.name}`, query, automatic, owner)] as const),
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Option } from "effect";
|
|
2
|
+
import type { LiveStatus } from "#live.ts";
|
|
3
|
+
|
|
4
|
+
export function aggregateLiveStatus(values: readonly LiveStatus<unknown>[]): LiveStatus<unknown> {
|
|
5
|
+
let connection: LiveStatus<unknown>["connection"] = "live";
|
|
6
|
+
if (values.some((value) => value.connection === "connecting")) {
|
|
7
|
+
connection = "connecting";
|
|
8
|
+
}
|
|
9
|
+
if (values.some((value) => value.connection === "reconnecting")) {
|
|
10
|
+
connection = "reconnecting";
|
|
11
|
+
}
|
|
12
|
+
return {
|
|
13
|
+
connection,
|
|
14
|
+
failure: values.find((value) => Option.isSome(value.failure))?.failure ?? Option.none(),
|
|
15
|
+
needsResync: values.some((value) => value.needsResync),
|
|
16
|
+
pending: values.reduce((sum, value) => sum + value.pending, 0),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Effect, Queue } from "effect";
|
|
2
|
+
import type { LiveHint } from "#live.ts";
|
|
3
|
+
|
|
4
|
+
export const liveHintQueue = Effect.gen(function* () {
|
|
5
|
+
const queue = yield* Queue.bounded<LiveHint>(256);
|
|
6
|
+
let overflowed = false;
|
|
7
|
+
function offer(hint: LiveHint) {
|
|
8
|
+
if (overflowed && Queue.sizeUnsafe(queue) > 0) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
overflowed = false;
|
|
12
|
+
if (Queue.offerUnsafe(queue, hint)) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
while (Queue.takeUnsafe(queue) !== undefined) {
|
|
16
|
+
// Overflow discards targeted hints because the resync covers every subscribed read.
|
|
17
|
+
}
|
|
18
|
+
overflowed = true;
|
|
19
|
+
Queue.offerUnsafe(queue, { _tag: "Resync" });
|
|
20
|
+
}
|
|
21
|
+
return { offer, queue };
|
|
22
|
+
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Cause, Option, Predicate } from "effect";
|
|
2
|
+
import type { LiveStatus } from "#live.ts";
|
|
3
|
+
|
|
4
|
+
export function queryFailure(started: () => boolean, publish: (cause: Cause.Cause<unknown>) => void, recheck: () => void) {
|
|
5
|
+
let rechecked: Cause.Cause<unknown> | undefined;
|
|
6
|
+
return ({ failure }: LiveStatus<unknown>) => {
|
|
7
|
+
if (Option.isNone(failure)) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
if (!started()) {
|
|
11
|
+
publish(failure.value);
|
|
12
|
+
} else if (
|
|
13
|
+
failure.value !== rechecked
|
|
14
|
+
&& Option.exists(Cause.findErrorOption(failure.value), (error) => Predicate.isTagged(error, "QueryReadDenied"))
|
|
15
|
+
) {
|
|
16
|
+
rechecked = failure.value;
|
|
17
|
+
recheck();
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Context, Effect, Layer } from "effect";
|
|
1
|
+
import { type Context, Effect, Layer, Schedule } 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";
|
|
@@ -40,7 +40,9 @@ const socketProtocol = Atom.family(
|
|
|
40
40
|
readonly identity: string | undefined;
|
|
41
41
|
readonly webSocketConstructor: ClientOptions["webSocketConstructor"];
|
|
42
42
|
}) => {
|
|
43
|
-
const protocol = RpcClient.layerProtocolSocket(
|
|
43
|
+
const protocol = RpcClient.layerProtocolSocket({
|
|
44
|
+
retryPolicy: Schedule.jittered(Schedule.min([Schedule.exponential(500, 1.5), Schedule.spaced(5000)])),
|
|
45
|
+
}).pipe(
|
|
44
46
|
Layer.provide(
|
|
45
47
|
Socket.layerWebSocket(options.url, { headers: options.headers }).pipe(
|
|
46
48
|
Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal),
|
package/src/live.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Cause, Duration, Effect, Option, Schema, Stream } from "effect";
|
|
1
|
+
import { type Cause, Duration, Effect, Option, Schedule, Schema, 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";
|
|
@@ -124,10 +124,9 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
124
124
|
Effect.scoped,
|
|
125
125
|
Effect.catchCause((failure) => Effect.sync(() => update({ failure: Option.some(failure) }))),
|
|
126
126
|
Effect.andThen(Effect.sync(() => update({ connection: "reconnecting", needsResync: true }))),
|
|
127
|
-
Effect.andThen(Effect.sleep(options.retryDelay ?? "1 second")),
|
|
128
127
|
);
|
|
129
128
|
});
|
|
130
|
-
yield* Effect.
|
|
129
|
+
yield* Effect.repeat(attempt, Schedule.jittered(Schedule.spaced(options.retryDelay ?? "1 second")));
|
|
131
130
|
}),
|
|
132
131
|
)
|
|
133
132
|
.pipe(Atom.setIdleTTL(0));
|
package/src/makeLiveServer.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { Effect, Queue, 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
|
+
import { liveHintQueue } from "#internal/liveHintQueue.ts";
|
|
4
5
|
import { changedHint } from "#internal/queryHints.ts";
|
|
5
6
|
import type { LiveHint } from "#live.ts";
|
|
6
7
|
import type { QuerySubscription } from "#querySubscription.ts";
|
|
8
|
+
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
7
9
|
|
|
8
10
|
export const makeLiveServer = Effect.gen(function* () {
|
|
9
11
|
const reactivity = yield* Reactivity.Reactivity;
|
|
10
12
|
let openStreams = 0;
|
|
11
13
|
const resyncKey = `@shivaedev/contract/resync/${crypto.randomUUID()}`;
|
|
12
|
-
function open(keys: readonly Key[], context?: KeyContext
|
|
14
|
+
function open(keys: readonly Key[], context?: KeyContext): Stream.Stream<LiveHint> {
|
|
13
15
|
return Stream.unwrap(
|
|
14
16
|
Effect.gen(function* () {
|
|
15
|
-
const queue = yield*
|
|
17
|
+
const { offer, queue } = yield* liveHintQueue;
|
|
16
18
|
const pending = new Map<string, Key>();
|
|
17
19
|
let scheduled = false;
|
|
18
20
|
let resync = false;
|
|
@@ -25,7 +27,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
25
27
|
queueMicrotask(() => {
|
|
26
28
|
scheduled = false;
|
|
27
29
|
if (active) {
|
|
28
|
-
|
|
30
|
+
offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
|
|
29
31
|
}
|
|
30
32
|
pending.clear();
|
|
31
33
|
resync = false;
|
|
@@ -55,18 +57,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
55
57
|
}),
|
|
56
58
|
);
|
|
57
59
|
yield* Queue.offer(queue, { _tag: "Resync" });
|
|
58
|
-
|
|
59
|
-
return Effect.map(subscription?.authorized ?? Effect.succeed(true), (allowed) => {
|
|
60
|
-
if (!allowed) {
|
|
61
|
-
return changedHint([], subscription?.scopes);
|
|
62
|
-
}
|
|
63
|
-
return hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription?.scopes);
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
return Stream.fromQueue(queue).pipe(
|
|
67
|
-
Stream.mapEffect(authorizeHint),
|
|
68
|
-
Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0),
|
|
69
|
-
);
|
|
60
|
+
return Stream.fromQueue(queue);
|
|
70
61
|
}),
|
|
71
62
|
);
|
|
72
63
|
}
|
|
@@ -77,6 +68,16 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
77
68
|
return {
|
|
78
69
|
resync,
|
|
79
70
|
stream: (keys: readonly Key[], context?: KeyContext) => open(keys, context),
|
|
80
|
-
subscribe: (subscription: QuerySubscription, context?: KeyContext) =>
|
|
71
|
+
subscribe: (subscription: QuerySubscription, context?: KeyContext) =>
|
|
72
|
+
open(subscription.keys, context).pipe(
|
|
73
|
+
Stream.mapEffect((hint) =>
|
|
74
|
+
Effect.flatMap(subscription.authorized, (allowed) =>
|
|
75
|
+
allowed
|
|
76
|
+
? Effect.succeed(hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription.scopes))
|
|
77
|
+
: Effect.fail(new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })),
|
|
78
|
+
),
|
|
79
|
+
),
|
|
80
|
+
Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0),
|
|
81
|
+
),
|
|
81
82
|
};
|
|
82
83
|
});
|