@shivaedev/contract 0.44.0 → 0.45.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 +6 -0
- package/README.md +3 -1
- package/dist/adapters/activityState.d.ts +3 -2
- package/dist/adapters/activityState.d.ts.map +1 -1
- package/dist/adapters/activityState.js +11 -1
- package/dist/adapters/activityState.js.map +1 -1
- package/dist/adapters/clientConnection.d.ts +1 -0
- package/dist/adapters/clientConnection.d.ts.map +1 -1
- package/dist/adapters/clientConnection.js +18 -10
- package/dist/adapters/clientConnection.js.map +1 -1
- package/dist/clientActivities.d.ts +2 -0
- package/dist/clientActivities.d.ts.map +1 -1
- package/dist/clientActivities.js +7 -3
- package/dist/clientActivities.js.map +1 -1
- package/dist/clientActivity.d.ts +2 -0
- package/dist/clientActivity.d.ts.map +1 -1
- package/dist/clientActivity.js.map +1 -1
- package/dist/defineModule.js +1 -1
- package/dist/defineModule.js.map +1 -1
- package/dist/rpcClient.d.ts +1 -0
- package/dist/rpcClient.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/adapters/activityState.ts +12 -3
- package/src/adapters/clientConnection.ts +24 -16
- package/src/clientActivities.ts +7 -3
- package/src/clientActivity.ts +2 -0
- package/src/defineModule.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.45.0 - 2026-11-18
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- The client activity state carries `firstSettled`, the latch behind that hook, and `clientActivity(client)` exposes it as a native `firstSettled` atom beside `connectionStatus`. Code that builds a `ClientActivityState` value itself adds `firstSettled`.
|
|
8
|
+
|
|
3
9
|
## 0.44.0 - 2026-11-11
|
|
4
10
|
|
|
5
11
|
### Added
|
package/README.md
CHANGED
|
@@ -536,6 +536,8 @@ Use this helper in hosts from `@shivaedev/server`, or a native RPC host wired wi
|
|
|
536
536
|
|
|
537
537
|
`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" | "waiting-for-connection"` value aggregated across mounted queries from all bindings of the same client service, with live subscription changes debounced for 300 ms on the client runtime’s Clock and held commands reported immediately. Refused subscriptions do not count as reconnecting. The stream also exposes its native `connectionStatus` atom for React readers.
|
|
538
538
|
|
|
539
|
+
The state's `firstSettled` flag is `false` until a mounted query has delivered its first success or failure and, with that, no mounted query awaits a first result and no command is in flight. It then stays `true` for that client: a later command or a newly mounted query does not turn it back, and a client that mounts no query never turns it on. The stream exposes it as its native `firstSettled` atom, which React reads through `useFirstSettled`.
|
|
540
|
+
|
|
539
541
|
For screen stories, pass `activityScreenSignal(clientActivity(client))` to a test-story screen driver's `activity` option. By default, `settle()` waits for commands in flight and the first result of each mounted query, then flushes the renderer. Contract identifies commands from its own RPC annotations; kits need no query-name exceptions. The activity state's `commands` count includes commands held for a connection, and `initialQueries` counts mounted queries until their first success or failure. Unmounting releases that query's pending activity. `isClientSettled(state)` checks these two counts. An open live query that has delivered its first result, including one awaiting a later refresh, does not keep a screen story pending.
|
|
540
542
|
|
|
541
543
|
`activityScreenSignal(activity)` projects the stream and its `current` Effect into `{ pending, connectionStatus }`. The returned shape is structural and carries no test-story dependency. Stories that need a later live change wait for it with the screen driver's `withLiveAnswer` and `liveAnswers` below, then settle the screen. `isClientIdle(state)` retains the full finite-work check: `rpcCalls` for finite calls, `refreshingAtoms` for mounted query atoms awaiting values must all be zero. Long-lived subscription streams and server reruns themselves do not count as finite calls.
|
|
@@ -836,7 +838,7 @@ const client = makeClient(Notes, {
|
|
|
836
838
|
});
|
|
837
839
|
```
|
|
838
840
|
|
|
839
|
-
The URL identifies the client configuration; the in-memory protocol opens no socket. The client's direct calls and bound query atoms use the real handlers, schema decoding and middleware. Live subscriptions use the supplied handlers and change source, and mounted queries refresh from their updates. Closing a subscription interrupts its server stream. The protocol does not add handlers or publish changes: provide the same live handlers and change source that the application serves over WebSocket.
|
|
841
|
+
The URL identifies the client configuration; the in-memory protocol opens no socket. The client's direct calls and bound query atoms use the real handlers, schema decoding and middleware. Live subscriptions use the supplied handlers and change source, and mounted queries refresh from their updates. Closing a subscription interrupts its server stream. The protocol does not add handlers or publish changes: provide the same live handlers and change source that the application serves over WebSocket. It refuses a group the application host would refuse to start, such as one whose RPC uses a field name both as sensitive and as public, with the host's error; the [test-kits README](https://github.com/ShivaeDev/platform/tree/main/packages/test-kits#contract-subscriptions) describes the check.
|
|
840
842
|
|
|
841
843
|
### Settled queries in stories
|
|
842
844
|
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import type
|
|
2
|
+
import { type ClientActivityState, type 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
|
-
|
|
7
|
+
answered: () => void;
|
|
8
|
+
change: (key: Exclude<keyof ClientActivityState, "connectionStatus" | "firstSettled">, delta: number) => void;
|
|
8
9
|
hold: () => () => void;
|
|
9
10
|
setConnection: (connectionStatus: ConnectionStatus) => void;
|
|
10
11
|
};
|
|
@@ -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,
|
|
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,EAAE,KAAK,mBAAmB,EAAE,KAAK,gBAAgB,EAAmB,MAAM,oBAAoB,CAAC;AAEtG,wBAAgB,aAAa;IAyB3B,QAAQ;;;IACR,QAAQ;IAIR,MAAM,QAAQ,OAAO,CAAC,MAAM,mBAAmB,EAAE,kBAAkB,GAAG,cAAc,CAAC,SAAS,MAAM;IAGpG,IAAI;IAQJ,aAAa,qBAAqB,gBAAgB;EAKnD"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
+
import { isClientSettled } from "#clientActivity.ts";
|
|
2
3
|
export function activityState() {
|
|
3
4
|
let held = 0;
|
|
5
|
+
let answered = false;
|
|
4
6
|
let connection = "live";
|
|
5
7
|
const state = Effect.runSync(SubscriptionRef.make({
|
|
6
8
|
commands: 0,
|
|
7
9
|
connectionStatus: "live",
|
|
10
|
+
firstSettled: false,
|
|
8
11
|
initialQueries: 0,
|
|
9
12
|
liveHints: 0,
|
|
10
13
|
refreshingAtoms: 0,
|
|
@@ -14,10 +17,17 @@ export function activityState() {
|
|
|
14
17
|
const connectionStatus = held > 0 ? "waiting-for-connection" : connection;
|
|
15
18
|
Effect.runSync(SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })));
|
|
16
19
|
}
|
|
20
|
+
function latched(current) {
|
|
21
|
+
return answered && !current.firstSettled && isClientSettled(current) ? { ...current, firstSettled: true } : current;
|
|
22
|
+
}
|
|
17
23
|
return {
|
|
18
24
|
activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
|
|
25
|
+
answered: () => {
|
|
26
|
+
answered = true;
|
|
27
|
+
Effect.runSync(SubscriptionRef.update(state, latched));
|
|
28
|
+
},
|
|
19
29
|
change: (key, delta) => {
|
|
20
|
-
Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
|
|
30
|
+
Effect.runSync(SubscriptionRef.update(state, (current) => latched({ ...current, [key]: current[key] + delta })));
|
|
21
31
|
},
|
|
22
32
|
hold: () => {
|
|
23
33
|
held += 1;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAmD,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,UAAU,aAAa;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,UAAU,GAAqB,MAAM,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAC3B,eAAe,CAAC,IAAI,CAAsB;QACzC,QAAQ,EAAE,CAAC;QACX,gBAAgB,EAAE,MAAM;QACxB,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,eAAe,EAAE,CAAC;QAClB,QAAQ,EAAE,CAAC;KACX,CAAC,CACF,CAAC;IACF,SAAS,OAAO;QACf,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,UAAU,CAAC;QAC1E,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;IACH,CAAC;IACD,SAAS,OAAO,CAAC,OAA4B;QAC5C,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACrH,CAAC;IACD,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,QAAQ,EAAE,GAAG,EAAE;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,EAAE,CAAC,GAA4E,EAAE,KAAa,EAAE,EAAE;YACvG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAClH,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,CAAC;YACV,OAAO,EAAE,CAAC;YACV,OAAO,GAAG,EAAE;gBACX,IAAI,IAAI,CAAC,CAAC;gBACV,OAAO,EAAE,CAAC;YACX,CAAC,CAAC;QACH,CAAC;QACD,aAAa,EAAE,CAAC,gBAAkC,EAAE,EAAE;YACrD,UAAU,GAAG,gBAAgB,CAAC;YAC9B,OAAO,EAAE,CAAC;QACX,CAAC;KACD,CAAC;AACH,CAAC"}
|
|
@@ -5,6 +5,7 @@ import type { LiveStatus } from "#live.ts";
|
|
|
5
5
|
export declare function clientConnection(factory: Atom.RuntimeFactory, publish: (status: ConnectionStatus) => void, activity: Stream.Stream<ClientActivityState> & {
|
|
6
6
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
7
7
|
}): {
|
|
8
|
+
firstSettled: Atom.Atom<boolean>;
|
|
8
9
|
status: Atom.Atom<ConnectionStatus>;
|
|
9
10
|
statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>, ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
10
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,IAAI,CAAC,cAAc,EAC5B,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,EAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;CAAE
|
|
1
|
+
{"version":3,"file":"clientConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,IAAI,CAAC,cAAc,EAC5B,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,EAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;CAAE;;;;EAsDvG"}
|
|
@@ -17,15 +17,23 @@ export function clientConnection(factory, publish, activity) {
|
|
|
17
17
|
get.addFinalizer(cancel);
|
|
18
18
|
return "live";
|
|
19
19
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
20
|
+
function follow(select, mounts = []) {
|
|
21
|
+
return Atom.make((get) => {
|
|
22
|
+
for (const mounted of mounts) {
|
|
23
|
+
get.mount(mounted);
|
|
24
|
+
}
|
|
25
|
+
const context = AsyncResult.value(get(runtime));
|
|
26
|
+
if (Option.isSome(context)) {
|
|
27
|
+
const cancel = Effect.runCallbackWith(context.value)(activity.pipe(Stream.map(select), Stream.changes, Stream.runForEach((value) => Effect.sync(() => get.setSelf(value)))));
|
|
28
|
+
get.addFinalizer(cancel);
|
|
29
|
+
}
|
|
30
|
+
return select(Effect.runSync(activity.current));
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
firstSettled: follow((state) => state.firstSettled),
|
|
35
|
+
status: follow((state) => state.connectionStatus, [debounced]),
|
|
36
|
+
statuses,
|
|
37
|
+
};
|
|
30
38
|
}
|
|
31
39
|
//# sourceMappingURL=clientConnection.js.map
|
|
@@ -1 +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,CAC/B,OAA4B,EAC5B,OAA2C,EAC3C,QAAuG;IAEvG,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,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAoB,EAAE;QACrD,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,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"clientConnection.js","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare const clientActivities: WeakMap<object, {
|
|
|
6
6
|
current: Effect.Effect<import("./clientActivity.ts").ClientActivityState, never, never>;
|
|
7
7
|
} & {
|
|
8
8
|
connectionStatus: Atom.Atom<import("./clientActivity.ts").ConnectionStatus>;
|
|
9
|
+
firstSettled: Atom.Atom<boolean>;
|
|
9
10
|
};
|
|
10
11
|
hint: () => void;
|
|
11
12
|
hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
@@ -18,6 +19,7 @@ export declare function makeActivity(factory: Atom.RuntimeFactory): {
|
|
|
18
19
|
current: Effect.Effect<import("./clientActivity.ts").ClientActivityState, never, never>;
|
|
19
20
|
} & {
|
|
20
21
|
connectionStatus: Atom.Atom<import("./clientActivity.ts").ConnectionStatus>;
|
|
22
|
+
firstSettled: Atom.Atom<boolean>;
|
|
21
23
|
};
|
|
22
24
|
hint: () => void;
|
|
23
25
|
hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivities.d.ts","sourceRoot":"","sources":["../src/clientActivities.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;AAMpD,eAAO,MAAM,gBAAgB
|
|
1
|
+
{"version":3,"file":"clientActivities.d.ts","sourceRoot":"","sources":["../src/clientActivities.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;AAMpD,eAAO,MAAM,gBAAgB;;;;;;;;WA4EpB,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;YAnEhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAwBvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAjCE,CAAC;AAEvE,wBAAgB,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc;;;;;;;;WA0EhD,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;YAnEhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAwBvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAwDnE"}
|
package/dist/clientActivities.js
CHANGED
|
@@ -5,7 +5,7 @@ import { clientConnection } from "#adapters/clientConnection.ts";
|
|
|
5
5
|
import { wrapAtom } from "#wrapAtom.ts";
|
|
6
6
|
export const clientActivities = new WeakMap();
|
|
7
7
|
export function makeActivity(factory) {
|
|
8
|
-
const { activity, change, hold, setConnection } = activityState();
|
|
8
|
+
const { activity, answered, change, hold, setConnection } = activityState();
|
|
9
9
|
const connection = clientConnection(factory, setConnection, activity);
|
|
10
10
|
function begin(key) {
|
|
11
11
|
change(key, 1);
|
|
@@ -43,9 +43,13 @@ export function makeActivity(factory) {
|
|
|
43
43
|
if (!active) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
received
|
|
46
|
+
const first = !(received || AsyncResult.isInitial(result));
|
|
47
|
+
received ||= first;
|
|
47
48
|
initial.set(!received);
|
|
48
49
|
refreshing.set(result.waiting || AsyncResult.isInitial(result));
|
|
50
|
+
if (first) {
|
|
51
|
+
answered();
|
|
52
|
+
}
|
|
49
53
|
}
|
|
50
54
|
get.addFinalizer(() => {
|
|
51
55
|
active = false;
|
|
@@ -68,7 +72,7 @@ export function makeActivity(factory) {
|
|
|
68
72
|
return watched;
|
|
69
73
|
}
|
|
70
74
|
return {
|
|
71
|
-
activity: Object.assign(activity, { connectionStatus: connection.status }),
|
|
75
|
+
activity: Object.assign(activity, { connectionStatus: connection.status, firstSettled: connection.firstSettled }),
|
|
72
76
|
hint: () => change("liveHints", 1),
|
|
73
77
|
hold: (effect) => track(Effect.acquireUseRelease(Effect.sync(hold), () => effect, (end) => Effect.sync(end)), true),
|
|
74
78
|
statuses: connection.statuses,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.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,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEvE,MAAM,UAAU,YAAY,CAAC,OAA4B;IACxD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"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"}
|
package/dist/clientActivity.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export type ConnectionStatus = "live" | "reconnecting" | "waiting-for-connection
|
|
|
4
4
|
export interface ClientActivityState {
|
|
5
5
|
readonly commands: number;
|
|
6
6
|
readonly connectionStatus: ConnectionStatus;
|
|
7
|
+
readonly firstSettled: boolean;
|
|
7
8
|
readonly initialQueries: number;
|
|
8
9
|
readonly liveHints: number;
|
|
9
10
|
readonly refreshingAtoms: number;
|
|
@@ -12,6 +13,7 @@ export interface ClientActivityState {
|
|
|
12
13
|
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
13
14
|
readonly connectionStatus: Atom.Atom<ConnectionStatus>;
|
|
14
15
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
16
|
+
readonly firstSettled: Atom.Atom<boolean>;
|
|
15
17
|
};
|
|
16
18
|
export declare const Activity: unique symbol;
|
|
17
19
|
export interface ActiveClient {
|
|
@@ -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;AACxC,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,wBAAwB,CAAC;AAElF,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,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;
|
|
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,GAAG,wBAAwB,CAAC;AAElF,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,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;IACrD,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;CAC1C,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,eAAe,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,yBAAkB;;;;;;;;EAKvF"}
|
|
@@ -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;AAqBxC,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,eAAe,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAA0B;IACzD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAwB,EAAE,OAAO,GAAG,eAAe;IACvF,SAAS,WAAW,CAAC,KAA0B;QAC9C,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/E,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"}
|
package/dist/defineModule.js
CHANGED
|
@@ -12,6 +12,6 @@ export function defineModule(definition) {
|
|
|
12
12
|
...(definition.keyScope === undefined ? {} : { keyScope: definition.keyScope }),
|
|
13
13
|
...(definition.subject === undefined ? {} : { subject: definition.subject }),
|
|
14
14
|
});
|
|
15
|
-
return definition.middleware
|
|
15
|
+
return definition.middleware === undefined ? group : group.middleware(definition.middleware);
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=defineModule.js.map
|
package/dist/defineModule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineModule.js","sourceRoot":"","sources":["../src/defineModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAiB,aAAa,EAAE,MAAM,cAAc,CAAC;AAO5D,OAAO,EAA4B,KAAK,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,OAAO,EAAyB,CAAC,mCAAmC,CAAC;CAAG;AAkFnH,MAAM,UAAU,YAAY,CAAC,UAO5B;IACA,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE;QAC5C,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC;QACzD,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC;QACxE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC;QACrE,GAAG,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/E,GAAG,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;KAC5E,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"defineModule.js","sourceRoot":"","sources":["../src/defineModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAiB,aAAa,EAAE,MAAM,cAAc,CAAC;AAO5D,OAAO,EAA4B,KAAK,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,OAAO,EAAyB,CAAC,mCAAmC,CAAC;CAAG;AAkFnH,MAAM,UAAU,YAAY,CAAC,UAO5B;IACA,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE;QAC5C,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC;QACzD,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC;QACxE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC;QACrE,GAAG,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/E,GAAG,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;KAC5E,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC9F,CAAC"}
|
package/dist/rpcClient.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export declare function rpcClient(name: string, source: RpcSource, options: Clie
|
|
|
13
13
|
current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
|
|
14
14
|
} & {
|
|
15
15
|
connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
|
|
16
|
+
firstSettled: Atom.Atom<boolean>;
|
|
16
17
|
};
|
|
17
18
|
Client: AtomRpc.AtomRpcClient<unknown, `${string}/Client`, Rpc.Any>;
|
|
18
19
|
client: Effect.Effect<{
|
package/dist/rpcClient.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,YAAY,CAAC;AAI3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AASvD,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/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,YAAY,CAAC;AAI3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AASvD,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;;;;;;;;;+BA8DH,KAAK,eAAe,KAAK;;;EAKtG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/contract",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.45.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -51,13 +51,13 @@
|
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@effect/platform-node": "4.1.2",
|
|
53
53
|
"@effect/vitest": "4.1.2",
|
|
54
|
-
"@shivaedev/identity": "0.
|
|
55
|
-
"@shivaedev/quality": "0.
|
|
56
|
-
"@shivaedev/server": "0.34.
|
|
57
|
-
"@shivaedev/sql": "0.
|
|
58
|
-
"@shivaedev/test-kits": "0.
|
|
59
|
-
"@shivaedev/test-sql": "0.
|
|
60
|
-
"@shivaedev/test-story": "0.47.
|
|
54
|
+
"@shivaedev/identity": "0.32.1",
|
|
55
|
+
"@shivaedev/quality": "0.78.1",
|
|
56
|
+
"@shivaedev/server": "0.34.2",
|
|
57
|
+
"@shivaedev/sql": "0.48.0",
|
|
58
|
+
"@shivaedev/test-kits": "0.13.0",
|
|
59
|
+
"@shivaedev/test-sql": "0.25.1",
|
|
60
|
+
"@shivaedev/test-story": "0.47.2",
|
|
61
61
|
"@types/node": "24.19.2",
|
|
62
62
|
"effect": "4.1.2",
|
|
63
63
|
"happy-dom": "21.0.4",
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
-
import type
|
|
2
|
+
import { type ClientActivityState, type ConnectionStatus, isClientSettled } from "#clientActivity.ts";
|
|
3
3
|
|
|
4
4
|
export function activityState() {
|
|
5
5
|
let held = 0;
|
|
6
|
+
let answered = false;
|
|
6
7
|
let connection: ConnectionStatus = "live";
|
|
7
8
|
const state = Effect.runSync(
|
|
8
9
|
SubscriptionRef.make<ClientActivityState>({
|
|
9
10
|
commands: 0,
|
|
10
11
|
connectionStatus: "live",
|
|
12
|
+
firstSettled: false,
|
|
11
13
|
initialQueries: 0,
|
|
12
14
|
liveHints: 0,
|
|
13
15
|
refreshingAtoms: 0,
|
|
@@ -20,10 +22,17 @@ export function activityState() {
|
|
|
20
22
|
SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })),
|
|
21
23
|
);
|
|
22
24
|
}
|
|
25
|
+
function latched(current: ClientActivityState): ClientActivityState {
|
|
26
|
+
return answered && !current.firstSettled && isClientSettled(current) ? { ...current, firstSettled: true } : current;
|
|
27
|
+
}
|
|
23
28
|
return {
|
|
24
29
|
activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
|
|
25
|
-
|
|
26
|
-
|
|
30
|
+
answered: () => {
|
|
31
|
+
answered = true;
|
|
32
|
+
Effect.runSync(SubscriptionRef.update(state, latched));
|
|
33
|
+
},
|
|
34
|
+
change: (key: Exclude<keyof ClientActivityState, "connectionStatus" | "firstSettled">, delta: number) => {
|
|
35
|
+
Effect.runSync(SubscriptionRef.update(state, (current) => latched({ ...current, [key]: current[key] + delta })));
|
|
27
36
|
},
|
|
28
37
|
hold: () => {
|
|
29
38
|
held += 1;
|
|
@@ -37,20 +37,28 @@ export function clientConnection(
|
|
|
37
37
|
get.addFinalizer(cancel);
|
|
38
38
|
return "live";
|
|
39
39
|
});
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
40
|
+
function follow<A>(select: (state: ClientActivityState) => A, mounts: readonly Atom.Atom<unknown>[] = []) {
|
|
41
|
+
return Atom.make((get): A => {
|
|
42
|
+
for (const mounted of mounts) {
|
|
43
|
+
get.mount(mounted);
|
|
44
|
+
}
|
|
45
|
+
const context = AsyncResult.value(get(runtime));
|
|
46
|
+
if (Option.isSome(context)) {
|
|
47
|
+
const cancel = Effect.runCallbackWith(context.value)(
|
|
48
|
+
activity.pipe(
|
|
49
|
+
Stream.map(select),
|
|
50
|
+
Stream.changes,
|
|
51
|
+
Stream.runForEach((value) => Effect.sync(() => get.setSelf(value))),
|
|
52
|
+
),
|
|
53
|
+
);
|
|
54
|
+
get.addFinalizer(cancel);
|
|
55
|
+
}
|
|
56
|
+
return select(Effect.runSync(activity.current));
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
firstSettled: follow((state) => state.firstSettled),
|
|
61
|
+
status: follow((state) => state.connectionStatus, [debounced]),
|
|
62
|
+
statuses,
|
|
63
|
+
};
|
|
56
64
|
}
|
package/src/clientActivities.ts
CHANGED
|
@@ -9,7 +9,7 @@ type ActivityTracker = ReturnType<typeof makeActivity>;
|
|
|
9
9
|
export const clientActivities = new WeakMap<object, ActivityTracker>();
|
|
10
10
|
|
|
11
11
|
export function makeActivity(factory: Atom.RuntimeFactory) {
|
|
12
|
-
const { activity, change, hold, setConnection } = activityState();
|
|
12
|
+
const { activity, answered, change, hold, setConnection } = activityState();
|
|
13
13
|
const connection = clientConnection(factory, setConnection, activity);
|
|
14
14
|
function begin(key: "rpcCalls" | "commands") {
|
|
15
15
|
change(key, 1);
|
|
@@ -51,9 +51,13 @@ export function makeActivity(factory: Atom.RuntimeFactory) {
|
|
|
51
51
|
if (!active) {
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
received
|
|
54
|
+
const first = !(received || AsyncResult.isInitial(result));
|
|
55
|
+
received ||= first;
|
|
55
56
|
initial.set(!received);
|
|
56
57
|
refreshing.set(result.waiting || AsyncResult.isInitial(result));
|
|
58
|
+
if (first) {
|
|
59
|
+
answered();
|
|
60
|
+
}
|
|
57
61
|
}
|
|
58
62
|
get.addFinalizer(() => {
|
|
59
63
|
active = false;
|
|
@@ -76,7 +80,7 @@ export function makeActivity(factory: Atom.RuntimeFactory) {
|
|
|
76
80
|
return watched;
|
|
77
81
|
}
|
|
78
82
|
return {
|
|
79
|
-
activity: Object.assign(activity, { connectionStatus: connection.status }),
|
|
83
|
+
activity: Object.assign(activity, { connectionStatus: connection.status, firstSettled: connection.firstSettled }),
|
|
80
84
|
hint: () => change("liveHints", 1),
|
|
81
85
|
hold: <A, E, R>(effect: Effect.Effect<A, E, R>) =>
|
|
82
86
|
track(
|
package/src/clientActivity.ts
CHANGED
|
@@ -6,6 +6,7 @@ export type ConnectionStatus = "live" | "reconnecting" | "waiting-for-connection
|
|
|
6
6
|
export interface ClientActivityState {
|
|
7
7
|
readonly commands: number;
|
|
8
8
|
readonly connectionStatus: ConnectionStatus;
|
|
9
|
+
readonly firstSettled: boolean;
|
|
9
10
|
readonly initialQueries: number;
|
|
10
11
|
readonly liveHints: number;
|
|
11
12
|
readonly refreshingAtoms: number;
|
|
@@ -15,6 +16,7 @@ export interface ClientActivityState {
|
|
|
15
16
|
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
16
17
|
readonly connectionStatus: Atom.Atom<ConnectionStatus>;
|
|
17
18
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
19
|
+
readonly firstSettled: Atom.Atom<boolean>;
|
|
18
20
|
};
|
|
19
21
|
|
|
20
22
|
export const Activity = Symbol.for("@shivaedev/contract/ClientActivity");
|
package/src/defineModule.ts
CHANGED
|
@@ -108,5 +108,5 @@ export function defineModule(definition: {
|
|
|
108
108
|
...(definition.keyScope === undefined ? {} : { keyScope: definition.keyScope }),
|
|
109
109
|
...(definition.subject === undefined ? {} : { subject: definition.subject }),
|
|
110
110
|
});
|
|
111
|
-
return definition.middleware
|
|
111
|
+
return definition.middleware === undefined ? group : group.middleware(definition.middleware);
|
|
112
112
|
}
|