@shivaedev/react 0.38.1 → 0.39.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 +15 -0
- package/README.md +30 -1
- package/dist/client/QueryView.js +1 -1
- package/dist/client/QueryView.js.map +1 -1
- package/dist/client/adapters/useConnectionStatus.d.ts +3 -0
- package/dist/client/adapters/useConnectionStatus.d.ts.map +1 -0
- package/dist/client/adapters/useConnectionStatus.js +6 -0
- package/dist/client/adapters/useConnectionStatus.js.map +1 -0
- package/dist/client/adapters/useDeployUpdate.d.ts +10 -0
- package/dist/client/adapters/useDeployUpdate.d.ts.map +1 -0
- package/dist/client/adapters/useDeployUpdate.js +18 -0
- package/dist/client/adapters/useDeployUpdate.js.map +1 -0
- package/dist/client/deployUpdate.d.ts +20 -0
- package/dist/client/deployUpdate.d.ts.map +1 -0
- package/dist/client/deployUpdate.js +53 -0
- package/dist/client/deployUpdate.js.map +1 -0
- package/dist/client/pageHidden.d.ts +3 -0
- package/dist/client/pageHidden.d.ts.map +1 -0
- package/dist/client/pageHidden.js +13 -0
- package/dist/client/pageHidden.js.map +1 -0
- package/dist/client/resultState.d.ts +3 -0
- package/dist/client/resultState.d.ts.map +1 -1
- package/dist/client/resultState.js +1 -0
- package/dist/client/resultState.js.map +1 -1
- package/dist/internal/loadedQuery.d.ts +6 -0
- package/dist/internal/loadedQuery.d.ts.map +1 -1
- package/dist/internal/loadedQuery.js +1 -0
- package/dist/internal/loadedQuery.js.map +1 -1
- package/package.json +8 -8
- package/src/client/QueryView.ts +1 -1
- package/src/client/adapters/useConnectionStatus.ts +6 -0
- package/src/client/adapters/useDeployUpdate.ts +20 -0
- package/src/client/deployUpdate.ts +69 -0
- package/src/client/pageHidden.ts +13 -0
- package/src/client/resultState.ts +7 -0
- package/src/internal/loadedQuery.ts +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.39.0 - 2026-11-04
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- `useConnectionStatus(client)` exposes one debounced `live | reconnecting` status across every binding on a client.
|
|
8
|
+
- Query state exposes `refusal` separately from RPC transport failures, keeping retained data available during socket recovery. `QueryView` reports refusals through its failure slot while keeping transport causes available on the query.
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- Session boundaries mount nested live bindings and apply the session coalescing window to them.
|
|
13
|
+
|
|
14
|
+
### Breaking
|
|
15
|
+
|
|
16
|
+
- `QueryView` calls its failure renderer only for refusals. Read `query.cause` for transport diagnostics and use the client connection status for a shared reconnecting notice.
|
|
17
|
+
|
|
3
18
|
## 0.38.1 - 2026-11-04
|
|
4
19
|
|
|
5
20
|
### Changed
|
package/README.md
CHANGED
|
@@ -24,10 +24,12 @@ const editor = useEditor({
|
|
|
24
24
|
|
|
25
25
|
State belongs to an **atom in a registry**. A query hook reads that atom's native `AsyncResult`; an action hook reads and dispatches a native action atom. Two readers of the same query share its execution. Changing the query atom resets displayed data by default. An application can use `useQuery(atom, { keepPreviousData: true })` to keep the last successful value while a changed payload loads or fails. This retained display belongs to the hook and clears when its registry changes; native atoms still own execution and caching. Editors keep the default reset so a new record starts a new form.
|
|
26
26
|
|
|
27
|
-
`useQuery` and `useAction` turn native results into `data`, `cause`, `pending` and `refreshing`. A query's same-identity refresh always keeps the last successful value, including after a typed failure, so a component can show data and an error together. An action uses the native result's retained success. Keep the atom's identity stable for the same work: declare it outside render or use the native family's identity, such as `AtomRpc.Service.query(...)`.
|
|
27
|
+
`useQuery` and `useAction` turn native results into `data`, `cause`, `pending` and `refreshing`. Queries also expose `refusal`, the typed error excluding RPC transport failures; use it for per-query error text during a connection interruption. `cause` and `result` retain the native transport failure for diagnostics. `QueryView` renders its failure slot for refusals and throws defects, while retained data stays visible during transport recovery. A query's same-identity refresh always keeps the last successful value, including after a typed failure, so a component can show data and an error together. An action uses the native result's retained success. Keep the atom's identity stable for the same work: declare it outside render or use the native family's identity, such as `AtomRpc.Service.query(...)`.
|
|
28
28
|
|
|
29
29
|
An **editor** joins a query atom, a form field schema and a save Effect. The query provides the row; `values(row)` converts it to input values; the schema decodes those values before the save runs. form owns the draft and the per-field merge. A **create form** uses the same submission rules without a query and starts a fresh form after success.
|
|
30
30
|
|
|
31
|
+
Use `useConnectionStatus(client)` from `@shivaedev/react/client/adapters/useConnectionStatus.ts` with the client returned by contract's `makeClient`. It returns one `"live" | "reconnecting"` value across mounted queries from every binding on that client's `Client` service. Status changes debounce for 300 ms on the client runtime's Clock. A query refusal is separate from connectivity. Visible browser `online` and `visibilitychange` signals interrupt the live retry delay and reconnect immediately with a fresh backoff schedule.
|
|
32
|
+
|
|
31
33
|
A **session generation** is the string returned by `identify(session)`. `SessionBoundary` owns its client, registry and React subtree. Your auth owner supplies the session and decides when to replace or end it. The boundary automatically mounts live connections on bound contract APIs returned by `connect`, directly or as client properties such as `api`. Use a Platform database host and the default shared WebSocket client; the application needs no subscribe handler or `live()` call. Live changed hints coalesce over 20 ms by default. Set `liveCoalesceWindow` on `SessionBoundary` to a native Duration to choose the window for that session, or `0` for immediate per-hint refreshes. A bound query can override that default with `useQuery(atom, { coalesceWindow: "2 seconds" })`. Changing this option applies to subsequent windows without reconnecting or refetching any query; a window already started keeps its deadline. A refetch in flight runs once more after settling when further hints arrive. Cache policy, RPC declarations and transport stay with native Effect and the application; this package supplies their React state and lifecycle boundary.
|
|
32
34
|
|
|
33
35
|
`useEditor` and `useCreate` opt into persisted input with `persistedDraft: { key, ...persistence }`. Choose a stable key for the record or create request, independent of its server revision. Acquire `persistence` with `draftPersistence` from `@shivaedev/form/adapters/draftPersistence.ts`, provided with `browserDraftStorage` from `@shivaedev/form/adapters/browserDraftStorage.ts`. The setup reads the storage provider and Clock from the Effect environment; timestamps and expiry use that captured clock. The hooks inherit ownership from `SessionBoundary`: reload and query refresh preserve edits, successful submission clears accepted input, and a committed session replacement drops tracked drafts. A suspended replacement that is canceled keeps the visible session's draft and future writes. Later edits made during a save remain persisted. Observed draft storage shares changes across editors while preserving locally edited fields; a completed older save cannot clear a newer stored draft. Supply `DraftStorageProvider` for custom storage; optional `maxBytes` and `maxAgeMs` customize the bounds, which default to 256 KiB of UTF-8 JSON and seven days. See [form's persisted input API](https://github.com/ShivaeDev/platform/tree/main/packages/form#persist-input-across-reloads) for direct form hooks and limits.
|
|
@@ -145,6 +147,33 @@ const connect = () => bind(Notes, Client, { resume });
|
|
|
145
147
|
|
|
146
148
|
`Notes` and `Client` are the application's contract and native AtomRpc client. The application implements `onAppResume` and `onNetworkReturn`, each returning its unsubscribe function. `SessionBoundary` mounts the bound connection, and native notifications reopen the subscription and reconcile its tracked queries alongside the browser visibility and online defaults. Disposing the session's registry releases the native listeners. Omitting `resume` keeps the browser defaults.
|
|
147
149
|
|
|
150
|
+
#### Detect a deployment and activate a staged update
|
|
151
|
+
|
|
152
|
+
Configure the host's `config.buildVersion` with the deployed build ID and embed that same ID in the browser bundle. Create one `deployUpdate` from `@shivaedev/react/client/deployUpdate.ts` per registry owner. Pass the same connection options as the application's contract clients so version announcements share their live socket. `useDeployUpdate` from `@shivaedev/react/client/adapters/useDeployUpdate.ts` mounts the controller and exposes `version`, `available`, `blocked`, the native `activation` result and `reload`.
|
|
153
|
+
|
|
154
|
+
```tsx
|
|
155
|
+
import { Effect } from "effect";
|
|
156
|
+
import { deployUpdate } from "@shivaedev/react/client/deployUpdate.ts";
|
|
157
|
+
import { useDeployUpdate, useUpdateBlocker } from "@shivaedev/react/client/adapters/useDeployUpdate.ts";
|
|
158
|
+
|
|
159
|
+
const update = deployUpdate({
|
|
160
|
+
url: `${location.origin}/rpc`,
|
|
161
|
+
loadedVersion: BUILD_VERSION,
|
|
162
|
+
activate: Effect.promise(() => stagedUpdate.activate()),
|
|
163
|
+
reload: () => location.reload(),
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
function UpdateNotice({ saving, sheetOpen }: { saving: boolean; sheetOpen: boolean }) {
|
|
167
|
+
useUpdateBlocker(update, saving || sheetOpen);
|
|
168
|
+
const state = useDeployUpdate(update);
|
|
169
|
+
return state.available ? <button onClick={state.reload}>Reload application</button> : null;
|
|
170
|
+
}
|
|
171
|
+
```
|
|
172
|
+
|
|
173
|
+
`BUILD_VERSION` and `stagedUpdate` are supplied by the application. Build IDs are opaque strings: a differing host ID means the loaded bundle has been superseded, including after a rollback. A host restart announces its ID through RPC after reconnect; there is no health polling. While visible or blocked, the controller leaves activation to the reload action. When hidden with no registered blockers, it runs the application's activation Effect once for that version. A successful activation clears `available`; a typed activation failure keeps reload available. Omit `activate` when the application has no staged-update mechanism; reload stays available even while hidden. UI wording and confirmation belong to the application.
|
|
174
|
+
|
|
175
|
+
Each `useUpdateBlocker(update, true)` holds its own blocker until it becomes false or unmounts. Code outside React can run `update.block` with the same `AtomRegistry` service; it returns a release function. Hold it around pending work and call that function when the work ends. All blockers must release before hidden activation proceeds.
|
|
176
|
+
|
|
148
177
|
#### Mount the notice host
|
|
149
178
|
|
|
150
179
|
Mount the optional `NoticeHost` from `@shivaedev/react/notices.ts` inside `SessionBoundary`, above the screens. The host owns a native atom collection, dismissal, expiry and each notice action's native `AsyncResult`. Supply `render(notice)` to choose markup, wording for action outcomes and labels. Render `notice.action.run` as a button handler and disable that control with `notice.action.pending`; `notice.dismiss` removes the entry. No command requires a host. Expiry sleeps on the `Clock` of the optional `runtime` prop, an atom runtime such as `client.runtime`; without it, the host uses Effect's default clock. A story can pass a runtime built with `Layer.succeed(Clock.Clock, clock)` and drive expiry with `TestClock.adjust`.
|
package/dist/client/QueryView.js
CHANGED
|
@@ -6,7 +6,7 @@ export function QueryView({ query, loading, content, failure }) {
|
|
|
6
6
|
if (Result.isSuccess(defect)) {
|
|
7
7
|
throw defect.success;
|
|
8
8
|
}
|
|
9
|
-
return
|
|
9
|
+
return query.refusal;
|
|
10
10
|
});
|
|
11
11
|
return createElement(Fragment, null, Option.isSome(query.data) ? content(query.data.value, query) : null, query.pending || (Option.isNone(query.data) && Option.isNone(error)) ? loading(query) : null, Option.isSome(error) ? failure(error.value, query) : null);
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryView.js","sourceRoot":"","sources":["../../src/client/QueryView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AAUhE,MAAM,UAAU,SAAS,CAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAwB;IACzF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,MAAM,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,OAAO,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"QueryView.js","sourceRoot":"","sources":["../../src/client/QueryView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AAUhE,MAAM,UAAU,SAAS,CAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAwB;IACzF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,MAAM,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CACnB,QAAQ,EACR,IAAI,EACJ,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EACnE,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAC5F,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CACzD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useConnectionStatus.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useConnectionStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAkB,MAAM,uCAAuC,CAAC;AAEjH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CAE1E"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import { clientActivity } from "@shivaedev/contract/clientActivity.ts";
|
|
3
|
+
export function useConnectionStatus(client) {
|
|
4
|
+
return useAtomValue(clientActivity(client).connectionStatus);
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=useConnectionStatus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useConnectionStatus.js","sourceRoot":"","sources":["../../../src/client/adapters/useConnectionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAA4C,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEjH,MAAM,UAAU,mBAAmB,CAAC,MAAoB;IACvD,OAAO,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { deployUpdate } from "#client/deployUpdate.ts";
|
|
2
|
+
export declare function useDeployUpdate<E>(update: ReturnType<typeof deployUpdate<E>>): {
|
|
3
|
+
available: boolean;
|
|
4
|
+
blocked: boolean;
|
|
5
|
+
version: string | undefined;
|
|
6
|
+
activation: import("effect/reactivity/AsyncResult").AsyncResult<void, E>;
|
|
7
|
+
reload: () => void;
|
|
8
|
+
};
|
|
9
|
+
export declare function useUpdateBlocker<E>(update: ReturnType<typeof deployUpdate<E>>, blocked: boolean): void;
|
|
10
|
+
//# sourceMappingURL=useDeployUpdate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useDeployUpdate.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useDeployUpdate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;;;;;;EAG5E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAQtG"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { RegistryContext, useAtomMount, useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import { useContext, useEffect } from "react";
|
|
5
|
+
export function useDeployUpdate(update) {
|
|
6
|
+
useAtomMount(update.controller);
|
|
7
|
+
return { ...useAtomValue(update.state), activation: useAtomValue(update.activation), reload: update.reload };
|
|
8
|
+
}
|
|
9
|
+
export function useUpdateBlocker(update, blocked) {
|
|
10
|
+
const registry = useContext(RegistryContext);
|
|
11
|
+
useEffect(() => {
|
|
12
|
+
if (blocked) {
|
|
13
|
+
return Effect.runSync(update.block.pipe(Effect.provideService(AtomRegistry.AtomRegistry, registry)));
|
|
14
|
+
}
|
|
15
|
+
return undefined;
|
|
16
|
+
}, [blocked, registry, update]);
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=useDeployUpdate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useDeployUpdate.js","sourceRoot":"","sources":["../../../src/client/adapters/useDeployUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAG9C,MAAM,UAAU,eAAe,CAAI,MAA0C;IAC5E,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,OAAO,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAC9G,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAI,MAA0C,EAAE,OAAgB;IAC/F,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7C,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,OAAO,EAAE,CAAC;YACb,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import type { ClientOptions } from "@shivaedev/contract/clientOptions.ts";
|
|
5
|
+
export declare function deployUpdate<E = never>(options: ClientOptions & {
|
|
6
|
+
readonly loadedVersion: string;
|
|
7
|
+
readonly activate?: Effect.Effect<void, E>;
|
|
8
|
+
readonly reload: () => void;
|
|
9
|
+
}): {
|
|
10
|
+
activation: Atom.AtomResultFn<string, void, E>;
|
|
11
|
+
block: Effect.Effect<() => void, never, AtomRegistry.AtomRegistry>;
|
|
12
|
+
controller: Atom.Atom<undefined>;
|
|
13
|
+
reload: () => void;
|
|
14
|
+
state: Atom.Atom<{
|
|
15
|
+
available: boolean;
|
|
16
|
+
blocked: boolean;
|
|
17
|
+
version: string | undefined;
|
|
18
|
+
}>;
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=deployUpdate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deployUpdate.d.ts","sourceRoot":"","sources":["../../src/client/deployUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAClD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAI1E,wBAAgB,YAAY,CAAC,CAAC,GAAG,KAAK,EACrC,OAAO,EAAE,aAAa,GAAG;IACxB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC5B;;;;kBADuB,IAAI;;;;;;EAwD5B"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { Effect, Schedule, Stream } from "effect";
|
|
2
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import { makeClient } from "@shivaedev/contract/bind.ts";
|
|
5
|
+
import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
|
|
6
|
+
import { pageHidden } from "./pageHidden.js";
|
|
7
|
+
export function deployUpdate(options) {
|
|
8
|
+
const client = makeClient(HostVersion, options);
|
|
9
|
+
const version = Atom.make(undefined);
|
|
10
|
+
const activated = Atom.make(undefined);
|
|
11
|
+
const blockers = Atom.make(new Set());
|
|
12
|
+
const activation = client.runtime.fn((next, get) => (options.activate ?? Effect.void).pipe(Effect.tap(() => Effect.sync(() => get.set(activated, next)))));
|
|
13
|
+
const connection = client.runtime.atom((get) => client.api.watch.run().pipe(Stream.retry(Schedule.spaced("500 millis")), Stream.runForEach((next) => Effect.sync(() => get.set(version, next)))));
|
|
14
|
+
const state = Atom.make((get) => {
|
|
15
|
+
get.mount(connection);
|
|
16
|
+
get.mount(activation);
|
|
17
|
+
const next = get(version);
|
|
18
|
+
return {
|
|
19
|
+
available: next !== undefined && next !== options.loadedVersion && next !== get(activated),
|
|
20
|
+
blocked: get(blockers).size > 0,
|
|
21
|
+
version: next,
|
|
22
|
+
};
|
|
23
|
+
});
|
|
24
|
+
const controller = Atom.make((get) => {
|
|
25
|
+
get.mount(state);
|
|
26
|
+
get.mount(pageHidden);
|
|
27
|
+
let activating;
|
|
28
|
+
function check() {
|
|
29
|
+
const current = get.once(state);
|
|
30
|
+
if (options.activate !== undefined
|
|
31
|
+
&& current.available
|
|
32
|
+
&& !current.blocked
|
|
33
|
+
&& get.once(pageHidden)
|
|
34
|
+
&& current.version !== undefined
|
|
35
|
+
&& current.version !== activating) {
|
|
36
|
+
activating = current.version;
|
|
37
|
+
get.set(activation, current.version);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
get.subscribe(state, check);
|
|
41
|
+
get.subscribe(pageHidden, check);
|
|
42
|
+
check();
|
|
43
|
+
return undefined;
|
|
44
|
+
}).pipe(Atom.setIdleTTL(0));
|
|
45
|
+
const block = Effect.gen(function* () {
|
|
46
|
+
const registry = yield* AtomRegistry.AtomRegistry;
|
|
47
|
+
const key = {};
|
|
48
|
+
registry.set(blockers, new Set([...registry.get(blockers), key]));
|
|
49
|
+
return () => registry.set(blockers, new Set([...registry.get(blockers)].filter((entry) => entry !== key)));
|
|
50
|
+
});
|
|
51
|
+
return { activation, block, controller, reload: options.reload, state };
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=deployUpdate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deployUpdate.js","sourceRoot":"","sources":["../../src/client/deployUpdate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageHidden.d.ts","sourceRoot":"","sources":["../../src/client/pageHidden.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,eAAO,MAAM,UAAU,oBAUI,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
2
|
+
export const pageHidden = Atom.make((get) => {
|
|
3
|
+
if (typeof document === "undefined") {
|
|
4
|
+
return false;
|
|
5
|
+
}
|
|
6
|
+
function changed() {
|
|
7
|
+
get.setSelf(document.visibilityState === "hidden");
|
|
8
|
+
}
|
|
9
|
+
document.addEventListener("visibilitychange", changed);
|
|
10
|
+
get.addFinalizer(() => document.removeEventListener("visibilitychange", changed));
|
|
11
|
+
return document.visibilityState === "hidden";
|
|
12
|
+
}).pipe(Atom.setIdleTTL(0));
|
|
13
|
+
//# sourceMappingURL=pageHidden.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageHidden.js","sourceRoot":"","sources":["../../src/client/pageHidden.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;IAC3C,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,SAAS,OAAO;QACf,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC;IACpD,CAAC;IACD,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACvD,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,OAAO,QAAQ,CAAC,eAAe,KAAK,QAAQ,CAAC;AAC9C,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -14,6 +14,9 @@ export interface ResultState<A, E> {
|
|
|
14
14
|
export interface QueryState<A, E> extends ResultState<A, E> {
|
|
15
15
|
readonly denied: boolean;
|
|
16
16
|
readonly refresh: () => void;
|
|
17
|
+
readonly refusal: Option.Option<Exclude<E, {
|
|
18
|
+
readonly _tag: "RpcClientError";
|
|
19
|
+
}>>;
|
|
17
20
|
}
|
|
18
21
|
export interface QueryOptions<E = unknown> {
|
|
19
22
|
readonly coalesceWindow?: Duration.Input | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultState.d.ts","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAGpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,uBAAuB,CAAC;AAG5E,MAAM,WAAW,WAAW,CAAC,CAAC,EAAE,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C;AAkBD,MAAM,WAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"resultState.d.ts","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ export function useQuery(atom, options = {}) {
|
|
|
50
50
|
...state(result, data),
|
|
51
51
|
denied: Option.exists(AsyncResult.cause(result), (cause) => Option.exists(Cause.findErrorOption(cause), Predicate.isTagged("QueryReadDenied"))),
|
|
52
52
|
refresh,
|
|
53
|
+
refusal: Option.flatMap(AsyncResult.cause(result), (cause) => Option.filter(Cause.findErrorOption(cause), (error) => !Predicate.isTagged(error, "RpcClientError"))),
|
|
53
54
|
};
|
|
54
55
|
}
|
|
55
56
|
export function useAction(source, run, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultState.js","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,KAAK,EAA8B,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAsB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,SAAS,KAAK,CAAO,MAAqC,EAAE,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3F,OAAO;QACN,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,IAAI;QACJ,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;QACjD,MAAM;KACN,CAAC;AACH,CAAC;AACD,SAAS,wBAAwB,CAAO,MAAqC,EAAE,OAAO,GAAG,IAAI;IAC5F,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,OAAO,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC;YACrH,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAChC,CAAC;
|
|
1
|
+
{"version":3,"file":"resultState.js","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,9 @@ interface QuerySnapshot<A, E> {
|
|
|
5
5
|
readonly denied: boolean;
|
|
6
6
|
readonly pending: boolean;
|
|
7
7
|
readonly refresh: () => void;
|
|
8
|
+
readonly refusal: Option.Option<Exclude<E, {
|
|
9
|
+
readonly _tag: "RpcClientError";
|
|
10
|
+
}>>;
|
|
8
11
|
}
|
|
9
12
|
export declare function loadedQuery<A, E>(query: QuerySnapshot<A, E>, loaded: A): {
|
|
10
13
|
cause: Option.Option<Cause.Cause<E>>;
|
|
@@ -13,6 +16,9 @@ export declare function loadedQuery<A, E>(query: QuerySnapshot<A, E>, loaded: A)
|
|
|
13
16
|
pending: boolean;
|
|
14
17
|
refresh: () => void;
|
|
15
18
|
refreshing: boolean;
|
|
19
|
+
refusal: Option.Option<Exclude<E, {
|
|
20
|
+
readonly _tag: "RpcClientError";
|
|
21
|
+
}>>;
|
|
16
22
|
};
|
|
17
23
|
export {};
|
|
18
24
|
//# sourceMappingURL=loadedQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadedQuery.d.ts","sourceRoot":"","sources":["../../src/internal/loadedQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE5C,UAAU,aAAa,CAAC,CAAC,EAAE,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"loadedQuery.d.ts","sourceRoot":"","sources":["../../src/internal/loadedQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE5C,UAAU,aAAa,CAAC,CAAC,EAAE,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,CAAC;CACjF;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAErE,KAAK;IACL,IAAI;IACJ,MAAM;IACN,OAAO;IACP,OAAO,QAVgB,IAAI;IAW3B,UAAU;IACV,OAAO;uBAXoD,gBAAgB;;EAa5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadedQuery.js","sourceRoot":"","sources":["../../src/internal/loadedQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"loadedQuery.js","sourceRoot":"","sources":["../../src/internal/loadedQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,QAAQ,CAAC;AAW5C,MAAM,UAAU,WAAW,CAAO,KAA0B,EAAE,MAAS;IACtE,OAAO;QACN,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC;QAChD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,UAAU,EAAE,KAAK,CAAC,OAAO;QACzB,OAAO,EAAE,KAAK,CAAC,OAAO;KACtB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.39.0",
|
|
4
4
|
"description": "React query, action, editor and session hooks for native Effect atoms",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -46,10 +46,10 @@
|
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@shivaedev/access": "0.4.2",
|
|
49
|
-
"@shivaedev/contract": "0.
|
|
49
|
+
"@shivaedev/contract": "0.35.0",
|
|
50
50
|
"@shivaedev/errors": "0.8.0",
|
|
51
51
|
"@shivaedev/form": "0.15.0",
|
|
52
|
-
"@shivaedev/identity": "0.23.
|
|
52
|
+
"@shivaedev/identity": "0.23.1"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
55
|
"@effect/atom-react": "4.0.6",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"@effect/sql-sqlite-node": "4.0.6",
|
|
59
59
|
"@shivaedev/changes": "0.9.0",
|
|
60
60
|
"@shivaedev/jobs": "0.34.0",
|
|
61
|
-
"@shivaedev/quality": "0.
|
|
62
|
-
"@shivaedev/server": "0.
|
|
61
|
+
"@shivaedev/quality": "0.59.0",
|
|
62
|
+
"@shivaedev/server": "0.23.0",
|
|
63
63
|
"@shivaedev/service": "0.6.2",
|
|
64
64
|
"@shivaedev/sql": "0.36.1",
|
|
65
|
-
"@shivaedev/test-kits": "0.2.
|
|
66
|
-
"@shivaedev/test-sql": "0.
|
|
67
|
-
"@shivaedev/test-story": "0.37.
|
|
65
|
+
"@shivaedev/test-kits": "0.2.2",
|
|
66
|
+
"@shivaedev/test-sql": "0.19.0",
|
|
67
|
+
"@shivaedev/test-story": "0.37.1",
|
|
68
68
|
"@tanstack/react-router": "1.170.46",
|
|
69
69
|
"@types/node": "24.19.2",
|
|
70
70
|
"@types/react": "19.3.0",
|
package/src/client/QueryView.ts
CHANGED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import { type ActiveClient, type ConnectionStatus, clientActivity } from "@shivaedev/contract/clientActivity.ts";
|
|
3
|
+
|
|
4
|
+
export function useConnectionStatus(client: ActiveClient): ConnectionStatus {
|
|
5
|
+
return useAtomValue(clientActivity(client).connectionStatus);
|
|
6
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { RegistryContext, useAtomMount, useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import { useContext, useEffect } from "react";
|
|
5
|
+
import type { deployUpdate } from "#client/deployUpdate.ts";
|
|
6
|
+
|
|
7
|
+
export function useDeployUpdate<E>(update: ReturnType<typeof deployUpdate<E>>) {
|
|
8
|
+
useAtomMount(update.controller);
|
|
9
|
+
return { ...useAtomValue(update.state), activation: useAtomValue(update.activation), reload: update.reload };
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export function useUpdateBlocker<E>(update: ReturnType<typeof deployUpdate<E>>, blocked: boolean): void {
|
|
13
|
+
const registry = useContext(RegistryContext);
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
if (blocked) {
|
|
16
|
+
return Effect.runSync(update.block.pipe(Effect.provideService(AtomRegistry.AtomRegistry, registry)));
|
|
17
|
+
}
|
|
18
|
+
return undefined;
|
|
19
|
+
}, [blocked, registry, update]);
|
|
20
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { Effect, Schedule, Stream } from "effect";
|
|
2
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import { makeClient } from "@shivaedev/contract/bind.ts";
|
|
5
|
+
import type { ClientOptions } from "@shivaedev/contract/clientOptions.ts";
|
|
6
|
+
import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
|
|
7
|
+
import { pageHidden } from "./pageHidden.ts";
|
|
8
|
+
|
|
9
|
+
export function deployUpdate<E = never>(
|
|
10
|
+
options: ClientOptions & {
|
|
11
|
+
readonly loadedVersion: string;
|
|
12
|
+
readonly activate?: Effect.Effect<void, E>;
|
|
13
|
+
readonly reload: () => void;
|
|
14
|
+
},
|
|
15
|
+
) {
|
|
16
|
+
const client = makeClient(HostVersion, options);
|
|
17
|
+
const version = Atom.make<string | undefined>(undefined);
|
|
18
|
+
const activated = Atom.make<string | undefined>(undefined);
|
|
19
|
+
const blockers = Atom.make<ReadonlySet<object>>(new Set<object>());
|
|
20
|
+
const activation = client.runtime.fn((next: string, get) =>
|
|
21
|
+
(options.activate ?? Effect.void).pipe(Effect.tap(() => Effect.sync(() => get.set(activated, next)))),
|
|
22
|
+
);
|
|
23
|
+
const connection = client.runtime.atom((get) =>
|
|
24
|
+
client.api.watch.run().pipe(
|
|
25
|
+
Stream.retry(Schedule.spaced("500 millis")),
|
|
26
|
+
Stream.runForEach((next) => Effect.sync(() => get.set(version, next))),
|
|
27
|
+
),
|
|
28
|
+
);
|
|
29
|
+
const state = Atom.make((get) => {
|
|
30
|
+
get.mount(connection);
|
|
31
|
+
get.mount(activation);
|
|
32
|
+
const next = get(version);
|
|
33
|
+
return {
|
|
34
|
+
available: next !== undefined && next !== options.loadedVersion && next !== get(activated),
|
|
35
|
+
blocked: get(blockers).size > 0,
|
|
36
|
+
version: next,
|
|
37
|
+
};
|
|
38
|
+
});
|
|
39
|
+
const controller = Atom.make((get) => {
|
|
40
|
+
get.mount(state);
|
|
41
|
+
get.mount(pageHidden);
|
|
42
|
+
let activating: string | undefined;
|
|
43
|
+
function check() {
|
|
44
|
+
const current = get.once(state);
|
|
45
|
+
if (
|
|
46
|
+
options.activate !== undefined
|
|
47
|
+
&& current.available
|
|
48
|
+
&& !current.blocked
|
|
49
|
+
&& get.once(pageHidden)
|
|
50
|
+
&& current.version !== undefined
|
|
51
|
+
&& current.version !== activating
|
|
52
|
+
) {
|
|
53
|
+
activating = current.version;
|
|
54
|
+
get.set(activation, current.version);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
get.subscribe(state, check);
|
|
58
|
+
get.subscribe(pageHidden, check);
|
|
59
|
+
check();
|
|
60
|
+
return undefined;
|
|
61
|
+
}).pipe(Atom.setIdleTTL(0));
|
|
62
|
+
const block = Effect.gen(function* () {
|
|
63
|
+
const registry = yield* AtomRegistry.AtomRegistry;
|
|
64
|
+
const key = {};
|
|
65
|
+
registry.set(blockers, new Set([...registry.get(blockers), key]));
|
|
66
|
+
return () => registry.set(blockers, new Set([...registry.get(blockers)].filter((entry) => entry !== key)));
|
|
67
|
+
});
|
|
68
|
+
return { activation, block, controller, reload: options.reload, state };
|
|
69
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
2
|
+
|
|
3
|
+
export const pageHidden = Atom.make((get) => {
|
|
4
|
+
if (typeof document === "undefined") {
|
|
5
|
+
return false;
|
|
6
|
+
}
|
|
7
|
+
function changed() {
|
|
8
|
+
get.setSelf(document.visibilityState === "hidden");
|
|
9
|
+
}
|
|
10
|
+
document.addEventListener("visibilitychange", changed);
|
|
11
|
+
get.addFinalizer(() => document.removeEventListener("visibilitychange", changed));
|
|
12
|
+
return document.visibilityState === "hidden";
|
|
13
|
+
}).pipe(Atom.setIdleTTL(0));
|
|
@@ -42,6 +42,7 @@ function useRecheckOnUnauthorized<A, E>(result: AsyncResult.AsyncResult<A, E>, e
|
|
|
42
42
|
export interface QueryState<A, E> extends ResultState<A, E> {
|
|
43
43
|
readonly denied: boolean;
|
|
44
44
|
readonly refresh: () => void;
|
|
45
|
+
readonly refusal: Option.Option<Exclude<E, { readonly _tag: "RpcClientError" }>>;
|
|
45
46
|
}
|
|
46
47
|
export interface QueryOptions<E = unknown> {
|
|
47
48
|
readonly coalesceWindow?: Duration.Input | undefined;
|
|
@@ -79,6 +80,12 @@ export function useQuery<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, o
|
|
|
79
80
|
...state(result, data),
|
|
80
81
|
denied: Option.exists(AsyncResult.cause(result), (cause) => Option.exists(Cause.findErrorOption(cause), Predicate.isTagged("QueryReadDenied"))),
|
|
81
82
|
refresh,
|
|
83
|
+
refusal: Option.flatMap(AsyncResult.cause(result), (cause) =>
|
|
84
|
+
Option.filter(
|
|
85
|
+
Cause.findErrorOption(cause),
|
|
86
|
+
(error): error is Exclude<E, { readonly _tag: "RpcClientError" }> => !Predicate.isTagged(error, "RpcClientError"),
|
|
87
|
+
),
|
|
88
|
+
),
|
|
82
89
|
};
|
|
83
90
|
}
|
|
84
91
|
export interface ActionState<TInput, A, E> extends ResultState<A, E> {
|
|
@@ -6,6 +6,7 @@ interface QuerySnapshot<A, E> {
|
|
|
6
6
|
readonly denied: boolean;
|
|
7
7
|
readonly pending: boolean;
|
|
8
8
|
readonly refresh: () => void;
|
|
9
|
+
readonly refusal: Option.Option<Exclude<E, { readonly _tag: "RpcClientError" }>>;
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
export function loadedQuery<A, E>(query: QuerySnapshot<A, E>, loaded: A) {
|
|
@@ -16,5 +17,6 @@ export function loadedQuery<A, E>(query: QuerySnapshot<A, E>, loaded: A) {
|
|
|
16
17
|
pending: query.pending,
|
|
17
18
|
refresh: query.refresh,
|
|
18
19
|
refreshing: query.pending,
|
|
20
|
+
refusal: query.refusal,
|
|
19
21
|
};
|
|
20
22
|
}
|