@shivaedev/contract 0.56.0 → 0.57.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 (75) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/README.md +16 -15
  3. package/dist/AutomaticQueryOptions.d.ts +1 -1
  4. package/dist/AutomaticQueryOptions.d.ts.map +1 -1
  5. package/dist/{bind.d.ts → Bound.d.ts} +1 -19
  6. package/dist/Bound.d.ts.map +1 -0
  7. package/dist/Bound.js +2 -0
  8. package/dist/Bound.js.map +1 -0
  9. package/dist/ClientOptions.d.ts +2 -2
  10. package/dist/ClientOptions.d.ts.map +1 -1
  11. package/dist/automaticLive.d.ts +2 -1
  12. package/dist/automaticLive.d.ts.map +1 -1
  13. package/dist/automaticLive.js +4 -9
  14. package/dist/automaticLive.js.map +1 -1
  15. package/dist/automaticQuery.js +2 -2
  16. package/dist/automaticQuery.js.map +1 -1
  17. package/dist/clientActivities.d.ts +1 -15
  18. package/dist/clientActivities.d.ts.map +1 -1
  19. package/dist/clientActivities.js +0 -1
  20. package/dist/clientActivities.js.map +1 -1
  21. package/dist/clientOperations.d.ts +3 -2
  22. package/dist/clientOperations.d.ts.map +1 -1
  23. package/dist/clientOperations.js +3 -4
  24. package/dist/clientOperations.js.map +1 -1
  25. package/dist/makeClient.d.ts +1 -1
  26. package/dist/makeClient.d.ts.map +1 -1
  27. package/dist/makeClient.js +3 -3
  28. package/dist/makeClient.js.map +1 -1
  29. package/dist/queryDelivery.d.ts +1 -1
  30. package/dist/queryDelivery.d.ts.map +1 -1
  31. package/dist/queryDelivery.js.map +1 -1
  32. package/dist/reflectCommand.d.ts.map +1 -1
  33. package/dist/reflectCommand.js +7 -18
  34. package/dist/reflectCommand.js.map +1 -1
  35. package/dist/reflectedStream.d.ts +3 -3
  36. package/dist/reflectedStream.d.ts.map +1 -1
  37. package/dist/reflectedStream.js +4 -5
  38. package/dist/reflectedStream.js.map +1 -1
  39. package/dist/reflection.d.ts +4 -0
  40. package/dist/reflection.d.ts.map +1 -1
  41. package/dist/reflection.js +4 -0
  42. package/dist/reflection.js.map +1 -1
  43. package/dist/rpcClient.d.ts +29 -12
  44. package/dist/rpcClient.d.ts.map +1 -1
  45. package/dist/rpcClient.js +2 -3
  46. package/dist/rpcClient.js.map +1 -1
  47. package/dist/servedHandlers.d.ts.map +1 -1
  48. package/dist/servedHandlers.js +3 -2
  49. package/dist/servedHandlers.js.map +1 -1
  50. package/dist/socketAuthentication.d.ts +1 -11
  51. package/dist/socketAuthentication.d.ts.map +1 -1
  52. package/dist/socketAuthentication.js +15 -7
  53. package/dist/socketAuthentication.js.map +1 -1
  54. package/dist/socketProtocol.js +4 -8
  55. package/dist/socketProtocol.js.map +1 -1
  56. package/package.json +6 -6
  57. package/src/AutomaticQueryOptions.ts +1 -1
  58. package/src/{bind.ts → Bound.ts} +0 -46
  59. package/src/ClientOptions.ts +2 -2
  60. package/src/automaticLive.ts +9 -10
  61. package/src/automaticQuery.ts +2 -2
  62. package/src/clientActivities.ts +1 -2
  63. package/src/clientOperations.ts +5 -4
  64. package/src/makeClient.ts +4 -4
  65. package/src/queryDelivery.ts +2 -2
  66. package/src/reflectCommand.ts +7 -18
  67. package/src/reflectedStream.ts +5 -5
  68. package/src/reflection.ts +5 -0
  69. package/src/rpcClient.ts +2 -3
  70. package/src/servedHandlers.ts +5 -4
  71. package/src/socketAuthentication.ts +22 -7
  72. package/src/socketProtocol.ts +5 -10
  73. package/dist/bind.d.ts.map +0 -1
  74. package/dist/bind.js +0 -11
  75. package/dist/bind.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"queryDelivery.js","sourceRoot":"","sources":["../src/queryDelivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAK/D,SAAS,OAAO,CAAC,MAAkC,EAAE,QAAwC;IAC5F,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,QAAQ,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;SAAM,CAAC;QACP,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,aAAa,CAAO,MAA6B,EAAE,MAA0B,EAAE,OAAoC;IAClI,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAgC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC1C,MAAmB,EACnB,QAAwC;QAExC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;QAClD,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,uHAAuH;QACvH,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACvB,OAAO;QACR,CAAC;QACD,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,OAAO,EAAE,CAAC;gBACb,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3G,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QACf,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,OAAO;QACN,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,CAAY,MAA6C,EAAE,QAA6B,EAAE,EAAE,CACnG,MAAM,CAAC,IAAI,CACV,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EACvD,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAC7C;QACF,OAAO;KACP,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"queryDelivery.js","sourceRoot":"","sources":["../src/queryDelivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAK/D,SAAS,OAAO,CAAC,MAAkC,EAAE,QAAwC;IAC5F,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,QAAQ,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;SAAM,CAAC;QACP,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,aAAa,CAAO,MAA6B,EAAE,MAA0B,EAAE,OAAoC;IAClI,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAgC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC1C,MAAmB,EACnB,QAA4B;QAE5B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;QAClD,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,uHAAuH;QACvH,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACvB,OAAO;QACR,CAAC;QACD,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,OAAO,EAAE,CAAC;gBACb,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3G,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QACf,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,OAAO;QACN,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,CAAY,MAA6C,EAAE,QAA4B,EAAE,EAAE,CAClG,MAAM,CAAC,IAAI,CACV,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EACvD,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAC7C;QACF,OAAO;KACP,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"reflectCommand.d.ts","sourceRoot":"","sources":["../src/reflectCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,IAAI,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACxF,UAAU,UAAQ,GAChB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAgCxB"}
1
+ {"version":3,"file":"reflectCommand.d.ts","sourceRoot":"","sources":["../src/reflectCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,IAAI,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC/C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACxF,UAAU,UAAQ,GAChB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAqBxB"}
@@ -1,34 +1,23 @@
1
1
  import { Effect, Exit } from "effect";
2
- import { reflections } from "#reflection.ts";
2
+ import { reflectionScope } from "#reflection.ts";
3
3
  import { commandSyncHeaders } from "#syncHeader.ts";
4
4
  export function reflectCommand(client, observer, send, standalone = false) {
5
- return Effect.suspend(() => {
6
- const scope = reflections.get(client);
7
- const reflection = scope?.reflection;
8
- let own;
9
- if (scope !== undefined) {
10
- own = standalone ? scope.reflection.flight() : scope.reflection.send(scope.piggyback);
11
- }
5
+ return Effect.flatMap(reflectionScope(client), ({ piggyback, reflection }) => {
6
+ const own = standalone ? reflection.flight() : reflection.send(piggyback);
12
7
  const finish = observer.pending();
13
8
  observer.signal("sent");
14
- const sent = reflection === undefined || own === undefined ? send() : send({ headers: commandSyncHeaders({ client: reflection.client, id: own }) });
9
+ const sent = own === undefined ? send() : send({ headers: commandSyncHeaders({ client: reflection.client, id: own }) });
15
10
  return Effect.onExit(sent, (exit) => Effect.sync(() => {
16
11
  if (Exit.isFailure(exit)) {
17
- reflection?.failed(own);
12
+ reflection.failed(own);
18
13
  finish();
19
14
  return;
20
15
  }
21
16
  observer.signal("accepted");
22
- function reflected() {
17
+ reflection.accepted(own, () => {
23
18
  finish();
24
19
  observer.signal("reflected");
25
- }
26
- if (reflection === undefined) {
27
- reflected();
28
- }
29
- else {
30
- reflection.accepted(own, reflected);
31
- }
20
+ });
32
21
  }));
33
22
  });
34
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"reflectCommand.js","sourceRoot":"","sources":["../src/reflectCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOpD,MAAM,UAAU,cAAc,CAC7B,MAAc,EACd,QAAyB,EACzB,IAAwF,EACxF,UAAU,GAAG,KAAK;IAElB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,EAAE,UAAU,CAAC;QACrC,IAAI,GAAuB,CAAC;QAC5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;QAClC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,IAAI,GACT,UAAU,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACxI,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CACnC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBACxB,MAAM,EAAE,CAAC;gBACT,OAAO;YACR,CAAC;YACD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5B,SAAS,SAAS;gBACjB,MAAM,EAAE,CAAC;gBACT,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,SAAS,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACrC,CAAC;QACF,CAAC,CAAC,CACF,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"reflectCommand.js","sourceRoot":"","sources":["../src/reflectCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOpD,MAAM,UAAU,cAAc,CAC7B,MAAc,EACd,QAAyB,EACzB,IAAwF,EACxF,UAAU,GAAG,KAAK;IAElB,OAAO,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE;QAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;QAClC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACxH,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CACnC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACvB,MAAM,EAAE,CAAC;gBACT,OAAO;YACR,CAAC;YACD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5B,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;gBAC7B,MAAM,EAAE,CAAC;gBACT,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CACF,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Stream } from "effect";
1
+ import { Effect, Stream } from "effect";
2
2
  import { Headers } from "effect/http";
3
3
  import { type FollowedStream, type Reflection } from "#reflection.ts";
4
4
  export interface StreamAnchor extends FollowedStream {
@@ -10,9 +10,9 @@ export interface ReflectionFollower {
10
10
  readonly confirmed: (ids: readonly number[]) => void;
11
11
  readonly data: () => void;
12
12
  }
13
- export declare function followReflection(client: object, anchor: StreamAnchor): {
13
+ export declare function followReflection(client: object, anchor: StreamAnchor): Effect.Effect<{
14
14
  follower: ReflectionFollower;
15
15
  headers: (headers: Headers.Input | undefined) => Headers.Headers;
16
16
  lifetime: <A, E, R>(stream: Stream.Stream<A, E, R>) => Stream.Stream<A, E, R>;
17
- } | undefined;
17
+ }, never, never>;
18
18
  //# sourceMappingURL=reflectedStream.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"reflectedStream.d.ts","sourceRoot":"","sources":["../src/reflectedStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAe,MAAM,gBAAgB,CAAC;AAGnF,MAAM,WAAW,YAAa,SAAQ,cAAc;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;CAC1B;AAGD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;;uBAYhD,OAAO,CAAC,KAAK,GAAG,SAAS;eAEjC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;cAqBnD"}
1
+ {"version":3,"file":"reflectedStream.d.ts","sourceRoot":"","sources":["../src/reflectedStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAmB,MAAM,gBAAgB,CAAC;AAGvF,MAAM,WAAW,YAAa,SAAQ,cAAc;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;CAC1B;AAGD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;;uBAYhD,OAAO,CAAC,KAAK,GAAG,SAAS;eAEjC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;iBAZnD"}
@@ -1,14 +1,13 @@
1
1
  import { Effect, Exit, Stream } from "effect";
2
2
  import { Headers } from "effect/http";
3
3
  import { retriesLive } from "#liveRetry.ts";
4
- import { reflections } from "#reflection.ts";
4
+ import { reflectionScope } from "#reflection.ts";
5
5
  import { streamSyncHeaders } from "#syncHeader.ts";
6
6
  // A mounted query keeps one place in its connection's waits across attempts; it leaves only when it unmounts or stops retrying.
7
7
  export function followReflection(client, anchor) {
8
- const reflection = reflections.get(client)?.reflection;
9
- if (reflection === undefined) {
10
- return undefined;
11
- }
8
+ return Effect.map(reflectionScope(client), ({ reflection }) => follow(reflection, anchor));
9
+ }
10
+ function follow(reflection, anchor) {
12
11
  const follower = {
13
12
  armed: () => reflection.armed(anchor),
14
13
  confirmed: (ids) => reflection.confirmed(anchor, ids),
@@ -1 +1 @@
1
- {"version":3,"file":"reflectedStream.js","sourceRoot":"","sources":["../src/reflectedStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAwC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAanD,gIAAgI;AAChI,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAoB;IACpE,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IACvD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,QAAQ,GAAuB;QACpC,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;QACrC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC;QACrD,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;KACnC,CAAC;IACF,OAAO;QACN,QAAQ;QACR,OAAO,EAAE,CAAC,OAAkC,EAAE,EAAE,CAC/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACnG,QAAQ,EAAE,CAAU,MAA8B,EAAE,EAAE,CACrD,MAAM,CAAC,IAAI,CACV,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC,CACF,EACD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACzE,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACP,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC,CAAC,CACF,CACD;KACF,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"reflectedStream.js","sourceRoot":"","sources":["../src/reflectedStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAwC,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAanD,gIAAgI;AAChI,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAoB;IACpE,OAAO,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,MAAM,CAAC,UAAsB,EAAE,MAAoB;IAC3D,MAAM,QAAQ,GAAuB;QACpC,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;QACrC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC;QACrD,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;KACnC,CAAC;IACF,OAAO;QACN,QAAQ;QACR,OAAO,EAAE,CAAC,OAAkC,EAAE,EAAE,CAC/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACnG,QAAQ,EAAE,CAAU,MAA8B,EAAE,EAAE,CACrD,MAAM,CAAC,IAAI,CACV,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC,CACF,EACD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACzE,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACP,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC,CAAC,CACF,CACD;KACF,CAAC;AACH,CAAC"}
@@ -23,4 +23,8 @@ export declare const reflections: WeakMap<object, {
23
23
  readonly piggyback: boolean;
24
24
  readonly reflection: Reflection;
25
25
  }>;
26
+ export declare function reflectionScope(client: object): Effect.Effect<{
27
+ readonly piggyback: boolean;
28
+ readonly reflection: Reflection;
29
+ }, never, never>;
26
30
  //# sourceMappingURL=reflection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"reflection.d.ts","sourceRoot":"","sources":["../src/reflection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,MAAM,WAAW,cAAc;IAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAWD,eAAO,MAAM,cAAc;;oBAkCR,MAAM,GAAG,SAAS,aAAa,MAAM,IAAI;oBAgBzC,cAAc;;;wBASV,cAAc,OAAO,SAAS,MAAM,EAAE;mBAM3C,cAAc;qBAMZ,cAAc;kBAIjB,MAAM,GAAG,SAAS;;sBAMd,cAAc;sBAKd,OAAO;;gBAI3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,CAAC;AAE/D,eAAO,MAAM,WAAW;wBAA6C,OAAO;yBAAuB,UAAU;EAAK,CAAC"}
1
+ {"version":3,"file":"reflection.d.ts","sourceRoot":"","sources":["../src/reflection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,MAAM,WAAW,cAAc;IAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAWD,eAAO,MAAM,cAAc;;oBAkCR,MAAM,GAAG,SAAS,aAAa,MAAM,IAAI;oBAgBzC,cAAc;;;wBASV,cAAc,OAAO,SAAS,MAAM,EAAE;mBAM3C,cAAc;qBAMZ,cAAc;kBAIjB,MAAM,GAAG,SAAS;;sBAMd,cAAc;sBAKd,OAAO;;gBAI3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,CAAC;AAE/D,eAAO,MAAM,WAAW;wBAA6C,OAAO;yBAAuB,UAAU;EAAK,CAAC;AAEnH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM;wBAFuB,OAAO;yBAAuB,UAAU;iBAK5G"}
@@ -91,4 +91,8 @@ export const makeReflection = Effect.flatMap(Queue.sliding(1), (catchUps) => Eff
91
91
  };
92
92
  }));
93
93
  export const reflections = new WeakMap();
94
+ export function reflectionScope(client) {
95
+ const scope = reflections.get(client);
96
+ return scope === undefined ? Effect.die(new Error("A client made by makeClient carries its connection's reflection")) : Effect.succeed(scope);
97
+ }
94
98
  //# sourceMappingURL=reflection.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"reflection.js","sourceRoot":"","sources":["../src/reflection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reflection.js","sourceRoot":"","sources":["../src/reflection.ts"],"names":[],"mappings":"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"}
@@ -10,19 +10,36 @@ export interface RpcSource {
10
10
  readonly annotations: Context.Context<never>;
11
11
  readonly requests: ReadonlyMap<string, Rpc.Any>;
12
12
  }
13
- export declare function rpcClient(name: string, source: RpcSource, options: ClientOptions): Layer.Layer<unknown, never, never> & {
14
- [Activity]: Stream.Stream<import("#clientActivity.ts").ClientActivityState, never, never> & {
15
- current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
16
- } & {
17
- connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
18
- firstSettled: Atom.Atom<boolean>;
19
- rendered: Effect.Effect<void, never, never>;
13
+ export declare function rpcClient(name: string, source: RpcSource, options: ClientOptions): {
14
+ activity: {
15
+ activity: Stream.Stream<import("#clientActivity.ts").ClientActivityState, never, never> & {
16
+ current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
17
+ } & {
18
+ connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
19
+ firstSettled: Atom.Atom<boolean>;
20
+ rendered: Effect.Effect<void, never, never>;
21
+ };
22
+ hint: () => void;
23
+ hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
24
+ reflecting: () => () => void;
25
+ statuses: Atom.Writable<ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>, ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>>;
26
+ track: <A, E, R>(effect: Effect.Effect<A, E, R>, command?: boolean) => Effect.Effect<A, E, R>;
27
+ watch: <A, E>(atom: Atom.Atom<import("effect/reactivity/AsyncResult").AsyncResult<A, E>>, warm: (get: Atom.AtomContext) => boolean) => Atom.Atom<import("effect/reactivity/AsyncResult").AsyncResult<A, E>>;
28
+ };
29
+ connection: Layer.Layer<unknown, never, never> & {
30
+ [Activity]: Stream.Stream<import("#clientActivity.ts").ClientActivityState, never, never> & {
31
+ current: Effect.Effect<import("#clientActivity.ts").ClientActivityState, never, never>;
32
+ } & {
33
+ connectionStatus: Atom.Atom<import("#clientActivity.ts").ConnectionStatus>;
34
+ firstSettled: Atom.Atom<boolean>;
35
+ rendered: Effect.Effect<void, never, never>;
36
+ };
37
+ 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>>;
38
+ client: Effect.Effect<{
39
+ [k: string]: (payload: never, callOptions: never) => Effect.Effect<void, RpcClientError, never>;
40
+ }, never, ConnectionScope | import("effect/Scope").Scope>;
41
+ runtime: Atom.AtomRuntime<unknown, never>;
20
42
  };
21
- 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>>;
22
- client: Effect.Effect<{
23
- [k: string]: (payload: never, callOptions: never) => Effect.Effect<void, RpcClientError, never>;
24
- }, never, ConnectionScope | import("effect/Scope").Scope>;
25
- runtime: Atom.AtomRuntime<unknown, never>;
26
43
  };
27
44
  export declare const socketIdentity: Atom.Writable<string | undefined, string | undefined>;
28
45
  //# sourceMappingURL=rpcClient.d.ts.map
@@ -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;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAY7E,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;AAMD,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;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAY7E,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;;;;;;;;;;;;;;;;;;;;;;;;;;mCAgEH,KAAK,eAAe,KAAK;;;;EAKtG;AAMD,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
package/dist/rpcClient.js CHANGED
@@ -3,7 +3,7 @@ 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 { catchUp } from "#catchUp.ts";
6
- import { clientActivities, makeActivity } from "#clientActivities.ts";
6
+ import { makeActivity } from "#clientActivities.ts";
7
7
  import { Activity } from "#clientActivity.ts";
8
8
  import { ConnectionScope, connectionProtocol } from "#connectionProtocol.ts";
9
9
  import { commandConnections } from "#connectionReadiness.ts";
@@ -70,10 +70,9 @@ export function rpcClient(name, source, options) {
70
70
  protocol: typeof options.protocol === "object" ? protocol : (get) => protocolFor(get(socketIdentity)),
71
71
  runtime: options.runtime,
72
72
  });
73
- clientActivities.set(Client, activity);
74
73
  const directClient = withClientProtocol(protocol, make).pipe(Effect.map((flat) => Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload, callOptions) => flat(tag, payload, callOptions)]))));
75
74
  const layer = Layer.effect(Client, make).pipe(Layer.provide(protocol));
76
- return Object.assign(layer, { [Activity]: activity.activity, Client, client: directClient, runtime: Client.runtime });
75
+ return { activity, connection: Object.assign(layer, { [Activity]: activity.activity, Client, client: directClient, runtime: Client.runtime }) };
77
76
  }
78
77
  function pageRpcUrl() {
79
78
  return new URL("/rpc", typeof location === "undefined" ? undefined : location.href).href;
@@ -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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"servedHandlers.d.ts","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAe,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,GAAG,EAAuB,MAAM,YAAY,CAAC;AAItD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA6C3E,wBAAgB,cAAc,CAC7B,WAAW,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,EAChE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,EAAE,SAAS,YAAY,EAAE,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,GAAG,SAAS,CAAC,GAC1H,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAclD"}
1
+ {"version":3,"file":"servedHandlers.d.ts","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAA4B,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,GAAG,EAAuB,MAAM,YAAY,CAAC;AAItD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA8C3E,wBAAgB,cAAc,CAC7B,WAAW,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,EAChE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,EAAE,SAAS,YAAY,EAAE,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,GAAG,SAAS,CAAC,GAC1H,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAclD"}
@@ -24,10 +24,11 @@ function served(rpc, operation, run, span) {
24
24
  return yield* run(payload);
25
25
  }).pipe(Effect.withSpan(span), boundary);
26
26
  }
27
- // Live subscriptions check the policy outside the handler, so the policy carries the handler's failure mapping.
27
+ // Live subscriptions check the policy outside the handler, so the policy carries the handler's failure mapping. It keeps the
28
+ // policy's own properties, such as the mark of a permission policy that collection reads require.
28
29
  function servedPolicy(rpc, policy) {
29
30
  const boundary = guarded(rpc);
30
- return (payload, viewer) => boundary(Effect.suspend(() => policy(payload, viewer)));
31
+ return Object.assign((payload, viewer) => boundary(Effect.suspend(() => policy(payload, viewer))), policy);
31
32
  }
32
33
  // An erased Rpc's `any` success schema selects the stream branch of Rpc.ResultFrom, which an Effect handler cannot satisfy.
33
34
  function isEffectRpc(rpc) {
@@ -1 +1 @@
1
- {"version":3,"file":"servedHandlers.js","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"servedHandlers.js","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"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"}
@@ -4,15 +4,5 @@ export declare const SocketAuthentication: Schema.Struct<{
4
4
  readonly _tag: Schema.Literal<"Authenticate">;
5
5
  readonly token: Schema.String;
6
6
  }>;
7
- export declare const authenticateSocket: (token: string) => Effect.Effect<{
8
- "~effect/socket/Socket": typeof Socket.TypeId;
9
- reader: Effect.Effect<{
10
- upgrade: (options?: Socket.TlsUpgradeOptions) => Effect.Effect<void, Socket.SocketError>;
11
- pull: Effect.Effect<readonly [string | Uint8Array<ArrayBufferLike>, ...(string | Uint8Array<ArrayBufferLike>)[]], Socket.SocketError, never>;
12
- }, Socket.SocketError, import("effect/Scope").Scope>;
13
- writer: Effect.Effect<{
14
- write: (chunk: Parameters<(chunk: Uint8Array | string | Socket.CloseEvent) => Effect.Effect<void, Socket.SocketError>>[0]) => Effect.Effect<void, Socket.SocketError, never>;
15
- writeAll: (chunks: Parameters<(chunks: import("effect/Array").NonEmptyReadonlyArray<Uint8Array | string>) => Effect.Effect<void, Socket.SocketError>>[0]) => Effect.Effect<void, Socket.SocketError, never>;
16
- }, never, never>;
17
- }, never, import("effect/Scope").Scope | Socket.Socket>;
7
+ export declare const authenticateSocket: (url: string, credential: Effect.Effect<string | null, never, never>, headers?: Readonly<Record<string, string>> | undefined) => Effect.Effect<Socket.Socket, never, import("effect/Scope").Scope | Socket.WebSocketConstructor>;
18
8
  //# sourceMappingURL=socketAuthentication.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"socketAuthentication.d.ts","sourceRoot":"","sources":["../src/socketAuthentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;uBAId,UAAU,6FAA2B,CAAC,CAAC,CAAC;2BACpC,UAAU,wHAA8B,CAAC,CAAC,CAAC;;uDAc9D,CAAC"}
1
+ {"version":3,"file":"socketAuthentication.d.ts","sourceRoot":"","sources":["../src/socketAuthentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC;AAGH,eAAO,MAAM,kBAAkB,kOAiC7B,CAAC"}
@@ -4,24 +4,32 @@ export const SocketAuthentication = Schema.Struct({
4
4
  _tag: Schema.Literal("Authenticate"),
5
5
  token: Schema.String.check(Schema.isPattern(/^[\x21-\x7e]+$/u)),
6
6
  });
7
- export const authenticateSocket = Effect.fnUntraced(function* (token) {
8
- const socket = yield* Socket.Socket;
7
+ // Each connection reads the credential once, so a reconnect sends the one stored now and asks for a frame only when one follows.
8
+ export const authenticateSocket = Effect.fnUntraced(function* (url, credential, headers) {
9
+ const framed = new URL(url);
10
+ framed.searchParams.set("auth", "frame");
11
+ let token = null;
12
+ const socket = yield* Socket.makeWebSocket(Effect.map(credential, (current) => {
13
+ token = current;
14
+ return current === null ? url : framed.toString();
15
+ }), { headers });
9
16
  const ready = yield* Latch.make(false);
10
17
  const writer = yield* Effect.map(socket.writer, (nativeWriter) => ({
11
18
  write: (chunk) => ready.await.pipe(Effect.andThen(nativeWriter.write(chunk))),
12
19
  writeAll: (chunks) => ready.await.pipe(Effect.andThen(nativeWriter.writeAll(chunks))),
13
20
  }));
14
- return {
15
- ...socket,
21
+ return Socket.make({
16
22
  reader: Effect.gen(function* () {
17
23
  yield* ready.close;
18
24
  const reader = yield* socket.reader;
19
- const raw = yield* socket.writer;
20
- yield* raw.write(JSON.stringify({ _tag: "Authenticate", token }));
25
+ if (token !== null) {
26
+ const raw = yield* socket.writer;
27
+ yield* raw.write(JSON.stringify({ _tag: "Authenticate", token }));
28
+ }
21
29
  yield* ready.open;
22
30
  return { ...reader, pull: reader.pull.pipe(Effect.onError(() => ready.close)) };
23
31
  }),
24
32
  writer: Effect.succeed(writer),
25
- };
33
+ });
26
34
  });
27
35
  //# sourceMappingURL=socketAuthentication.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"socketAuthentication.js","sourceRoot":"","sources":["../src/socketAuthentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;CAC/D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAa;IAC3E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAClE,KAAK,EAAE,CAAC,KAA+C,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACvH,QAAQ,EAAE,CAAC,MAAmD,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;KAClI,CAAC,CAAC,CAAC;IACJ,OAAO;QACN,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3B,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YACnB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACjC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAClE,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,OAAO,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACjF,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"socketAuthentication.js","sourceRoot":"","sources":["../src/socketAuthentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;CAC/D,CAAC,CAAC;AAEH,iIAAiI;AACjI,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC5D,GAAW,EACX,UAAwC,EACxC,OAA0C;IAE1C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CACzC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,EAAE;QAClC,KAAK,GAAG,OAAO,CAAC;QAChB,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC,CAAC,EACF,EAAE,OAAO,EAAE,CACX,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAClE,KAAK,EAAE,CAAC,KAA+C,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACvH,QAAQ,EAAE,CAAC,MAAmD,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;KAClI,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,CAAC,IAAI,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3B,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YACnB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACpB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;gBACjC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACnE,CAAC;YACD,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,OAAO,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACjF,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KAC9B,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -18,14 +18,10 @@ export function socketProtocol(options) {
18
18
  return protocols({ ...options, resumeWindow: reference });
19
19
  }
20
20
  const protocols = Atom.family((options) => {
21
- let url = options.url;
22
- if (options.bearerToken !== undefined) {
23
- const address = new URL(url);
24
- address.searchParams.set("auth", "frame");
25
- url = address.toString();
26
- }
27
- const raw = Socket.layerWebSocket(url, { headers: options.headers });
28
- const authenticated = (options.bearerToken === undefined ? raw : Layer.effect(Socket.Socket, authenticateSocket(options.bearerToken)).pipe(Layer.provide(raw))).pipe(Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal));
21
+ const opened = options.bearerToken === undefined
22
+ ? Socket.layerWebSocket(options.url, { headers: options.headers })
23
+ : Layer.effect(Socket.Socket, authenticateSocket(options.url, options.bearerToken, options.headers));
24
+ const authenticated = opened.pipe(Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal));
29
25
  const socket = Layer.effect(Socket.Socket, resumeSocket({
30
26
  ...(options.resumeWindow === undefined ? {} : { window: options.resumeWindow.target }),
31
27
  ...(options.resume === undefined ? {} : { native: options.resume }),
@@ -1 +1 @@
1
- {"version":3,"file":"socketProtocol.js","sourceRoot":"","sources":["../src/socketProtocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"socketProtocol.js","sourceRoot":"","sources":["../src/socketProtocol.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.56.0",
3
+ "version": "0.57.0",
4
4
  "description": "Typed query and command contracts over native Effect RPC and reactivity",
5
5
  "keywords": [
6
6
  "effect"
@@ -51,13 +51,13 @@
51
51
  "devDependencies": {
52
52
  "@effect/platform-node": "4.1.4",
53
53
  "@effect/vitest": "4.1.4",
54
- "@shivaedev/identity": "0.38.2",
55
- "@shivaedev/quality": "0.83.1",
56
- "@shivaedev/server": "0.41.1",
54
+ "@shivaedev/identity": "0.38.3",
55
+ "@shivaedev/quality": "0.83.2",
56
+ "@shivaedev/server": "0.41.2",
57
57
  "@shivaedev/sql": "0.54.0",
58
- "@shivaedev/test-kits": "0.16.2",
58
+ "@shivaedev/test-kits": "0.16.3",
59
59
  "@shivaedev/test-sql": "0.26.0",
60
- "@shivaedev/test-story": "0.52.2",
60
+ "@shivaedev/test-story": "0.52.3",
61
61
  "@types/node": "24.19.2",
62
62
  "effect": "4.1.4",
63
63
  "fake-indexeddb": "6.2.8",
@@ -7,7 +7,7 @@ import type { StreamAnchor } from "#reflectedStream.ts";
7
7
 
8
8
  export interface AutomaticQueryOptions<A, E> {
9
9
  readonly anchor: (registry: object) => StreamAnchor;
10
- readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
10
+ readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
11
11
  readonly equivalent: (left: A, right: A) => boolean;
12
12
  readonly paused: Atom.Writable<boolean>;
13
13
  readonly ready: Atom.Writable<boolean>;
@@ -2,19 +2,11 @@ import type { Effect, Stream } from "effect";
2
2
  import type { Headers } from "effect/http";
3
3
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
4
4
  import type * as Atom from "effect/reactivity/Atom";
5
- import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
6
- import type * as AtomRpc from "effect/reactivity/AtomRpc";
7
5
  import type * as Reactivity from "effect/reactivity/Reactivity";
8
6
  import type { Rpc } from "effect/rpc";
9
7
  import type { RpcClientError } from "effect/rpc/RpcClientError";
10
- import { bindingOwner } from "#adapters/bindingOwner.ts";
11
- import { automaticLive, type LiveBound } from "#automaticLive.ts";
12
- import { bindOperations } from "#bindOperations.ts";
13
- import { clientOperations } from "#clientOperations.ts";
14
- import type { Contract, Declared } from "#contract.ts";
15
8
  import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
16
9
  import type { Tag } from "#operationRpc.ts";
17
- import type { ResumeSource, ResumeWindow } from "#resume.ts";
18
10
 
19
11
  // Like Effect's own `Rpc` helpers, these take any type: `Rpc.ExtractTag` of a generic group is not provably an `Rpc.Any`.
20
12
  export type Failure<R> =
@@ -73,41 +65,3 @@ export type Bound<
73
65
  } & {
74
66
  readonly [TStream in TStreams[number] as TStream["name"]]: BoundStream<Rpc.ExtractTag<TRpcs, Tag<TName, TStream["name"]>>, TSelf>;
75
67
  };
76
-
77
- type MatchingClient<TRpcs extends Rpc.Any, TClientRpcs extends Rpc.Any> = [TRpcs] extends [Extract<TClientRpcs, { readonly _tag: TRpcs["_tag"] }>]
78
- ? [Extract<TClientRpcs, { readonly _tag: TRpcs["_tag"] }>] extends [TRpcs]
79
- ? unknown
80
- : "Client must preserve the contract RPC types"
81
- : "Client must implement the contract RPCs";
82
-
83
- interface BindOptions {
84
- readonly registry?: AtomRegistry.AtomRegistry;
85
- readonly resume?: ResumeSource;
86
- readonly resumeWindow?: ResumeWindow;
87
- }
88
-
89
- export function bind<
90
- TName extends string,
91
- TQueries extends readonly QueryShape[],
92
- TCommands extends readonly CommandShape[],
93
- TRpcs extends Rpc.Any,
94
- TSelf,
95
- TId extends string,
96
- TClientRpcs extends Rpc.Any,
97
- TStreams extends readonly StreamShape[],
98
- TScope extends "session" | undefined,
99
- >(
100
- contract: Contract<TName, TQueries, TCommands, TRpcs, TStreams, TScope>,
101
- service: AtomRpc.AtomRpcClient<TSelf, TId, TClientRpcs> & MatchingClient<NoInfer<TRpcs>, TClientRpcs>,
102
- ...options: "session" extends TScope ? [options: BindOptions & { readonly registry: AtomRegistry.AtomRegistry }] : [options?: BindOptions]
103
- ): Bound<TName, TQueries, TCommands, TRpcs, TSelf, TStreams> & LiveBound;
104
- export function bind(
105
- contract: { readonly declaration: Declared<string, readonly QueryShape[], readonly CommandShape[], readonly StreamShape[], "session" | undefined> },
106
- service: AtomRpc.AtomRpcClient<unknown, string, Rpc.Any>,
107
- options?: BindOptions,
108
- ): unknown {
109
- const { name, keyScope } = contract.declaration;
110
- const owner = bindingOwner(keyScope, options?.registry);
111
- const automatic = automaticLive(service, name, owner, options?.resume, options?.resumeWindow);
112
- return bindOperations(contract.declaration, clientOperations(service, automatic, owner), automatic.subscription);
113
- }
@@ -1,4 +1,4 @@
1
- import type { Layer } from "effect";
1
+ import type { Effect, Layer } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
3
  import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
4
4
  import type { RpcClient } from "effect/rpc";
@@ -6,7 +6,7 @@ import type * as Socket from "effect/socket/Socket";
6
6
  import type { ResumeSource, ResumeWindow } from "#resume.ts";
7
7
 
8
8
  export interface ClientOptions {
9
- readonly bearerToken?: string;
9
+ readonly bearerToken?: Effect.Effect<string | null>;
10
10
  readonly headers?: Readonly<Record<string, string>>;
11
11
  readonly protocol?: Layer.Layer<RpcClient.Protocol> | ((identity: string | undefined) => Layer.Layer<RpcClient.Protocol>);
12
12
  readonly registry?: AtomRegistry.AtomRegistry;
@@ -9,7 +9,7 @@ import type { BindingOwner } from "#adapters/bindingOwner.ts";
9
9
  import { changesClient } from "#adapters/erasedClient.ts";
10
10
  import { aggregateLiveStatus } from "#aggregateLiveStatus.ts";
11
11
  import { automaticQuery } from "#automaticQuery.ts";
12
- import { clientActivities } from "#clientActivities.ts";
12
+ import type { ActivityTracker } from "#clientActivities.ts";
13
13
  import { type LiveStatus, live } from "#live.ts";
14
14
  import { queryDelivery } from "#queryDelivery.ts";
15
15
  import { querySignals, shareQuerySignals } from "#querySignals.ts";
@@ -34,6 +34,7 @@ const pausedByRuntime = Atom.family((_runtime: object) => Atom.keepAlive(Atom.ma
34
34
 
35
35
  export function automaticLive(
36
36
  operations: AtomRpc.AtomRpcClient<unknown, string, Rpc.Any>,
37
+ activity: ActivityTracker,
37
38
  name: string,
38
39
  owner?: BindingOwner,
39
40
  resume?: ResumeSource,
@@ -81,20 +82,18 @@ export function automaticLive(
81
82
  resume: signal,
82
83
  stream: Stream.unwrap(
83
84
  service.use((client) =>
84
- Effect.map(AtomRegistry.AtomRegistry, (registry) => {
85
- const reflected = followReflection(client, anchor(registry));
86
- if (reflected === undefined) {
87
- return delivery.stream(client(`${name}.$changes`, { queries: [reference] }, { headers }));
88
- }
89
- const opened = client(`${name}.$changes`, { queries: [reference] }, { headers: reflected.headers(headers) });
90
- return delivery.stream(reflected.lifetime(opened), reflected.follower);
91
- }),
85
+ Effect.flatMap(AtomRegistry.AtomRegistry, (registry) =>
86
+ Effect.map(followReflection(client, anchor(registry)), (reflected) => {
87
+ const opened = client(`${name}.$changes`, { queries: [reference] }, { headers: reflected.headers(headers) });
88
+ return delivery.stream(reflected.lifetime(opened), reflected.follower);
89
+ }),
90
+ ),
92
91
  ),
93
92
  ),
94
93
  });
95
94
  const gated = automaticQuery({
96
95
  anchor,
97
- clientStatuses: clientActivities.get(service)?.statuses,
96
+ clientStatuses: activity.statuses,
98
97
  equivalent,
99
98
  ownerFailure,
100
99
  paused,