@shivaedev/contract 0.39.0 → 0.41.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 (152) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/README.md +39 -32
  3. package/dist/AutomaticQueryOptions.d.ts +22 -0
  4. package/dist/AutomaticQueryOptions.d.ts.map +1 -0
  5. package/dist/AutomaticQueryOptions.js +2 -0
  6. package/dist/AutomaticQueryOptions.js.map +1 -0
  7. package/dist/adapters/LiveDispatcher.d.ts +9 -0
  8. package/dist/adapters/LiveDispatcher.d.ts.map +1 -0
  9. package/dist/adapters/LiveDispatcher.js +5 -0
  10. package/dist/adapters/LiveDispatcher.js.map +1 -0
  11. package/dist/adapters/activityState.d.ts.map +1 -1
  12. package/dist/adapters/activityState.js +9 -1
  13. package/dist/adapters/activityState.js.map +1 -1
  14. package/dist/adapters/liveHintStream.d.ts +30 -0
  15. package/dist/adapters/liveHintStream.d.ts.map +1 -0
  16. package/dist/adapters/liveHintStream.js +10 -0
  17. package/dist/adapters/liveHintStream.js.map +1 -0
  18. package/dist/adapters/openLiveHints.d.ts +30 -0
  19. package/dist/adapters/openLiveHints.d.ts.map +1 -0
  20. package/dist/adapters/openLiveHints.js +59 -0
  21. package/dist/adapters/openLiveHints.js.map +1 -0
  22. package/dist/adapters/refreshSubscription.d.ts +4 -0
  23. package/dist/adapters/refreshSubscription.d.ts.map +1 -0
  24. package/dist/adapters/refreshSubscription.js +5 -0
  25. package/dist/adapters/refreshSubscription.js.map +1 -0
  26. package/dist/adapters/standaloneLiveServer.d.ts +32 -0
  27. package/dist/adapters/standaloneLiveServer.d.ts.map +1 -0
  28. package/dist/adapters/standaloneLiveServer.js +13 -0
  29. package/dist/adapters/standaloneLiveServer.js.map +1 -0
  30. package/dist/adapters/withClientProtocol.d.ts +4 -0
  31. package/dist/adapters/withClientProtocol.d.ts.map +1 -0
  32. package/dist/adapters/withClientProtocol.js +6 -0
  33. package/dist/adapters/withClientProtocol.js.map +1 -0
  34. package/dist/adapters/withPolicyContext.d.ts +4 -0
  35. package/dist/adapters/withPolicyContext.d.ts.map +1 -0
  36. package/dist/adapters/withPolicyContext.js +7 -0
  37. package/dist/adapters/withPolicyContext.js.map +1 -0
  38. package/dist/automaticLive.d.ts +1 -1
  39. package/dist/automaticLive.d.ts.map +1 -1
  40. package/dist/automaticLive.js +9 -7
  41. package/dist/automaticLive.js.map +1 -1
  42. package/dist/automaticQuery.d.ts +3 -17
  43. package/dist/automaticQuery.d.ts.map +1 -1
  44. package/dist/automaticQuery.js +12 -7
  45. package/dist/automaticQuery.js.map +1 -1
  46. package/dist/changesSuccess.d.ts +2 -3
  47. package/dist/changesSuccess.d.ts.map +1 -1
  48. package/dist/changesSuccess.js +2 -4
  49. package/dist/changesSuccess.js.map +1 -1
  50. package/dist/clientActivities.d.ts +2 -2
  51. package/dist/clientActivities.d.ts.map +1 -1
  52. package/dist/clientActivities.js +28 -12
  53. package/dist/clientActivities.js.map +1 -1
  54. package/dist/clientActivity.d.ts +4 -1
  55. package/dist/clientActivity.d.ts.map +1 -1
  56. package/dist/clientActivity.js +5 -2
  57. package/dist/clientActivity.js.map +1 -1
  58. package/dist/clientOperations.d.ts.map +1 -1
  59. package/dist/clientOperations.js +1 -1
  60. package/dist/clientOperations.js.map +1 -1
  61. package/dist/compareQueries.d.ts +1 -1
  62. package/dist/compareQueries.d.ts.map +1 -1
  63. package/dist/compareQueries.js +10 -4
  64. package/dist/compareQueries.js.map +1 -1
  65. package/dist/live-server/initialize.d.ts +6 -0
  66. package/dist/live-server/initialize.d.ts.map +1 -0
  67. package/dist/live-server/initialize.js +7 -0
  68. package/dist/live-server/initialize.js.map +1 -0
  69. package/dist/live-server/layer.d.ts +3 -0
  70. package/dist/live-server/layer.d.ts.map +1 -0
  71. package/dist/live-server/layer.js +5 -0
  72. package/dist/live-server/layer.js.map +1 -0
  73. package/dist/live-server/register.d.ts +26 -0
  74. package/dist/live-server/register.d.ts.map +1 -0
  75. package/dist/live-server/register.js +8 -0
  76. package/dist/live-server/register.js.map +1 -0
  77. package/dist/live-server/resync.d.ts +4 -3
  78. package/dist/live-server/resync.d.ts.map +1 -1
  79. package/dist/live-server/resync.js +8 -2
  80. package/dist/live-server/resync.js.map +1 -1
  81. package/dist/live-server/service.d.ts +49 -0
  82. package/dist/live-server/service.d.ts.map +1 -0
  83. package/dist/live-server/service.js +19 -0
  84. package/dist/live-server/service.js.map +1 -0
  85. package/dist/live-server/stream.d.ts +4 -4
  86. package/dist/live-server/stream.d.ts.map +1 -1
  87. package/dist/live-server/stream.js +6 -3
  88. package/dist/live-server/stream.js.map +1 -1
  89. package/dist/live-server/subscribe.d.ts +3 -4
  90. package/dist/live-server/subscribe.d.ts.map +1 -1
  91. package/dist/live-server/subscribe.js +28 -6
  92. package/dist/live-server/subscribe.js.map +1 -1
  93. package/dist/liveAttempt.d.ts.map +1 -1
  94. package/dist/liveAttempt.js +8 -2
  95. package/dist/liveAttempt.js.map +1 -1
  96. package/dist/makeLiveServer.d.ts +5 -10
  97. package/dist/makeLiveServer.d.ts.map +1 -1
  98. package/dist/makeLiveServer.js +3 -90
  99. package/dist/makeLiveServer.js.map +1 -1
  100. package/dist/publicConfig.d.ts +6 -1
  101. package/dist/publicConfig.d.ts.map +1 -1
  102. package/dist/queryDelivery.d.ts +3 -1
  103. package/dist/queryDelivery.d.ts.map +1 -1
  104. package/dist/queryDelivery.js +18 -5
  105. package/dist/queryDelivery.js.map +1 -1
  106. package/dist/queryHints.js +1 -1
  107. package/dist/queryHints.js.map +1 -1
  108. package/dist/querySubscription.js +5 -11
  109. package/dist/querySubscription.js.map +1 -1
  110. package/dist/readPolicy.d.ts.map +1 -1
  111. package/dist/readPolicy.js +2 -3
  112. package/dist/readPolicy.js.map +1 -1
  113. package/dist/rpcClient.d.ts +1 -1
  114. package/dist/rpcClient.d.ts.map +1 -1
  115. package/dist/rpcClient.js +6 -3
  116. package/dist/rpcClient.js.map +1 -1
  117. package/package.json +8 -8
  118. package/src/AutomaticQueryOptions.ts +22 -0
  119. package/src/adapters/LiveDispatcher.ts +10 -0
  120. package/src/adapters/activityState.ts +9 -1
  121. package/src/adapters/liveHintStream.ts +15 -0
  122. package/src/adapters/openLiveHints.ts +62 -0
  123. package/src/adapters/refreshSubscription.ts +6 -0
  124. package/src/adapters/standaloneLiveServer.ts +19 -0
  125. package/src/adapters/withClientProtocol.ts +10 -0
  126. package/src/adapters/withPolicyContext.ts +8 -0
  127. package/src/automaticLive.ts +11 -7
  128. package/src/automaticQuery.ts +16 -21
  129. package/src/changesSuccess.ts +11 -14
  130. package/src/clientActivities.ts +29 -12
  131. package/src/clientActivity.ts +8 -2
  132. package/src/clientOperations.ts +4 -2
  133. package/src/compareQueries.ts +10 -4
  134. package/src/live-server/initialize.ts +7 -0
  135. package/src/live-server/layer.ts +5 -0
  136. package/src/live-server/register.ts +10 -0
  137. package/src/live-server/resync.ts +9 -4
  138. package/src/live-server/service.ts +19 -0
  139. package/src/live-server/stream.ts +7 -4
  140. package/src/live-server/subscribe.ts +43 -12
  141. package/src/liveAttempt.ts +10 -2
  142. package/src/makeLiveServer.ts +3 -104
  143. package/src/queryDelivery.ts +22 -5
  144. package/src/queryHints.ts +1 -1
  145. package/src/querySubscription.ts +8 -11
  146. package/src/readPolicy.ts +2 -3
  147. package/src/rpcClient.ts +10 -8
  148. package/dist/LiveServer.d.ts +0 -27
  149. package/dist/LiveServer.d.ts.map +0 -1
  150. package/dist/LiveServer.js +0 -18
  151. package/dist/LiveServer.js.map +0 -1
  152. package/src/LiveServer.ts +0 -18
