@shivaedev/contract 0.27.0 → 0.29.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +46 -0
- package/README.md +170 -21
- package/dist/LiveServer.d.ts +30 -0
- package/dist/LiveServer.d.ts.map +1 -0
- package/dist/LiveServer.js +16 -0
- package/dist/LiveServer.js.map +1 -0
- package/dist/QueryServerReads.d.ts +5 -0
- package/dist/QueryServerReads.d.ts.map +1 -0
- package/dist/QueryServerReads.js +2 -0
- package/dist/QueryServerReads.js.map +1 -0
- package/dist/WebSocketRequired.d.ts +8 -0
- package/dist/WebSocketRequired.d.ts.map +1 -0
- package/dist/WebSocketRequired.js +4 -0
- package/dist/WebSocketRequired.js.map +1 -0
- package/dist/automaticLive.js +1 -1
- package/dist/automaticLive.js.map +1 -1
- package/dist/bind.d.ts +1 -2
- package/dist/bind.d.ts.map +1 -1
- package/dist/bind.js.map +1 -1
- package/dist/clientOptions.d.ts +1 -0
- package/dist/clientOptions.d.ts.map +1 -1
- package/dist/internal/automaticQuery.d.ts +1 -1
- package/dist/internal/automaticQuery.d.ts.map +1 -1
- package/dist/internal/automaticQuery.js +21 -4
- package/dist/internal/automaticQuery.js.map +1 -1
- package/dist/internal/clientOperations.d.ts.map +1 -1
- package/dist/internal/clientOperations.js +0 -4
- package/dist/internal/clientOperations.js.map +1 -1
- package/dist/internal/operationDeclaration.d.ts +6 -1
- package/dist/internal/operationDeclaration.d.ts.map +1 -1
- package/dist/internal/operationDeclaration.js.map +1 -1
- package/dist/internal/policyContext.d.ts +4 -0
- package/dist/internal/policyContext.d.ts.map +1 -0
- package/dist/internal/policyContext.js +7 -0
- package/dist/internal/policyContext.js.map +1 -0
- package/dist/internal/queryReactivity.d.ts.map +1 -1
- package/dist/internal/queryReactivity.js +10 -5
- package/dist/internal/queryReactivity.js.map +1 -1
- package/dist/internal/queryReadKeys.d.ts +5 -0
- package/dist/internal/queryReadKeys.d.ts.map +1 -0
- package/dist/internal/queryReadKeys.js +6 -0
- package/dist/internal/queryReadKeys.js.map +1 -0
- package/dist/internal/resolveQueries.d.ts +8 -0
- package/dist/internal/resolveQueries.d.ts.map +1 -0
- package/dist/internal/resolveQueries.js +8 -0
- package/dist/internal/resolveQueries.js.map +1 -0
- package/dist/internal/retryOnChange.d.ts.map +1 -1
- package/dist/internal/retryOnChange.js +8 -3
- package/dist/internal/retryOnChange.js.map +1 -1
- package/dist/internal/rpcClient.d.ts.map +1 -1
- package/dist/internal/rpcClient.js +11 -1
- package/dist/internal/rpcClient.js.map +1 -1
- package/dist/operation.d.ts +9 -9
- package/dist/operation.d.ts.map +1 -1
- package/dist/operation.js +2 -1
- package/dist/operation.js.map +1 -1
- package/dist/publicConfig.d.ts +1 -1
- package/dist/publicConfig.d.ts.map +1 -1
- package/dist/queryKeys.d.ts +9 -0
- package/dist/queryKeys.d.ts.map +1 -0
- package/dist/queryKeys.js +13 -0
- package/dist/queryKeys.js.map +1 -0
- package/dist/querySubscription.d.ts +1 -1
- package/dist/querySubscription.d.ts.map +1 -1
- package/dist/querySubscription.js +15 -3
- package/dist/querySubscription.js.map +1 -1
- package/dist/readPolicy.d.ts +1 -0
- package/dist/readPolicy.d.ts.map +1 -1
- package/dist/readPolicy.js +6 -3
- package/dist/readPolicy.js.map +1 -1
- package/dist/readPolicyErrors.d.ts +6 -0
- package/dist/readPolicyErrors.d.ts.map +1 -1
- package/dist/readPolicyErrors.js +5 -0
- package/dist/readPolicyErrors.js.map +1 -1
- package/dist/serverMetadata.d.ts +4 -5
- package/dist/serverMetadata.d.ts.map +1 -1
- package/dist/serverMetadata.js +5 -13
- package/dist/serverMetadata.js.map +1 -1
- package/dist/socketAuthentication.d.ts +18 -0
- package/dist/socketAuthentication.d.ts.map +1 -0
- package/dist/socketAuthentication.js +27 -0
- package/dist/socketAuthentication.js.map +1 -0
- package/dist/testing.d.ts +4 -2
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +35 -1
- package/dist/testing.js.map +1 -1
- package/dist/validateReadPolicies.d.ts +5 -0
- package/dist/validateReadPolicies.d.ts.map +1 -0
- package/dist/validateReadPolicies.js +25 -0
- package/dist/validateReadPolicies.js.map +1 -0
- package/package.json +7 -3
- package/src/LiveServer.ts +20 -0
- package/src/QueryServerReads.ts +8 -0
- package/src/WebSocketRequired.ts +3 -0
- package/src/automaticLive.ts +1 -1
- package/src/bind.ts +1 -5
- package/src/clientOptions.ts +1 -0
- package/src/internal/automaticQuery.ts +21 -5
- package/src/internal/clientOperations.ts +0 -6
- package/src/internal/operationDeclaration.ts +7 -1
- package/src/internal/policyContext.ts +8 -0
- package/src/internal/queryReactivity.ts +14 -5
- package/src/internal/queryReadKeys.ts +8 -0
- package/src/internal/resolveQueries.ts +10 -0
- package/src/internal/retryOnChange.ts +10 -3
- package/src/internal/rpcClient.ts +14 -5
- package/src/operation.ts +13 -13
- package/src/queryKeys.ts +23 -0
- package/src/querySubscription.ts +18 -4
- package/src/readPolicy.ts +7 -3
- package/src/readPolicyErrors.ts +5 -0
- package/src/serverMetadata.ts +7 -22
- package/src/socketAuthentication.ts +28 -0
- package/src/testing.ts +42 -2
- package/src/validateReadPolicies.ts +26 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querySubscription.d.ts","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"querySubscription.d.ts","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAc,KAAK,cAAc,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE5F,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEzG,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;CAC7C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EACrD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,SAAS,cAAc,EAAE,EACrC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CACf,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,EAClF,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EACnE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAChC,CAAC"}
|
|
@@ -1,12 +1,24 @@
|
|
|
1
1
|
import { Context, Effect } from "effect";
|
|
2
|
+
import { Rpc } from "effect/rpc";
|
|
3
|
+
import { policyContext } from "#internal/policyContext.ts";
|
|
4
|
+
import { queryReadKeys } from "#internal/queryReadKeys.ts";
|
|
2
5
|
import { checkQuery } from "#readPolicy.ts";
|
|
3
6
|
import { ChangesQueries } from "#serverMetadata.ts";
|
|
4
7
|
export function querySubscription(rpc, references, viewer) {
|
|
5
8
|
return Effect.fnUntraced(function* () {
|
|
6
9
|
const queries = yield* Context.getUnsafe(rpc.annotations, ChangesQueries).resolve(references);
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
+
const prefix = rpc._tag.slice(0, -"$changes".length);
|
|
11
|
+
const policies = yield* Effect.forEach(queries, Effect.fnUntraced(function* ({ query, payload }) {
|
|
12
|
+
const context = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
|
|
13
|
+
return {
|
|
14
|
+
check: Effect.provideContext(checkQuery(query, payload, viewer), context),
|
|
15
|
+
keys: queryReadKeys(query, payload, viewer).pipe(Effect.provideContext(context)),
|
|
16
|
+
permitted: Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false)).pipe(Effect.provideContext(context)),
|
|
17
|
+
};
|
|
18
|
+
}));
|
|
19
|
+
yield* Effect.forEach(policies, ({ check }) => check);
|
|
20
|
+
const scopes = yield* Effect.forEach(policies, ({ keys }) => keys);
|
|
21
|
+
const authorized = Effect.map(Effect.forEach(policies, ({ permitted }) => permitted), (permissions) => permissions.every(Boolean));
|
|
10
22
|
return { authorized, keys: scopes.flat(), queries, scopes };
|
|
11
23
|
})();
|
|
12
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;
|
|
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,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAoC,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAA0C,MAAM,oBAAoB,CAAC;AAoB5F,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,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;gBACN,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC;gBACzE,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAChF,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;aAClI,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,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACnE,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,MAAM,EAAgD,CAAC;IAC3G,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
|
package/dist/readPolicy.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export interface Viewer {
|
|
|
7
7
|
}
|
|
8
8
|
export type QueryReadPolicy<TPayload, E = never, R = never> = (payload: TPayload, viewer: Option.Option<Viewer>) => Effect.Effect<boolean, E, R>;
|
|
9
9
|
export declare const CurrentViewer: Context.Reference<Option.Option<Viewer>>;
|
|
10
|
+
export declare const signedIn: QueryReadPolicy<unknown>;
|
|
10
11
|
export declare const checkQuery: <E, R>(query: QueryShape<E, R>, payload: unknown, viewer: Option.Option<Viewer>) => Effect.Effect<undefined, E | MissingReadPolicy | QueryReadDenied, R>;
|
|
11
12
|
export type PolicyChannels<TRpc> = TRpc extends {
|
|
12
13
|
readonly setPayload: unknown;
|
package/dist/readPolicy.d.ts.map
CHANGED
|
@@ -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;
|
|
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;AAChD,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,mJAOzD,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"}
|
package/dist/readPolicy.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Context, Effect, Option } from "effect";
|
|
2
|
+
import { policyContext } from "#internal/policyContext.ts";
|
|
2
3
|
import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
3
4
|
import { QueryDefinition } from "#serverMetadata.ts";
|
|
4
5
|
export const CurrentViewer = Context.Reference("@shivaedev/contract/CurrentViewer", { defaultValue: Option.none });
|
|
6
|
+
export const signedIn = (_payload, viewer) => Effect.succeed(Option.isSome(viewer));
|
|
5
7
|
export const checkQuery = Effect.fnUntraced(function* (query, payload, viewer) {
|
|
6
8
|
if (query.readPolicy === undefined) {
|
|
7
|
-
return yield* new MissingReadPolicy({ message: `Declare a readPolicy on query ${query.name} before
|
|
9
|
+
return yield* new MissingReadPolicy({ message: `Declare a readPolicy on query ${query.name} before reading it or subscribing` });
|
|
8
10
|
}
|
|
9
11
|
if (!(yield* query.readPolicy(payload, viewer))) {
|
|
10
12
|
return yield* new QueryReadDenied({ message: `Read not allowed for query ${query.name}` });
|
|
@@ -13,8 +15,9 @@ export const checkQuery = Effect.fnUntraced(function* (query, payload, viewer) {
|
|
|
13
15
|
export function authorizeReads(effect, request, viewer) {
|
|
14
16
|
return Effect.fnUntraced(function* () {
|
|
15
17
|
const definition = Context.getOption(request.rpc.annotations, QueryDefinition);
|
|
16
|
-
if (Option.isSome(definition)
|
|
17
|
-
yield*
|
|
18
|
+
if (Option.isSome(definition)) {
|
|
19
|
+
const context = yield* policyContext(request.rpc);
|
|
20
|
+
yield* checkQuery(definition.value.definition, request.payload, viewer).pipe(Effect.provideContext(context));
|
|
18
21
|
}
|
|
19
22
|
return yield* Effect.provideService(effect, CurrentViewer, viewer);
|
|
20
23
|
})();
|
package/dist/readPolicy.js.map
CHANGED
|
@@ -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;
|
|
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,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,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,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"}
|
|
@@ -9,5 +9,11 @@ declare const QueryReadDenied_base: Schema.Class<QueryReadDenied, Schema.TaggedS
|
|
|
9
9
|
}>, import("effect/Cause").YieldableError>;
|
|
10
10
|
export declare class QueryReadDenied extends QueryReadDenied_base {
|
|
11
11
|
}
|
|
12
|
+
declare const MissingReadPolicies_base: Schema.Class<MissingReadPolicies, Schema.TaggedStruct<"MissingReadPolicies", {
|
|
13
|
+
readonly message: Schema.String;
|
|
14
|
+
readonly queries: Schema.$Array<Schema.String>;
|
|
15
|
+
}>, import("effect/Cause").YieldableError>;
|
|
16
|
+
export declare class MissingReadPolicies extends MissingReadPolicies_base {
|
|
17
|
+
}
|
|
12
18
|
export {};
|
|
13
19
|
//# sourceMappingURL=readPolicyErrors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readPolicyErrors.d.ts","sourceRoot":"","sources":["../src/readPolicyErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;AAEhC,qBAAa,iBAAkB,SAAQ,sBAAwF;CAAG;;;;AAClI,qBAAa,eAAgB,SAAQ,oBAAoF;CAAG"}
|
|
1
|
+
{"version":3,"file":"readPolicyErrors.d.ts","sourceRoot":"","sources":["../src/readPolicyErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;AAEhC,qBAAa,iBAAkB,SAAQ,sBAAwF;CAAG;;;;AAClI,qBAAa,eAAgB,SAAQ,oBAAoF;CAAG;;;;;AAE5H,qBAAa,mBAAoB,SAAQ,wBAGvC;CAAG"}
|
package/dist/readPolicyErrors.js
CHANGED
|
@@ -3,4 +3,9 @@ export class MissingReadPolicy extends Schema.TaggedError()("MissingReadPolicy",
|
|
|
3
3
|
}
|
|
4
4
|
export class QueryReadDenied extends Schema.TaggedError()("QueryReadDenied", { message: Schema.String }) {
|
|
5
5
|
}
|
|
6
|
+
export class MissingReadPolicies extends Schema.TaggedError()("MissingReadPolicies", {
|
|
7
|
+
message: Schema.String,
|
|
8
|
+
queries: Schema.Array(Schema.String),
|
|
9
|
+
}) {
|
|
10
|
+
}
|
|
6
11
|
//# sourceMappingURL=readPolicyErrors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readPolicyErrors.js","sourceRoot":"","sources":["../src/readPolicyErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,WAAW,EAAqB,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAClI,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,WAAW,EAAmB,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
|
|
1
|
+
{"version":3,"file":"readPolicyErrors.js","sourceRoot":"","sources":["../src/readPolicyErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,WAAW,EAAqB,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAClI,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,WAAW,EAAmB,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAE5H,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,WAAW,EAAuB,CAAC,qBAAqB,EAAE;IACzG,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CACpC,CAAC;CAAG"}
|
package/dist/serverMetadata.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { Context, Effect,
|
|
1
|
+
import { Context, type Effect, Schema } from "effect";
|
|
2
2
|
import { Rpc, type RpcSchema } from "effect/rpc";
|
|
3
|
-
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
4
3
|
import type { QueryServices } from "#contract.ts";
|
|
5
4
|
import { changesSuccess } from "#internal/changesSuccess.ts";
|
|
6
5
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
7
|
-
import type { Viewer } from "#readPolicy.ts";
|
|
8
6
|
import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
7
|
+
import { WebSocketRequired } from "#WebSocketRequired.ts";
|
|
9
8
|
declare const QueryDefinition_base: Context.ServiceClass<QueryDefinition, "@shivaedev/contract/QueryDefinition", {
|
|
10
9
|
readonly definition: QueryShape;
|
|
11
10
|
}>;
|
|
@@ -16,6 +15,7 @@ export interface QueryRequest<E = unknown, R = unknown> {
|
|
|
16
15
|
readonly query: QueryShape<E, R>;
|
|
17
16
|
}
|
|
18
17
|
declare const ChangesQueries_base: Context.ServiceClass<ChangesQueries, "@shivaedev/contract/ChangesQueries", {
|
|
18
|
+
readonly queries: readonly QueryShape[];
|
|
19
19
|
readonly resolve: (references: readonly QueryReference[]) => Effect.Effect<readonly QueryRequest[]>;
|
|
20
20
|
}>;
|
|
21
21
|
export declare class ChangesQueries extends ChangesQueries_base {
|
|
@@ -36,9 +36,8 @@ type ReferenceSchema<TQuery extends QueryShape> = TQuery extends QueryShape ? Sc
|
|
|
36
36
|
query: Schema.Literal<TQuery["name"]>;
|
|
37
37
|
payload: TQuery["payload"];
|
|
38
38
|
}> : never;
|
|
39
|
-
export declare const queryKeys: (queries: readonly QueryShape<unknown, unknown>[], requested: readonly QueryReference[], viewer?: Option.Option<Viewer> | undefined) => Effect.Effect<readonly Key[], never, never>;
|
|
40
39
|
declare function referenceSchemas<const TQueries extends readonly QueryShape[]>(queries: TQueries): Schema.$Array<Schema.Union<readonly ReferenceSchema<TQueries[number]>[]>>;
|
|
41
|
-
type ChangesError<TQueries extends readonly QueryShape[]> = Schema.Union<readonly [typeof MissingReadPolicy, typeof QueryReadDenied, ...TQueries[number]["error"][]]>;
|
|
40
|
+
type ChangesError<TQueries extends readonly QueryShape[]> = Schema.Union<readonly [typeof MissingReadPolicy, typeof QueryReadDenied, typeof WebSocketRequired, ...TQueries[number]["error"][]]>;
|
|
42
41
|
export declare function changesRpc<const TName extends string, const TQueries extends readonly QueryShape[]>(name: TName, queries: TQueries): Rpc.Rpc<`${TName}.$changes`, Schema.Struct<{
|
|
43
42
|
queries: ReturnType<typeof referenceSchemas<TQueries>>;
|
|
44
43
|
}>, RpcSchema.Stream<ReturnType<typeof changesSuccess<TQueries>>, ChangesError<TQueries>>, Schema.Never, never, QueryServices<TQueries[number]>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverMetadata.d.ts","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"serverMetadata.d.ts","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"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"}
|
package/dist/serverMetadata.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { Context,
|
|
1
|
+
import { Context, Schema } from "effect";
|
|
2
2
|
import { Rpc } from "effect/rpc";
|
|
3
3
|
import { changesSuccess } from "#internal/changesSuccess.ts";
|
|
4
|
+
import { resolveQueries } from "#internal/resolveQueries.ts";
|
|
4
5
|
import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
6
|
+
import { WebSocketRequired } from "#WebSocketRequired.ts";
|
|
5
7
|
export class QueryDefinition extends Context.Service()("@shivaedev/contract/QueryDefinition") {
|
|
6
8
|
}
|
|
7
9
|
export class ChangesQueries extends Context.Service()("@shivaedev/contract/ChangesQueries") {
|
|
@@ -10,26 +12,16 @@ export class CommandInvalidation extends Context.Service()("@shivaedev/contract/
|
|
|
10
12
|
}
|
|
11
13
|
export class KeyScope extends Context.Service()("@shivaedev/contract/KeyScope") {
|
|
12
14
|
}
|
|
13
|
-
function resolveQueries(queries, requested) {
|
|
14
|
-
return Effect.forEach(requested, (reference) => {
|
|
15
|
-
const query = queries.find((candidate) => candidate.name === reference.query);
|
|
16
|
-
return query === undefined ? Effect.die(new Error(`Unknown query: ${reference.query}`)) : Effect.succeed({ payload: reference.payload, query });
|
|
17
|
-
});
|
|
18
|
-
}
|
|
19
|
-
export const queryKeys = Effect.fnUntraced(function* (queries, requested, viewer = Option.none()) {
|
|
20
|
-
const resolved = yield* resolveQueries(queries, requested);
|
|
21
|
-
return resolved.flatMap(({ query, payload }) => query.reads(payload, viewer));
|
|
22
|
-
});
|
|
23
15
|
function referenceSchemas(queries) {
|
|
24
16
|
return Schema.Array(Schema.Union(queries.map((query) => Schema.Struct({ payload: query.payload, query: Schema.Literal(query.name) }))));
|
|
25
17
|
}
|
|
26
18
|
export function changesRpc(name, queries) {
|
|
27
19
|
return Rpc.make(`${name}.$changes`, {
|
|
28
|
-
error: Schema.Union([MissingReadPolicy, QueryReadDenied, ...queries.map((query) => query.error)]),
|
|
20
|
+
error: Schema.Union([MissingReadPolicy, QueryReadDenied, WebSocketRequired, ...queries.map((query) => query.error)]),
|
|
29
21
|
payload: { queries: referenceSchemas(queries) },
|
|
30
22
|
stream: true,
|
|
31
23
|
success: changesSuccess(queries),
|
|
32
|
-
}).annotate(ChangesQueries, { resolve: (references) => resolveQueries(queries, references) });
|
|
24
|
+
}).annotate(ChangesQueries, { queries, resolve: (references) => resolveQueries(queries, references) });
|
|
33
25
|
}
|
|
34
26
|
export function operationAnnotations(operation, keyScope) {
|
|
35
27
|
const scope = keyScope === undefined ? Context.empty() : Context.make(KeyScope, keyScope);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverMetadata.js","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"serverMetadata.js","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAkB,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,OAAO,EAAwD,CAAC,qCAAqC,CAAC;CAAG;AAKtJ,MAAM,OAAO,cAAe,SAAQ,OAAO,CAAC,OAAO,EAMhD,CAAC,oCAAoC,CAAC;CAAG;AAE5C,MAAM,OAAO,mBAAoB,SAAQ,OAAO,CAAC,OAAO,EAA8E,CACrI,yCAAyC,CACzC;CAAG;AAEJ,MAAM,OAAO,QAAS,SAAQ,OAAO,CAAC,OAAO,EAAuB,CAAC,8BAA8B,CAAC;CAAG;AAcvG,SAAS,gBAAgB,CAAC,OAA8B;IACvD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACzI,CAAC;AAiBD,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,OAA8B;IACtE,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,WAAW,EAAE;QACnC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACpH,OAAO,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC/C,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC;KAChC,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;AACxG,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAkD,EAAE,QAA+B;IACvH,MAAM,KAAK,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1F,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5G,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import * as Socket from "effect/socket/Socket";
|
|
3
|
+
export declare const SocketAuthentication: Schema.Struct<{
|
|
4
|
+
readonly _tag: Schema.Literal<"Authenticate">;
|
|
5
|
+
readonly token: Schema.String;
|
|
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>;
|
|
18
|
+
//# sourceMappingURL=socketAuthentication.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { Effect, Latch, Schema } from "effect";
|
|
2
|
+
import * as Socket from "effect/socket/Socket";
|
|
3
|
+
export const SocketAuthentication = Schema.Struct({
|
|
4
|
+
_tag: Schema.Literal("Authenticate"),
|
|
5
|
+
token: Schema.String.check(Schema.isPattern(/^[\x21-\x7e]+$/u)),
|
|
6
|
+
});
|
|
7
|
+
export const authenticateSocket = Effect.fnUntraced(function* (token) {
|
|
8
|
+
const socket = yield* Socket.Socket;
|
|
9
|
+
const ready = yield* Latch.make(false);
|
|
10
|
+
const writer = yield* Effect.map(socket.writer, (nativeWriter) => ({
|
|
11
|
+
write: (chunk) => ready.await.pipe(Effect.andThen(nativeWriter.write(chunk))),
|
|
12
|
+
writeAll: (chunks) => ready.await.pipe(Effect.andThen(nativeWriter.writeAll(chunks))),
|
|
13
|
+
}));
|
|
14
|
+
return {
|
|
15
|
+
...socket,
|
|
16
|
+
reader: Effect.gen(function* () {
|
|
17
|
+
yield* ready.close;
|
|
18
|
+
const reader = yield* socket.reader;
|
|
19
|
+
const raw = yield* socket.writer;
|
|
20
|
+
yield* raw.write(JSON.stringify({ _tag: "Authenticate", token }));
|
|
21
|
+
yield* ready.open;
|
|
22
|
+
return { ...reader, pull: reader.pull.pipe(Effect.onError(() => ready.close)) };
|
|
23
|
+
}),
|
|
24
|
+
writer: Effect.succeed(writer),
|
|
25
|
+
};
|
|
26
|
+
});
|
|
27
|
+
//# sourceMappingURL=socketAuthentication.js.map
|
|
@@ -0,0 +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"}
|
package/dist/testing.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { type Duration, Effect, Stream, SubscriptionRef } from "effect";
|
|
1
|
+
import { type Duration, Effect, Layer, Stream, SubscriptionRef } from "effect";
|
|
2
|
+
import { type Rpc, RpcClient, type RpcGroup, RpcSerialization, RpcServer } from "effect/rpc";
|
|
2
3
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
3
|
-
import type { LiveHint } from "
|
|
4
|
+
import type { LiveHint } from "#live.ts";
|
|
4
5
|
export interface HintViewer<E> {
|
|
5
6
|
readonly finished: Effect.Effect<void, E>;
|
|
6
7
|
readonly hints: SubscriptionRef.SubscriptionRef<readonly LiveHint[]>;
|
|
@@ -48,4 +49,5 @@ export declare const watchHints: <E, R>(stream: Stream.Stream<{
|
|
|
48
49
|
export declare const heard: <E>(viewer: HintViewer<E>, keys: readonly Key[], options?: {
|
|
49
50
|
readonly within?: Duration.Input;
|
|
50
51
|
} | undefined) => Effect.Effect<boolean, E, never>;
|
|
52
|
+
export declare function layerMemoryProtocol<TRpcs extends Rpc.Any>(group: RpcGroup.RpcGroup<TRpcs>): Layer.Layer<RpcClient.Protocol, never, Exclude<Exclude<Exclude<Rpc.ServicesServer<TRpcs>, RpcServer.Protocol>, import("effect/Scope").Scope>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Rpc.ToHandler<TRpcs>, RpcServer.Protocol>, import("effect/Scope").Scope>, RpcSerialization.RpcSerialization>>;
|
|
51
53
|
//# sourceMappingURL=testing.d.ts.map
|
package/dist/testing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,EAAS,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,EAAS,KAAK,EAAS,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAE,KAAK,GAAG,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAmB,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC9G,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,eAAe,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC;CACrE;AAED,eAAO,MAAM,UAAU,GAA2C,CAAC,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAYpE,CAAC;AAEH,eAAO,MAAM,KAAK,GAAsC,CAAC;sBAG3B,QAAQ,CAAC,KAAK;kDAU1C,CAAC;AAMH,wBAAgB,mBAAmB,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,4TAqCzF"}
|
package/dist/testing.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Deferred, Effect, Fiber, Stream, SubscriptionRef } from "effect";
|
|
1
|
+
import { Deferred, Effect, Fiber, Layer, Queue, Stream, SubscriptionRef } from "effect";
|
|
2
|
+
import { RpcClient, RpcSerialization, RpcServer } from "effect/rpc";
|
|
2
3
|
export const watchHints = Effect.fn("Live.watchHints")(function* (stream) {
|
|
3
4
|
const hints = yield* SubscriptionRef.make([]);
|
|
4
5
|
const ready = yield* Deferred.make();
|
|
@@ -14,4 +15,37 @@ export const heard = Effect.fn("Live.heard")(function* (viewer, keys, options =
|
|
|
14
15
|
function namesKeys(hint, keys) {
|
|
15
16
|
return hint._tag === "Changed" && keys.every((key) => hint.keys.some((actual) => JSON.stringify(actual) === JSON.stringify(key)));
|
|
16
17
|
}
|
|
18
|
+
export function layerMemoryProtocol(group) {
|
|
19
|
+
return Layer.effect(RpcClient.Protocol, Effect.gen(function* () {
|
|
20
|
+
const requests = yield* Queue.unbounded();
|
|
21
|
+
const disconnects = yield* Queue.unbounded();
|
|
22
|
+
const { codecFor } = yield* RpcSerialization.RpcSerialization;
|
|
23
|
+
const protocol = yield* RpcClient.Protocol.make((send, clientIds) => Effect.gen(function* () {
|
|
24
|
+
const server = RpcServer.Protocol.of({
|
|
25
|
+
clientIds: Effect.sync(() => clientIds),
|
|
26
|
+
codecFor,
|
|
27
|
+
disconnects,
|
|
28
|
+
end: () => Effect.void,
|
|
29
|
+
initialMessage: Effect.succeedNone,
|
|
30
|
+
run: (receive) => Effect.forever(Effect.flatMap(Queue.take(requests), ([id, message]) => receive(id, message))),
|
|
31
|
+
send,
|
|
32
|
+
supportsAck: true,
|
|
33
|
+
supportsNotifications: true,
|
|
34
|
+
supportsSpanPropagation: true,
|
|
35
|
+
supportsTransferables: false,
|
|
36
|
+
});
|
|
37
|
+
yield* RpcServer.make(group).pipe(Effect.provideService(RpcServer.Protocol, server), Effect.forkScoped);
|
|
38
|
+
return {
|
|
39
|
+
codecFor,
|
|
40
|
+
send: (clientId, request) => Queue.offer(requests, [clientId, request]).pipe(Effect.asVoid),
|
|
41
|
+
supportsAck: true,
|
|
42
|
+
supportsTransferables: false,
|
|
43
|
+
};
|
|
44
|
+
}));
|
|
45
|
+
return {
|
|
46
|
+
...protocol,
|
|
47
|
+
run: (clientId, receive) => protocol.run(clientId, receive).pipe(Effect.ensuring(Queue.offer(disconnects, clientId))),
|
|
48
|
+
};
|
|
49
|
+
})).pipe(Layer.provide(RpcSerialization.layerNdjson));
|
|
50
|
+
}
|
|
17
51
|
//# sourceMappingURL=testing.js.map
|
package/dist/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { Rpc, RpcGroup } from "effect/rpc";
|
|
3
|
+
import { MissingReadPolicies } from "#readPolicyErrors.ts";
|
|
4
|
+
export declare const validateReadPolicies: <R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>) => Effect.Effect<undefined, MissingReadPolicies, never>;
|
|
5
|
+
//# sourceMappingURL=validateReadPolicies.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateReadPolicies.d.ts","sourceRoot":"","sources":["../src/validateReadPolicies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG3D,eAAO,MAAM,oBAAoB,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG,sFAoBhF,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Context, Effect, Option } from "effect";
|
|
2
|
+
import { MissingReadPolicies } from "#readPolicyErrors.ts";
|
|
3
|
+
import { ChangesQueries, QueryDefinition } from "#serverMetadata.ts";
|
|
4
|
+
export const validateReadPolicies = Effect.fnUntraced(function* (group) {
|
|
5
|
+
const missing = new Set();
|
|
6
|
+
for (const rpc of group.requests.values()) {
|
|
7
|
+
const query = Context.getOption(rpc.annotations, QueryDefinition);
|
|
8
|
+
if (Option.isSome(query) && query.value.definition.readPolicy === undefined) {
|
|
9
|
+
missing.add(rpc._tag);
|
|
10
|
+
}
|
|
11
|
+
const changes = Context.getOption(rpc.annotations, ChangesQueries);
|
|
12
|
+
if (Option.isSome(changes)) {
|
|
13
|
+
for (const definition of changes.value.queries) {
|
|
14
|
+
if (definition.readPolicy === undefined) {
|
|
15
|
+
missing.add(`${rpc._tag.slice(0, -"$changes".length)}${definition.name}`);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (missing.size > 0) {
|
|
21
|
+
const queries = [...missing].sort((left, right) => left.localeCompare(right));
|
|
22
|
+
return yield* new MissingReadPolicies({ message: `Declare a readPolicy on queries: ${queries.join(", ")}`, queries });
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=validateReadPolicies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateReadPolicies.js","sourceRoot":"","sources":["../src/validateReadPolicies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErE,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAqB,KAA2B;IAC9G,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAClE,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACnE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBAChD,IAAI,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;oBACzC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3E,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,oCAAoC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACvH,CAAC;AACF,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/contract",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.29.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -44,15 +44,19 @@
|
|
|
44
44
|
],
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@shivaedev/changes": "0.6.0",
|
|
47
|
+
"@shivaedev/service": "0.6.0",
|
|
47
48
|
"@shivaedev/types": "0.3.0"
|
|
48
49
|
},
|
|
49
50
|
"devDependencies": {
|
|
50
51
|
"@effect/platform-node": "4.0.6",
|
|
51
52
|
"@effect/vitest": "4.0.6",
|
|
52
|
-
"@shivaedev/
|
|
53
|
+
"@shivaedev/errors": "0.3.0",
|
|
54
|
+
"@shivaedev/identity": "0.11.1",
|
|
55
|
+
"@shivaedev/quality": "0.50.0",
|
|
56
|
+
"@shivaedev/server": "0.12.0",
|
|
53
57
|
"@shivaedev/test": "0.12.0",
|
|
54
58
|
"@shivaedev/test-sql": "0.15.0",
|
|
55
|
-
"@shivaedev/test-story": "0.
|
|
59
|
+
"@shivaedev/test-story": "0.30.0",
|
|
56
60
|
"@types/node": "24.19.2",
|
|
57
61
|
"effect": "4.0.6",
|
|
58
62
|
"esbuild": "0.28.2",
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import type { Key, KeyContext } from "@shivaedev/changes/keys.ts";
|
|
4
|
+
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
5
|
+
import { genericMethod } from "@shivaedev/service/genericMethod.ts";
|
|
6
|
+
import { makeLiveServer } from "#makeLiveServer.ts";
|
|
7
|
+
import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
|
|
8
|
+
|
|
9
|
+
export const LiveServer = defineService({
|
|
10
|
+
id: "@shivaedev/contract/LiveServer",
|
|
11
|
+
initialize: makeLiveServer,
|
|
12
|
+
methods: (server) => ({
|
|
13
|
+
resync: () => server.resync,
|
|
14
|
+
stream: (keys: readonly Key[], context?: KeyContext) => Effect.succeed(server.stream(keys, context)),
|
|
15
|
+
subscribe: genericMethod(<E, R>(subscription: QuerySubscription<E, R>, context?: KeyContext, read?: QueryRerun<E, R>) =>
|
|
16
|
+
Effect.succeed(read === undefined ? server.subscribe(subscription, context) : server.subscribe(subscription, context, read)),
|
|
17
|
+
),
|
|
18
|
+
}),
|
|
19
|
+
requires: [Reactivity.Reactivity],
|
|
20
|
+
});
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Effect, Option } from "effect";
|
|
2
|
+
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
3
|
+
import type { Viewer } from "#readPolicy.ts";
|
|
4
|
+
|
|
5
|
+
export type QueryServerReads<TPayload, E = never, R = never> = (
|
|
6
|
+
payload: TPayload,
|
|
7
|
+
viewer: Option.Option<Viewer>,
|
|
8
|
+
) => Effect.Effect<readonly Key[], E, R>;
|
package/src/automaticLive.ts
CHANGED
|
@@ -77,7 +77,7 @@ export function automaticLive(
|
|
|
77
77
|
}
|
|
78
78
|
const ready = Atom.make(false);
|
|
79
79
|
const delivery = queryDelivery(atom, decode, paused);
|
|
80
|
-
const source = delivery.atom;
|
|
80
|
+
const source = decode === undefined ? delivery.atom.pipe(Atom.setIdleTTL(0)) : delivery.atom;
|
|
81
81
|
const subscription = live(service.runtime, {
|
|
82
82
|
initialResync: false,
|
|
83
83
|
keyContext: owner?.context,
|
package/src/bind.ts
CHANGED
|
@@ -14,7 +14,6 @@ import { bindingOwner } from "#internal/bindingOwner.ts";
|
|
|
14
14
|
import { boundCommand, boundQuery, boundStream } from "#internal/clientOperations.ts";
|
|
15
15
|
import { type RpcSource, rpcClient } from "#internal/rpcClient.ts";
|
|
16
16
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
17
|
-
import type { MissingReadPolicy } from "#readPolicyErrors.ts";
|
|
18
17
|
import type { ResumeSource, ResumeWindow } from "#resume.ts";
|
|
19
18
|
|
|
20
19
|
export type Failure<R extends Rpc.Any> =
|
|
@@ -34,10 +33,7 @@ export interface QueryOptions {
|
|
|
34
33
|
}
|
|
35
34
|
|
|
36
35
|
export interface BoundQuery<R extends Rpc.Any, TSelf> {
|
|
37
|
-
readonly query: (
|
|
38
|
-
payload: Rpc.Payload<R>,
|
|
39
|
-
options?: QueryOptions,
|
|
40
|
-
) => Atom.Atom<AsyncResult.AsyncResult<Rpc.Success<R>, Failure<R> | MissingReadPolicy>>;
|
|
36
|
+
readonly query: (payload: Rpc.Payload<R>, options?: QueryOptions) => Atom.Atom<AsyncResult.AsyncResult<Rpc.Success<R>, Failure<R>>>;
|
|
41
37
|
readonly run: (payload: Rpc.Payload<R>) => Effect.Effect<Rpc.Success<R>, RunFailure<R>, TSelf>;
|
|
42
38
|
}
|
|
43
39
|
|
package/src/clientOptions.ts
CHANGED
|
@@ -10,6 +10,7 @@ import type { ActiveClient } from "#clientActivity.ts";
|
|
|
10
10
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
11
11
|
|
|
12
12
|
export interface ClientOptions {
|
|
13
|
+
readonly bearerToken?: string;
|
|
13
14
|
readonly headers?: Readonly<Record<string, string>>;
|
|
14
15
|
readonly live?: boolean;
|
|
15
16
|
readonly protocol?: Layer.Layer<RpcClient.Protocol> | ((identity: string | undefined) => Layer.Layer<RpcClient.Protocol>);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { Cause, type Duration, Option, Predicate } from "effect";
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import type { LiveBound, LiveConnection } from "#automaticLive.ts";
|
|
@@ -38,6 +38,9 @@ export function automaticQuery<A, E>({
|
|
|
38
38
|
assertOwner(get);
|
|
39
39
|
const registry = get.registry;
|
|
40
40
|
const dispatcher = registry.schedulerAsync.makeDispatcher();
|
|
41
|
+
let denied = false;
|
|
42
|
+
let stopSource: (() => void) | undefined;
|
|
43
|
+
get.addFinalizer(() => stopSource?.());
|
|
41
44
|
get.set(ready, false);
|
|
42
45
|
get.once(queryCoalesceWindow(gated));
|
|
43
46
|
get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(atom), value), { immediate: true });
|
|
@@ -50,6 +53,7 @@ export function automaticQuery<A, E>({
|
|
|
50
53
|
}
|
|
51
54
|
}, 0);
|
|
52
55
|
if (value.connection === "live") {
|
|
56
|
+
denied = false;
|
|
53
57
|
registry.set(ready, true);
|
|
54
58
|
}
|
|
55
59
|
}
|
|
@@ -67,15 +71,19 @@ export function automaticQuery<A, E>({
|
|
|
67
71
|
get.addFinalizer(registry.subscribe(coalesceWindow, (value) => registry.set(subscription.coalesceWindow, value), { immediate: true }));
|
|
68
72
|
let started = false;
|
|
69
73
|
function start() {
|
|
70
|
-
if (
|
|
74
|
+
if (stopSource !== undefined) {
|
|
71
75
|
return;
|
|
72
76
|
}
|
|
73
77
|
started = true;
|
|
74
78
|
if (!pushed) {
|
|
75
79
|
get.refresh(source);
|
|
76
80
|
}
|
|
77
|
-
const publish = queryResult<A, E>(equivalent, (value) =>
|
|
78
|
-
|
|
81
|
+
const publish = queryResult<A, E>(equivalent, (value) => {
|
|
82
|
+
if (!denied) {
|
|
83
|
+
get.setSelf(value);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
stopSource = registry.subscribe(source, publish);
|
|
79
87
|
publish(get.once(source));
|
|
80
88
|
}
|
|
81
89
|
get.once(ready);
|
|
@@ -86,7 +94,15 @@ export function automaticQuery<A, E>({
|
|
|
86
94
|
});
|
|
87
95
|
const failed = queryFailure(
|
|
88
96
|
() => started && !pushed,
|
|
89
|
-
(cause) =>
|
|
97
|
+
(cause) => {
|
|
98
|
+
if (Option.exists(Cause.findErrorOption(cause), Predicate.isTagged("QueryReadDenied"))) {
|
|
99
|
+
denied = true;
|
|
100
|
+
registry.set(ready, false);
|
|
101
|
+
stopSource?.();
|
|
102
|
+
stopSource = undefined;
|
|
103
|
+
}
|
|
104
|
+
get.setSelf(AsyncResult.failure(cause));
|
|
105
|
+
},
|
|
90
106
|
);
|
|
91
107
|
get.subscribe(subscription.status, failed);
|
|
92
108
|
get.addFinalizer(registry.subscribe(paused, (value) => registry.set(subscription.paused, value), { immediate: true }));
|