@shivaedev/server 0.39.0 → 0.41.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.
@@ -1 +1 @@
1
- {"version":3,"file":"boundedRpcSocket.js","sourceRoot":"","sources":["../src/boundedRpcSocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAa;IACzE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CACzB,OAAO,CAAC,OAAO,EACf,CAAC,MAAM,EAAiB,EAAE,CAAC,CAAC;QAC3B,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,OAAO;gBACN,GAAG,MAAM;gBACT,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;oBAC5C,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;wBACjH,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAC/B,CAAC;oBACD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACzG,OAAO,MAAM;yBACX,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;yBAC7D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzE,CAAC,CAAC;aACF,CAAC;QACH,CAAC,CAAC;KACF,CAAC,CACF,CAAC;IACF,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACzB,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;KAClG,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"boundedRpcSocket.js","sourceRoot":"","sources":["../src/boundedRpcSocket.ts"],"names":[],"mappings":"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"}
package/dist/hostRpc.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  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
- import { CommandGuard } from "@shivaedev/contract/CommandGuard.ts";
5
4
  import { type RequestServices } from "#requestServices.ts";
6
5
  export declare const rpcCacheControl: HttpEffect.PreResponseHandler;
7
6
  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>, Effect.Error<(R extends {
@@ -24,11 +23,11 @@ export declare const hostRpc: <R extends Rpc.Any, TServices = never, TRequiremen
24
23
  readonly middlewares: ReadonlySet<infer TMiddleware>;
25
24
  } ? Extract<TMiddleware, {
26
25
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
27
- }> : never>>, RequestServices<TServices, TRequirements>> | Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<R, RpcMiddleware.ServiceClass<RequestServices<TServices, TRequirements>, "@shivaedev/server/RequestServices", TServices, import("effect/Schema").Never, never, TRequirements, false>>, typeof CommandGuard>>, never>, CommandGuard>, import("effect/Context").Service.Identifier<R extends {
26
+ }> : never>>, RequestServices<TServices, TRequirements>> | Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<R, RpcMiddleware.ServiceClass<RequestServices<TServices, TRequirements>, "@shivaedev/server/RequestServices", TServices, import("effect/Schema").Never, never, TRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<R extends {
28
27
  readonly middlewares: ReadonlySet<infer TMiddleware>;
29
28
  } ? Extract<TMiddleware, {
30
29
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
31
- }> : never>>, RequestServices<TServices, TRequirements>> | Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<R, RpcMiddleware.ServiceClass<RequestServices<TServices, TRequirements>, "@shivaedev/server/RequestServices", TServices, import("effect/Schema").Never, never, TRequirements, false>>, typeof CommandGuard>>, never>, CommandGuard>, import("effect/Context").Service.Identifier<R extends {
30
+ }> : never>>, RequestServices<TServices, TRequirements>> | Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<R, RpcMiddleware.ServiceClass<RequestServices<TServices, TRequirements>, "@shivaedev/server/RequestServices", TServices, import("effect/Schema").Never, never, TRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<R extends {
32
31
  readonly middlewares: ReadonlySet<infer TMiddleware>;
33
32
  } ? Extract<TMiddleware, {
34
33
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
@@ -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;AAOrG,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"}
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;AAG/E,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAIjF,eAAO,MAAM,eAAe,EAAE,UAAU,CAAC,kBACoD,CAAC;AAE9F,eAAO,MAAM,OAAO,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,UAAU,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAsBrG,CAAC"}
package/dist/hostRpc.js CHANGED
@@ -1,26 +1,19 @@
1
1
  import { Effect, Layer } from "effect";
2
2
  import { HttpServerResponse } from "effect/http";
3
3
  import { RpcMiddleware, RpcServer } from "effect/rpc";
4
- import { CommandGuard, commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
5
- import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
6
- import { LiveSync } from "@shivaedev/contract/LiveSync.ts";
7
4
  import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
8
- import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
9
5
  import { subjectLayers } from "@shivaedev/contract/subjectLayers.ts";
10
- import { publishCommand } from "#publishCommand.ts";
11
6
  import { RequestServicesLayer } from "#requestServices.ts";
7
+ import { servedGroup } from "#servedGroup.ts";
12
8
  import { tracedGroup } from "#tracedGroup.ts";
13
9
  export const rpcCacheControl = (_, response) => Effect.succeed(HttpServerResponse.setHeader(response, "cache-control", "private, no-store"));
14
10
  export const hostRpc = Effect.fnUntraced(function* (group, websocket = false, services) {
15
11
  const requestsMiddleware = RpcMiddleware.Service()("@shivaedev/server/RequestServices");
16
12
  const requestLayer = Layer.mergeAll(services ?? Layer.empty);
17
13
  const requested = yield* prependMiddleware(group.middleware(requestsMiddleware), requestsMiddleware.key);
18
- const requests = yield* prependMiddleware(requested, ReadPolicyGuard.key);
19
- const guarded = yield* guardCommands(requests.merge(HostVersion.application).merge(LiveSync.application));
20
- const traced = tracedGroup(guarded);
21
- const readPolicy = yield* ReadPolicyGuard.pipe(Effect.provide(readPolicyGuardLayer({ websocket })));
22
- const publication = yield* CommandGuard.pipe(Effect.provide(commandGuardLayer(publishCommand)));
14
+ const served = yield* servedGroup(requested, websocket);
15
+ const traced = tracedGroup(served.group);
23
16
  const handler = websocket ? RpcServer.toHttpEffectWebsocket(traced) : RpcServer.toHttpEffect(traced);
24
- 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)))));
17
+ return yield* handler.pipe(Effect.provide(served.guards), Effect.provide(subjectLayers(group)), Effect.provide(Layer.succeed(requestsMiddleware, (effect) => effect.pipe(Effect.provideService(RequestServicesLayer, { requestLayer }), Effect.provide(requestLayer)))));
25
18
  });
