@shivaedev/contract 0.44.0 → 0.46.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.
Files changed (205) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/README.md +73 -37
  3. package/dist/AutomaticQueryOptions.d.ts +2 -0
  4. package/dist/AutomaticQueryOptions.d.ts.map +1 -1
  5. package/dist/CommandGuard.d.ts +2 -1
  6. package/dist/CommandGuard.d.ts.map +1 -1
  7. package/dist/CommandGuard.js +3 -2
  8. package/dist/CommandGuard.js.map +1 -1
  9. package/dist/HostVersion.d.ts +6 -1
  10. package/dist/HostVersion.d.ts.map +1 -1
  11. package/dist/LiveSync.d.ts +18 -0
  12. package/dist/LiveSync.d.ts.map +1 -0
  13. package/dist/LiveSync.js +9 -0
  14. package/dist/LiveSync.js.map +1 -0
  15. package/dist/adapters/activityState.d.ts +3 -2
  16. package/dist/adapters/activityState.d.ts.map +1 -1
  17. package/dist/adapters/activityState.js +12 -1
  18. package/dist/adapters/activityState.js.map +1 -1
  19. package/dist/adapters/clientConnection.d.ts +1 -0
  20. package/dist/adapters/clientConnection.d.ts.map +1 -1
  21. package/dist/adapters/clientConnection.js +18 -10
  22. package/dist/adapters/clientConnection.js.map +1 -1
  23. package/dist/adapters/liveHintStream.d.ts +3 -19
  24. package/dist/adapters/liveHintStream.d.ts.map +1 -1
  25. package/dist/adapters/liveHintStream.js +2 -2
  26. package/dist/adapters/liveHintStream.js.map +1 -1
  27. package/dist/adapters/openLiveHints.d.ts +3 -19
  28. package/dist/adapters/openLiveHints.d.ts.map +1 -1
  29. package/dist/adapters/openLiveHints.js +21 -3
  30. package/dist/adapters/openLiveHints.js.map +1 -1
  31. package/dist/adapters/standaloneLiveServer.d.ts +5 -18
  32. package/dist/adapters/standaloneLiveServer.d.ts.map +1 -1
  33. package/dist/adapters/standaloneLiveServer.js +6 -1
  34. package/dist/adapters/standaloneLiveServer.js.map +1 -1
  35. package/dist/automaticLive.d.ts.map +1 -1
  36. package/dist/automaticLive.js +21 -1
  37. package/dist/automaticLive.js.map +1 -1
  38. package/dist/automaticQuery.d.ts +1 -1
  39. package/dist/automaticQuery.d.ts.map +1 -1
  40. package/dist/automaticQuery.js +7 -1
  41. package/dist/automaticQuery.js.map +1 -1
  42. package/dist/bind.js +3 -2
  43. package/dist/bind.js.map +1 -1
  44. package/dist/catchUp.d.ts +6 -0
  45. package/dist/catchUp.d.ts.map +1 -0
  46. package/dist/catchUp.js +9 -0
  47. package/dist/catchUp.js.map +1 -0
  48. package/dist/changesSuccess.d.ts +2 -1
  49. package/dist/changesSuccess.d.ts.map +1 -1
  50. package/dist/changesSuccess.js +3 -0
  51. package/dist/changesSuccess.js.map +1 -1
  52. package/dist/clientActivities.d.ts +4 -0
  53. package/dist/clientActivities.d.ts.map +1 -1
  54. package/dist/clientActivities.js +8 -3
  55. package/dist/clientActivities.js.map +1 -1
  56. package/dist/clientActivity.d.ts +3 -0
  57. package/dist/clientActivity.d.ts.map +1 -1
  58. package/dist/clientActivity.js +1 -1
  59. package/dist/clientActivity.js.map +1 -1
  60. package/dist/clientOperations.d.ts +1 -0
  61. package/dist/clientOperations.d.ts.map +1 -1
  62. package/dist/clientOperations.js +17 -1
  63. package/dist/clientOperations.js.map +1 -1
  64. package/dist/clientOptions.d.ts +1 -0
  65. package/dist/clientOptions.d.ts.map +1 -1
  66. package/dist/commandSignal.d.ts +5 -0
  67. package/dist/commandSignal.d.ts.map +1 -0
  68. package/dist/commandSignal.js +25 -0
  69. package/dist/commandSignal.js.map +1 -0
  70. package/dist/connectionProtocol.d.ts +10 -14
  71. package/dist/connectionProtocol.d.ts.map +1 -1
  72. package/dist/connectionProtocol.js +8 -3
  73. package/dist/connectionProtocol.js.map +1 -1
  74. package/dist/defineModule.js +1 -1
  75. package/dist/defineModule.js.map +1 -1
  76. package/dist/live-server/initialize.d.ts +1 -0
  77. package/dist/live-server/initialize.d.ts.map +1 -1
  78. package/dist/live-server/initialize.js +2 -1
  79. package/dist/live-server/initialize.js.map +1 -1
  80. package/dist/live-server/register.d.ts +2 -19
  81. package/dist/live-server/register.d.ts.map +1 -1
  82. package/dist/live-server/register.js +2 -2
  83. package/dist/live-server/register.js.map +1 -1
  84. package/dist/live-server/service.d.ts +7 -37
  85. package/dist/live-server/service.d.ts.map +1 -1
  86. package/dist/live-server/service.js +2 -0
  87. package/dist/live-server/service.js.map +1 -1
  88. package/dist/live-server/stream.d.ts +1 -18
  89. package/dist/live-server/stream.d.ts.map +1 -1
  90. package/dist/live-server/stream.js +2 -2
  91. package/dist/live-server/stream.js.map +1 -1
  92. package/dist/live-server/subscribe.d.ts.map +1 -1
  93. package/dist/live-server/subscribe.js +6 -2
  94. package/dist/live-server/subscribe.js.map +1 -1
  95. package/dist/live-server/syncFrames.d.ts +5 -0
  96. package/dist/live-server/syncFrames.d.ts.map +1 -0
  97. package/dist/live-server/syncFrames.js +16 -0
  98. package/dist/live-server/syncFrames.js.map +1 -0
  99. package/dist/live-server/synced.d.ts +7 -0
  100. package/dist/live-server/synced.d.ts.map +1 -0
  101. package/dist/live-server/synced.js +11 -0
  102. package/dist/live-server/synced.js.map +1 -0
  103. package/dist/liveHintQueue.d.ts +5 -19
  104. package/dist/liveHintQueue.d.ts.map +1 -1
  105. package/dist/liveHintQueue.js +4 -2
  106. package/dist/liveHintQueue.js.map +1 -1
  107. package/dist/liveRetry.d.ts +1 -0
  108. package/dist/liveRetry.d.ts.map +1 -1
  109. package/dist/liveRetry.js +5 -2
  110. package/dist/liveRetry.js.map +1 -1
  111. package/dist/liveSyncRequest.d.ts +6 -0
  112. package/dist/liveSyncRequest.d.ts.map +1 -0
  113. package/dist/liveSyncRequest.js +7 -0
  114. package/dist/liveSyncRequest.js.map +1 -0
  115. package/dist/liveSyncRpc.d.ts +7 -0
  116. package/dist/liveSyncRpc.d.ts.map +1 -0
  117. package/dist/liveSyncRpc.js +10 -0
  118. package/dist/liveSyncRpc.js.map +1 -0
  119. package/dist/makeLiveServer.d.ts +5 -18
  120. package/dist/makeLiveServer.d.ts.map +1 -1
  121. package/dist/publicConfig.d.ts +6 -1
  122. package/dist/publicConfig.d.ts.map +1 -1
  123. package/dist/queryDelivery.d.ts +2 -1
  124. package/dist/queryDelivery.d.ts.map +1 -1
  125. package/dist/queryDelivery.js +20 -4
  126. package/dist/queryDelivery.js.map +1 -1
  127. package/dist/querySubscription.d.ts +1 -0
  128. package/dist/querySubscription.d.ts.map +1 -1
  129. package/dist/querySubscription.js.map +1 -1
  130. package/dist/queryUpdate.d.ts +15 -1
  131. package/dist/queryUpdate.d.ts.map +1 -1
  132. package/dist/queryUpdate.js +4 -0
  133. package/dist/queryUpdate.js.map +1 -1
  134. package/dist/reflectCommand.d.ts +10 -0
  135. package/dist/reflectCommand.d.ts.map +1 -0
  136. package/dist/reflectCommand.js +35 -0
  137. package/dist/reflectCommand.js.map +1 -0
  138. package/dist/reflectedStream.d.ts +18 -0
  139. package/dist/reflectedStream.d.ts.map +1 -0
  140. package/dist/reflectedStream.js +35 -0
  141. package/dist/reflectedStream.js.map +1 -0
  142. package/dist/reflection.d.ts +26 -0
  143. package/dist/reflection.d.ts.map +1 -0
  144. package/dist/reflection.js +94 -0
  145. package/dist/reflection.js.map +1 -0
  146. package/dist/rpcClient.d.ts +4 -2
  147. package/dist/rpcClient.d.ts.map +1 -1
  148. package/dist/rpcClient.js +12 -6
  149. package/dist/rpcClient.js.map +1 -1
  150. package/dist/screenSync.d.ts +8 -0
  151. package/dist/screenSync.d.ts.map +1 -0
  152. package/dist/screenSync.js +6 -0
  153. package/dist/screenSync.js.map +1 -0
  154. package/dist/socketProtocol.d.ts +1 -1
  155. package/dist/socketProtocol.d.ts.map +1 -1
  156. package/dist/syncHeader.d.ts +7 -0
  157. package/dist/syncHeader.d.ts.map +1 -0
  158. package/dist/syncHeader.js +22 -0
  159. package/dist/syncHeader.js.map +1 -0
  160. package/package.json +9 -9
  161. package/src/AutomaticQueryOptions.ts +2 -0
  162. package/src/CommandGuard.ts +12 -4
  163. package/src/LiveSync.ts +9 -0
  164. package/src/adapters/activityState.ts +13 -3
  165. package/src/adapters/clientConnection.ts +24 -16
  166. package/src/adapters/liveHintStream.ts +6 -2
  167. package/src/adapters/openLiveHints.ts +25 -3
  168. package/src/adapters/standaloneLiveServer.ts +6 -1
  169. package/src/automaticLive.ts +24 -2
  170. package/src/automaticQuery.ts +7 -0
  171. package/src/bind.ts +3 -2
  172. package/src/catchUp.ts +21 -0
  173. package/src/changesSuccess.ts +4 -1
  174. package/src/clientActivities.ts +9 -4
  175. package/src/clientActivity.ts +4 -1
  176. package/src/clientOperations.ts +28 -10
  177. package/src/clientOptions.ts +1 -0
  178. package/src/commandSignal.ts +27 -0
  179. package/src/connectionProtocol.ts +9 -3
  180. package/src/defineModule.ts +1 -1
  181. package/src/live-server/initialize.ts +2 -1
  182. package/src/live-server/register.ts +2 -2
  183. package/src/live-server/service.ts +2 -0
  184. package/src/live-server/stream.ts +2 -2
  185. package/src/live-server/subscribe.ts +10 -4
  186. package/src/live-server/syncFrames.ts +19 -0
  187. package/src/live-server/synced.ts +13 -0
  188. package/src/liveHintQueue.ts +9 -4
  189. package/src/liveRetry.ts +6 -2
  190. package/src/liveSyncRequest.ts +17 -0
  191. package/src/liveSyncRpc.ts +11 -0
  192. package/src/queryDelivery.ts +29 -5
  193. package/src/querySubscription.ts +1 -0
  194. package/src/queryUpdate.ts +7 -1
  195. package/src/reflectCommand.ts +48 -0
  196. package/src/reflectedStream.ts +54 -0
  197. package/src/reflection.ts +110 -0
  198. package/src/rpcClient.ts +12 -6
  199. package/src/screenSync.ts +10 -0
  200. package/src/syncHeader.ts +27 -0
  201. package/dist/liveAnswers.d.ts +0 -9
  202. package/dist/liveAnswers.d.ts.map +0 -1
  203. package/dist/liveAnswers.js +0 -12
  204. package/dist/liveAnswers.js.map +0 -1
  205. package/src/liveAnswers.ts +0 -13
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reflection.js","sourceRoot":"","sources":["../src/reflection.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import * as AtomRpc from "effect/reactivity/AtomRpc";
4
4
  import { type Rpc } from "effect/rpc";
