@shivaedev/server 0.29.0 → 0.29.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,13 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.29.1 - 2026-11-06
4
+
5
+ ### Changed
6
+
7
+ - Update `@shivaedev/admin` from 0.22.0 to 0.22.1.
8
+ - Update `@shivaedev/contract` from 0.41.0 to 0.42.0.
9
+ - Update `@shivaedev/identity` from 0.29.0 to 0.29.1.
10
+
3
11
  ## 0.29.0 - 2026-11-06
4
12
 
5
13
  ### Changed
@@ -1 +1 @@
1
- {"version":3,"file":"unixHttpServer.d.ts","sourceRoot":"","sources":["../../src/adapters/unixHttpServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAY,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAIpD,eAAO,MAAM,cAAc;;;;;;yGA6CzB,CAAC"}
1
+ {"version":3,"file":"unixHttpServer.d.ts","sourceRoot":"","sources":["../../src/adapters/unixHttpServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAY,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAIpD,eAAO,MAAM,cAAc;;;;;;yGA6DzB,CAAC"}
@@ -37,20 +37,19 @@ export const unixHttpServer = Effect.fn("Server.unixHttpServer")(function* (path
37
37
  yield* fs.chmod(pending, 0o600);
38
38
  // Unpublish before Node closes its private bind path.
39
39
  yield* Effect.acquireRelease(fs.rename(pending, path), () => fs.remove(path, { force: true }).pipe(Effect.orDie)).pipe(Scope.provide(scope));
40
- return withUnixRequests({ ...server, address: NetAddress.unixPathAddress(path) }, node, options);
40
+ const published = { ...server, address: NetAddress.unixPathAddress(path) };
41
+ function beginCloseTimeout() {
42
+ const deadline = setTimeout(() => node.closeAllConnections(), Duration.toMillis(Duration.fromInputUnsafe(options.gracefulShutdownTimeout ?? "20 seconds")));
43
+ node.once("close", () => clearTimeout(deadline));
44
+ }
45
+ return HttpServer.make({
46
+ address: published.address,
47
+ serve: (handler, middleware) => Effect.gen(function* () {
48
+ const unix = handler.pipe(Effect.provideService(UnixSocketRequest, true));
49
+ yield* middleware === undefined ? published.serve(unix) : published.serve(unix, middleware);
50
+ yield* Effect.addFinalizer(() => Effect.sync(beginCloseTimeout));
51
+ }),
52
+ });
41
53
  }));
42
54
  });
43
- function withUnixRequests(server, node, options) {
44
- return HttpServer.make({
45
- address: server.address,
46
- serve: (handler, middleware) => Effect.gen(function* () {
47
- const unix = handler.pipe(Effect.provideService(UnixSocketRequest, true));
48
- yield* middleware === undefined ? server.serve(unix) : server.serve(unix, middleware);
49
- yield* Effect.addFinalizer(() => Effect.sync(() => {
50
- const deadline = setTimeout(() => node.closeAllConnections(), Duration.toMillis(Duration.fromInputUnsafe(options.gracefulShutdownTimeout ?? "20 seconds")));
51
- node.once("close", () => clearTimeout(deadline));
52
- }));
53
- }),
54
- });
55
- }
56
55
  //# sourceMappingURL=unixHttpServer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"unixHttpServer.js","sourceRoot":"","sources":["../../src/adapters/unixHttpServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unixHttpServer.js","sourceRoot":"","sources":["../../src/adapters/unixHttpServer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"browserErrorRoute.d.ts","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,EAAkB,MAAM,QAAQ,CAAC;AACvF,OAAO,EAAuB,UAAU,EAAyC,MAAM,aAAa,CAAC;AAgBrG,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CAClC;AAgDD,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,oDA6BzF"}
1
+ {"version":3,"file":"browserErrorRoute.d.ts","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,EAAkB,MAAM,QAAQ,CAAC;AACvF,OAAO,EAAuB,UAAU,EAAyC,MAAM,aAAa,CAAC;AAgBrG,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CAClC;AAkCD,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,oDA+CzF"}
@@ -38,23 +38,24 @@ const receiveReport = Effect.fnUntraced(function* (options, userId) {
38
38
  }).pipe(Effect.annotateLogs({ "browser.kind": parsed.value.kind, "url.full": parsed.value.url, ...(userId === undefined ? {} : { "user.id": userId }) }));