26
19
  //# sourceMappingURL=hostRpc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hostRpc.js","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"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"}
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,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAwB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,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,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,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,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAC7B,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EACpC,MAAM,CAAC,OAAO,CACb,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,CAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CACxG,CACD,CACD,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -24,52 +24,52 @@ declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequi
24
24
  readonly middlewares: ReadonlySet<infer TMiddleware>;
25
25
  } ? Extract<TMiddleware, {
26
26
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
27
- }> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, SessionPolicy | Exclude<Exclude<Exclude<TRequirements, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<HttpRouter.HttpRouter, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
27
+ }> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, SessionPolicy | Exclude<TRequirements, RpcSerialization.RpcSerialization> | Exclude<Exclude<HttpRouter.HttpRouter, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
28
28
  readonly _tag: `${string}.$changes`;
29
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<HttpRouter.Request<"Requires", SessionPolicy>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
29
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<HttpRouter.Request<"Requires", SessionPolicy>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
30
30
  readonly _tag: `${string}.$changes`;
31
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
31
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
32
32
  readonly _tag: `${string}.$changes`;
33
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<TRpcs extends {
33
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<TRpcs extends {
34
34
  readonly middlewares: ReadonlySet<infer TMiddleware>;
35
35
  } ? Extract<TMiddleware, {
36
36
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
37
- }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
37
+ }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
38
38
  readonly _tag: `${string}.$changes`;
39
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.liveSync.request">, import("effect/Context").Service.Identifier<TRpcs extends {
39
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.liveSync.request">, import("effect/Context").Service.Identifier<TRpcs extends {
40
40
  readonly middlewares: ReadonlySet<infer TMiddleware>;
41
41
  } ? Extract<TMiddleware, {
42
42
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
43
- }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
43
+ }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
44
44
  readonly _tag: `${string}.$changes`;
45
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<import("effect/Scope").Scope, import("effect/Context").Service.Identifier<TRpcs extends {
45
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<import("effect/Scope").Scope, import("effect/Context").Service.Identifier<TRpcs extends {
46
46
  readonly middlewares: ReadonlySet<infer TMiddleware>;
47
47
  } ? Extract<TMiddleware, {
48
48
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
49
- }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
49
+ }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
50
50
  readonly _tag: `${string}.$changes`;
51
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
51
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
52
52
  readonly middlewares: ReadonlySet<infer TMiddleware>;
53
53
  } ? Extract<TMiddleware, {
54
54
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
55
- }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
55
+ }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
56
56
  readonly _tag: `${string}.$changes`;