5
5
  import { Activity } from "#clientActivity.ts";
6
6
  import type { ClientOptions } from "#clientOptions.ts";
7
+ import { ConnectionScope } from "#connectionProtocol.ts";
7
8
  export interface RpcSource {
8
9
  readonly annotations: Context.Context<never>;
9
10
  readonly requests: ReadonlyMap<string, Rpc.Any>;
@@ -13,11 +14,12 @@ export declare function rpcClient(name: string, source: RpcSource, options: Clie
13
14
  current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
14
15
  } & {
15
16
  connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
17
+ firstSettled: Atom.Atom<boolean>;
16
18
  };
17
- Client: AtomRpc.AtomRpcClient<unknown, `${string}/Client`, Rpc.Any>;
19
+ Client: AtomRpc.AtomRpcClient<unknown, `${string}/Client`, Rpc.Any | Rpc.Rpc<"platform.liveSync.request", import("effect/Schema").Void, import("effect/Schema").Void, import("effect/Schema").Never, never, never>>;
18
20
  client: Effect.Effect<{
19
21
  [k: string]: (payload: never, callOptions: never) => never;
20
- }, never, import("effect/Scope").Scope>;
22
+ }, never, ConnectionScope | import("effect/Scope").Scope>;
21
23
  runtime: Atom.AtomRuntime<unknown, never>;