39
39
  return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Accepted") });
40
40
  });
41
- const receiveForSession = Effect.fnUntraced(function* (options, policy) {
42
- if (!(options.requireSession || options.includeUserId)) {
43
- return yield* receiveReport(options);
44
- }
45
- const request = yield* HttpServerRequest.HttpServerRequest;
46
- const session = Option.isSome(policy)
47
- ? yield* resolveSession(request.headers, "$browserError").pipe(Effect.provideService(SessionPolicy, policy.value))
48
- : Option.none();
49
- if (options.requireSession && Option.isNone(session)) {
50
- return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Unauthorized") });
51
- }
52
- return yield* receiveReport(options, options.includeUserId && Option.isSome(session) ? session.value.user.id : undefined);
53
- });
54
41
  export function browserErrorRoute(trustedProxy, options = {}) {
55
42
  return HttpRouter.use((router) => Effect.gen(function* () {
56
43
  const limiter = yield* RateLimiter.RateLimiter;
57
44
  const policy = yield* Effect.serviceOption(SessionPolicy);
45
+ const receiveForSession = Effect.fnUntraced(function* () {
46
+ if (!(options.requireSession || options.includeUserId)) {
47
+ return yield* receiveReport(options);
48
+ }
49
+ const request = yield* HttpServerRequest.HttpServerRequest;
50
+ const session = yield* Option.match(policy, {
51
+ onNone: () => Effect.succeed(Option.none()),
52
+ onSome: (configured) => resolveSession(request.headers, "$browserError").pipe(Effect.provideService(SessionPolicy, configured)),
53
+ });
54
+ if (options.requireSession && Option.isNone(session)) {
55
+ return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Unauthorized") });
56
+ }
57
+ return yield* receiveReport(options, options.includeUserId ? Option.getOrUndefined(Option.map(session, (current) => current.user.id)) : undefined);
58
+ });
58
59
  const allowed = localTransport(trustedProxy);
59
60
  const trusted = trustedProxyPeer(trustedProxy);
60
61
  yield* router.add("POST", "/_platform/errors", Effect.gen(function* () {
@@ -68,7 +69,7 @@ export function browserErrorRoute(trustedProxy, options = {}) {
68
69
  if (!accepted) {
69
70
  return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("TooManyRequests") });
70
71
  }
71
- return yield* receiveForSession(options, policy);
72
+ return yield* receiveForSession();
72
73
  }).pipe(Effect.catchIf(isAuthUnavailable, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("ServiceUnavailable") }))), Effect.catchIf(isForbidden, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Forbidden") })))));
73
74
  })).pipe(Layer.provide(RateLimiter.layer.pipe(Layer.provide(RateLimiter.layerStoreMemory))));
74
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"browserErrorRoute.js","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browserErrorRoute.js","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"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"}
@@ -12,46 +12,48 @@ import { revalidateStream } from "@shivaedev/identity/server/revalidateStream.ts
12
12
  import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
13
13
  import { rerunQuery } from "#rerunQuery.ts";
14
14
  export function hostChanges(group) {
15
- return Layer.unwrap(Effect.gen(function* () {
16
- const changes = yield* Effect.serviceOption(LiveServer);
17
- const sessions = yield* Effect.serviceOption(SessionPolicy);
18
- const retained = [];
19
- if (Option.isNone(changes)) {
20
- for (const rpc of group.requests.values()) {
21
- if (!rpc._tag.endsWith(".$changes")) {
22
- continue;
23
- }
24
- const key = Context.Service(rpc.key);
25
- const provided = yield* Effect.serviceOption(key);
26
- if (Option.isSome(provided)) {
27
- retained.push(Layer.succeed(key, provided.value));
28
- }
29
- }
30
- }
31
- const hosted = changesHandlerLayer(group, (rpc) => ({ queries }, options) => subscribe(group, changes, sessions, rpc, queries, options));
32
- return Layer.mergeAll(hosted, ...retained);
33
- }));
15
+ return Layer.unwrap(initializeHostChanges(group));
34
16
  }
