@shivaedev/contract 0.21.0 → 0.23.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 +27 -0
- package/README.md +5 -3
- package/dist/automaticLive.d.ts.map +1 -1
- package/dist/automaticLive.js +4 -6
- package/dist/automaticLive.js.map +1 -1
- package/dist/contract.d.ts +2 -1
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +3 -10
- package/dist/contract.js.map +1 -1
- package/dist/internal/liveHintQueue.d.ts +25 -0
- package/dist/internal/liveHintQueue.d.ts.map +1 -0
- package/dist/internal/liveHintQueue.js +21 -0
- package/dist/internal/liveHintQueue.js.map +1 -0
- package/dist/internal/queryFailure.d.ts +4 -0
- package/dist/internal/queryFailure.d.ts.map +1 -0
- package/dist/internal/queryFailure.js +18 -0
- package/dist/internal/queryFailure.js.map +1 -0
- package/dist/internal/rpcClient.d.ts.map +1 -1
- package/dist/internal/rpcClient.js +4 -2
- package/dist/internal/rpcClient.js.map +1 -1
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +3 -3
- package/dist/live.js.map +1 -1
- package/dist/makeLiveServer.d.ts +3 -2
- package/dist/makeLiveServer.d.ts.map +1 -1
- package/dist/makeLiveServer.js +9 -13
- package/dist/makeLiveServer.js.map +1 -1
- package/dist/operation.d.ts +8 -8
- package/dist/operation.d.ts.map +1 -1
- package/dist/operation.js.map +1 -1
- package/dist/publicConfig.d.ts +2 -2
- package/dist/publicConfig.d.ts.map +1 -1
- package/dist/querySubscription.d.ts +7 -9
- package/dist/querySubscription.d.ts.map +1 -1
- package/dist/querySubscription.js +10 -7
- package/dist/querySubscription.js.map +1 -1
- package/dist/readPolicy.d.ts +22 -6
- package/dist/readPolicy.d.ts.map +1 -1
- package/dist/readPolicy.js +10 -9
- package/dist/readPolicy.js.map +1 -1
- package/dist/serverMetadata.d.ts +12 -25
- package/dist/serverMetadata.d.ts.map +1 -1
- package/dist/serverMetadata.js +8 -1
- package/dist/serverMetadata.js.map +1 -1
- package/package.json +5 -6
- package/src/automaticLive.ts +8 -6
- package/src/contract.ts +13 -12
- package/src/internal/liveHintQueue.ts +22 -0
- package/src/internal/queryFailure.ts +20 -0
- package/src/internal/rpcClient.ts +4 -2
- package/src/live.ts +2 -3
- package/src/makeLiveServer.ts +17 -16
- package/src/operation.ts +9 -8
- package/src/querySubscription.ts +27 -14
- package/src/readPolicy.ts +29 -13
- package/src/serverMetadata.ts +30 -6
package/dist/operation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../src/operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../src/operation.ts"],"names":[],"mappings":"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"}
|
package/dist/operation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../src/operation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../src/operation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAsF1E,MAAM,UAAU,KAAK,CACpB,IAAY,EACZ,WAGC;IAED,OAAO;QACN,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC;QACxC,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,GAAG,CAAC,WAAW,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC;KACvF,CAAC;AACH,CAAC;AAaD,MAAM,UAAU,OAAO,CACtB,IAAY,EACZ,WAAoI;IAEpI,OAAO,EAAE,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC;AAC7F,CAAC;AAcD,MAAM,UAAU,MAAM,CAAC,IAAY,EAAE,WAA6E;IACjH,OAAO,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC;AAChF,CAAC"}
|
package/dist/publicConfig.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Schema } from "effect";
|
|
2
|
-
export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("#contract.ts").Contract<"platform.publicConfig", readonly [NoInfer<import("#operation.ts").Query<"get", Schema.Void, Schema.Codec<T, E, never, never>, {}>>], readonly [], import("effect/rpc/Rpc").Rpc<"platform.publicConfig.get", Schema.Void, Schema.Codec<T, E, never, never>, Schema.Union<readonly [Schema.Never, typeof import("./readPolicyErrors.ts").QueryReadDenied]>, never, never> | import("effect/rpc/Rpc").Rpc<"platform.publicConfig.$changes", Schema.Struct<{
|
|
2
|
+
export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("#contract.ts").Contract<"platform.publicConfig", readonly [NoInfer<import("#operation.ts").Query<"get", Schema.Void, Schema.Codec<T, E, never, never>, {}, never>>], readonly [], import("effect/rpc/Rpc").Rpc<"platform.publicConfig.get", Schema.Void, Schema.Codec<T, E, never, never>, Schema.Union<readonly [Schema.Never, typeof import("./readPolicyErrors.ts").QueryReadDenied]>, never, never> | import("effect/rpc/Rpc").Rpc<"platform.publicConfig.$changes", Schema.Struct<{
|
|
3
3
|
queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
|
|
4
4
|
query: Schema.Literal<"get">;
|
|
5
5
|
payload: Schema.Void;
|
|
@@ -22,5 +22,5 @@ export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("
|
|
|
22
22
|
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
23
23
|
}>, Schema.Struct<{
|
|
24
24
|
readonly _tag: Schema.Literal<"Resync">;
|
|
25
|
-
}>]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, never, never>, readonly [], undefined>;
|
|
25
|
+
}>]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...Schema.Never[]]>>, Schema.Never, never, never>, readonly [], undefined>;
|
|
26
26
|
//# sourceMappingURL=publicConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;0NAI5D"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { Effect, type Option } from "effect";
|
|
2
|
+
import type { Rpc } from "effect/rpc";
|
|
2
3
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
3
|
-
import { type Viewer } from "#readPolicy.ts";
|
|
4
|
-
import type {
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
import { type PolicyChannels, type Viewer } from "#readPolicy.ts";
|
|
5
|
+
import type { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
6
|
+
import { type QueryReference } from "#serverMetadata.ts";
|
|
7
|
+
export interface QuerySubscription<E = never, R = never> {
|
|
8
|
+
readonly authorized: Effect.Effect<boolean, E, R>;
|
|
7
9
|
readonly keys: readonly Key[];
|
|
8
10
|
readonly scopes: readonly (readonly Key[])[];
|
|
9
11
|
}
|
|
10
|
-
export declare
|
|
11
|
-
authorized: Effect.Effect<boolean, never, never>;
|
|
12
|
-
keys: Key[];
|
|
13
|
-
scopes: (readonly Key[])[];
|
|
14
|
-
}, import("./readPolicyErrors.ts").MissingReadPolicy | import("./readPolicyErrors.ts").QueryReadDenied, never>;
|
|
12
|
+
export declare function querySubscription<TRpc extends Rpc.Any>(rpc: TRpc, references: readonly QueryReference[], viewer: Option.Option<Viewer>): Effect.Effect<QuerySubscription<PolicyChannels<TRpc>["error"], PolicyChannels<TRpc>["services"]>, PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied, PolicyChannels<TRpc>["services"]>;
|
|
15
13
|
//# sourceMappingURL=querySubscription.d.ts.map
|
|
@@ -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,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;
|
|
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,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,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,MAAM,oBAAoB,CAAC;AAEzE,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,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,10 +1,13 @@
|
|
|
1
1
|
import { Context, Effect } from "effect";
|
|
2
2
|
import { checkQuery } from "#readPolicy.ts";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
});
|
|
3
|
+
import { ChangesQueries } from "#serverMetadata.ts";
|
|
4
|
+
export function querySubscription(rpc, references, viewer) {
|
|
5
|
+
return Effect.fnUntraced(function* () {
|
|
6
|
+
const queries = yield* Context.getUnsafe(rpc.annotations, ChangesQueries).resolve(references);
|
|
7
|
+
yield* Effect.forEach(queries, ({ query, payload }) => checkQuery(query, payload, viewer));
|
|
8
|
+
const scopes = queries.map(({ query, payload }) => query.reads(payload, viewer));
|
|
9
|
+
const authorized = Effect.map(Effect.forEach(queries, ({ query, payload }) => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false)), (permissions) => permissions.every(Boolean));
|
|
10
|
+
return { authorized, keys: scopes.flat(), scopes };
|
|
11
|
+
})();
|
|
12
|
+
}
|
|
10
13
|
//# sourceMappingURL=querySubscription.js.map
|
|
@@ -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;AAGtD,OAAO,EAAE,UAAU,EAAoC,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAuB,MAAM,oBAAoB,CAAC;AAiBzE,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,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3F,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QACjF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAC7G,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,MAAM,EAAgD,CAAC;IAClG,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
|
package/dist/readPolicy.d.ts
CHANGED
|
@@ -1,15 +1,31 @@
|
|
|
1
|
-
import { Context, Effect, Option } from "effect";
|
|
1
|
+
import { Context, Effect, Option, type Stream, type Types } from "effect";
|
|
2
2
|
import type { Rpc } from "effect/rpc";
|
|
3
3
|
import type { QueryShape } from "#operation.ts";
|
|
4
4
|
import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
5
5
|
export interface Viewer {
|
|
6
6
|
readonly id: string;
|
|
7
7
|
}
|
|
8
|
-
export type QueryReadPolicy<TPayload> = (payload: TPayload, viewer: Option.Option<Viewer>) => Effect.Effect<boolean,
|
|
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 checkQuery: (query: QueryShape, payload: unknown, viewer: Option.Option<Viewer>) => Effect.Effect<undefined, MissingReadPolicy | QueryReadDenied,
|
|
11
|
-
export
|
|
12
|
-
readonly
|
|
10
|
+
export declare const checkQuery: <E, R>(query: QueryShape<E, R>, payload: unknown, viewer: Option.Option<Viewer>) => Effect.Effect<undefined, E | MissingReadPolicy | QueryReadDenied, R>;
|
|
11
|
+
export type PolicyChannels<TRpc> = TRpc extends {
|
|
12
|
+
readonly setPayload: unknown;
|
|
13
|
+
readonly errorSchema: {
|
|
14
|
+
readonly Type: infer E;
|
|
15
|
+
};
|
|
16
|
+
readonly successSchema: {
|
|
17
|
+
readonly Type: infer TSuccess;
|
|
18
|
+
};
|
|
19
|
+
readonly "~requires": infer R;
|
|
20
|
+
} ? {
|
|
21
|
+
readonly error: E | (TSuccess extends Stream.Stream<unknown, infer TError, unknown> ? TError : never);
|
|
22
|
+
readonly services: R;
|
|
23
|
+
} : {
|
|
24
|
+
readonly error: Types.unhandled;
|
|
25
|
+
readonly services: never;
|
|
26
|
+
};
|
|
27
|
+
export declare function authorizeReads<A, E, R, TRpc extends Rpc.Any>(effect: Effect.Effect<A, E, R>, request: {
|
|
28
|
+
readonly rpc: TRpc;
|
|
13
29
|
readonly payload: unknown;
|
|
14
|
-
}, viewer: Option.Option<Viewer>)
|
|
30
|
+
}, viewer: Option.Option<Viewer>): Effect.Effect<A, E | PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied, R | PolicyChannels<TRpc>["services"]>;
|
|
15
31
|
//# sourceMappingURL=readPolicy.d.ts.map
|
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,MAAM,QAAQ,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;AACtC,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,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
|
@@ -6,16 +6,17 @@ export const checkQuery = Effect.fnUntraced(function* (query, payload, viewer) {
|
|
|
6
6
|
if (query.readPolicy === undefined) {
|
|
7
7
|
return yield* new MissingReadPolicy({ message: `Declare a readPolicy on query ${query.name} before running it live or subscribing` });
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
if (!(yield* Effect.provideContext(query.readPolicy(payload, viewer), context))) {
|
|
9
|
+
if (!(yield* query.readPolicy(payload, viewer))) {
|
|
11
10
|
return yield* new QueryReadDenied({ message: `Read not allowed for query ${query.name}` });
|
|
12
11
|
}
|
|
13
12
|
});
|
|
14
|
-
export
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
export function authorizeReads(effect, request, viewer) {
|
|
14
|
+
return Effect.fnUntraced(function* () {
|
|
15
|
+
const definition = Context.getOption(request.rpc.annotations, QueryDefinition);
|
|
16
|
+
if (Option.isSome(definition) && definition.value.definition.readPolicy !== undefined) {
|
|
17
|
+
yield* checkQuery(definition.value.definition, request.payload, viewer);
|
|
18
|
+
}
|
|
19
|
+
return yield* Effect.provideService(effect, CurrentViewer, viewer);
|
|
20
|
+
})();
|
|
21
|
+
}
|
|
21
22
|
//# sourceMappingURL=readPolicy.js.map
|
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,
|
|
1
|
+
{"version":3,"file":"readPolicy.js","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAG1E,OAAO,EAAE,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,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,wCAAwC,EAAE,CAAC,CAAC;IACvI,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,IAAI,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACvF,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
|
package/dist/serverMetadata.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
-
import { Rpc } from "effect/rpc";
|
|
2
|
+
import { Rpc, type RpcSchema } from "effect/rpc";
|
|
3
3
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
4
|
-
import type {
|
|
4
|
+
import type { QueryServices } from "#contract.ts";
|
|
5
|
+
import { LiveHint } from "#live.ts";
|
|
6
|
+
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
5
7
|
import type { Viewer } from "#readPolicy.ts";
|
|
6
8
|
import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
|
|
7
9
|
declare const QueryDefinition_base: Context.ServiceClass<QueryDefinition, "@shivaedev/contract/QueryDefinition", {
|
|
@@ -9,9 +11,9 @@ declare const QueryDefinition_base: Context.ServiceClass<QueryDefinition, "@shiv
|
|
|
9
11
|
}>;
|
|
10
12
|
export declare class QueryDefinition extends QueryDefinition_base {
|
|
11
13
|
}
|
|
12
|
-
export interface QueryRequest {
|
|
14
|
+
export interface QueryRequest<E = unknown, R = unknown> {
|
|
13
15
|
readonly payload: unknown;
|
|
14
|
-
readonly query: QueryShape
|
|
16
|
+
readonly query: QueryShape<E, R>;
|
|
15
17
|
}
|
|
16
18
|
declare const ChangesQueries_base: Context.ServiceClass<ChangesQueries, "@shivaedev/contract/ChangesQueries", {
|
|
17
19
|
readonly resolve: (references: readonly QueryReference[]) => Effect.Effect<readonly QueryRequest[]>;
|
|
@@ -34,27 +36,12 @@ type ReferenceSchema<TQuery extends QueryShape> = TQuery extends QueryShape ? Sc
|
|
|
34
36
|
query: Schema.Literal<TQuery["name"]>;
|
|
35
37
|
payload: TQuery["payload"];
|
|
36
38
|
}> : never;
|
|
37
|
-
export declare const queryKeys: (queries: readonly QueryShape[], requested: readonly QueryReference[], viewer?: Option.Option<Viewer> | undefined) => Effect.Effect<readonly Key[], never, 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
|
+
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"][]]>;
|
|
38
42
|
export declare function changesRpc<const TName extends string, const TQueries extends readonly QueryShape[]>(name: TName, queries: TQueries): Rpc.Rpc<`${TName}.$changes`, Schema.Struct<{
|
|
39
|
-
queries:
|
|
40
|
-
}>,
|
|
41
|
-
|
|
42
|
-
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
43
|
-
readonly _tag: Schema.Literal<"Bucket">;
|
|
44
|
-
readonly collection: Schema.String;
|
|
45
|
-
readonly field: Schema.String;
|
|
46
|
-
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
47
|
-
}>, Schema.Struct<{
|
|
48
|
-
readonly _tag: Schema.Literal<"List">;
|
|
49
|
-
readonly collection: Schema.String;
|
|
50
|
-
}>, Schema.Struct<{
|
|
51
|
-
readonly _tag: Schema.Literal<"Item">;
|
|
52
|
-
readonly collection: Schema.String;
|
|
53
|
-
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
54
|
-
}>]>>;
|
|
55
|
-
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
56
|
-
}>, Schema.Struct<{
|
|
57
|
-
readonly _tag: Schema.Literal<"Resync">;
|
|
58
|
-
}>]>, Schema.Union<readonly [typeof MissingReadPolicy, typeof QueryReadDenied]>>, Schema.Never, never, never>;
|
|
43
|
+
queries: ReturnType<typeof referenceSchemas<TQueries>>;
|
|
44
|
+
}>, RpcSchema.Stream<typeof LiveHint, ChangesError<TQueries>>, Schema.Never, never, QueryServices<TQueries[number]>>;
|
|
45
|
+
export declare function operationAnnotations(operation: QueryShape | CommandShape | StreamShape, keyScope: "session" | undefined): Context.Context<never>;
|
|
59
46
|
export {};
|
|
60
47
|
//# sourceMappingURL=serverMetadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverMetadata.d.ts","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"serverMetadata.d.ts","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"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"}
|
package/dist/serverMetadata.js
CHANGED
|
@@ -25,10 +25,17 @@ function referenceSchemas(queries) {
|
|
|
25
25
|
}
|
|
26
26
|
export function changesRpc(name, queries) {
|
|
27
27
|
return Rpc.make(`${name}.$changes`, {
|
|
28
|
-
error: Schema.Union([MissingReadPolicy, QueryReadDenied]),
|
|
28
|
+
error: Schema.Union([MissingReadPolicy, QueryReadDenied, ...queries.map((query) => query.error)]),
|
|
29
29
|
payload: { queries: referenceSchemas(queries) },
|
|
30
30
|
stream: true,
|
|
31
31
|
success: LiveHint,
|
|
32
32
|
}).annotate(ChangesQueries, { resolve: (references) => resolveQueries(queries, references) });
|
|
33
33
|
}
|
|
34
|
+
export function operationAnnotations(operation, keyScope) {
|
|
35
|
+
const scope = keyScope === undefined ? Context.empty() : Context.make(KeyScope, keyScope);
|
|
36
|
+
if (operation.kind === "command") {
|
|
37
|
+
return Context.add(scope, CommandInvalidation, { invalidates: operation.invalidates });
|
|
38
|
+
}
|
|
39
|
+
return operation.kind === "query" ? Context.add(scope, QueryDefinition, { definition: operation }) : scope;
|
|
40
|
+
}
|
|
34
41
|
//# sourceMappingURL=serverMetadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverMetadata.js","sourceRoot":"","sources":["../src/serverMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"serverMetadata.js","sourceRoot":"","sources":["../src/serverMetadata.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.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"description": "Typed query and command contracts over native Effect RPC and reactivity",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -31,7 +31,6 @@
|
|
|
31
31
|
"types": "./dist/*.d.ts",
|
|
32
32
|
"default": "./dist/*.js"
|
|
33
33
|
},
|
|
34
|
-
"./internal/*": null,
|
|
35
34
|
"./package.json": "./package.json"
|
|
36
35
|
},
|
|
37
36
|
"files": [
|
|
@@ -50,10 +49,10 @@
|
|
|
50
49
|
"devDependencies": {
|
|
51
50
|
"@effect/platform-node": "4.0.6",
|
|
52
51
|
"@effect/vitest": "4.0.6",
|
|
53
|
-
"@shivaedev/quality": "0.
|
|
54
|
-
"@shivaedev/test": "0.
|
|
55
|
-
"@shivaedev/test-sql": "0.
|
|
56
|
-
"@shivaedev/test-story": "0.
|
|
52
|
+
"@shivaedev/quality": "0.47.0",
|
|
53
|
+
"@shivaedev/test": "0.11.0",
|
|
54
|
+
"@shivaedev/test-sql": "0.13.0",
|
|
55
|
+
"@shivaedev/test-story": "0.25.1",
|
|
57
56
|
"@types/node": "24.19.2",
|
|
58
57
|
"effect": "4.0.6",
|
|
59
58
|
"esbuild": "0.28.2",
|
package/src/automaticLive.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { type Duration, Effect,
|
|
1
|
+
import { type Duration, Effect, Stream } from "effect";
|
|
2
2
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import type * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
5
5
|
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
6
6
|
import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
|
|
7
7
|
import type { BindingOwner } from "#internal/bindingOwner.ts";
|
|
8
|
+
import { queryFailure } from "#internal/queryFailure.ts";
|
|
8
9
|
import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
|
|
9
10
|
import { queryResult } from "#internal/queryResult.ts";
|
|
10
11
|
import { socketIdentity } from "#internal/rpcClient.ts";
|
|
@@ -122,11 +123,12 @@ export function automaticLive(
|
|
|
122
123
|
start();
|
|
123
124
|
}
|
|
124
125
|
});
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
126
|
+
const failed = queryFailure(
|
|
127
|
+
() => started,
|
|
128
|
+
(cause) => get.setSelf(AsyncResult.failure(cause)),
|
|
129
|
+
() => get.refresh(atom),
|
|
130
|
+
);
|
|
131
|
+
get.subscribe(subscription.status, failed);
|
|
130
132
|
get.addFinalizer(registry.subscribe(paused, (value) => registry.set(subscription.paused, value), { immediate: true }));
|
|
131
133
|
get.mount(subscription.connection);
|
|
132
134
|
if (get.once(ready)) {
|
package/src/contract.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Schema } from "effect";
|
|
2
2
|
import { Rpc, RpcGroup, type RpcMiddleware, type RpcSchema } from "effect/rpc";
|
|
3
3
|
import type { CommandShape, OperationShape, QueryShape, StreamShape } from "#operation.ts";
|
|
4
4
|
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
5
|
-
import {
|
|
5
|
+
import { changesRpc, KeyScope, operationAnnotations } from "#serverMetadata.ts";
|
|
6
6
|
|
|
7
7
|
export type Tag<TContract extends string, TName extends string> = `${TContract}.${TName}`;
|
|
8
8
|
|
|
9
|
+
export type QueryServices<TQuery> = TQuery extends QueryShape<unknown, infer R> ? R : never;
|
|
10
|
+
|
|
9
11
|
type OperationError<TOperation extends OperationShape> = TOperation extends QueryShape
|
|
10
12
|
? Schema.Union<readonly [TOperation["error"], typeof QueryReadDenied]>
|
|
11
13
|
: TOperation["error"];
|
|
@@ -13,7 +15,14 @@ type OperationError<TOperation extends OperationShape> = TOperation extends Quer
|
|
|
13
15
|
export type OperationRpc<TContract extends string, TOperation> = TOperation extends OperationShape
|
|
14
16
|
? TOperation extends StreamShape
|
|
15
17
|
? Rpc.Rpc<Tag<TContract, TOperation["name"]>, TOperation["payload"], RpcSchema.Stream<TOperation["success"], TOperation["error"]>, Schema.Never>
|
|
16
|
-
: Rpc.Rpc<
|
|
18
|
+
: Rpc.Rpc<
|
|
19
|
+
Tag<TContract, TOperation["name"]>,
|
|
20
|
+
TOperation["payload"],
|
|
21
|
+
TOperation["success"],
|
|
22
|
+
OperationError<TOperation>,
|
|
23
|
+
never,
|
|
24
|
+
QueryServices<TOperation>
|
|
25
|
+
>
|
|
17
26
|
: never;
|
|
18
27
|
|
|
19
28
|
export interface Declared<
|
|
@@ -63,14 +72,6 @@ function assertUnique(operations: readonly OperationShape[]) {
|
|
|
63
72
|
}
|
|
64
73
|
}
|
|
65
74
|
|
|
66
|
-
function annotations(operation: QueryShape | CommandShape | StreamShape, keyScope: "session" | undefined) {
|
|
67
|
-
const scope = keyScope === undefined ? Context.empty() : Context.make(KeyScope, keyScope);
|
|
68
|
-
if (operation.kind === "command") {
|
|
69
|
-
return Context.add(scope, CommandInvalidation, { invalidates: operation.invalidates });
|
|
70
|
-
}
|
|
71
|
-
return operation.kind === "query" ? Context.add(scope, QueryDefinition, { definition: operation }) : scope;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
75
|
type AnyDeclared = Declared<string, readonly QueryShape[], readonly CommandShape[], readonly StreamShape[], "session" | undefined>;
|
|
75
76
|
|
|
76
77
|
interface Group {
|
|
@@ -131,7 +132,7 @@ export function contract(
|
|
|
131
132
|
payload: operation.payload,
|
|
132
133
|
stream: operation.kind === "stream",
|
|
133
134
|
success: operation.success,
|
|
134
|
-
}).annotateMerge(
|
|
135
|
+
}).annotateMerge(operationAnnotations(operation, keyScope)),
|
|
135
136
|
);
|
|
136
137
|
const application = RpcGroup.make(...rpcs);
|
|
137
138
|
const changes = changesRpc(name, queries);
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Effect, Queue } from "effect";
|
|
2
|
+
import type { LiveHint } from "#live.ts";
|
|
3
|
+
|
|
4
|
+
export const liveHintQueue = Effect.gen(function* () {
|
|
5
|
+
const queue = yield* Queue.bounded<LiveHint>(256);
|
|
6
|
+
let overflowed = false;
|
|
7
|
+
function offer(hint: LiveHint) {
|
|
8
|
+
if (overflowed && Queue.sizeUnsafe(queue) > 0) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
overflowed = false;
|
|
12
|
+
if (Queue.offerUnsafe(queue, hint)) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
while (Queue.takeUnsafe(queue) !== undefined) {
|
|
16
|
+
// Overflow discards targeted hints because the resync covers every subscribed read.
|
|
17
|
+
}
|
|
18
|
+
overflowed = true;
|
|
19
|
+
Queue.offerUnsafe(queue, { _tag: "Resync" });
|
|
20
|
+
}
|
|
21
|
+
return { offer, queue };
|
|
22
|
+
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Cause, Option, Predicate } from "effect";
|
|
2
|
+
import type { LiveStatus } from "#live.ts";
|
|
3
|
+
|
|
4
|
+
export function queryFailure(started: () => boolean, publish: (cause: Cause.Cause<unknown>) => void, recheck: () => void) {
|
|
5
|
+
let rechecked: Cause.Cause<unknown> | undefined;
|
|
6
|
+
return ({ failure }: LiveStatus<unknown>) => {
|
|
7
|
+
if (Option.isNone(failure)) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
if (!started()) {
|
|
11
|
+
publish(failure.value);
|
|
12
|
+
} else if (
|
|
13
|
+
failure.value !== rechecked
|
|
14
|
+
&& Option.exists(Cause.findErrorOption(failure.value), (error) => Predicate.isTagged(error, "QueryReadDenied"))
|
|
15
|
+
) {
|
|
16
|
+
rechecked = failure.value;
|
|
17
|
+
recheck();
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Context, Effect, Layer } from "effect";
|
|
1
|
+
import { type Context, Effect, Layer, Schedule } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import * as AtomRpc from "effect/reactivity/AtomRpc";
|
|
4
4
|
import { type Rpc, RpcClient, RpcGroup, RpcSerialization } from "effect/rpc";
|
|
@@ -40,7 +40,9 @@ const socketProtocol = Atom.family(
|
|
|
40
40
|
readonly identity: string | undefined;
|
|
41
41
|
readonly webSocketConstructor: ClientOptions["webSocketConstructor"];
|
|
42
42
|
}) => {
|
|
43
|
-
const protocol = RpcClient.layerProtocolSocket(
|
|
43
|
+
const protocol = RpcClient.layerProtocolSocket({
|
|
44
|
+
retryPolicy: Schedule.jittered(Schedule.min([Schedule.exponential(500, 1.5), Schedule.spaced(5000)])),
|
|
45
|
+
}).pipe(
|
|
44
46
|
Layer.provide(
|
|
45
47
|
Socket.layerWebSocket(options.url, { headers: options.headers }).pipe(
|
|
46
48
|
Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal),
|
package/src/live.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Cause, Duration, Effect, Option, Schema, Stream } from "effect";
|
|
1
|
+
import { type Cause, Duration, Effect, Option, Schedule, Schema, Stream } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
3
|
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
4
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
@@ -124,10 +124,9 @@ export function live<R, E, TRuntimeError>(runtime: Atom.AtomRuntime<R, TRuntimeE
|
|
|
124
124
|
Effect.scoped,
|
|
125
125
|
Effect.catchCause((failure) => Effect.sync(() => update({ failure: Option.some(failure) }))),
|
|
126
126
|
Effect.andThen(Effect.sync(() => update({ connection: "reconnecting", needsResync: true }))),
|
|
127
|
-
Effect.andThen(Effect.sleep(options.retryDelay ?? "1 second")),
|
|
128
127
|
);
|
|
129
128
|
});
|
|
130
|
-
yield* Effect.
|
|
129
|
+
yield* Effect.repeat(attempt, Schedule.jittered(Schedule.spaced(options.retryDelay ?? "1 second")));
|
|
131
130
|
}),
|
|
132
131
|
)
|
|
133
132
|
.pipe(Atom.setIdleTTL(0));
|
package/src/makeLiveServer.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { Effect, Queue, Stream } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { type Key, type KeyContext, readKeys } from "@shivaedev/changes/keys.ts";
|
|
4
|
+
import { liveHintQueue } from "#internal/liveHintQueue.ts";
|
|
4
5
|
import { changedHint } from "#internal/queryHints.ts";
|
|
5
6
|
import type { LiveHint } from "#live.ts";
|
|
6
7
|
import type { QuerySubscription } from "#querySubscription.ts";
|
|
8
|
+
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
7
9
|
|
|
8
10
|
export const makeLiveServer = Effect.gen(function* () {
|
|
9
11
|
const reactivity = yield* Reactivity.Reactivity;
|
|
10
12
|
let openStreams = 0;
|
|
11
13
|
const resyncKey = `@shivaedev/contract/resync/${crypto.randomUUID()}`;
|
|
12
|
-
function open(keys: readonly Key[], context?: KeyContext
|
|
14
|
+
function open(keys: readonly Key[], context?: KeyContext): Stream.Stream<LiveHint> {
|
|
13
15
|
return Stream.unwrap(
|
|
14
16
|
Effect.gen(function* () {
|
|
15
|
-
const queue = yield*
|
|
17
|
+
const { offer, queue } = yield* liveHintQueue;
|
|
16
18
|
const pending = new Map<string, Key>();
|
|
17
19
|
let scheduled = false;
|
|
18
20
|
let resync = false;
|
|
@@ -25,7 +27,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
25
27
|
queueMicrotask(() => {
|
|
26
28
|
scheduled = false;
|
|
27
29
|
if (active) {
|
|
28
|
-
|
|
30
|
+
offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
|
|
29
31
|
}
|
|
30
32
|
pending.clear();
|
|
31
33
|
resync = false;
|
|
@@ -55,18 +57,7 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
55
57
|
}),
|
|
56
58
|
);
|
|
57
59
|
yield* Queue.offer(queue, { _tag: "Resync" });
|
|
58
|
-
|
|
59
|
-
return Effect.map(subscription?.authorized ?? Effect.succeed(true), (allowed) => {
|
|
60
|
-
if (!allowed) {
|
|
61
|
-
return changedHint([], subscription?.scopes);
|
|
62
|
-
}
|
|
63
|
-
return hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription?.scopes);
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
return Stream.fromQueue(queue).pipe(
|
|
67
|
-
Stream.mapEffect(authorizeHint),
|
|
68
|
-
Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0),
|
|
69
|
-
);
|
|
60
|
+
return Stream.fromQueue(queue);
|
|
70
61
|
}),
|
|
71
62
|
);
|
|
72
63
|
}
|
|
@@ -77,6 +68,16 @@ export const makeLiveServer = Effect.gen(function* () {
|
|
|
77
68
|
return {
|
|
78
69
|
resync,
|
|
79
70
|
stream: (keys: readonly Key[], context?: KeyContext) => open(keys, context),
|
|
80
|
-
subscribe: (subscription: QuerySubscription, context?: KeyContext) =>
|
|
71
|
+
subscribe: <E, R>(subscription: QuerySubscription<E, R>, context?: KeyContext) =>
|
|
72
|
+
open(subscription.keys, context).pipe(
|
|
73
|
+
Stream.mapEffect((hint) =>
|
|
74
|
+
Effect.flatMap(subscription.authorized, (allowed) =>
|
|
75
|
+
allowed
|
|
76
|
+
? Effect.succeed(hint._tag === "Resync" ? hint : changedHint(hint.keys, subscription.scopes))
|
|
77
|
+
: Effect.fail(new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })),
|
|
78
|
+
),
|
|
79
|
+
),
|
|
80
|
+
Stream.filter((hint) => hint._tag === "Resync" || hint.keys.length > 0),
|
|
81
|
+
),
|
|
81
82
|
};
|
|
82
83
|
});
|