22
24
  };
23
25
  export declare const socketIdentity: Atom.Writable<string | undefined, string | undefined>;
@@ -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;;;;;;;;+BA8DH,KAAK,eAAe,KAAK;;;EAKtG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
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;AAK3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAU7E,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;;;;;;;;;+BAiEH,KAAK,eAAe,KAAK;;;EAKtG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
package/dist/rpcClient.js CHANGED
@@ -3,15 +3,18 @@ import * as Atom from "effect/reactivity/Atom";
3
3
  import * as AtomRpc from "effect/reactivity/AtomRpc";
4
4
  import { RpcClient, RpcGroup } from "effect/rpc";
5
5
  import { withClientProtocol } from "#adapters/withClientProtocol.ts";
6
+ import { catchUp } from "#catchUp.ts";
6
7
  import { clientActivities, makeActivity } from "#clientActivities.ts";
7
8
  import { Activity } from "#clientActivity.ts";
8
- import { connectionProtocol, protocolConnections } from "#connectionProtocol.ts";
9
+ import { ConnectionScope, connectionProtocol } from "#connectionProtocol.ts";
9
10
  import { commandConnections } from "#connectionReadiness.ts";
11
+ import { liveSyncRpc } from "#liveSyncRpc.ts";
12
+ import { reflections } from "#reflection.ts";
10
13
  import { CommandInvalidation } from "#serverMetadata.ts";
11
14
  import { socketProtocol } from "#socketProtocol.ts";