35
- function subscribe(group, changes, sessions, rpc, queries, options) {
36
- return Stream.unwrap(Effect.gen(function* () {
37
- const subscription = yield* resolveChanges(rpc, queries);
38
- const viewer = yield* CurrentViewer;
39
- const refresh = refreshSession(sessions, viewer, rpc._tag);
40
- const read = rerunQuery(group, options);
41
- const stream = Option.isSome(changes)
42
- ? Stream.unwrap(subscribeQueries({ ...subscription, refresh }, read).pipe(Effect.provideService(LiveServer, changes.value)))
43
- : Stream.concat(Stream.fromEffect(compareQueries(subscription, read)({ _tag: "Resync" })).pipe(Stream.flatMap(Stream.fromIterable)), Stream.never);
17
+ const initializeHostChanges = Effect.fnUntraced(function* (group) {
18
+ const changes = yield* Effect.serviceOption(LiveServer);
19
+ const sessions = yield* Effect.serviceOption(SessionPolicy);
20
+ function subscribe(rpc, queries, options) {
21
+ return Stream.unwrap(Effect.gen(function* () {
22
+ const subscription = yield* resolveChanges(rpc, queries);
23
+ const viewer = yield* CurrentViewer;
24
+ const refresh = refreshSession(viewer, rpc._tag);
25
+ const read = rerunQuery(group, options);
26
+ const pending = subscribeQueries({ ...subscription, refresh }, read);
27
+ const stream = Option.isSome(changes)
28
+ ? Stream.unwrap(pending.pipe(Effect.provideService(LiveServer, changes.value)))
29
+ : Stream.concat(Stream.fromEffect(compareQueries(subscription, read)({ _tag: "Resync" })).pipe(Stream.flatMap(Stream.fromIterable)), Stream.never);
30
+ if (Option.isNone(sessions) || Option.isNone(viewer)) {
31
+ return stream;
32
+ }
33
+ const revalidation = Effect.never.pipe(revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)), Effect.provideService(SessionPolicy, sessions.value));
34
+ return Stream.interruptWhen(stream, revalidation);
35
+ }));
36
+ }
37
+ function refreshSession(viewer, tag) {
44
38
  if (Option.isNone(sessions) || Option.isNone(viewer)) {
45
- return stream;
39
+ return Effect.context();
46
40
  }
47
- const revalidation = Effect.never.pipe(revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)), Effect.provideService(SessionPolicy, sessions.value));
48
- return Stream.interruptWhen(stream, revalidation);
49
- }));
50
- }
51
- function refreshSession(sessions, viewer, tag) {
52
- if (Option.isNone(sessions) || Option.isNone(viewer)) {
53
- return Effect.context();
41
+ return currentSessionContext(viewer.value.id, recheckSession(Headers.empty, tag)).pipe(Effect.provideService(SessionPolicy, sessions.value));
54
42
  }
55
- return currentSessionContext(viewer.value.id, recheckSession(Headers.empty, tag)).pipe(Effect.provideService(SessionPolicy, sessions.value));
56
- }
43
+ const retained = [];
44
+ if (Option.isNone(changes)) {
45
+ for (const rpc of group.requests.values()) {
46
+ if (!rpc._tag.endsWith(".$changes")) {
47
+ continue;
48
+ }
49
+ const key = Context.Service(rpc.key);
50
+ const provided = yield* Effect.serviceOption(key);
51
+ if (Option.isSome(provided)) {
52
+ retained.push(Layer.succeed(key, provided.value));
53
+ }
54
+ }
55
+ }
56
+ const hosted = changesHandlerLayer(group, (rpc) => ({ queries }, options) => subscribe(rpc, queries, options));
57
+ return Layer.mergeAll(hosted, ...retained);
58
+ });
57
59
  //# sourceMappingURL=hostChanges.js.map
