@shivaedev/server 0.31.0 → 0.31.1

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 CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.31.1 - 2026-11-07
4
+
5
+ ### Fixed
6
+
7
+ - Keep shared and separate LISTEN connections open past the database pool's TTL without resynchronizing live subscribers on a timer.
8
+
3
9
  ## 0.31.0 - 2026-11-06
4
10
 
5
11
  ### Added
@@ -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;AAchD,wBAAgB,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAC5C,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GACzB,KAAK,CAAC,KAAK,CACb,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,CAAC,EAClE,KAAK,EACH,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,EAAE,GAAG,MAAM,WAAW,CAAC,GAC9F,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,CAAC,CACpE,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;AAehD,wBAAgB,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAC5C,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GACzB,KAAK,CAAC,KAAK,CACb,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,CAAC,EAClE,KAAK,EACH,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,EAAE,GAAG,MAAM,WAAW,CAAC,GAC9F,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,CAAC,CACpE,CAAC"}
@@ -10,6 +10,7 @@ import { recheckSession } from "@shivaedev/identity/server/recheckSession.ts";
10
10
  import { resolveChanges } from "@shivaedev/identity/server/resolveChanges.ts";
11
11
  import { revalidateStream } from "@shivaedev/identity/server/revalidateStream.ts";
12
12
  import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
13
+ import { RequestServicesLayer } from "#requestServices.ts";
13
14
  import { rerunQuery } from "#rerunQuery.ts";