57
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
57
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
58
58
  readonly middlewares: ReadonlySet<infer TMiddleware>;
59
59
  } ? Extract<TMiddleware, {
60
60
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
61
- }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
61
+ }> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
62
62
  readonly _tag: `${string}.$changes`;
63
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Effect.Services<(TRpcs extends {
63
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Effect.Services<(TRpcs extends {
64
64
  readonly middlewares: ReadonlySet<infer TMiddleware>;
65
65
  } ? Extract<TMiddleware, {
66
66
  readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
67
- }> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
67
+ }> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
68
68
  readonly _tag: `${string}.$changes`;
69
- }>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
69
+ }>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
70
70
  readonly _tag: `${string}.$changes`;
71
- }>, `${string}.$changes`>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Exclude<TRpcs, {
71
+ }>, `${string}.$changes`>, THandlers>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Rpc.ToHandler<Exclude<TRpcs, {
72
72
  readonly _tag: `${string}.$changes`;
73
- }>>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization>>;
73
+ }>>, THandlers>, RpcSerialization.RpcSerialization>>;
74
74
  export {};
75
75
  //# sourceMappingURL=hostRpcRoutes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
@@ -8,12 +8,10 @@ import { authenticatedLayer, maybeAuthenticatedLayer } from "@shivaedev/identity
8
8
  import { subjectResolverLayer } from "@shivaedev/identity/server/subjectResolverLayer.ts";
9
9
  import { boundedRpcRequest } from "#boundedRpcRequest.ts";
10
10
  import { boundedRpcSocket } from "#boundedRpcSocket.ts";
11
- import { hostChanges } from "#hostChanges.ts";
12
11
  import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
13
- import { hostVersionLayer } from "#hostVersionLayer.ts";
14
- import { liveSyncLayer } from "#liveSyncLayer.ts";
15
12
  import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
16
13
  import { rpcRequestTracing } from "#rpcRequestTracing.ts";
14
+ import { servedHandlers } from "#servedHandlers.ts";
17
15
  import { servedModules } from "#servedModules.ts";
18
16
  import { socketRpc } from "#socketRpc.ts";
19
17
  import { UnixSocketRequest } from "#UnixSocketRequest.ts";
@@ -46,8 +44,8 @@ function buildRpcRoutes(options, { bodySize, trustedProxy, nativeOrigins }, sens
46
44
  yield* router.add("OPTIONS", options.rpcPath ?? "/rpc", HttpServerResponse.text("Local same-origin requests only", {
47
45
  status: HttpStatus.fromLiteral("Forbidden"),
48
46
  }));
49
- yield* router.add("GET", options.rpcPath ?? "/rpc", () => boundedRpcSocket(bodySize).pipe(Effect.flatMap((request) => socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.provideService(RpcSerialization.RpcSerialization, wire)))));
47
+ yield* router.add("GET", options.rpcPath ?? "/rpc", () => boundedRpcSocket(bodySize, options.rpcPath ?? "/rpc").pipe(Effect.flatMap((request) => socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.provideService(RpcSerialization.RpcSerialization, wire)))));
50
48
  yield* router.add("POST", options.rpcPath ?? "/rpc", () => boundedRpcRequest().pipe(Effect.flatMap((request) => guarded.pipe(Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(bodySize)), Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.provideService(RpcSerialization.RpcSerialization, wire), HttpEffect.withPreResponseHandler(rpcCacheControl)))));
51
- })).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(hostVersionLayer(options.config?.buildVersion)), Layer.provide(liveSyncLayer), Layer.provide(RpcSerialization.layerNdjson));
49
+ })).pipe(Layer.provide(Layer.merge(middleware, servedHandlers(options.group, options.handlers, options.config?.buildVersion))), Layer.provide(RpcSerialization.layerNdjson));
52
50
  }
53
51
  //# sourceMappingURL=hostRpcRoutes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { Effect, Layer } from "effect";