12
15
  export function rpcClient(name, source, options) {
13
16
  const activity = makeActivity(options.runtime ?? Atom.runtime);
14
- const group = RpcGroup.make(...source.requests.values()).annotateMerge(source.annotations);
17
+ const group = RpcGroup.make(...source.requests.values(), ...liveSyncRpc.requests.values()).annotateMerge(source.annotations);
15
18
  const commands = new Set([...group.requests].filter(([, rpc]) => Option.isSome(Context.getOption(rpc.annotations, CommandInvalidation))).map(([tag]) => tag));
16
19
  function sharedProtocol(identity) {
17
20
  return socketProtocol({
@@ -52,11 +55,14 @@ export function rpcClient(name, source, options) {
52
55
  return observed;
53
56
  }
54
57
  const make = Effect.gen(function* () {
55
- const transport = yield* RpcClient.Protocol;
56
- const connection = protocolConnections.get(transport);
57
- const wait = connection === undefined ? Effect.void : Effect.suspend(() => (connection.isReady() ? Effect.void : activity.hold(connection.wait)));
58
+ const { connection, reflection } = yield* ConnectionScope;
59
+ const wait = Effect.suspend(() => (connection.isReady() ? Effect.void : activity.hold(connection.wait)));
58
60
  const native = yield* RpcClient.make(group, { flatten: true });
59
- return observeClient(native, wait);
61
+ const observed = observeClient(native, wait);
62
+ // Only the shared socket proves a command reaches the host that holds its streams; any other protocol syncs after the reply.
63
+ reflections.set(observed, { piggyback: options.protocol === undefined, reflection });
64
+ yield* catchUp(reflection, native, wait);
65
+ return observed;
60
66
  });
61
67
  const Client = AtomRpc.Service()(`${name}/Client`, {
62
68
  group,
@@ -1 +1 @@
1
- {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { Effect } from "effect";
2
+ import * as Atom from "effect/reactivity/Atom";
3
+ import * as AtomRegistry from "effect/reactivity/AtomRegistry";
4
+ export declare function screenSync<E, R, TRuntimeError>(client: {
5
+ readonly runtime: Atom.AtomRuntime<R, TRuntimeError>;
6
+ readonly sync: Effect.Effect<void, E, R>;
7
+ }, registry: AtomRegistry.AtomRegistry): Effect.Effect<void, E | TRuntimeError, never>;
8
+ //# sourceMappingURL=screenSync.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"screenSync.d.ts","sourceRoot":"","sources":["../src/screenSync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAC7C,MAAM,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,EAC1G,QAAQ,EAAE,YAAY,CAAC,YAAY,iDAGnC"}
@@ -0,0 +1,6 @@
1
+ import * as Atom from "effect/reactivity/Atom";
2
+ import * as AtomRegistry from "effect/reactivity/AtomRegistry";
3
+ export function screenSync(client, registry) {
4
+ return AtomRegistry.getResult(registry, client.runtime.atom(client.sync).pipe(Atom.setIdleTTL(0)));
5
+ }
6
+ //# sourceMappingURL=screenSync.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"screenSync.js","sourceRoot":"","sources":["../src/screenSync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,MAAM,UAAU,UAAU,CACzB,MAA0G,EAC1G,QAAmC;IAEnC,OAAO,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpG,CAAC"}
@@ -10,6 +10,6 @@ interface SocketOptions {
10
10
  readonly url: string;
11
11
  readonly webSocketConstructor: ClientOptions["webSocketConstructor"];
12
12
  }
13
- export declare function socketProtocol(options: SocketOptions): Layer.Layer<RpcClient.Protocol, never, never>;
13
+ export declare function socketProtocol(options: SocketOptions): Layer.Layer<import("#connectionProtocol.ts").ConnectionScope | RpcClient.Protocol, never, never>;
14
14
  export {};
15
15
  //# sourceMappingURL=socketProtocol.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"socketProtocol.d.ts","sourceRoot":"","sources":["../src/socketProtocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAY,MAAM,QAAQ,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAoB,MAAM,YAAY,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMvD,UAAU,aAAa;IACtB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;CACrE;AAMD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,iDAQpD"}
1
+ {"version":3,"file":"socketProtocol.d.ts","sourceRoot":"","sources":["../src/socketProtocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,EAAY,MAAM,QAAQ,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAoB,MAAM,YAAY,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMvD,UAAU,aAAa;IACtB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;CACrE;AAMD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,oGAQpD"}
@@ -0,0 +1,7 @@
1
+ import type { Headers } from "effect/http";
2
+ import { SyncToken } from "@shivaedev/changes/syncToken.ts";
3
+ export declare function streamSyncHeaders(client: string): Record<string, string>;
4
+ export declare function commandSyncHeaders(token: SyncToken): Record<string, string>;
5
+ export declare function syncClient(headers: Headers.Headers): string | undefined;
6
+ export declare function syncToken(headers: Headers.Headers): SyncToken | undefined;
7
+ //# sourceMappingURL=syncHeader.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"syncHeader.d.ts","sourceRoot":"","sources":["../src/syncHeader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAK5D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAExE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE3E;AAGD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,MAAM,GAAG,SAAS,CAGvE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,GAAG,SAAS,CAKzE"}
@@ -0,0 +1,22 @@
1
+ import { Option, Schema } from "effect";
2
+ import { SyncToken } from "@shivaedev/changes/syncToken.ts";
3
+ const HEADER = "x-shivaedev-sync";
4
+ const decodeToken = Schema.decodeUnknownOption(SyncToken);
5
+ export function streamSyncHeaders(client) {
6
+ return { [HEADER]: client };
7
+ }
8
+ export function commandSyncHeaders(token) {
9
+ return { [HEADER]: `${token.client}:${token.id}` };
10
+ }
11
+ // A live stream names only its client; the id 1 stands in so one schema validates both header forms.
12
+ export function syncClient(headers) {
13
+ const value = headers[HEADER];
14
+ return value === undefined ? undefined : Option.getOrUndefined(Option.map(decodeToken({ client: value, id: 1 }), (token) => token.client));
15
+ }
16
+ export function syncToken(headers) {
17
+ const [client, id, ...rest] = headers[HEADER]?.split(":") ?? [];
18
+ return rest.length > 0 || id === undefined || !/^[1-9]\d{0,15}$/u.test(id)
19
+ ? undefined
20
+ : Option.getOrUndefined(decodeToken({ client, id: Number(id) }));
21
+ }
22
+ //# sourceMappingURL=syncHeader.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"syncHeader.js","sourceRoot":"","sources":["../src/syncHeader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,MAAM,MAAM,GAAG,kBAAkB,CAAC;AAClC,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;AAE1D,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC/C,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAgB;IAClD,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;AACpD,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,UAAU,CAAC,OAAwB;IAClD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5I,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAwB;IACjD,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAChE,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,KAAK,SAAS,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;QACzE,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/contract",
3
- "version": "0.44.0",
3
+ "version": "0.46.0",
4
4
  "description": "Typed query and command contracts over native Effect RPC and reactivity",
5
5
  "keywords": [
6
6
  "effect"
@@ -43,7 +43,7 @@
43
43
  "README.md"
44
44
  ],
45
45
  "dependencies": {
46
- "@shivaedev/changes": "0.12.0",
46
+ "@shivaedev/changes": "0.13.0",
47
47
  "@shivaedev/errors": "0.12.0",
48
48
  "@shivaedev/service": "0.9.1",
49
49
  "@shivaedev/types": "0.4.0"
@@ -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.31.2",
55
- "@shivaedev/quality": "0.77.0",
56
- "@shivaedev/server": "0.34.0",
57
- "@shivaedev/sql": "0.47.0",
58
- "@shivaedev/test-kits": "0.12.0",
59
- "@shivaedev/test-sql": "0.24.9",
60
- "@shivaedev/test-story": "0.47.0",
54
+ "@shivaedev/identity": "0.32.2",
55
+ "@shivaedev/quality": "0.78.2",
56
+ "@shivaedev/server": "0.35.0",
57
+ "@shivaedev/sql": "0.49.0",
58
+ "@shivaedev/test-kits": "0.13.1",
59
+ "@shivaedev/test-sql": "0.25.2",
60
+ "@shivaedev/test-story": "0.47.3",
61
61
  "@types/node": "24.19.2",
62
62
  "effect": "4.1.2",
63
63
  "happy-dom": "21.0.4",
@@ -3,8 +3,10 @@ import type * as Atom from "effect/reactivity/Atom";
3
3
  import type { LiveBound, LiveConnection } from "#automaticLive.ts";
4
4
  import type { LiveStatus } from "#live.ts";
5
5
  import type { QuerySignals } from "#querySignals.ts";
6
+ import type { StreamAnchor } from "#reflectedStream.ts";
6
7
 
7
8
  export interface AutomaticQueryOptions<A, E> {
9
+ readonly anchor: (registry: object) => StreamAnchor;
8
10
  readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
9
11
  readonly equivalent: (left: A, right: A) => boolean;
10
12
  readonly paused: Atom.Writable<boolean>;
@@ -1,17 +1,23 @@
1
1
  import { Context, Effect, Layer, Option, Ref } from "effect";
2
2
  import { type Rpc, type RpcGroup, RpcMiddleware } from "effect/rpc";
3
3
  import { invalidationKeys, type Key } from "@shivaedev/changes/keys.ts";
4
+ import type { SyncToken } from "@shivaedev/changes/syncToken.ts";
4
5
  import { CommandResultKeys } from "#CommandResultKeys.ts";
5
6
  import { prependMiddleware } from "#prependMiddleware.ts";
6
7
  import { CurrentViewer } from "#readPolicy.ts";
7
8
  import { CommandInvalidation } from "#serverMetadata.ts";
9
+ import { syncToken } from "#syncHeader.ts";
8
10
 
9
- export type CommandBoundary = <A, E, R>(effect: Effect.Effect<A, E, R>, keys: (result: A) => readonly unknown[]) => Effect.Effect<A, E, R>;
11
+ export type CommandBoundary = <A, E, R>(
12
+ effect: Effect.Effect<A, E, R>,
13
+ keys: (result: A) => readonly unknown[],
14
+ sync?: SyncToken,
15
+ ) => Effect.Effect<A, E, R>;
10
16
 
11
17
  export class CommandGuard extends RpcMiddleware.Service<CommandGuard>()("@shivaedev/contract/CommandGuard") {}
12
18
 
13
19
  export function commandGuardLayer(boundary: CommandBoundary): Layer.Layer<CommandGuard> {
14
- return Layer.succeed(CommandGuard, (effect, { rpc, payload }) => {
20
+ return Layer.succeed(CommandGuard, (effect, { rpc, payload, headers }) => {
15
21
  const declaration = Context.getOption(rpc.annotations, CommandInvalidation);
16
22
  return Option.isNone(declaration)
17
23
  ? effect
@@ -22,8 +28,10 @@ export function commandGuardLayer(boundary: CommandBoundary): Layer.Layer<Comman
22
28
  Effect.provideService(CommandResultKeys, keys),
23
29
  Effect.flatMap((result) => Effect.map(Ref.get(keys), (extra) => ({ extra, result }))),
24
30
  );
25
- const published = yield* boundary(completed, ({ extra, result }) =>
26
- invalidationKeys([...declaration.value.invalidates(payload, result, viewer), ...extra]),
31
+ const published = yield* boundary(
32
+ completed,
33
+ ({ extra, result }) => invalidationKeys([...declaration.value.invalidates(payload, result, viewer), ...extra]),
34
+ syncToken(headers),
27
35
  );
28
36
  return published.result;
29
37
  });
@@ -0,0 +1,9 @@
1
+ import { Schema } from "effect";
2
+ import { contract } from "#contract.ts";
3
+ import { LIVE_SYNC_COMMAND, LIVE_SYNC_CONTRACT } from "#liveSyncRpc.ts";
4
+ import { command } from "#operation.ts";
5
+
6
+ // A command that writes nothing: its sync token alone travels the change channel, behind every earlier commit.
7
+ export const LiveSync = contract(LIVE_SYNC_CONTRACT, {
8
+ commands: [command(LIVE_SYNC_COMMAND, { invalidates: () => [], success: Schema.Void })],
9
+ });
@@ -1,17 +1,20 @@
1
1
  import { Effect, SubscriptionRef } from "effect";
2
- import type { ClientActivityState, ConnectionStatus } from "#clientActivity.ts";
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,
14
16
  rpcCalls: 0,
17
+ unreflectedCommands: 0,
15
18
  }),
16
19
  );
17
20
  function publish() {
@@ -20,10 +23,17 @@ export function activityState() {
20
23
  SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })),
21
24
  );
22
25
  }
26
+ function latched(current: ClientActivityState): ClientActivityState {
27
+ return answered && !current.firstSettled && isClientSettled(current) ? { ...current, firstSettled: true } : current;
28
+ }
23
29
  return {
24
30
  activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
25
- change: (key: Exclude<keyof ClientActivityState, "connectionStatus">, delta: number) => {
26
- Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
31
+ answered: () => {
32
+ answered = true;
33
+ Effect.runSync(SubscriptionRef.update(state, latched));
34
+ },
35
+ change: (key: Exclude<keyof ClientActivityState, "connectionStatus" | "firstSettled">, delta: number) => {
36
+ Effect.runSync(SubscriptionRef.update(state, (current) => latched({ ...current, [key]: current[key] + delta })));
27
37
  },
28
38
  hold: () => {
29
39
  held += 1;
@@ -37,20 +37,28 @@ export function clientConnection(
37
37
  get.addFinalizer(cancel);
38
38
  return "live";
39
39
  });
40
- const status = Atom.make((get): ConnectionStatus => {
41
- get.mount(debounced);
42
- const context = AsyncResult.value(get(runtime));
43
- if (Option.isSome(context)) {
44
- const cancel = Effect.runCallbackWith(context.value)(
45
- activity.pipe(
46
- Stream.map((state) => state.connectionStatus),
47
- Stream.changes,
48
- Stream.runForEach((value) => Effect.sync(() => get.setSelf(value))),
49
- ),
50
- );
51
- get.addFinalizer(cancel);
52
- }
53
- return Effect.runSync(activity.current).connectionStatus;
54
- });
55
- return { status, statuses };
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
  }
@@ -5,10 +5,14 @@ import { LiveDispatcher } from "#adapters/LiveDispatcher.ts";
5
5
  import { openLiveHints } from "#adapters/openLiveHints.ts";
6
6
  import type { initialize } from "#live-server/initialize.ts";
7
7
 
8
- export const liveHintStream = Effect.fn("LiveServer.liveHintStream")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
8
+ export const liveHintStream = Effect.fn("LiveServer.liveHintStream")(function* (
9
+ state: Effect.Success<typeof initialize>,
10
+ keys: readonly Key[],
11
+ syncClient?: string,
12
+ ) {
9
13
  const reactivity = yield* Reactivity.Reactivity;
10
14
  const dispatcher = yield* LiveDispatcher;
11
- return Stream.unwrap(Effect.map(openLiveHints(state, keys), Stream.succeed)).pipe(
15
+ return Stream.unwrap(Effect.map(openLiveHints(state, keys, syncClient), Stream.succeed)).pipe(
12
16
  Stream.provideService(Reactivity.Reactivity, reactivity),
13
17
  Stream.provideService(LiveDispatcher, dispatcher),
14
18
  );
@@ -5,12 +5,17 @@ import { LiveDispatcher } from "#adapters/LiveDispatcher.ts";
5
5
  import type { initialize } from "#live-server/initialize.ts";
6
6
  import { liveHintQueue } from "#liveHintQueue.ts";
7
7
 
8
- export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
8
+ export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (
9
+ state: Effect.Success<typeof initialize>,
10
+ keys: readonly Key[],
11
+ syncClient?: string,
12
+ ) {
9
13
  const reactivity = yield* Reactivity.Reactivity;
10
- const { openStreams, resyncKey } = state;
14
+ const { openStreams, resyncKey, syncClients } = state;
11
15
  const { dispatcher } = yield* LiveDispatcher;
12
16
  const { offer, queue } = yield* liveHintQueue;
13
17
  const pending = new Map<string, Key>();
18
+ const synced = new Set<number>();
14
19
  let scheduled = false;
15
20
  let resync = false;
16
21
  let active = true;
@@ -22,9 +27,11 @@ export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (st
22
27
  dispatcher.scheduleTask(() => {
23
28
  scheduled = false;
24
29
  if (active) {
25
- offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
30
+ const tokens = synced.size === 0 ? {} : { synced: [...synced] };
31
+ offer(resync ? { _tag: "Resync", ...tokens } : { _tag: "Changed", keys: [...pending.values()], ...tokens });
26
32
  }
27
33
  pending.clear();
34
+ synced.clear();
28
35
  resync = false;
29
36
  }, 0);
30
37
  }
@@ -48,6 +55,21 @@ export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (st
48
55
  flush();
49
56
  }),
50
57
  ];
58
+ // The token joins the keys already waiting for the flush, so it stays behind every rerun they cause.
59
+ function sync(id: number) {
60
+ synced.add(id);
61
+ flush();
62
+ }
63
+ if (syncClient !== undefined) {
64
+ syncClients.set(syncClient, (syncClients.get(syncClient) ?? new Set()).add(sync));
65
+ cancel.push(() => {
66
+ const subscriptions = syncClients.get(syncClient);
67
+ subscriptions?.delete(sync);
68
+ if (subscriptions?.size === 0) {
69
+ syncClients.delete(syncClient);
70
+ }
71
+ });
72
+ }
51
73
  yield* Ref.update(openStreams, (count) => count + 1);
52
74
  yield* Effect.addFinalizer(() =>
53
75
  Effect.sync(() => {
@@ -11,5 +11,10 @@ export const standaloneLiveServer = Effect.gen(function* () {
11
11
  function subscribe<E, R>(subscription: QuerySubscription<E, R>, read: QueryRerun<E, R>) {
12
12
  return Stream.unwrap(Effect.provideContext(subscribeQueries(subscription, read), context));
13
13
  }
14
- return { resync: server.resync(), stream: (keys: readonly Key[]) => Stream.unwrap(server.stream(keys)), subscribe };
14
+ return {
15
+ resync: server.resync(),
16
+ stream: (keys: readonly Key[], syncClient?: string) => Stream.unwrap(server.stream(keys, syncClient)),
17
+ subscribe,
18
+ synced: server.synced,
19
+ };
15
20
  });
@@ -2,6 +2,7 @@ import { Cause, Effect, Option, type Schema, Stream } from "effect";
2
2
  import type { Headers } from "effect/http";
3
3
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
4
4
  import * as Atom from "effect/reactivity/Atom";
5
+ import * as AtomRegistry from "effect/reactivity/AtomRegistry";
5
6
  import type * as AtomRpc from "effect/reactivity/AtomRpc";
6
7
  import type { Rpc, RpcSchema } from "effect/rpc";
7
8
  import type { Key } from "@shivaedev/changes/keys.ts";
@@ -14,6 +15,7 @@ import { queryDelivery } from "#queryDelivery.ts";
14
15
  import { queryProgress } from "#queryProgress.ts";
15
16
  import { querySignals, shareQuerySignals } from "#querySignals.ts";
16
17
  import type { QueryUpdate } from "#queryUpdate.ts";
18
+ import { followReflection, type StreamAnchor } from "#reflectedStream.ts";
17
19
  import { type ResumeSource, type ResumeWindow, resumeSignal } from "#resume.ts";
18
20
  import { socketIdentity } from "#rpcClient.ts";
19
21
  import type { QueryReference } from "#serverMetadata.ts";
@@ -83,15 +85,35 @@ export function automaticLive(
83
85
  const signals = querySignals(atom);
84
86
  const delivery = queryDelivery(decode, paused, signals);
85
87
  const source = delivery.atom;
88
+ const anchors = new WeakMap<object, StreamAnchor>();
89
+ function anchor(registry: object) {
90
+ const existing = anchors.get(registry);
91
+ if (existing !== undefined) {
92
+ return existing;
93
+ }
94
+ const made: StreamAnchor = { armedAt: undefined, mounted: false, reflection: undefined, supported: undefined };
95
+ anchors.set(registry, made);
96
+ return made;
97
+ }
86
98
  const subscription = live(service.runtime, {
87
99
  keyContext: owner?.context,
88
100
  resume: signal,
89
101
  retryKeys: keys,
90
- stream: Stream.unwrap(service.use((client) => Effect.succeed(client(`${name}.$changes`, { queries: [reference] }, { headers })))).pipe(
91
- delivery.stream,
102
+ stream: Stream.unwrap(
103
+ service.use((client) =>
104
+ Effect.map(AtomRegistry.AtomRegistry, (registry) => {
105
+ const reflected = followReflection(client, anchor(registry));
106
+ if (reflected === undefined) {
107
+ return delivery.stream(client(`${name}.$changes`, { queries: [reference] }, { headers }));
108
+ }
109
+ const opened = client(`${name}.$changes`, { queries: [reference] }, { headers: reflected.headers(headers) });
110
+ return delivery.stream(reflected.lifetime(opened), reflected.follower);
111
+ }),
112
+ ),
92
113
  ),
93
114
  });
94
115
  const gated = automaticQuery({
116
+ anchor,
95
117
  clientStatuses: clientActivities.get(service)?.statuses,
96
118
  equivalent,
97
119
  ownerFailure,
@@ -8,6 +8,7 @@ import { queryResult } from "#queryResult.ts";
8
8
 
9
9
  type GateOptions<A, E> = AutomaticQueryOptions<A, E> & { readonly ownerFailure: (get: Atom.AtomContext) => Error | undefined };
10
10
  export function automaticQuery<A, E>({
11
+ anchor,
11
12
  clientStatuses,
12
13
  equivalent,
13
14
  ownerFailure,
@@ -28,6 +29,12 @@ export function automaticQuery<A, E>({
28
29
  get.set(signals, recordCompletion(get.once(signals), failure));
29
30
  return failure;
30
31
  }
32
+ const mounted = anchor(get.registry);
33
+ mounted.mounted = true;
34
+ get.addFinalizer(() => {
35
+ mounted.mounted = false;
36
+ mounted.reflection?.detach(mounted);
37
+ });
31
38
  get.mount(subscriptionVersion);
32
39
  const openingVersion = get.once(subscriptionVersion);
33
40
  get.refresh(subscription.connection);
package/src/bind.ts CHANGED
@@ -135,6 +135,7 @@ export function makeClient(
135
135
  bindingOptions.live,
136
136
  bindingOptions.resumeWindow,
137
137
  );
138
- const api = bindOperations(contract.declaration, clientOperations(connection.Client, automatic, owner), automatic.subscription);
139
- return Object.assign(connection, { api });
138
+ const operations = clientOperations(connection.Client, automatic, owner);
139
+ const api = bindOperations(contract.declaration, operations, automatic.subscription);
140
+ return Object.assign(connection, { api, sync: operations.sync });
140
141
  }
package/src/catchUp.ts ADDED
@@ -0,0 +1,21 @@
1
+ import { Effect, Queue } from "effect";
2
+ import type { Rpc, RpcClient } from "effect/rpc";
3
+ import type { RpcClientError } from "effect/rpc/RpcClientError";
4
+ import { liveSyncRequest } from "#liveSyncRequest.ts";
5
+ import type { Reflection } from "#reflection.ts";
6
+
7
+ // A stream that may have opened behind a command's token passes a later one, sent on its own once the stream confirms tokens.
8
+ export function catchUp(
9
+ reflection: Reflection,
10
+ client: RpcClient.RpcClient.Flat<Rpc.Any, RpcClientError>,
11
+ connected: Effect.Effect<void, RpcClientError>,
12
+ ) {
13
+ return Queue.take(reflection.catchUps).pipe(
14
+ Effect.andThen(connected),
15
+ Effect.andThen(Effect.suspend(() => liveSyncRequest(client, { client: reflection.client, id: reflection.token() }))),
16
+ // A host that cannot answer the sync will never confirm it, so the waits it covered end here.
17
+ Effect.catchCause(() => Effect.sync(reflection.abandon)),
18
+ Effect.forever,
19
+ Effect.forkScoped,
20
+ );
21
+ }
@@ -1,5 +1,6 @@
1
1
  import { Schema } from "effect";
2
2
  import type { QueryShape } from "#operation.ts";
3
+ import { QuerySynced, QuerySyncing } from "#queryUpdate.ts";
3
4
  import { QueryReadDenied } from "#readPolicyErrors.ts";
4
5
 
5
6
  export const QueryUnchanged = Schema.Struct({ _tag: Schema.Literal("Unchanged"), queryIndex: Schema.Number });
@@ -17,10 +18,12 @@ type ResultSchema<TQuery extends QueryShape> = TQuery extends QueryShape
17
18
 
18
19
  export function changesSuccess<const TQueries extends readonly QueryShape[]>(
19
20
  queries: TQueries,
20
- ): Schema.Union<readonly [typeof QueryReadDenied, ...ResultSchema<TQueries[number]>[]]>;
21
+ ): Schema.Union<readonly [typeof QueryReadDenied, typeof QuerySyncing, typeof QuerySynced, ...ResultSchema<TQueries[number]>[]]>;
21
22
  export function changesSuccess(queries: readonly QueryShape[]) {
22
23
  return Schema.Union([
23
24
  QueryReadDenied,
25
+ QuerySyncing,
26
+ QuerySynced,
24
27
  ...queries.flatMap((query) => [
25
28
  QueryUnchanged,
26
29
  Schema.Struct({