14
15
  export function hostChanges(group) {
15
16
  return Layer.unwrap(initializeHostChanges(group));
@@ -19,10 +20,19 @@ const initializeHostChanges = Effect.fnUntraced(function* (group) {
19
20
  const sessions = yield* Effect.serviceOption(SessionPolicy);
20
21
  function subscribe(rpc, queries, options) {
21
22
  return Stream.unwrap(Effect.gen(function* () {
22
- const subscription = yield* resolveChanges(rpc, queries);
23
+ const requestServices = Layer.fresh((yield* RequestServicesLayer).requestLayer);
24
+ const resolved = yield* resolveChanges(rpc, queries);
25
+ const subscription = {
26
+ ...resolved,
27
+ authorized: Effect.provide(resolved.authorized, requestServices),
28
+ ...(resolved.readScopes === undefined ? {} : { readScopes: Effect.provide(resolved.readScopes, requestServices) }),
29
+ };
23
30
  const viewer = yield* CurrentViewer;
24
31
  const refresh = refreshSession(viewer, rpc._tag);
25
- const read = rerunQuery(group, options);
32
+ const rerun = rerunQuery(group, options);
33
+ function read(query) {
34
+ return Effect.provide(rerun(query), requestServices);
35
+ }
26
36
  const pending = subscribeQueries({ ...subscription, refresh }, read);
27
37
  const stream = Option.isSome(changes)
28
38
  ? Stream.unwrap(pending.pipe(Effect.provideService(LiveServer, changes.value)))
@@ -1 +1 @@
1
- {"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"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"}
package/dist/hostRpc.d.ts CHANGED
@@ -2,7 +2,7 @@ import { Effect, Layer } from "effect";
2
2
  import { type HttpEffect, HttpServerResponse } from "effect/http";
3
3
  import { type Rpc, type RpcGroup, RpcMiddleware } from "effect/rpc";
4
4
  import { CommandGuard } from "@shivaedev/contract/CommandGuard.ts";
5
- import type { RequestServices } from "#requestServices.ts";
5
+ import { type RequestServices } from "#requestServices.ts";
6
6
  export declare const rpcCacheControl: HttpEffect.PreResponseHandler;
7
7
  export declare const hostRpc: <R extends Rpc.Any, TServices = never, TRequirements = never>(group: RpcGroup.RpcGroup<R>, websocket?: boolean | undefined, services?: Layer.Layer<TServices, never, TRequirements> | undefined) => Effect.Effect<Effect.Effect<HttpServerResponse.HttpServerResponse, never, import("effect/http/HttpServerRequest").HttpServerRequest | import("effect/Scope").Scope>, never, Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<R extends {
8
8
  readonly middlewares: ReadonlySet<infer TMiddleware>;
@@ -1 +1 @@
1
- {"version":3,"file":"hostRpc.d.ts","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,aAAa,EAAa,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAoC,MAAM,qCAAqC,CAAC;AAMrG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG3D,eAAO,MAAM,eAAe,EAAE,UAAU,CAAC,kBACoD,CAAC;AAE9F,eAAO,MAAM,OAAO,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,UAAU,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAsBrG,CAAC"}
1
+ {"version":3,"file":"hostRpc.d.ts","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,aAAa,EAAa,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAoC,MAAM,qCAAqC,CAAC;AAMrG,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAGjF,eAAO,MAAM,eAAe,EAAE,UAAU,CAAC,kBACoD,CAAC;AAE9F,eAAO,MAAM,OAAO,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,UAAU,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHA0BrG,CAAC"}
package/dist/hostRpc.js CHANGED
@@ -7,6 +7,7 @@ import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
7
7
  import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
8
8
  import { subjectLayers } from "@shivaedev/contract/subjectLayers.ts";
9
9
  import { publishCommand } from "#publishCommand.ts";
10
+ import { RequestServicesLayer } from "#requestServices.ts";
10
11
  import { tracedGroup } from "#tracedGroup.ts";
11
12
  export const rpcCacheControl = (_, response) => Effect.succeed(HttpServerResponse.setHeader(response, "cache-control", "private, no-store"));
12
13
  export const hostRpc = Effect.fnUntraced(function* (group, websocket = false, services) {
@@ -19,6 +20,6 @@ export const hostRpc = Effect.fnUntraced(function* (group, websocket = false, se
19
20
  const readPolicy = yield* ReadPolicyGuard.pipe(Effect.provide(readPolicyGuardLayer({ websocket })));
20
21
  const publication = yield* CommandGuard.pipe(Effect.provide(commandGuardLayer(publishCommand)));
21
22
  const handler = websocket ? RpcServer.toHttpEffectWebsocket(traced) : RpcServer.toHttpEffect(traced);
22
- return yield* handler.pipe(Effect.provideService(ReadPolicyGuard, readPolicy), Effect.provideService(CommandGuard, publication), Effect.provide(subjectLayers(group)), Effect.provide(Layer.succeed(requestsMiddleware, (effect) => Effect.provide(effect, requestLayer))));
23
+ return yield* handler.pipe(Effect.provideService(ReadPolicyGuard, readPolicy), Effect.provideService(CommandGuard, publication), Effect.provide(subjectLayers(group)), Effect.provide(Layer.succeed(requestsMiddleware, (effect) => effect.pipe(Effect.provideService(RequestServicesLayer, { requestLayer }), Effect.provide(requestLayer)))));
23
24
  });
24
25
  //# sourceMappingURL=hostRpc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hostRpc.js","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAmB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAA2B,aAAa,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,CAAC,MAAM,eAAe,GAAkC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAC7E,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACjD,KAA2B,EAC3B,SAAS,GAAG,KAAK,EACjB,QAAuD;IAEvD,MAAM,kBAAkB,GAAG,aAAa,CAAC,OAAO,EAA+F,CAC9I,mCAAmC,CACnC,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACzG,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9E,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACpG,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAChG,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACrG,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CACzB,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,UAAU,CAAC,EAClD,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,EAChD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CACnG,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"hostRpc.js","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,11 @@
1
- import type { Schema } from "effect";
1
+ import { Context, Layer, type Schema } from "effect";
2
2
  import type { Rpc, RpcMiddleware } from "effect/rpc";
3
3
  import type { Identity, OptionalIdentity, SessionUser, SessionUserWithProviderAccounts } from "@shivaedev/identity/identity.ts";
4
4
  import type { Subject } from "@shivaedev/identity/subject.ts";
5
5
  export type RequestContext = Identity | OptionalIdentity | SessionUser | SessionUserWithProviderAccounts | Subject;
6
+ export declare const RequestServicesLayer: Context.Reference<{
7
+ readonly requestLayer: Layer.Layer<never, never, unknown>;
8
+ }>;
6
9
  export type RequestRequirements<TRpcs extends Rpc.Any, TRequirements> = TRpcs extends unknown ? Exclude<TRequirements, Rpc.ExtractProvides<TRpcs, TRpcs["_tag"]>> : never;
7
10
  export type GlobalServices<TRequirements, TRequestServices = never> = [Extract<TRequirements, RequestContext | TRequestServices>] extends [never] ? unknown : {
8
11
  readonly "Register caller-dependent services in requestServices": never;
@@ -1 +1 @@
1
- {"version":3,"file":"requestServices.d.ts","sourceRoot":"","sources":["../src/requestServices.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAChI,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,gBAAgB,GAAG,WAAW,GAAG,+BAA+B,GAAG,OAAO,CAAC;AACnH,MAAM,MAAM,mBAAmB,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,aAAa,IAAI,KAAK,SAAS,OAAO,GAC1F,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GACjE,KAAK,CAAC;AACT,MAAM,MAAM,cAAc,CAAC,aAAa,EAAE,gBAAgB,GAAG,KAAK,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC9I,OAAO,GACP;IAAE,QAAQ,CAAC,uDAAuD,EAAE,KAAK,CAAA;CAAE,CAAC;AAE/E,MAAM,WAAW,eAAe,CAAC,SAAS,EAAE,aAAa,CAAE,SAAQ,aAAa,CAAC,KAAK;IACrF,QAAQ,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;QAC7B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;QACjC,QAAQ,CAAC,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QACpC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;KAC5B,CAAC;CACF"}
1
+ {"version":3,"file":"requestServices.d.ts","sourceRoot":"","sources":["../src/requestServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAChI,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,gBAAgB,GAAG,WAAW,GAAG,+BAA+B,GAAG,OAAO,CAAC;AACnH,eAAO,MAAM,oBAAoB;2BAA8C,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;EAKhH,CAAC;AACF,MAAM,MAAM,mBAAmB,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,aAAa,IAAI,KAAK,SAAS,OAAO,GAC1F,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GACjE,KAAK,CAAC;AACT,MAAM,MAAM,cAAc,CAAC,aAAa,EAAE,gBAAgB,GAAG,KAAK,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC9I,OAAO,GACP;IAAE,QAAQ,CAAC,uDAAuD,EAAE,KAAK,CAAA;CAAE,CAAC;AAE/E,MAAM,WAAW,eAAe,CAAC,SAAS,EAAE,aAAa,CAAE,SAAQ,aAAa,CAAC,KAAK;IACrF,QAAQ,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAChC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;QAC7B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;QACjC,QAAQ,CAAC,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QACpC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;KAC5B,CAAC;CACF"}
@@ -1,2 +1,5 @@
1
- export {};
1
+ import { Context, Layer } from "effect";
2
+ export const RequestServicesLayer = Context.Reference("@shivaedev/server/RequestServicesLayer", {
3
+ defaultValue: () => ({ requestLayer: Layer.empty }),
4
+ });
2
5
  //# sourceMappingURL=requestServices.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"requestServices.js","sourceRoot":"","sources":["../src/requestServices.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"requestServices.js","sourceRoot":"","sources":["../src/requestServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAe,MAAM,QAAQ,CAAC;AAMrD,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,SAAS,CACpD,wCAAwC,EACxC;IACC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;CACnD,CACD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/server",
3
- "version": "0.31.0",
3
+ "version": "0.31.1",
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"
@@ -49,37 +49,37 @@
49
49
  "@shivaedev/contract": "0.43.0",
50
50
  "@shivaedev/errors": "0.10.0",
51
51
  "@shivaedev/http": "0.8.0",
52
- "@shivaedev/identity": "0.30.0",
52
+ "@shivaedev/identity": "0.30.1",
53
53
  "@shivaedev/local-postgres": "0.15.0",
54
- "@shivaedev/sql": "0.45.0"
54
+ "@shivaedev/sql": "0.46.0"
55
55
  },
56
56
  "devDependencies": {
57
- "@effect/platform-node": "4.1.0",
58
- "@effect/sql-pg": "4.1.0",
59
- "@effect/vitest": "4.1.0",
57
+ "@effect/platform-node": "4.1.1",
58
+ "@effect/sql-pg": "4.1.1",
59
+ "@effect/vitest": "4.1.1",
60
60
  "@shivaedev/access": "0.6.0",
61
- "@shivaedev/admin": "0.23.1",
62
- "@shivaedev/jobs": "0.41.0",
63
- "@shivaedev/quality": "0.69.3",
64
- "@shivaedev/rate-limit": "0.6.3",
61
+ "@shivaedev/admin": "0.23.2",
62
+ "@shivaedev/jobs": "0.41.1",
63
+ "@shivaedev/quality": "0.69.4",
64
+ "@shivaedev/rate-limit": "0.6.4",
65
65
  "@shivaedev/service": "0.8.0",
66
- "@shivaedev/test-kits": "0.10.0",
67
- "@shivaedev/test-sql": "0.24.3",
68
- "@shivaedev/test-story": "0.45.0",
66
+ "@shivaedev/test-kits": "0.10.1",
67
+ "@shivaedev/test-sql": "0.24.4",
68
+ "@shivaedev/test-story": "0.45.1",
69
69
  "@types/node": "24.19.2",
70
70
  "better-auth": "1.7.14",
71
- "effect": "4.1.0",
71
+ "effect": "4.1.1",
72
72
  "pg-boss": "12.38.0",
73
73
  "typescript": "7.0.2",
74
74
  "vitest": "5.0.5"
75
75
  },
76
76
  "peerDependencies": {
77
- "@effect/platform-node": "4.1.0",
78
- "@effect/sql-pg": "4.1.0",
79
- "@effect/vitest": "4.1.0",
80
- "@shivaedev/admin": "0.23.1",
77
+ "@effect/platform-node": "4.1.1",
78
+ "@effect/sql-pg": "4.1.1",
79
+ "@effect/vitest": "4.1.1",
80
+ "@shivaedev/admin": "0.23.2",
81
81
  "better-auth": "1.7.14",
82
- "effect": "4.1.0"
82
+ "effect": "4.1.1"
83
83
  },
84
84
  "peerDependenciesMeta": {
85
85
  "@effect/platform-node": {
@@ -12,6 +12,7 @@ import { recheckSession } from "@shivaedev/identity/server/recheckSession.ts";
12
12
  import { resolveChanges } from "@shivaedev/identity/server/resolveChanges.ts";
13
13
  import { revalidateStream } from "@shivaedev/identity/server/revalidateStream.ts";
14
14
  import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
15
+ import { RequestServicesLayer } from "#requestServices.ts";
15
16
  import { rerunQuery } from "#rerunQuery.ts";
16
17
 
17
18
  export function hostChanges<R extends Rpc.Any>(
@@ -32,10 +33,19 @@ const initializeHostChanges = Effect.fnUntraced(function* (group: RpcGroup.RpcGr
32
33
  function subscribe(rpc: Rpc.AnyWithProps, queries: readonly QueryReference[], options: Parameters<Rpc.Handler<string>["handler"]>[1]) {
33
34
  return Stream.unwrap(
34
35
  Effect.gen(function* () {
35
- const subscription = yield* resolveChanges(rpc, queries);
36
+ const requestServices = Layer.fresh((yield* RequestServicesLayer).requestLayer);
37
+ const resolved = yield* resolveChanges(rpc, queries);
38
+ const subscription = {
39
+ ...resolved,
40
+ authorized: Effect.provide(resolved.authorized, requestServices),
41
+ ...(resolved.readScopes === undefined ? {} : { readScopes: Effect.provide(resolved.readScopes, requestServices) }),
42
+ };
36
43
  const viewer = yield* CurrentViewer;
37
44
  const refresh = refreshSession(viewer, rpc._tag);
38
- const read = rerunQuery(group, options);
45
+ const rerun = rerunQuery(group, options);
46
+ function read(query: Parameters<typeof rerun>[0]) {
47
+ return Effect.provide(rerun(query), requestServices);
48
+ }
39
49
  type Failure = Effect.Error<typeof subscription.authorized | typeof refresh | ReturnType<typeof read>>;
40
50
  const pending = subscribeQueries<Failure, Effect.Services<ReturnType<typeof read>>>({ ...subscription, refresh }, read);
41
51
  const stream = Option.isSome(changes)
package/src/hostRpc.ts CHANGED
@@ -7,7 +7,7 @@ import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
7
7
  import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
8
8
  import { subjectLayers } from "@shivaedev/contract/subjectLayers.ts";
9
9
  import { publishCommand } from "#publishCommand.ts";
10
- import type { RequestServices } from "#requestServices.ts";
10
+ import { type RequestServices, RequestServicesLayer } from "#requestServices.ts";
11
11
  import { tracedGroup } from "#tracedGroup.ts";
12
12
 
13
13
  export const rpcCacheControl: HttpEffect.PreResponseHandler = (_, response) =>
@@ -33,6 +33,10 @@ export const hostRpc = Effect.fnUntraced(function* <R extends Rpc.Any, TServices
33
33
  Effect.provideService(ReadPolicyGuard, readPolicy),
34
34
  Effect.provideService(CommandGuard, publication),
35
35
  Effect.provide(subjectLayers(group)),
36
- Effect.provide(Layer.succeed(requestsMiddleware, (effect) => Effect.provide(effect, requestLayer))),
36
+ Effect.provide(
37
+ Layer.succeed(requestsMiddleware, (effect) =>
38
+ effect.pipe(Effect.provideService(RequestServicesLayer, { requestLayer }), Effect.provide(requestLayer)),
39
+ ),
40
+ ),
37
41
  );
38
42
  });
@@ -1,9 +1,15 @@
1
- import type { Schema } from "effect";
1
+ import { Context, Layer, type Schema } from "effect";
2
2
  import type { Rpc, RpcMiddleware } from "effect/rpc";
3
3
  import type { Identity, OptionalIdentity, SessionUser, SessionUserWithProviderAccounts } from "@shivaedev/identity/identity.ts";
4
4
  import type { Subject } from "@shivaedev/identity/subject.ts";
5
5
 
6
6
  export type RequestContext = Identity | OptionalIdentity | SessionUser | SessionUserWithProviderAccounts | Subject;
7
+ export const RequestServicesLayer = Context.Reference<{ readonly requestLayer: Layer.Layer<never, never, unknown> }>(
8
+ "@shivaedev/server/RequestServicesLayer",
9
+ {
10
+ defaultValue: () => ({ requestLayer: Layer.empty }),
11
+ },
12
+ );
7
13
  export type RequestRequirements<TRpcs extends Rpc.Any, TRequirements> = TRpcs extends unknown
8
14
  ? Exclude<TRequirements, Rpc.ExtractProvides<TRpcs, TRpcs["_tag"]>>
9
15
  : never;