@@ -1,6 +1,6 @@
1
1
  import { Context, Effect } from "effect";
2
2
  import { Rpc } from "effect/rpc";
3
- import { policyContext } from "#policyContext.ts";
3
+ import { withPolicyContext } from "#adapters/withPolicyContext.ts";
4
4
  import { queryReadKeys } from "#queryReadKeys.ts";
5
5
  import { checkQuery } from "#readPolicy.ts";
6
6
  import { ChangesQueries } from "#serverMetadata.ts";
@@ -9,17 +9,11 @@ export function querySubscription(rpc, references, viewer) {
9
9
  const queries = yield* Context.getUnsafe(rpc.annotations, ChangesQueries).resolve(references);
10
10
  const prefix = rpc._tag.slice(0, -"$changes".length);
11
11
  const policies = yield* Effect.forEach(queries, Effect.fnUntraced(function* ({ query, payload }) {
12
- const context = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
12
+ const policyRpc = Rpc.make(`${prefix}${query.name}`);
13
13
  return {
14
- check: Effect.provideContext(checkQuery(query, payload, viewer), context),
15
- keys: Effect.gen(function* () {
16
- const current = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
17
- return yield* queryReadKeys(query, payload, viewer).pipe(Effect.provideContext(current));
18
- }),
19
- permitted: Effect.gen(function* () {
20
- const current = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
21
- return yield* Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false)).pipe(Effect.provideContext(current));
22
- }),
14
+ check: withPolicyContext(policyRpc, checkQuery(query, payload, viewer)),
15
+ keys: withPolicyContext(policyRpc, queryReadKeys(query, payload, viewer)),
16
+ permitted: withPolicyContext(policyRpc, Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false))),
23
17
  };
