@shivaedev/server 0.8.0 → 0.9.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/dist/appHost.d.ts +5 -38
- package/dist/appHost.d.ts.map +1 -1
- package/dist/hostChanges.d.ts.map +1 -1
- package/dist/hostChanges.js +4 -3
- package/dist/hostChanges.js.map +1 -1
- package/dist/rerunQuery.d.ts +7 -0
- package/dist/rerunQuery.d.ts.map +1 -0
- package/dist/rerunQuery.js +22 -0
- package/dist/rerunQuery.js.map +1 -0
- package/package.json +7 -5
- package/src/hostChanges.ts +5 -3
- package/src/rerunQuery.ts +23 -0
package/dist/appHost.d.ts
CHANGED
|
@@ -8,44 +8,11 @@ import type { HostCoreOptions, HostPolicy, HostRouteRequirements, HostRoutes } f
|
|
|
8
8
|
import type { MigrationOptions } from "#MigrationOptions.ts";
|
|
9
9
|
declare const AppChanges_base: Context.ServiceClass<AppChanges, "@shivaedev/server/AppChanges", {
|
|
10
10
|
resync: Effect.Effect<number, never, never>;
|
|
11
|
-
stream: (keys: readonly import("@shivaedev/changes/keys.ts").Key[], context?: import("@shivaedev/changes/keys.ts").KeyContext) => import("effect/Stream").Stream<
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
readonly field: string;
|
|
17
|
-
readonly value: string | number;
|
|
18
|
-
} | {
|
|
19
|
-
readonly _tag: "List";
|
|
20
|
-
readonly collection: string;
|
|
21
|
-
} | {
|
|
22
|
-
readonly _tag: "Item";
|
|
23
|
-
readonly collection: string;
|
|
24
|
-
readonly id: string | number;
|
|
25
|
-
})[];
|
|
26
|
-
readonly queryIndexes?: readonly number[] | undefined;
|
|
27
|
-
} | {
|
|
28
|
-
readonly _tag: "Resync";
|
|
29
|
-
}, never, never>;
|
|
30
|
-
subscribe: <E, R>(subscription: import("@shivaedev/contract/querySubscription.ts").QuerySubscription<E, R>, context?: import("@shivaedev/changes/keys.ts").KeyContext) => import("effect/Stream").Stream<{
|
|
31
|
-
readonly _tag: "Changed";
|
|
32
|
-
readonly keys: readonly ({
|
|
33
|
-
readonly _tag: "Bucket";
|
|
34
|
-
readonly collection: string;
|
|
35
|
-
readonly field: string;
|
|
36
|
-
readonly value: string | number;
|
|
37
|
-
} | {
|
|
38
|
-
readonly _tag: "List";
|
|
39
|
-
readonly collection: string;
|
|
40
|
-
} | {
|
|
41
|
-
readonly _tag: "Item";
|
|
42
|
-
readonly collection: string;
|
|
43
|
-
readonly id: string | number;
|
|
44
|
-
})[];
|
|
45
|
-
readonly queryIndexes?: readonly number[] | undefined;
|
|
46
|
-
} | {
|
|
47
|
-
readonly _tag: "Resync";
|
|
48
|
-
}, E | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, R>;
|
|
11
|
+
stream: (keys: readonly import("@shivaedev/changes/keys.ts").Key[], context?: import("@shivaedev/changes/keys.ts").KeyContext) => import("effect/Stream").Stream<import("@shivaedev/contract/live.ts").LiveHint>;
|
|
12
|
+
subscribe: {
|
|
13
|
+
<E, R>(subscription: import("@shivaedev/contract/querySubscription.ts").QuerySubscription<E, R>, context?: import("@shivaedev/changes/keys.ts").KeyContext): import("effect/Stream").Stream<import("@shivaedev/contract/live.ts").LiveHint, E | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, R>;
|
|
14
|
+
<E, R>(subscription: import("@shivaedev/contract/querySubscription.ts").QuerySubscription<E, R>, context: import("@shivaedev/changes/keys.ts").KeyContext | undefined, read: import("@shivaedev/contract/querySubscription.ts").QueryRerun<E, R>): import("effect/Stream").Stream<import("@shivaedev/contract/queryUpdate.ts").QueryUpdate, E | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, R>;
|
|
15
|
+
};
|
|
49
16
|
}>;
|
|
50
17
|
export declare class AppChanges extends AppChanges_base {
|
|
51
18
|
}
|
package/dist/appHost.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appHost.d.ts","sourceRoot":"","sources":["../src/appHost.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,KAAK,cAAc,EAAiB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC
|
|
1
|
+
{"version":3,"file":"appHost.d.ts","sourceRoot":"","sources":["../src/appHost.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostChanges.d.ts","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEhE,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAKhD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAGzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"hostChanges.d.ts","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEhE,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAKhD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAGzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,wBAAgB,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,QAAQ,SAAS,YAAY,EAC3E,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,cAAc,EAAE,OAAO,UAAU,EACjC,QAAQ,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC;mBAuCoC,GAAG,MAAM,WAAW;mBAG1F"}
|
package/dist/hostChanges.js
CHANGED
|
@@ -5,18 +5,19 @@ import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
|
5
5
|
import { recheckSession } from "@shivaedev/identity/server/recheckSession.ts";
|
|
6
6
|
import { resolveChanges } from "@shivaedev/identity/server/sessionKeys.ts";
|
|
7
7
|
import { revalidateSession } from "@shivaedev/identity/server/socketSession.ts";
|
|
8
|
+
import { rerunQuery } from "#rerunQuery.ts";
|
|
8
9
|
export function hostChanges(group, changesService, sessions) {
|
|
9
10
|
return Layer.effectContext(Effect.gen(function* () {
|
|
10
11
|
const changes = yield* Effect.serviceOption(changesService);
|
|
11
12
|
const services = yield* Effect.context();
|
|
12
13
|
const handlers = new Map();
|
|
13
|
-
function subscribe(rpc, queries) {
|
|
14
|
+
function subscribe(rpc, queries, options) {
|
|
14
15
|
return Stream.unwrap(Effect.gen(function* () {
|
|
15
16
|
const { subscription, context } = yield* resolveChanges(rpc, queries);
|
|
16
17
|
const viewer = yield* CurrentViewer;
|
|
17
18
|
const authorized = authorizeSession(sessions, rpc._tag, viewer, subscription.authorized);
|
|
18
19
|
const stream = Option.isSome(changes)
|
|
19
|
-
? changes.value.subscribe({ ...subscription, authorized }, context)
|
|
20
|
+
? changes.value.subscribe({ ...subscription, authorized }, context, rerunQuery(group, options))
|
|
20
21
|
: Stream.concat(Stream.succeed({ _tag: "Resync" }), Stream.never);
|
|
21
22
|
if (sessions === undefined || Option.isNone(viewer)) {
|
|
22
23
|
return stream;
|
|
@@ -35,7 +36,7 @@ export function hostChanges(group, changesService, sessions) {
|
|
|
35
36
|
}
|
|
36
37
|
handlers.set(rpc.key, {
|
|
37
38
|
context: services,
|
|
38
|
-
handler: ({ queries }) => subscribe(rpc, queries),
|
|
39
|
+
handler: ({ queries }, options) => subscribe(rpc, queries, options),
|
|
39
40
|
tag: rpc._tag,
|
|
40
41
|
});
|
|
41
42
|
}
|
package/dist/hostChanges.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAe,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { Rpc } from "effect/rpc";
|
|
3
|
+
import type { QueryRequest } from "@shivaedev/contract/serverMetadata.ts";
|
|
4
|
+
export declare function rerunQuery(group: {
|
|
5
|
+
readonly requests: ReadonlyMap<string, Rpc.Any>;
|
|
6
|
+
}, options: Parameters<Rpc.Handler<string>["handler"]>[1]): (args_0: QueryRequest<unknown, unknown>) => Effect.Effect<unknown, unknown, never>;
|
|
7
|
+
//# sourceMappingURL=rerunQuery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rerunQuery.d.ts","sourceRoot":"","sources":["../src/rerunQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,GAAG,EAAY,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAE1E,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,EAAE,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,sFAiB5I"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Context, Effect } from "effect";
|
|
2
|
+
import { Rpc, RpcGroup } from "effect/rpc";
|
|
3
|
+
import { authorizeReads, CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
+
export function rerunQuery(group, options) {
|
|
5
|
+
const prefix = options.rpc._tag.slice(0, -"$changes".length);
|
|
6
|
+
return Effect.fnUntraced(function* ({ payload, query }) {
|
|
7
|
+
const tag = `${prefix}${query.name}`;
|
|
8
|
+
const rpc = group.requests.get(tag);
|
|
9
|
+
if (!Rpc.isRpc(rpc)) {
|
|
10
|
+
return yield* Effect.die(new Error(`Unknown query: ${tag}`));
|
|
11
|
+
}
|
|
12
|
+
const services = Context.makeUnsafe((yield* Effect.context()).mapUnsafe);
|
|
13
|
+
const handler = yield* RpcGroup.make(rpc).accessHandler(tag).pipe(Effect.provideContext(services));
|
|
14
|
+
const viewer = yield* CurrentViewer;
|
|
15
|
+
const result = handler(payload, { ...options });
|
|
16
|
+
if (!Effect.isEffect(result)) {
|
|
17
|
+
return yield* Effect.die(new Error(`Query ${tag} must return an Effect`));
|
|
18
|
+
}
|
|
19
|
+
return yield* authorizeReads(result, { payload, rpc }, viewer).pipe(Effect.provideContext(Context.makeUnsafe(services.mapUnsafe)));
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=rerunQuery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rerunQuery.js","sourceRoot":"","sources":["../src/rerunQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlF,MAAM,UAAU,UAAU,CAAC,KAA0D,EAAE,OAAsD;IAC5I,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC7D,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAgB;QACnE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAsB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC,CAAC,SAAS,CAAC,CAAC;QACrG,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnG,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;QACpC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,wBAAwB,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAU,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC7I,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.0",
|
|
4
4
|
"description": "The Effect application host: HTTP and RPC serving, health, OTLP export, database and migrations, and development mode",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -45,10 +45,10 @@
|
|
|
45
45
|
],
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@shivaedev/changes": "0.5.1",
|
|
48
|
-
"@shivaedev/contract": "0.
|
|
48
|
+
"@shivaedev/contract": "0.24.0",
|
|
49
49
|
"@shivaedev/errors": "0.1.2",
|
|
50
50
|
"@shivaedev/http": "0.3.0",
|
|
51
|
-
"@shivaedev/identity": "0.
|
|
51
|
+
"@shivaedev/identity": "0.8.0",
|
|
52
52
|
"@shivaedev/local-postgres": "0.7.0",
|
|
53
53
|
"@shivaedev/sql": "0.26.1"
|
|
54
54
|
},
|
|
@@ -56,10 +56,12 @@
|
|
|
56
56
|
"@effect/platform-node": "4.0.6",
|
|
57
57
|
"@effect/sql-pg": "4.0.6",
|
|
58
58
|
"@effect/vitest": "4.0.6",
|
|
59
|
+
"@shivaedev/access": "0.2.0",
|
|
59
60
|
"@shivaedev/jobs": "0.23.1",
|
|
60
61
|
"@shivaedev/quality": "0.47.0",
|
|
61
|
-
"@shivaedev/test
|
|
62
|
-
"@shivaedev/test-
|
|
62
|
+
"@shivaedev/test": "0.12.0",
|
|
63
|
+
"@shivaedev/test-sql": "0.14.0",
|
|
64
|
+
"@shivaedev/test-story": "0.26.1",
|
|
63
65
|
"@types/node": "24.19.2",
|
|
64
66
|
"@types/pg": "8.20.0",
|
|
65
67
|
"better-auth": "1.7.12",
|
package/src/hostChanges.ts
CHANGED
|
@@ -9,6 +9,7 @@ import type { SessionPolicy, SessionShape } from "@shivaedev/identity/server/ses
|
|
|
9
9
|
import { resolveChanges } from "@shivaedev/identity/server/sessionKeys.ts";
|
|
10
10
|
import { revalidateSession } from "@shivaedev/identity/server/socketSession.ts";
|
|
11
11
|
import type { AppChanges } from "#appHost.ts";
|
|
12
|
+
import { rerunQuery } from "#rerunQuery.ts";
|
|
12
13
|
|
|
13
14
|
export function hostChanges<R extends Rpc.Any, TSession extends SessionShape>(
|
|
14
15
|
group: RpcGroup.RpcGroup<R>,
|
|
@@ -20,14 +21,14 @@ export function hostChanges<R extends Rpc.Any, TSession extends SessionShape>(
|
|
|
20
21
|
const changes = yield* Effect.serviceOption(changesService);
|
|
21
22
|
const services = yield* Effect.context<never>();
|
|
22
23
|
const handlers = new Map<string, unknown>();
|
|
23
|
-
function subscribe(rpc: Rpc.Any, queries: readonly QueryReference[]) {
|
|
24
|
+
function subscribe(rpc: Rpc.Any, queries: readonly QueryReference[], options: Parameters<Rpc.Handler<string>["handler"]>[1]) {
|
|
24
25
|
return Stream.unwrap(
|
|
25
26
|
Effect.gen(function* () {
|
|
26
27
|
const { subscription, context } = yield* resolveChanges(rpc, queries);
|
|
27
28
|
const viewer = yield* CurrentViewer;
|
|
28
29
|
const authorized = authorizeSession(sessions, rpc._tag, viewer, subscription.authorized);
|
|
29
30
|
const stream = Option.isSome(changes)
|
|
30
|
-
? changes.value.subscribe({ ...subscription, authorized }, context)
|
|
31
|
+
? changes.value.subscribe({ ...subscription, authorized }, context, rerunQuery(group, options))
|
|
31
32
|
: Stream.concat(Stream.succeed({ _tag: "Resync" } as const), Stream.never);
|
|
32
33
|
if (sessions === undefined || Option.isNone(viewer)) {
|
|
33
34
|
return stream;
|
|
@@ -47,7 +48,8 @@ export function hostChanges<R extends Rpc.Any, TSession extends SessionShape>(
|
|
|
47
48
|
}
|
|
48
49
|
handlers.set(rpc.key, {
|
|
49
50
|
context: services,
|
|
50
|
-
handler: ({ queries }: { readonly queries: readonly QueryReference[] }) =>
|
|
51
|
+
handler: ({ queries }: { readonly queries: readonly QueryReference[] }, options: Parameters<Rpc.Handler<string>["handler"]>[1]) =>
|
|
52
|
+
subscribe(rpc, queries, options),
|
|
51
53
|
tag: rpc._tag,
|
|
52
54
|
});
|
|
53
55
|
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Context, Effect } from "effect";
|
|
2
|
+
import { Rpc, RpcGroup } from "effect/rpc";
|
|
3
|
+
import { authorizeReads, CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
+
import type { QueryRequest } from "@shivaedev/contract/serverMetadata.ts";
|
|
5
|
+
|
|
6
|
+
export function rerunQuery(group: { readonly requests: ReadonlyMap<string, Rpc.Any> }, options: Parameters<Rpc.Handler<string>["handler"]>[1]) {
|
|
7
|
+
const prefix = options.rpc._tag.slice(0, -"$changes".length);
|
|
8
|
+
return Effect.fnUntraced(function* ({ payload, query }: QueryRequest): Effect.fn.Return<unknown, unknown> {
|
|
9
|
+
const tag = `${prefix}${query.name}`;
|
|
10
|
+
const rpc = group.requests.get(tag);
|
|
11
|
+
if (!Rpc.isRpc(rpc)) {
|
|
12
|
+
return yield* Effect.die(new Error(`Unknown query: ${tag}`));
|
|
13
|
+
}
|
|
14
|
+
const services = Context.makeUnsafe<Rpc.Handler<string>>((yield* Effect.context<never>()).mapUnsafe);
|
|
15
|
+
const handler = yield* RpcGroup.make(rpc).accessHandler(tag).pipe(Effect.provideContext(services));
|
|
16
|
+
const viewer = yield* CurrentViewer;
|
|
17
|
+
const result = handler(payload, { ...options });
|
|
18
|
+
if (!Effect.isEffect(result)) {
|
|
19
|
+
return yield* Effect.die(new Error(`Query ${tag} must return an Effect`));
|
|
20
|
+
}
|
|
21
|
+
return yield* authorizeReads(result, { payload, rpc }, viewer).pipe(Effect.provideContext(Context.makeUnsafe<unknown>(services.mapUnsafe)));
|
|
22
|
+
});
|
|
23
|
+
}
|