@@ -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,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAe,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAU5C,MAAM,UAAU,WAAW,CAAC,KAAiC;IAC5D,OAAO,KAAK,CAAC,MAAM,CAClB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAuC,EAAE,CAAC;QACxD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACrC,SAAS;gBACV,CAAC;gBACD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAsB,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAClD,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBACnD,CAAC;YACF,CAAC;QACF,CAAC;QACD,MAAM,MAAM,GAAG,mBAAmB,CACjC,KAAK,EACL,CAAC,GAAG,EAAE,EAAE,CACP,CAAC,EAAE,OAAO,EAAmD,EAAE,OAAsD,EAAE,EAAE,CACxH,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAC5D,CAAC;QACF,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC5C,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CACjB,KAAiC,EACjC,OAAgE,EAChE,QAAqD,EACrD,GAAqB,EACrB,OAAkC,EAClC,OAAsD;IAEtD,OAAO,MAAM,CAAC,MAAM,CACnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;QACpC,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,MAAM,CAAC,MAAM,CACb,gBAAgB,CAAiE,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC,IAAI,CACxH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAChD,CACD;YACF,CAAC,CAAC,MAAM,CAAC,MAAM,CACb,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EACnH,MAAM,CAAC,KAAK,CACZ,CAAC;QACJ,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CACrC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC/E,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,CACpD,CAAC;QACF,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACnD,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,QAAqD,EAAE,MAA6B,EAAE,GAAW;IACxH,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,OAAO,MAAM,CAAC,OAAO,EAAS,CAAC;IAChC,CAAC;IACD,OAAO,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9I,CAAC"}
1
+ {"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/server",
3
- "version": "0.29.0",
3
+ "version": "0.29.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"
@@ -46,10 +46,10 @@
46
46
  ],
47
47
  "dependencies": {
48
48
  "@shivaedev/changes": "0.11.0",
49
- "@shivaedev/contract": "0.41.0",
49
+ "@shivaedev/contract": "0.42.0",
50
50
  "@shivaedev/errors": "0.10.0",
51
51
  "@shivaedev/http": "0.8.0",
52
- "@shivaedev/identity": "0.29.0",
52
+ "@shivaedev/identity": "0.29.1",
53
53
  "@shivaedev/local-postgres": "0.15.0",
54
54
  "@shivaedev/sql": "0.44.0"
55
55
  },
@@ -58,14 +58,14 @@
58
58
  "@effect/sql-pg": "4.1.0",
59
59
  "@effect/vitest": "4.1.0",
60
60
  "@shivaedev/access": "0.6.0",
61
- "@shivaedev/admin": "0.22.0",
61
+ "@shivaedev/admin": "0.22.1",
62
62
  "@shivaedev/jobs": "0.40.1",
63
- "@shivaedev/quality": "0.67.0",
63
+ "@shivaedev/quality": "0.67.3",
64
64
  "@shivaedev/rate-limit": "0.6.2",
65
65
  "@shivaedev/service": "0.8.0",
66
- "@shivaedev/test-kits": "0.9.0",
66
+ "@shivaedev/test-kits": "0.9.2",
67
67
  "@shivaedev/test-sql": "0.24.2",
68
- "@shivaedev/test-story": "0.43.0",
68
+ "@shivaedev/test-story": "0.44.1",
69
69
  "@types/node": "24.19.2",
70
70
  "better-auth": "1.7.14",
71
71
  "effect": "4.1.0",
@@ -77,7 +77,7 @@
77
77
  "@effect/platform-node": "4.1.0",
78
78
  "@effect/sql-pg": "4.1.0",
79
79
  "@effect/vitest": "4.1.0",
80
- "@shivaedev/admin": "0.22.0",
80
+ "@shivaedev/admin": "0.22.1",
81
81
  "better-auth": "1.7.14",
82
82
  "effect": "4.1.0"
83
83
  },