2
+ import type { Rpc, RpcGroup } from "effect/rpc";
3
+ export declare const servedGroup: <R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>, websocket: boolean) => Effect.Effect<{
4
+ group: RpcGroup.RpcGroup<Rpc.Rpc<"platform.hostVersion.watch", import("effect/Schema").Void, import("effect/rpc/RpcSchema").Stream<import("effect/Schema").String, import("effect/Schema").Never>, import("effect/Schema").Never, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard, never> | Rpc.Rpc<"platform.liveSync.request", import("effect/Schema").Void, import("effect/Schema").Void, import("effect/Schema").Never, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard, never> | Rpc.AddMiddleware<R, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>;
5
+ guards: Layer.Layer<import("@shivaedev/contract/CommandGuard.ts").CommandGuard, never, never>;
6
+ }, never, never>;
7
+ //# sourceMappingURL=servedGroup.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"servedGroup.d.ts","sourceRoot":"","sources":["../src/servedGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQhD,eAAO,MAAM,WAAW,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG;;;gBAMvE,CAAC"}
@@ -0,0 +1,15 @@
1
+ import { Effect, Layer } from "effect";
2
+ import { commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
3
+ import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
4
+ import { LiveSync } from "@shivaedev/contract/LiveSync.ts";
5
+ import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
6
+ import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
7
+ import { publishCommand } from "#publishCommand.ts";
8
+ export const servedGroup = Effect.fnUntraced(function* (group, websocket) {
9
+ const reads = yield* prependMiddleware(group, ReadPolicyGuard.key);
10
+ return {
11
+ group: yield* guardCommands(reads.merge(HostVersion.application).merge(LiveSync.application)),
12
+ guards: Layer.merge(readPolicyGuardLayer({ websocket }), commandGuardLayer(publishCommand)),
13
+ };
14
+ });
15
+ //# sourceMappingURL=servedGroup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"servedGroup.js","sourceRoot":"","sources":["../src/servedGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAqB,KAA2B,EAAE,SAAkB;IACzH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;IACnE,OAAO;QACN,KAAK,EAAE,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7F,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;KAC3F,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -0,0 +1,10 @@
1
+ import { Layer } from "effect";
2
+ import type { Rpc, RpcGroup } from "effect/rpc";
3
+ export declare function servedHandlers<R extends Rpc.Any, THandlers, E, TRequirements>(group: RpcGroup.RpcGroup<R>, handlers: Layer.Layer<THandlers, E, TRequirements>, buildVersion?: string): Layer.Layer<THandlers | Rpc.Handler<"platform.hostVersion.watch"> | Rpc.Handler<"platform.liveSync.request"> | Rpc.ToHandler<Extract<R, {
4
+ readonly _tag: `${string}.$changes`;
5
+ }>>, E, TRequirements | Exclude<Rpc.ExtractRequires<Extract<R, {
6
+ readonly _tag: `${string}.$changes`;
7
+ }>, `${string}.$changes`>, THandlers> | Exclude<Rpc.ToHandler<Exclude<R, {
8
+ readonly _tag: `${string}.$changes`;
9
+ }>>, THandlers>>;
10
+ //# sourceMappingURL=servedHandlers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"servedHandlers.d.ts","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAKhD,wBAAgB,cAAc,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,aAAa,EAC5E,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,aAAa,CAAC,EAClD,YAAY,CAAC,EAAE,MAAM;;;;;;iBAGrB"}
@@ -0,0 +1,8 @@
1
+ import { Layer } from "effect";
2
+ import { hostChanges } from "#hostChanges.ts";
3
+ import { hostVersionLayer } from "#hostVersionLayer.ts";
4
+ import { liveSyncLayer } from "#liveSyncLayer.ts";
5
+ export function servedHandlers(group, handlers, buildVersion) {
6
+ return Layer.mergeAll(hostChanges(group).pipe(Layer.provideMerge(handlers)), hostVersionLayer(buildVersion), liveSyncLayer);
7
+ }
8
+ //# sourceMappingURL=servedHandlers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"servedHandlers.js","sourceRoot":"","sources":["../src/servedHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,UAAU,cAAc,CAC7B,KAA2B,EAC3B,QAAkD,EAClD,YAAqB;IAErB,OAAO,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,CAAC;AAC7H,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/server",
3
- "version": "0.39.0",
3
+ "version": "0.41.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"
@@ -47,10 +47,10 @@
47
47
  ],