24
18
  }));
25
19
  yield* Effect.forEach(policies, ({ check }) => check);
@@ -1 +1 @@
1
- {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAoC,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAA0C,MAAM,oBAAoB,CAAC;AAsB5F,MAAM,UAAU,iBAAiB,CAAC,GAAY,EAAE,UAAqC,EAAE,MAA6B;IACnH,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACrC,OAAO,EACP,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YAC9C,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,OAAO;gBACN,KAAK,EAAE,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACvE,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACzE,SAAS,EAAE,iBAAiB,CAC3B,SAAS,EACT,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAClF;aACD,CAAC;QACH,CAAC,CAAC,CACF,CAAC;QACF,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAC5B,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EACtD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAC3C,CAAC;QACF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAgD,CAAC;IACvH,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"readPolicy.d.ts","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjJ,eAAO,MAAM,aAAa,0CAA+G,CAAC;AAC1I,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,OAAO,CAA+D,CAAC;AAE9G,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,mJAUzD,CAAC;AAGH,MAAM,MAAM,cAAc,CAAC,IAAI,IAAI,IAAI,SAAS;IAC/C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,aAAa,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,QAAQ,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;CAC9B,GACE;IAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;CAAE,GAC/H;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,EAC1D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"readPolicy.d.ts","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjJ,eAAO,MAAM,aAAa,0CAA+G,CAAC;AAC1I,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,OAAO,CAA+D,CAAC;AAE9G,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,mJAUzD,CAAC;AAGH,MAAM,MAAM,cAAc,CAAC,IAAI,IAAI,IAAI,SAAS;IAC/C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,aAAa,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,QAAQ,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;CAC9B,GACE;IAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;CAAE,GAC/H;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,EAC1D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Context, Effect, Option } from "effect";
2
+ import { withPolicyContext } from "#adapters/withPolicyContext.ts";
2
3
  import { isPermissionReadPolicy } from "#permissionReadPolicy.ts";
3
- import { policyContext } from "#policyContext.ts";
4
4
  import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
5
5
  import { QueryDefinition } from "#serverMetadata.ts";
6
6
  export const CurrentViewer = Context.Reference("@shivaedev/contract/CurrentViewer", { defaultValue: Option.none });