@@ -48,27 +48,23 @@ export const unixHttpServer = Effect.fn("Server.unixHttpServer")(function* (path
48
48
  yield* fs.chmod(pending, 0o600);
49
49
  // Unpublish before Node closes its private bind path.
50
50
  yield* Effect.acquireRelease(fs.rename(pending, path), () => fs.remove(path, { force: true }).pipe(Effect.orDie)).pipe(Scope.provide(scope));
51
- return withUnixRequests({ ...server, address: NetAddress.unixPathAddress(path) }, node, options);
51
+ const published = { ...server, address: NetAddress.unixPathAddress(path) };
52
+ function beginCloseTimeout() {
53
+ const deadline = setTimeout(
54
+ () => node.closeAllConnections(),
55
+ Duration.toMillis(Duration.fromInputUnsafe(options.gracefulShutdownTimeout ?? "20 seconds")),
56
+ );
57
+ node.once("close", () => clearTimeout(deadline));
58
+ }
59
+ return HttpServer.make({
60
+ address: published.address,
61
+ serve: (handler, middleware) =>
62
+ Effect.gen(function* () {
63
+ const unix = handler.pipe(Effect.provideService(UnixSocketRequest, true));
64
+ yield* middleware === undefined ? published.serve(unix) : published.serve(unix, middleware);
65
+ yield* Effect.addFinalizer(() => Effect.sync(beginCloseTimeout));
66
+ }),
67
+ });
52
68
  }),
53
69
  );
54
70
  });
55
-
56
- function withUnixRequests(server: HttpServer.HttpServer["Service"], node: ReturnType<typeof createServer>, options: NodeHttpServer.Options) {
57
- return HttpServer.make({
58
- address: server.address,
59
- serve: (handler, middleware) =>
60
- Effect.gen(function* () {
61
- const unix = handler.pipe(Effect.provideService(UnixSocketRequest, true));
62
- yield* middleware === undefined ? server.serve(unix) : server.serve(unix, middleware);
63
- yield* Effect.addFinalizer(() =>
64
- Effect.sync(() => {
65
- const deadline = setTimeout(
66
- () => node.closeAllConnections(),
67
- Duration.toMillis(Duration.fromInputUnsafe(options.gracefulShutdownTimeout ?? "20 seconds")),
68
- );
69
- node.once("close", () => clearTimeout(deadline));
70
- }),
71
- );
72
- }),
73
- });
74
- }
@@ -53,25 +53,29 @@ const receiveReport = Effect.fnUntraced(function* (options: BrowserErrorOptions,
53
53
  return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Accepted") });
54
54
  });
55
55
 
56
- const receiveForSession = Effect.fnUntraced(function* (options: BrowserErrorOptions, policy: Option.Option<SessionPolicy["Service"]>) {
57
- if (!(options.requireSession || options.includeUserId)) {
58
- return yield* receiveReport(options);
59
- }
60
- const request = yield* HttpServerRequest.HttpServerRequest;
61
- const session = Option.isSome(policy)
62
- ? yield* resolveSession(request.headers, "$browserError").pipe(Effect.provideService(SessionPolicy, policy.value))
63
- : Option.none();
64
- if (options.requireSession && Option.isNone(session)) {
65
- return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Unauthorized") });
66
- }
67
- return yield* receiveReport(options, options.includeUserId && Option.isSome(session) ? session.value.user.id : undefined);
68
- });
69
-
70
56
  export function browserErrorRoute(trustedProxy?: string, options: BrowserErrorOptions = {}) {
71
57
  return HttpRouter.use((router) =>
72
58
  Effect.gen(function* () {
73
59
  const limiter = yield* RateLimiter.RateLimiter;
74
60
  const policy = yield* Effect.serviceOption(SessionPolicy);
61
+ const receiveForSession = Effect.fnUntraced(function* () {
62
+ if (!(options.requireSession || options.includeUserId)) {
63
+ return yield* receiveReport(options);
64
+ }
65
+ const request = yield* HttpServerRequest.HttpServerRequest;
66
+ const session = yield* Option.match(policy, {
67
+ onNone: () => Effect.succeed(Option.none()),
68
+ onSome: (configured) => resolveSession(request.headers, "$browserError").pipe(Effect.provideService(SessionPolicy, configured)),
69
+ });
70
+ if (options.requireSession && Option.isNone(session)) {
71
+ return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Unauthorized") });
72
+ }
73
+ return yield* receiveReport(
74
+ options,
75
+ options.includeUserId ? Option.getOrUndefined(Option.map(session, (current) => current.user.id)) : undefined,
76
+ );
77
+ });
78
+
75
79
  const allowed = localTransport(trustedProxy);
76
80
  const trusted = trustedProxyPeer(trustedProxy);
77
81
  yield* router.add(
@@ -88,7 +92,7 @@ export function browserErrorRoute(trustedProxy?: string, options: BrowserErrorOp
88
92
  if (!accepted) {
89
93
  return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("TooManyRequests") });
90
94
  }
91
- return yield* receiveForSession(options, policy);
95
+ return yield* receiveForSession();
92
96
  }).pipe(
93
97
  Effect.catchIf(isAuthUnavailable, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("ServiceUnavailable") }))),