48
48
  "dependencies": {
49
49
  "@shivaedev/changes": "0.14.1",
50
- "@shivaedev/contract": "0.54.0",
50
+ "@shivaedev/contract": "0.55.0",
51
51
  "@shivaedev/errors": "0.14.1",
52
52
  "@shivaedev/http": "0.9.2",
53
- "@shivaedev/identity": "0.37.0",
53
+ "@shivaedev/identity": "0.38.1",
54
54
  "@shivaedev/local-postgres": "0.17.0",
55
55
  "@shivaedev/sql": "0.54.0"
56
56
  },
@@ -59,14 +59,14 @@
59
59
  "@effect/sql-pg": "4.1.4",
60
60
  "@effect/vitest": "4.1.4",
61
61
  "@shivaedev/access": "0.7.0",
62
- "@shivaedev/admin": "0.28.0",
62
+ "@shivaedev/admin": "0.28.2",
63
63
  "@shivaedev/jobs": "0.44.0",
64
- "@shivaedev/quality": "0.82.0",
64
+ "@shivaedev/quality": "0.83.0",
65
65
  "@shivaedev/rate-limit": "0.8.0",
66
66
  "@shivaedev/service": "0.9.2",
67
- "@shivaedev/test-kits": "0.15.0",
67
+ "@shivaedev/test-kits": "0.16.1",
68
68
  "@shivaedev/test-sql": "0.26.0",
69
- "@shivaedev/test-story": "0.51.0",
69
+ "@shivaedev/test-story": "0.52.1",
70
70
  "@types/node": "24.19.2",
71
71
  "better-auth": "1.7.22",
72
72
  "effect": "4.1.4",
@@ -78,7 +78,7 @@
78
78
  "@effect/platform-node": "4.1.4",
79
79
  "@effect/sql-pg": "4.1.4",
80
80
  "@effect/vitest": "4.1.4",
81
- "@shivaedev/admin": "0.28.0",
81
+ "@shivaedev/admin": "0.28.2",
82
82
  "better-auth": "1.7.22",
83
83
  "effect": "4.1.4"
84
84
  },
@@ -1,8 +1,8 @@
1
- import { Effect } from "effect";
1
+ import { Effect, Predicate } from "effect";
2
2
  import { HttpServerRequest } from "effect/http";
3
3
  import * as Socket from "effect/socket/Socket";
4
4
 