@@ -20,8 +20,7 @@ export function authorizeReads(effect, request, viewer) {
20
20
  return Effect.fnUntraced(function* () {
21
21
  const definition = Context.getOption(request.rpc.annotations, QueryDefinition);
22
22
  if (Option.isSome(definition)) {
23
- const context = yield* policyContext(request.rpc);
24
- yield* checkQuery(definition.value.definition, request.payload, viewer).pipe(Effect.provideContext(context));
23
+ yield* withPolicyContext(request.rpc, checkQuery(definition.value.definition, request.payload, viewer));
25
24
  }
26
25
  return yield* Effect.provideService(effect, CurrentViewer, viewer);
27
26
  })();
@@ -1 +1 @@
1
- {"version":3,"file":"readPolicy.js","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAG1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAOrD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAwB,mCAAmC,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1I,MAAM,CAAC,MAAM,QAAQ,GAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,KAAuB,EAAE,OAAgB,EAAE,MAA6B;IACpI,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,iCAAiC,KAAK,CAAC,IAAI,mCAAmC,EAAE,CAAC,CAAC;IAClI,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvF,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,yDAAyD,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvH,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC,CAAC,CAAC;AAiBH,MAAM,UAAU,cAAc,CAC7B,MAAgD,EAChD,OAA6D,EAC7D,MAA6B;IAE7B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClD,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9G,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"readPolicy.js","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAOrD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAwB,mCAAmC,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1I,MAAM,CAAC,MAAM,QAAQ,GAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,KAAuB,EAAE,OAAgB,EAAE,MAA6B;IACpI,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,iCAAiC,KAAK,CAAC,IAAI,mCAAmC,EAAE,CAAC,CAAC;IAClI,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvF,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,yDAAyD,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvH,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC,CAAC,CAAC;AAiBH,MAAM,UAAU,cAAc,CAC7B,MAAgD,EAChD,OAA6D,EAC7D,MAA6B;IAE7B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QACzG,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
@@ -1,4 +1,4 @@
1
- import { type Context, Effect, Layer, Stream } from "effect";
1
+ import { Context, Effect, Layer, Stream } from "effect";
2
2
  import * as Atom from "effect/reactivity/Atom";
3
3
  import * as AtomRpc from "effect/reactivity/AtomRpc";
4
4
  import { type Rpc } from "effect/rpc";
@@ -1 +1 @@
1
- {"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,YAAY,CAAC;AAE3D,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;;;;;;;;+BA4DF,KAAK,eAAe,KAAK;;;EAOvG;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;AAG3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAUvD,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/dist/rpcClient.js CHANGED
@@ -1,8 +1,10 @@
1
- import { Effect, Layer, Stream } from "effect";
1
+ import { Context, Effect, Layer, Option, Stream } from "effect";
2
2
  import * as Atom from "effect/reactivity/Atom";
3
3
  import * as AtomRpc from "effect/reactivity/AtomRpc";
4
4
  import { RpcClient, RpcGroup } from "effect/rpc";
5
+ import { withClientProtocol } from "#adapters/withClientProtocol.ts";
5
6
  import { Activity } from "#clientActivity.ts";
7
+ import { CommandInvalidation } from "#serverMetadata.ts";
6
8
  import { clientActivities, makeActivity } from "./clientActivities.js";
7
9
  import { connectionProtocol, protocolConnections } from "./connectionProtocol.js";
8
10
  import { commandConnections } from "./connectionReadiness.js";
@@ -10,6 +12,7 @@ import { socketProtocol } from "./socketProtocol.js";
10
12
  export function rpcClient(name, source, options) {
11
13
  const activity = makeActivity(options.runtime ?? Atom.runtime);
12
14
  const group = RpcGroup.make(...source.requests.values()).annotateMerge(source.annotations);
15
+ const commands = new Set([...group.requests].filter(([, rpc]) => Option.isSome(Context.getOption(rpc.annotations, CommandInvalidation))).map(([tag]) => tag));
13
16
  function sharedProtocol(identity) {
14
17
  return socketProtocol({
15
18
  bearerToken: options.bearerToken,
@@ -42,7 +45,7 @@ export function rpcClient(name, source, options) {
42
45
  // Publish after the consumer handles the hint so idle cannot race its invalidation.
43
46
  return result.pipe(Stream.flatMap((hint) => Stream.concat(Stream.succeed(hint), Stream.fromEffect(Effect.sync(activity.hint)).pipe(Stream.drain))));
44
47
  }
45
- return Effect.isEffect(result) && !args[2]?.asQueue ? activity.track(result) : result;
48
+ return Effect.isEffect(result) && !args[2]?.asQueue ? activity.track(result, commands.has(args[0])) : result;
46
49
  },
47
50
  });
48
51
  commandConnections.set(observed, wait);
@@ -62,7 +65,7 @@ export function rpcClient(name, source, options) {
62
65
  runtime: options.runtime,
63
66
  });
64
67
  clientActivities.set(Client, activity);
65
- const directClient = Effect.flatMap(Layer.build(protocol), (context) => make.pipe(Effect.map((flat) => Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload, callOptions) => flat(tag, payload, callOptions)]))), Effect.provideContext(context)));
68
+ const directClient = withClientProtocol(protocol, make).pipe(Effect.map((flat) => Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload, callOptions) => flat(tag, payload, callOptions)]))));
66
69
  const layer = Layer.effect(Client, make).pipe(Layer.provide(protocol));
67
70
  return Object.assign(layer, { [Activity]: activity.activity, Client, client: directClient, runtime: Client.runtime });
68
71
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAY,SAAS,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG9C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AASrD,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,MAAiB,EAAE,OAAsB;IAChF,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3F,SAAS,cAAc,CAAC,QAAiB;QACxC,OAAO,cAAc,CAAC;YACrB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1F,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;YACxC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SAClD,CAAC,CAAC;IACJ,CAAC;IACD,SAAS,kBAAkB;QAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,cAAc,CAAC;QACvB,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,QAA4B,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACzC,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACxC,SAAS,aAAa,CAAC,MAAyD,EAAE,IAAyC;QAC1H,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE;YAClC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI;gBAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACrD,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACtE,oFAAoF;oBACpF,OAAO,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAC/H,CAAC;gBACH,CAAC;gBACD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACvF,CAAC;SACD,CAAC,CAAC;QACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAChC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC5C,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClJ,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAgB,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAW,CAAC,GAAG,IAAI,SAAS,EAAE;QAC3D,KAAK;QACL,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrG,OAAO,EAAE,OAAO,CAAC,OAAO;KACxB,CAAC,CAAC;IACH,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CACtE,IAAI,CAAC,IAAI,CACR,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnB,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAc,EAAE,WAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAC3I,EACD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAC9B,CACD,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AACvH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAqB,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/contract",
3
- "version": "0.39.0",
3
+ "version": "0.41.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
  "@effect/platform-node": "4.1.0",