94
98
  Effect.catchIf(isForbidden, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Forbidden") }))),
@@ -23,74 +23,64 @@ export function hostChanges<R extends Rpc.Any>(
23
23
  | Rpc.ToHandler<Exclude<R, { readonly _tag: `${string}.$changes` }>>
24
24
  >;
25
25
  export function hostChanges(group: RpcGroup.RpcGroup<Rpc.Any>) {
26
- return Layer.unwrap(
27
- Effect.gen(function* () {
28
- const changes = yield* Effect.serviceOption(LiveServer);
29
- const sessions = yield* Effect.serviceOption(SessionPolicy);
30
- const retained: Layer.Layer<Rpc.Handler<string>>[] = [];
31
- if (Option.isNone(changes)) {
32
- for (const rpc of group.requests.values()) {
33
- if (!rpc._tag.endsWith(".$changes")) {
34
- continue;
35
- }
36
- const key = Context.Service<Rpc.Handler<string>>(rpc.key);
37
- const provided = yield* Effect.serviceOption(key);
38
- if (Option.isSome(provided)) {
39
- retained.push(Layer.succeed(key, provided.value));
40
- }
41
- }
42
- }
43
- const hosted = changesHandlerLayer(
44
- group,
45
- (rpc) =>
46
- ({ queries }: { readonly queries: readonly QueryReference[] }, options: Parameters<Rpc.Handler<string>["handler"]>[1]) =>
47
- subscribe(group, changes, sessions, rpc, queries, options),
48
- );
49
- return Layer.mergeAll(hosted, ...retained);
50
- }),
51
- );
26
+ return Layer.unwrap(initializeHostChanges(group));
52
27
  }
53
28
 
54
- function subscribe(
55
- group: RpcGroup.RpcGroup<Rpc.Any>,
56
- changes: Option.Option<Context.Service.Shape<typeof LiveServer>>,
57
- sessions: Option.Option<typeof SessionPolicy.Service>,
58
- rpc: Rpc.AnyWithProps,
59
- queries: readonly QueryReference[],
60
- options: Parameters<Rpc.Handler<string>["handler"]>[1],
61
- ) {
62
- return Stream.unwrap(
63
- Effect.gen(function* () {
64
- const subscription = yield* resolveChanges(rpc, queries);
65
- const viewer = yield* CurrentViewer;
66
- const refresh = refreshSession(sessions, viewer, rpc._tag);
67
- const read = rerunQuery(group, options);
68
- type Failure = Effect.Error<typeof subscription.authorized | typeof refresh | ReturnType<typeof read>>;
69
- const stream = Option.isSome(changes)
70
- ? Stream.unwrap(
71
- subscribeQueries<Failure, Effect.Services<ReturnType<typeof read>>, typeof read>({ ...subscription, refresh }, read).pipe(
72
- Effect.provideService(LiveServer, changes.value),
73
- ),
74
- )
75
- : Stream.concat(
76
- Stream.fromEffect(compareQueries(subscription, read)({ _tag: "Resync" })).pipe(Stream.flatMap(Stream.fromIterable)),
77
- Stream.never,
78
- );
79
- if (Option.isNone(sessions) || Option.isNone(viewer)) {
80
- return stream;
81
- }
82
- const revalidation = Effect.never.pipe(
83
- revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)),
84
- Effect.provideService(SessionPolicy, sessions.value),
85
- );
86
- return Stream.interruptWhen(stream, revalidation);
87
- }),
88
- );
89
- }
29
+ const initializeHostChanges = Effect.fnUntraced(function* (group: RpcGroup.RpcGroup<Rpc.Any>) {
30
+ const changes = yield* Effect.serviceOption(LiveServer);
31
+ const sessions = yield* Effect.serviceOption(SessionPolicy);
32
+ function subscribe(rpc: Rpc.AnyWithProps, queries: readonly QueryReference[], options: Parameters<Rpc.Handler<string>["handler"]>[1]) {
33
+ return Stream.unwrap(
34
+ Effect.gen(function* () {
35
+ const subscription = yield* resolveChanges(rpc, queries);
36
+ const viewer = yield* CurrentViewer;
37
+ const refresh = refreshSession(viewer, rpc._tag);
38
+ const read = rerunQuery(group, options);
39
+ type Failure = Effect.Error<typeof subscription.authorized | typeof refresh | ReturnType<typeof read>>;
40
+ const pending = subscribeQueries<Failure, Effect.Services<ReturnType<typeof read>>, typeof read>({ ...subscription, refresh }, read);
41
+ const stream = Option.isSome(changes)
42
+ ? Stream.unwrap(pending.pipe(Effect.provideService(LiveServer, changes.value)))
43
+ : Stream.concat(
44
+ Stream.fromEffect(compareQueries(subscription, read)({ _tag: "Resync" })).pipe(Stream.flatMap(Stream.fromIterable)),
45
+ Stream.never,
46
+ );
47
+ if (Option.isNone(sessions) || Option.isNone(viewer)) {
48
+ return stream;
49
+ }
50
+ const revalidation = Effect.never.pipe(
51
+ revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)),
52
+ Effect.provideService(SessionPolicy, sessions.value),
53
+ );
54
+ return Stream.interruptWhen(stream, revalidation);
55
+ }),
56
+ );
57
+ }
90
58
 