5
- export const boundedRpcSocket = Effect.fnUntraced(function* (limit: number) {
5
+ export const boundedRpcSocket = Effect.fnUntraced(function* (limit: number, route: string) {
6
6
  const request = yield* HttpServerRequest.HttpServerRequest;
7
7
  const upgrade = Effect.map(
8
8
  request.upgrade,
@@ -13,15 +13,7 @@ export const boundedRpcSocket = Effect.fnUntraced(function* (limit: number) {
13
13
  const writer = yield* socket.writer;
14
14
  return {
15
15
  ...reader,
16
- pull: Effect.flatMap(reader.pull, (frames) => {
17
- if (frames.every((frame) => (typeof frame === "string" ? Buffer.byteLength(frame) : frame.byteLength) <= limit)) {
18
- return Effect.succeed(frames);
19
- }
20
- const reason = new Socket.SocketCloseError({ closeReason: "RPC frame exceeds maxBodySize", code: 1009 });
21
- return writer
22
- .write(new Socket.CloseEvent(reason.code, reason.closeReason))
23
- .pipe(Effect.andThen(Effect.fail(new Socket.SocketError({ reason }))));
24
- }),
16
+ pull: boundedPull(reader.pull, writer, limit, route),
25
17
  };
26
18
  }),
27
19
  }),
@@ -30,3 +22,34 @@ export const boundedRpcSocket = Effect.fnUntraced(function* (limit: number) {
30
22
  get: (target, key, receiver) => (key === "upgrade" ? upgrade : Reflect.get(target, key, receiver)),
31
23
  });
32
24
  });
25
+
26
+ function boundedPull(pull: Socket.Reader["pull"], writer: Effect.Success<Socket.Socket["writer"]>, limit: number, route: string) {
27
+ return pull.pipe(
28
+ Effect.tapError((error) => (payloadRefused(error) ? refused(limit, route, undefined) : Effect.void)),
29
+ Effect.flatMap((frames) => {
30
+ const size = frames.map((frame) => (typeof frame === "string" ? Buffer.byteLength(frame) : frame.byteLength)).find((bytes) => bytes > limit);
31
+ if (size === undefined) {
32
+ return Effect.succeed(frames);
33
+ }
34
+ const reason = new Socket.SocketCloseError({ closeReason: "RPC frame exceeds maxBodySize", code: 1009 });
35
+ return refused(limit, route, size).pipe(
36
+ Effect.andThen(writer.write(new Socket.CloseEvent(reason.code, reason.closeReason))),
37
+ Effect.andThen(Effect.fail(new Socket.SocketError({ reason }))),
38
+ );
39
+ }),
40
+ );
41
+ }
42
+
43
+ function refused(limit: number, route: string, size: number | undefined) {
44
+ return Effect.logWarning(
45
+ `An RPC message of ${size === undefined ? "unknown size" : `${size} bytes`} exceeded the ${limit}-byte body limit at ${route}, so the host closed the socket with code 1009. Raise maxBodySize or MAX_BODY_SIZE if the application sends larger messages.`,
46
+ ).pipe(Effect.annotateLogs({ "rpc.maxBodySize": limit, "rpc.messageSize": size ?? "unknown", "url.path": route }));
47
+ }
48
+
49
+ // ws enforces the same limit as maxPayload and closes with 1009 before the frame reaches this reader; it reports no size.
50
+ function payloadRefused(error: Socket.SocketError) {
51
+ const cause = error.reason._tag === "SocketReadError" ? error.reason.cause : undefined;
52
+ return (
53
+ Predicate.hasProperty(cause, "error") && Predicate.hasProperty(cause.error, "code") && cause.error.code === "WS_ERR_UNSUPPORTED_MESSAGE_LENGTH"
54
+ );
55
+ }
package/src/hostRpc.ts CHANGED
@@ -1,14 +1,10 @@
1
1
  import { Effect, Layer } from "effect";
2
2
  import { type HttpEffect, HttpServerResponse } from "effect/http";
3
3
  import { type Rpc, type RpcGroup, RpcMiddleware, RpcServer } from "effect/rpc";
4
- import { CommandGuard, commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
5
- import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
6
- import { LiveSync } from "@shivaedev/contract/LiveSync.ts";
7
4
  import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
8
- import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
9
5
  import { subjectLayers } from "@shivaedev/contract/subjectLayers.ts";
10
- import { publishCommand } from "#publishCommand.ts";
11
6
  import { type RequestServices, RequestServicesLayer } from "#requestServices.ts";
7
+ import { servedGroup } from "#servedGroup.ts";
12
8
  import { tracedGroup } from "#tracedGroup.ts";
13
9
 
14
10
  export const rpcCacheControl: HttpEffect.PreResponseHandler = (_, response) =>
@@ -24,15 +20,11 @@ export const hostRpc = Effect.fnUntraced(function* <R extends Rpc.Any, TServices
24
20
  );
25
21
  const requestLayer = Layer.mergeAll(services ?? Layer.empty);
26
22
  const requested = yield* prependMiddleware(group.middleware(requestsMiddleware), requestsMiddleware.key);
27
- const requests = yield* prependMiddleware(requested, ReadPolicyGuard.key);
28
- const guarded = yield* guardCommands(requests.merge(HostVersion.application).merge(LiveSync.application));
29
- const traced = tracedGroup(guarded);
30
- const readPolicy = yield* ReadPolicyGuard.pipe(Effect.provide(readPolicyGuardLayer({ websocket })));
31
- const publication = yield* CommandGuard.pipe(Effect.provide(commandGuardLayer(publishCommand)));
23
+ const served = yield* servedGroup(requested, websocket);
24
+ const traced = tracedGroup(served.group);
32
25
  const handler = websocket ? RpcServer.toHttpEffectWebsocket(traced) : RpcServer.toHttpEffect(traced);
33
26
  return yield* handler.pipe(
34
- Effect.provideService(ReadPolicyGuard, readPolicy),
35
- Effect.provideService(CommandGuard, publication),
27
+ Effect.provide(served.guards),
36
28
  Effect.provide(subjectLayers(group)),
37
29
  Effect.provide(
38
30
  Layer.succeed(requestsMiddleware, (effect) =>
@@ -10,15 +10,13 @@ import { authenticatedLayer, maybeAuthenticatedLayer } from "@shivaedev/identity
10
10
  import { subjectResolverLayer } from "@shivaedev/identity/server/subjectResolverLayer.ts";
11
11
  import { boundedRpcRequest } from "#boundedRpcRequest.ts";
12
12
  import { boundedRpcSocket } from "#boundedRpcSocket.ts";
13
- import { hostChanges } from "#hostChanges.ts";
14
13
  import type { HostPolicy } from "#hostOptions.ts";
15
14
  import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
16
15
  import type { hostTransport } from "#hostTransport.ts";
17
- import { hostVersionLayer } from "#hostVersionLayer.ts";
18
- import { liveSyncLayer } from "#liveSyncLayer.ts";
19
16
  import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
20
17
  import type { RequestRequirements } from "#requestServices.ts";
21
18
  import { rpcRequestTracing } from "#rpcRequestTracing.ts";
19
+ import { servedHandlers } from "#servedHandlers.ts";
22
20
  import { servedModules } from "#servedModules.ts";
23
21
  import { socketRpc } from "#socketRpc.ts";
24
22
  import { UnixSocketRequest } from "#UnixSocketRequest.ts";
@@ -106,7 +104,7 @@ function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements,
106
104
  }),
107
105
  );
108
106
  yield* router.add("GET", options.rpcPath ?? "/rpc", () =>
109
- boundedRpcSocket(bodySize).pipe(
107
+ boundedRpcSocket(bodySize, options.rpcPath ?? "/rpc").pipe(
110
108
  Effect.flatMap((request) =>
111
109
  socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(
112
110
  Effect.provideService(HttpServerRequest.HttpServerRequest, request),
@@ -129,9 +127,7 @@ function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements,
129
127
  );
130
128
  }),
131
129
  ).pipe(
132
- Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))),
133
- Layer.provide(hostVersionLayer(options.config?.buildVersion)),
134
- Layer.provide(liveSyncLayer),
130
+ Layer.provide(Layer.merge(middleware, servedHandlers(options.group, options.handlers, options.config?.buildVersion))),
135
131
  Layer.provide(RpcSerialization.layerNdjson),
136
132
  );