52
52
  "@effect/vitest": "4.1.0",
53
53
  "@shivaedev/errors": "0.10.0",
54
- "@shivaedev/identity": "0.27.0",
55
- "@shivaedev/quality": "0.65.0",
56
- "@shivaedev/server": "0.27.0",
57
- "@shivaedev/sql": "0.42.0",
58
- "@shivaedev/test-kits": "0.8.0",
59
- "@shivaedev/test-sql": "0.24.0",
60
- "@shivaedev/test-story": "0.42.0",
54
+ "@shivaedev/identity": "0.29.0",
55
+ "@shivaedev/quality": "0.67.0",
56
+ "@shivaedev/server": "0.29.0",
57
+ "@shivaedev/sql": "0.44.0",
58
+ "@shivaedev/test-kits": "0.9.0",
59
+ "@shivaedev/test-sql": "0.24.2",
60
+ "@shivaedev/test-story": "0.43.0",
61
61
  "@types/node": "24.19.2",
62
62
  "effect": "4.1.0",
63
63
  "esbuild": "0.28.2",
@@ -0,0 +1,22 @@
1
+ import type { Duration } from "effect";
2
+ import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
+ import type * as Atom from "effect/reactivity/Atom";
4
+ import type { LiveBound, LiveConnection } from "#automaticLive.ts";
5
+ import type { LiveStatus } from "#live.ts";
6
+ import type { QuerySignals } from "#querySignals.ts";
7
+
8
+ export interface AutomaticQueryOptions<A, E> {
9
+ readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
10
+ readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
11
+ readonly coalesceWindow: Atom.Writable<Duration.Input>;
12
+ readonly equivalent: (left: A, right: A) => boolean;
13
+ readonly paused: Atom.Writable<boolean>;
14
+ readonly pushed: boolean;
15
+ readonly ready: Atom.Writable<boolean>;
16
+ readonly resultVersion: Atom.Atom<number>;
17
+ readonly signals: Atom.Writable<QuerySignals>;
18
+ readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
19
+ readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
20
+ readonly subscription: LiveBound[typeof LiveConnection];
21
+ readonly subscriptionVersion: Atom.Atom<number>;
22
+ }
@@ -0,0 +1,10 @@
1
+ import { Context, Effect, Layer, Scheduler } from "effect";
2
+
3
+ export class LiveDispatcher extends Context.Service<LiveDispatcher, { readonly dispatcher: Scheduler.SchedulerDispatcher }>()(
4
+ "@shivaedev/contract/LiveDispatcher",
5
+ ) {
6
+ static readonly layer = Layer.effect(
7
+ this,
8
+ Effect.map(Scheduler.Scheduler, (scheduler) => ({ dispatcher: scheduler.makeDispatcher() })),
9
+ );
10
+ }
@@ -5,7 +5,15 @@ export function activityState() {
5
5
  let held = 0;
6
6
  let connection: ConnectionStatus = "live";
7
7
  const state = Effect.runSync(
8
- SubscriptionRef.make<ClientActivityState>({ connectionStatus: "live", liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }),
8
+ SubscriptionRef.make<ClientActivityState>({
9
+ commands: 0,
10
+ connectionStatus: "live",
11
+ initialQueries: 0,
12
+ liveHints: 0,
13
+ liveInvalidations: 0,
14
+ refreshingAtoms: 0,
15
+ rpcCalls: 0,
16
+ }),
9
17
  );
10
18
  function publish() {
11
19
  const connectionStatus = held > 0 ? "waiting-for-connection" : connection;
@@ -0,0 +1,15 @@
1
+ import { Effect, Stream } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import type { Key } from "@shivaedev/changes/keys.ts";
4
+ import type { initialize } from "#live-server/initialize.ts";
5
+ import { LiveDispatcher } from "./LiveDispatcher.ts";
6
+ import { openLiveHints } from "./openLiveHints.ts";
7
+
8
+ export const liveHintStream = Effect.fn("LiveServer.liveHintStream")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
9
+ const reactivity = yield* Reactivity.Reactivity;
10
+ const dispatcher = yield* LiveDispatcher;
11
+ return Stream.unwrap(Effect.map(openLiveHints(state, keys), Stream.succeed)).pipe(
12
+ Stream.provideService(Reactivity.Reactivity, reactivity),
13
+ Stream.provideService(LiveDispatcher, dispatcher),
14
+ );
15
+ });
@@ -0,0 +1,62 @@
1
+ import { Effect, Queue, Ref, Stream } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import { type Key, readKeys } from "@shivaedev/changes/keys.ts";
4
+ import type { initialize } from "#live-server/initialize.ts";
5
+ import { liveHintQueue } from "#liveHintQueue.ts";
6
+ import { LiveDispatcher } from "./LiveDispatcher.ts";
7
+
8
+ export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
9
+ const reactivity = yield* Reactivity.Reactivity;
10
+ const { openStreams, resyncKey } = state;
11
+ const { dispatcher } = yield* LiveDispatcher;
12
+ const { offer, queue } = yield* liveHintQueue;
13
+ const pending = new Map<string, Key>();
14
+ let scheduled = false;
15
+ let resync = false;
16
+ let active = true;
17
+ function flush() {
18
+ if (scheduled) {
19
+ return;
20
+ }
21
+ scheduled = true;
22
+ dispatcher.scheduleTask(() => {
23
+ scheduled = false;
24
+ if (active) {
25
+ offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
26
+ }
27
+ pending.clear();
28
+ resync = false;
29
+ }, 0);
30
+ }
31
+ let cancelKeys: (() => void)[] = [];
32
+ function replaceKeys(current: readonly Key[]) {
33
+ for (const stop of cancelKeys) {
34
+ stop();
35
+ }
36
+ cancelKeys = current.map((key) => {
37
+ const own = readKeys([key]);
38
+ return reactivity.registerUnsafe(own, () => {
39
+ pending.set(own[0] ?? "", key);
40
+ flush();
41
+ });
42
+ });
43
+ }
44
+ replaceKeys(keys);
45
+ const cancel = [
46
+ reactivity.registerUnsafe([resyncKey], () => {
47
+ resync = true;
48
+ flush();
49
+ }),
50
+ ];
51
+ yield* Ref.update(openStreams, (count) => count + 1);
52
+ yield* Effect.addFinalizer(() =>
53
+ Effect.sync(() => {
54
+ active = false;
55
+ for (const stop of [...cancelKeys, ...cancel]) {
56
+ stop();
57
+ }
58
+ }).pipe(Effect.andThen(Ref.update(openStreams, (count) => count - 1))),
59
+ );
60
+ yield* Queue.offer(queue, { _tag: "Resync" });
61
+ return { replaceKeys, stream: Stream.fromQueue(queue) };
62
+ });
@@ -0,0 +1,6 @@
1
+ import { Effect } from "effect";
2
+ import type { QuerySubscription } from "#querySubscription.ts";
3
+
4
+ export function refreshSubscription<A, E, R>(subscription: QuerySubscription<E, R>, next: Effect.Effect<A, E, R>) {
5
+ return Effect.flatMap(subscription.refresh ?? Effect.context<never>(), (current) => Effect.provideContext(next, current));
6
+ }
@@ -0,0 +1,19 @@
1
+ import { Context, Effect, Layer, Stream } from "effect";
2
+ import type { Key } from "@shivaedev/changes/keys.ts";
3
+ import { liveServerLayer } from "#live-server/layer.ts";
4
+ import { LiveServer } from "#live-server/service.ts";
5
+ import { subscribe as subscribeQueries } from "#live-server/subscribe.ts";
6
+ import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
7
+ import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
8
+ import type { QueryReadDenied } from "#readPolicyErrors.ts";
9
+
10
+ export const standaloneLiveServer = Effect.gen(function* () {
11
+ const context = yield* Effect.scoped(Layer.build(liveServerLayer));
12
+ const server = Context.get(context, LiveServer);
13
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>): Stream.Stream<SubscriptionHint, E | QueryReadDenied, R>;
14
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>, read: QueryRerun<E, R>): Stream.Stream<QueryUpdate, E | QueryReadDenied, R>;
15
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>, read?: QueryRerun<E, R>) {
16
+ return Stream.unwrap(Effect.provideContext(subscribeQueries(subscription, read), context));
17
+ }
18
+ return { resync: server.resync(), stream: (keys: readonly Key[]) => Stream.unwrap(server.stream(keys)), subscribe };
19
+ });
@@ -0,0 +1,10 @@
1
+ import { Effect, Layer } from "effect";
2
+ import type { RpcClient } from "effect/rpc";
3
+
4
+ export const withClientProtocol = Effect.fn("RpcClient.withClientProtocol")(function* <A, E, R, TMakeError, TMakeRequirements>(
5
+ protocol: Layer.Layer<RpcClient.Protocol, E, R>,
6
+ make: Effect.Effect<A, TMakeError, TMakeRequirements>,
7
+ ) {
8
+ const context = yield* Layer.build(protocol);
9
+ return yield* Effect.provideContext(make, context);
10
+ });
@@ -0,0 +1,8 @@
1
+ import { Effect } from "effect";
2
+ import type { Rpc } from "effect/rpc";
3
+ import { policyContext } from "#policyContext.ts";
4
+
5
+ export const withPolicyContext = Effect.fn("ReadPolicy.withPolicyContext")(function* <A, E, R>(rpc: Rpc.Any, effect: Effect.Effect<A, E, R>) {
6
+ const context = yield* policyContext(rpc);
7
+ return yield* Effect.provideContext(effect, context);
8
+ });
@@ -74,22 +74,24 @@ export function automaticLive(
74
74
  reference: QueryReference,
75
75
  keys: readonly Key[],
76
76
  equivalent: (left: A, right: A) => boolean,
77
- decode?: (value: unknown) => A,
77
+ decode: (value: unknown) => A,
78
+ compared: boolean,
79
+ reactive: (source: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>,
78
80
  headers?: Headers.Input,
79
81
  ) {
80
82
  if (!enabled) {
81
- return queryProgress(atom);
83
+ return queryProgress(reactive(atom));
82
84
  }
83
85
  const ready = Atom.make(false);
84
86
  const signals = querySignals(atom);
85
- const delivery = queryDelivery(atom, decode, paused, signals);
86
- const source = decode === undefined ? delivery.atom.pipe(Atom.setIdleTTL(0)) : delivery.atom;
87
+ const delivery = queryDelivery(atom, decode, compared, paused, signals);
88
+ const source = compared ? delivery.atom : reactive(delivery.atom.pipe(Atom.setIdleTTL(0)));
87
89
  const subscription = live(service.runtime, {
88
90
  initialResync: false,
89
91
  keyContext: owner?.context,
90
- reopenOnResume: decode !== undefined,
92
+ reopenOnResume: compared,
91
93
  resume: signal,
92
- resyncKeys: decode === undefined ? localQueryKeys(keys) : [],
94
+ resyncKeys: compared ? [] : localQueryKeys(keys),
93
95
  retryKeys: keys,
94
96
  stream: Stream.unwrap(service.use((client) => Effect.succeed(client(`${name}.$changes`, { queries: [reference] }, { headers })))).pipe(
95
97
  delivery.stream,
@@ -103,12 +105,14 @@ export function automaticLive(
103
105
  coalesceWindow,
104
106
  equivalent,
105
107
  paused,
106
- pushed: decode !== undefined,
108
+ pushed: compared,
107
109
  ready,
110
+ resultVersion: delivery.version,
108
111
  signals,
109
112
  source,
110
113
  statuses,
111
114
  subscription,
115
+ subscriptionVersion: delivery.updates,
112
116
  });
113
117
  shareQuerySignals(gated, atom);
114
118
  Object.assign(gated, { initialValueTarget: atom });
@@ -1,27 +1,15 @@
1
- import { Cause, type Duration, Option, Predicate } from "effect";
1
+ import { Cause, Option, Predicate } from "effect";
2
2
  import * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import * as Atom from "effect/reactivity/Atom";
4
- import type { LiveBound, LiveConnection } from "#automaticLive.ts";
4
+ import type { AutomaticQueryOptions } from "#AutomaticQueryOptions.ts";
5
5
  import type { LiveStatus } from "#live.ts";
6
6
  import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
7
7
  import { queryFailure } from "#queryFailure.ts";
8
8
  import { recordCompletion, recordSubscription } from "#queryProgress.ts";
9
9
  import { queryResult } from "#queryResult.ts";
10
- import type { QuerySignals } from "#querySignals.ts";
11
10
 
12
- interface GateOptions<A, E> {
11
+ interface GateOptions<A, E> extends AutomaticQueryOptions<A, E> {
13
12
  readonly assertOwner: (get: Atom.AtomContext) => void;
14
- readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
15
- readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
16
- readonly coalesceWindow: Atom.Writable<Duration.Input>;
17
- readonly equivalent: (left: A, right: A) => boolean;
18
- readonly paused: Atom.Writable<boolean>;
19
- readonly pushed: boolean;
20
- readonly ready: Atom.Writable<boolean>;
21
- readonly signals: Atom.Writable<QuerySignals>;
22
- readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
23
- readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
24
- readonly subscription: LiveBound[typeof LiveConnection];
25
13
  }
26
14
  export function automaticQuery<A, E>({
27
15
  atom,
@@ -32,15 +20,21 @@ export function automaticQuery<A, E>({
32
20
  paused,
33
21
  pushed,
34
22
  ready,
23
+ resultVersion,
35
24
  signals,
36
25
  source,
37
26
  statuses,
38
27
  subscription,
28
+ subscriptionVersion,
39
29
  }: GateOptions<A, E>) {
40
30
  const gated = Atom.readable(
41
31
  (get) => {
42
32
  assertOwner(get);
43
33
  get.mount(signals);
34
+ get.mount(resultVersion);
35
+ get.mount(subscriptionVersion);
36
+ const openingVersion = get.once(subscriptionVersion);
37
+ get.refresh(subscription.connection);
44
38
  const registry = get.registry;
45
39
  const dispatcher = registry.schedulerAsync.makeDispatcher();
46
40
  let denied = false;
@@ -49,7 +43,7 @@ export function automaticQuery<A, E>({
49
43
  get.set(ready, false);
50
44
  get.set(signals, { ...get.once(signals), pending: true, subscription: "opening" });
51
45
  get.once(queryCoalesceWindow(gated));
52
- get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(atom), value), { immediate: true });
46
+ get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(source), value), { immediate: true });
53
47
  const token = {};
54
48
  let active = true;
55
49
  function observe(value: LiveStatus<unknown>) {
@@ -61,7 +55,7 @@ export function automaticQuery<A, E>({
61
55
  }
62
56
  }
63
57
  }, 0);
64
- if (value.connection === "live") {
58
+ if (value.connection === "live" && get.once(subscriptionVersion) > openingVersion) {
65
59
  denied = false;
66
60
  registry.set(ready, true);
67
61
  }
@@ -81,22 +75,22 @@ export function automaticQuery<A, E>({
81
75
  get.addFinalizer(registry.subscribe(subscription.status, observe, { immediate: true }));
82
76
  get.addFinalizer(registry.subscribe(coalesceWindow, (value) => registry.set(subscription.coalesceWindow, value), { immediate: true }));
83
77
  let started = false;
78
+ let deniedVersion = 0;
84
79
  function start() {
85
80
  if (stopSource !== undefined) {
86
81
  return;
87
82
  }
88
- started = true;
89
- if (!pushed) {
83
+ if (!pushed && get.once(resultVersion) === deniedVersion) {
90
84
  get.refresh(source);
91
85
  }
86
+ started = true;
92
87
  const publish = queryResult<A, E>(equivalent, (value) => {
93
88
  if (!denied) {
94
89
  get.setSelf(value);
95
90
  get.set(signals, recordCompletion(get.once(signals), value));
96
91
  }
97
92
  });
98
- stopSource = registry.subscribe(source, publish);
99
- publish(get.once(source));
93
+ stopSource = registry.subscribe(source, publish, { immediate: true });
100
94
  }
101
95
  get.once(ready);
102
96
  get.subscribe(ready, (value) => {
@@ -109,6 +103,7 @@ export function automaticQuery<A, E>({
109
103
  (cause) => {
110
104
  if (Option.exists(Cause.findErrorOption(cause), Predicate.isTagged("QueryReadDenied"))) {
111
105
  denied = true;
106
+ deniedVersion = get.once(resultVersion);
112
107
  registry.set(ready, false);
113
108
  stopSource?.();
114
109
  stopSource = undefined;
@@ -5,7 +5,6 @@ import { QueryReadDenied } from "#readPolicyErrors.ts";
5
5
 
6
6
  export const QueryUnchanged = Schema.Struct({ _tag: Schema.Literal("Unchanged"), queryIndex: Schema.Number });
7
7
 
8
- type Rerun<TQuery extends QueryShape> = TQuery extends QueryShape ? ("rerun-and-compare" extends TQuery["live"] ? TQuery : never) : never;
9
8
  type ResultSchema<TQuery extends QueryShape> = TQuery extends QueryShape
10
9
  ?
11
10
  | Schema.Struct<{
@@ -14,26 +13,24 @@ type ResultSchema<TQuery extends QueryShape> = TQuery extends QueryShape
14
13
  queryIndex: Schema.Number;
15
14
  value: TQuery["success"];
16
15
  }>
17
- | typeof QueryUnchanged
16
+ | ("rerun-and-compare" extends TQuery["live"] ? typeof QueryUnchanged : never)
18
17
  : never;
19
18
 
20
19
  export function changesSuccess<const TQueries extends readonly QueryShape[]>(
21
20
  queries: TQueries,
22
- ): Schema.Union<readonly [typeof LiveHint, typeof QueryReadDenied, ...ResultSchema<Rerun<TQueries[number]>>[]]>;
21
+ ): Schema.Union<readonly [typeof LiveHint, typeof QueryReadDenied, ...ResultSchema<TQueries[number]>[]]>;
23
22
  export function changesSuccess(queries: readonly QueryShape[]) {
24
23
  return Schema.Union([
25
24
  LiveHint,
26
25
  QueryReadDenied,
27
- ...queries
28
- .filter((query) => query.live === "rerun-and-compare")
29
- .flatMap((query) => [
30
- QueryUnchanged,
31
- Schema.Struct({
32
- _tag: Schema.Literal("Result"),
33
- query: Schema.Literal(query.name),
34
- queryIndex: Schema.Number,
35
- value: query.success,
36
- }),
37
- ]),
26
+ ...queries.flatMap((query) => [
27
+ ...(query.live === "rerun-and-compare" ? [QueryUnchanged] : []),
28
+ Schema.Struct({
29
+ _tag: Schema.Literal("Result"),
30
+ query: Schema.Literal(query.name),
31
+ queryIndex: Schema.Number,
32
+ value: query.success,
33
+ }),
34
+ ]),
38
35
  ]);
39
36
  }