91
- function refreshSession(sessions: Option.Option<typeof SessionPolicy.Service>, viewer: Option.Option<Viewer>, tag: string) {
92
- if (Option.isNone(sessions) || Option.isNone(viewer)) {
93
- return Effect.context<never>();
59
+ function refreshSession(viewer: Option.Option<Viewer>, tag: string) {
60
+ if (Option.isNone(sessions) || Option.isNone(viewer)) {
61
+ return Effect.context<never>();
62
+ }
63
+ return currentSessionContext(viewer.value.id, recheckSession(Headers.empty, tag)).pipe(Effect.provideService(SessionPolicy, sessions.value));
94
64
  }
95
- return currentSessionContext(viewer.value.id, recheckSession(Headers.empty, tag)).pipe(Effect.provideService(SessionPolicy, sessions.value));
96
- }
65
+
66
+ const retained: Layer.Layer<Rpc.Handler<string>>[] = [];
67
+ if (Option.isNone(changes)) {
68
+ for (const rpc of group.requests.values()) {
69
+ if (!rpc._tag.endsWith(".$changes")) {
70
+ continue;
71
+ }
72
+ const key = Context.Service<Rpc.Handler<string>>(rpc.key);
73
+ const provided = yield* Effect.serviceOption(key);
74
+ if (Option.isSome(provided)) {
75
+ retained.push(Layer.succeed(key, provided.value));
76
+ }
77
+ }
78
+ }
79
+ const hosted = changesHandlerLayer(
80
+ group,
81
+ (rpc) =>
82
+ ({ queries }: { readonly queries: readonly QueryReference[] }, options: Parameters<Rpc.Handler<string>["handler"]>[1]) =>
83
+ subscribe(rpc, queries, options),
84
+ );
85
+ return Layer.mergeAll(hosted, ...retained);
86
+ });