137
133
  }
@@ -0,0 +1,16 @@
1
+ import { Effect, Layer } from "effect";
2
+ import type { Rpc, RpcGroup } from "effect/rpc";
3
+ import { commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
4
+ import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
5
+ import { LiveSync } from "@shivaedev/contract/LiveSync.ts";
6
+ import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
7
+ import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
8
+ import { publishCommand } from "#publishCommand.ts";
9
+
10
+ export const servedGroup = Effect.fnUntraced(function* <R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>, websocket: boolean) {
11
+ const reads = yield* prependMiddleware(group, ReadPolicyGuard.key);
12
+ return {
13
+ group: yield* guardCommands(reads.merge(HostVersion.application).merge(LiveSync.application)),
14
+ guards: Layer.merge(readPolicyGuardLayer({ websocket }), commandGuardLayer(publishCommand)),
15
+ };
16
+ });
@@ -0,0 +1,13 @@
1
+ import { Layer } from "effect";
2
+ import type { Rpc, RpcGroup } from "effect/rpc";
3
+ import { hostChanges } from "#hostChanges.ts";
4
+ import { hostVersionLayer } from "#hostVersionLayer.ts";
5
+ import { liveSyncLayer } from "#liveSyncLayer.ts";
6
+
7
+ export function servedHandlers<R extends Rpc.Any, THandlers, E, TRequirements>(
8
+ group: RpcGroup.RpcGroup<R>,
9
+ handlers: Layer.Layer<THandlers, E, TRequirements>,
10
+ buildVersion?: string,
11
+ ) {
12
+ return Layer.mergeAll(hostChanges(group).pipe(Layer.provideMerge(handlers)), hostVersionLayer(buildVersion), liveSyncLayer);
13
+ }