@shivaedev/platform 0.31.0 → 0.33.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.
Files changed (95) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/README.md +27 -45
  3. package/dist/rpc/identity.d.ts +1 -1
  4. package/dist/rpc/identity.d.ts.map +1 -1
  5. package/dist/rpc/middleware.d.ts +1 -1
  6. package/dist/rpc/middleware.d.ts.map +1 -1
  7. package/dist/rpc/middleware.js +1 -1
  8. package/dist/rpc/middleware.js.map +1 -1
  9. package/dist/rpc/requireAdmin.d.ts +1 -1
  10. package/dist/rpc/requireAdmin.d.ts.map +1 -1
  11. package/dist/rpc/requireAdmin.js +1 -1
  12. package/dist/rpc/requireAdmin.js.map +1 -1
  13. package/dist/rpc/userRoles.d.ts +36 -0
  14. package/dist/rpc/userRoles.d.ts.map +1 -0
  15. package/dist/rpc/userRoles.js +18 -0
  16. package/dist/rpc/userRoles.js.map +1 -0
  17. package/dist/server/appHostHttp.d.ts +39 -39
  18. package/dist/server/appHostHttp.d.ts.map +1 -1
  19. package/dist/server/appHostHttp.js +12 -13
  20. package/dist/server/appHostHttp.js.map +1 -1
  21. package/dist/server/better-auth/revokeUnadmitted.d.ts +1 -1
  22. package/dist/server/better-auth/revokeUnadmitted.d.ts.map +1 -1
  23. package/dist/server/better-auth/signInGate.d.ts +1 -1
  24. package/dist/server/better-auth/signInGate.d.ts.map +1 -1
  25. package/dist/server/better-auth/signInGate.js +1 -1
  26. package/dist/server/better-auth/signInGate.js.map +1 -1
  27. package/dist/server/better-auth/testing.d.ts +2 -45
  28. package/dist/server/better-auth/testing.d.ts.map +1 -1
  29. package/dist/server/better-auth/testing.js +0 -12
  30. package/dist/server/better-auth/testing.js.map +1 -1
  31. package/dist/server/better-auth/userProfiles.d.ts +1 -1
  32. package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
  33. package/dist/server/better-auth/userProfiles.js +1 -1
  34. package/dist/server/better-auth/userProfiles.js.map +1 -1
  35. package/dist/server/better-auth/users.d.ts +24 -0
  36. package/dist/server/better-auth/users.d.ts.map +1 -0
  37. package/dist/server/better-auth/users.js +67 -0
  38. package/dist/server/better-auth/users.js.map +1 -0
  39. package/dist/server/hostOptions.d.ts +3 -1
  40. package/dist/server/hostOptions.d.ts.map +1 -1
  41. package/dist/server/hostTransport.d.ts +16 -0
  42. package/dist/server/hostTransport.d.ts.map +1 -0
  43. package/dist/server/hostTransport.js +16 -0
  44. package/dist/server/hostTransport.js.map +1 -0
  45. package/dist/server/nativeClientOrigins.d.ts +4 -0
  46. package/dist/server/nativeClientOrigins.d.ts.map +1 -0
  47. package/dist/server/nativeClientOrigins.js +38 -0
  48. package/dist/server/nativeClientOrigins.js.map +1 -0
  49. package/dist/server/rpc-server/adapters/betterAuthSessions.d.ts +1 -1
  50. package/dist/server/rpc-server/adapters/betterAuthSessions.d.ts.map +1 -1
  51. package/dist/server/rpc-server/adapters/betterAuthSessions.js +1 -1
  52. package/dist/server/rpc-server/adapters/betterAuthSessions.js.map +1 -1
  53. package/dist/server/rpc-server/local.d.ts +2 -1
  54. package/dist/server/rpc-server/local.d.ts.map +1 -1
  55. package/dist/server/rpc-server/local.js +12 -5
  56. package/dist/server/rpc-server/local.js.map +1 -1
  57. package/dist/server/rpc-server/revalidateStream.d.ts +1 -1
  58. package/dist/server/rpc-server/revalidateStream.d.ts.map +1 -1
  59. package/dist/server/rpc-server/revalidateStream.js +1 -1
  60. package/dist/server/rpc-server/revalidateStream.js.map +1 -1
  61. package/dist/server/rpc-server/roles.js +1 -1
  62. package/dist/server/rpc-server/roles.js.map +1 -1
  63. package/dist/server/rpc-server/session.d.ts +1 -1
  64. package/dist/server/rpc-server/session.d.ts.map +1 -1
  65. package/dist/server/rpc-server/session.js +1 -1
  66. package/dist/server/rpc-server/session.js.map +1 -1
  67. package/package.json +7 -7
  68. package/src/rpc/identity.ts +1 -1
  69. package/src/rpc/middleware.ts +1 -1
  70. package/src/rpc/requireAdmin.ts +1 -1
  71. package/src/rpc/userRoles.ts +20 -0
  72. package/src/server/appHostHttp.ts +14 -15
  73. package/src/server/better-auth/revokeUnadmitted.ts +1 -1
  74. package/src/server/better-auth/signInGate.ts +1 -1
  75. package/src/server/better-auth/testing.ts +2 -14
  76. package/src/server/better-auth/userProfiles.ts +1 -1
  77. package/src/server/better-auth/users.ts +69 -0
  78. package/src/server/hostOptions.ts +3 -1
  79. package/src/server/hostTransport.ts +26 -0
  80. package/src/server/nativeClientOrigins.ts +44 -0
  81. package/src/server/rpc-server/adapters/betterAuthSessions.ts +1 -1
  82. package/src/server/rpc-server/local.ts +16 -5
  83. package/src/server/rpc-server/revalidateStream.ts +1 -1
  84. package/src/server/rpc-server/roles.ts +1 -1
  85. package/src/server/rpc-server/session.ts +1 -1
  86. package/dist/errors/rejectedField.d.ts +0 -7
  87. package/dist/errors/rejectedField.d.ts.map +0 -1
  88. package/dist/errors/rejectedField.js +0 -7
  89. package/dist/errors/rejectedField.js.map +0 -1
  90. package/dist/errors/taxonomy.d.ts +0 -55
  91. package/dist/errors/taxonomy.d.ts.map +0 -1
  92. package/dist/errors/taxonomy.js +0 -24
  93. package/dist/errors/taxonomy.js.map +0 -1
  94. package/src/errors/rejectedField.ts +0 -10
  95. package/src/errors/taxonomy.ts +0 -14
@@ -1,5 +1,5 @@
1
1
  import { Effect } from "effect";
2
- import { Forbidden } from "#errors/taxonomy.ts";
2
+ import { Forbidden } from "@shivaedev/effect-contract/errors/taxonomy.ts";
3
3
  import { hasRole } from "./hasRole.ts";
4
4
  import { SessionUser, type SessionUserValue } from "./identity.ts";
5
5
 
@@ -0,0 +1,20 @@
1
+ import { Schema } from "effect";
2
+
3
+ export const UserRole = Schema.Literals(["user", "admin", "owner"]);
4
+ export type UserRole = typeof UserRole.Type;
5
+
6
+ export const AppUser = Schema.Struct({
7
+ createdAt: Schema.DateTimeUtcFromString,
8
+ email: Schema.String,
9
+ id: Schema.String,
10
+ name: Schema.String,
11
+ roles: Schema.Array(Schema.String),
12
+ });
13
+
14
+ export const UserListInput = Schema.Struct({
15
+ cursor: Schema.optionalKey(Schema.String),
16
+ limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
17
+ });
18
+ export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
19
+ export const ChangeRoleInput = Schema.Struct({ grant: Schema.Boolean, role: UserRole, userId: Schema.String });
20
+ export class LastOwner extends Schema.TaggedError<LastOwner>()("LastOwner", { userId: Schema.String }) {}
@@ -1,6 +1,6 @@
1
1
  import { createServer } from "node:http";
2
2
  import { NodeHttpServer, NodeServices } from "@effect/platform-node";
3
- import { ByteSize, Config, Effect, Layer, Option, Schema } from "effect";
3
+ import { ByteSize, Config, Effect, Layer } from "effect";
4
4
  import { HttpEffect, HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpServerResponse, HttpStaticServer } from "effect/http";
5
5
  import { type Rpc, RpcSerialization, RpcServer } from "effect/rpc";
6
6
  import type { Authenticated, MaybeAuthenticated, RequestTracing } from "#rpc/middleware.ts";
@@ -10,7 +10,9 @@ import type { databaseLayer } from "#server/databaseLayer.ts";
10
10
  import { healthRoute } from "#server/healthRoute.ts";
11
11
  import { hostChanges } from "#server/hostChanges.ts";
12
12
  import type { HostOptions, HostPolicy } from "#server/hostOptions.ts";
13
+ import { hostTransport } from "#server/hostTransport.ts";
13
14
  import type { MigrationOptions } from "#server/MigrationOptions.ts";
15
+ import { nativeClientOrigins } from "#server/nativeClientOrigins.ts";
14
16
  import { otlpTracing } from "#server/otlpTracing.ts";
15
17
  import { RedactionPolicy } from "#server/RedactionPolicy.ts";
16
18
  import { redactingDiagnostics } from "#server/redactingDiagnostics.ts";
@@ -18,7 +20,6 @@ import { redactingRpcSerialization } from "#server/redactingRpcSerialization.ts"
18
20
  import { localRpcGuard } from "#server/rpc-server/local.ts";
19
21
  import { authenticatedLayer, maybeAuthenticatedLayer, type SessionShape } from "#server/rpc-server/session.ts";
20
22
  import { requestTracingLayer } from "#server/rpc-server/tracing.ts";
21
- import { TrustedProxy } from "#server/rpc-server/trustedProxy.ts";
22
23
  import { schemaSensitiveKeys } from "#server/schemaSensitiveKeys.ts";
23
24
  import { tracedGroup } from "#server/tracedGroup.ts";
24
25
 
@@ -41,17 +42,7 @@ export function appHostHttp<
41
42
  const sensitive = schemaSensitiveKeys(options.group, options.config?.sensitiveKeys);
42
43
  return Layer.unwrap(
43
44
  Effect.gen(function* () {
44
- const maxBodySize = options.config?.maxBodySize ?? (yield* Config.Int("MAX_BODY_SIZE").pipe(Config.withDefault(1024 * 1024)));
45
- const bodySize = yield* Schema.decodeUnknownEffect(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)))(maxBodySize).pipe(
46
- Effect.mapError((cause) => new Config.ConfigError(cause)),
47
- );
48
- const trustedProxy =
49
- options.policy === "loopback"
50
- ? undefined
51
- : (options.config?.trustedProxy ?? Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option)));
52
- if (trustedProxy !== undefined) {
53
- yield* Schema.decodeUnknownEffect(TrustedProxy)(trustedProxy).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
54
- }
45
+ const { bodySize, trustedProxy, nativeOrigins } = yield* hostTransport(options);
55
46
  const middleware: Layer.Layer<RequestTracing> | Layer.Layer<Authenticated | MaybeAuthenticated | RequestTracing> =
56
47
  options.policy === "loopback"
57
48
  ? requestTracingLayer({ sensitive })
@@ -62,7 +53,10 @@ export function appHostHttp<
62
53
  const handler = yield* RpcServer.toHttpEffect(tracedGroup(options.group)).pipe(
63
54
  Effect.provideService(RpcSerialization.RpcSerialization, wire),
64
55
  );
65
- const guarded = localRpcGuard(handler, trustedProxy);
56
+ const guarded = localRpcGuard(handler, trustedProxy, nativeOrigins);
57
+ if (nativeOrigins.length > 0) {
58
+ yield* router.add("OPTIONS", options.rpcPath ?? "/rpc", HttpServerResponse.text("Local same-origin requests only", { status: 403 }));
59
+ }
66
60
  yield* router.add("POST", options.rpcPath ?? "/rpc", (request) => {
67
61
  HttpEffect.appendPreResponseHandlerUnsafe(request, rpcCacheControl);
68
62
  return guarded.pipe(
@@ -75,6 +69,7 @@ export function appHostHttp<
75
69
  ).pipe(
76
70
  Layer.provide(Layer.merge(middleware, hostChanges(options.group, changesService).pipe(Layer.provideMerge(options.handlers)))),
77
71
  Layer.provide(RpcSerialization.layerNdjson),
72
+ Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy)),
78
73
  );
79
74
  const assets =
80
75
  options.assets === undefined
@@ -86,6 +81,7 @@ export function appHostHttp<
86
81
  const port = options.config?.port ?? (yield* Config.Int("PORT").pipe(Config.withDefault(3000)));
87
82
  const host = options.config?.host ?? (yield* Config.String("HOST").pipe(Config.withDefault("127.0.0.1")));
88
83
  return NodeHttpServer.layer(createServer, {
84
+ gracefulShutdownTimeout: options.config?.gracefulShutdownTimeout,
89
85
  host,
90
86
  port,
91
87
  ...(options.config?.disablePreemptiveShutdown === undefined
@@ -94,7 +90,10 @@ export function appHostHttp<
94
90
  });
95
91
  }),
96
92
  );
97
- return HttpRouter.serve(Layer.mergeAll(routes, healthRoute, assets, options.routes ?? Layer.empty), { disableLogger: true }).pipe(
93
+ const applicationRoutes = (options.routes ?? Layer.empty).pipe(
94
+ Layer.provide(options.nativeOrigins === undefined ? Layer.empty : nativeClientOrigins(nativeOrigins, trustedProxy, true)),
95
+ );
96
+ return HttpRouter.serve(Layer.mergeAll(routes, healthRoute, assets, applicationRoutes), { disableLogger: true }).pipe(
98
97
  Layer.provideMerge(application),
99
98
  Layer.provideMerge(server),
100
99
  Layer.provide(NodeServices.layer),
@@ -1,5 +1,5 @@
1
1
  import { type Config, Effect } from "effect";
2
- import type { AuthUnavailable } from "#errors/taxonomy.ts";
2
+ import type { AuthUnavailable } from "@shivaedev/effect-contract/errors/taxonomy.ts";
3
3
  import { fromStorage, type PolicyStorage, type SignInGate } from "#server/better-auth/signInGate.ts";
4
4
 
5
5
  export interface RevokedSessions {
@@ -1,5 +1,5 @@
1
1
  import { Cache, type Config, Duration, Effect, Exit } from "effect";
2
- import { AuthUnavailable } from "#errors/taxonomy.ts";
2
+ import { AuthUnavailable } from "@shivaedev/effect-contract/errors/taxonomy.ts";
3
3
  import type { ProviderAccountValue } from "#rpc/identity.ts";
4
4
  import { redact } from "#server/rpc-server/redact.ts";
5
5
 
@@ -1,19 +1,7 @@
1
1
  import type { AuthContext } from "better-auth";
2
- import { testUtils } from "better-auth/plugins";
2
+ import type { testUtils } from "better-auth/plugins";
3
3
 
4
- export function authTestUtils(options?: Parameters<typeof testUtils>[0]) {
5
- const plugin = testUtils(options);
6
- return {
7
- ...plugin,
8
- init(context: Parameters<typeof plugin.init>[0]) {
9
- const result = plugin.init(context);
10
- // Remove this wrapper once Better Auth's testUtils omits undefined options.
11
- return result.options === undefined ? { context: result.context } : { context: result.context, options: result.options };
12
- },
13
- };
14
- }
15
-
16
- type TestContext = ReturnType<ReturnType<typeof authTestUtils>["init"]>["context"];
4
+ type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
17
5
  type AccountContext = Pick<AuthContext, "internalAdapter">;
18
6
 
19
7
  export async function signedInUser(
@@ -1,6 +1,6 @@
1
1
  import type { Auth } from "better-auth";
2
2
  import { Effect } from "effect";
3
- import { AuthUnavailable } from "#errors/taxonomy.ts";
3
+ import { AuthUnavailable } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
4
  import { redact } from "#server/rpc-server/redact.ts";
5
5
 
6
6
  export interface UserProfile {
@@ -0,0 +1,69 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
+ import { invalidateOnCommit, transact } from "@shivaedev/effect-sql/transact.ts";
5
+ import { hasRole } from "#rpc/hasRole.ts";
6
+ import { SessionUser } from "#rpc/identity.ts";
7
+ import { type ChangeRoleInput, LastOwner, type UserListInput } from "#rpc/userRoles.ts";
8
+
9
+ const StoredUser = Schema.Struct({
10
+ createdAt: Schema.Date,
11
+ email: Schema.String,
12
+ id: Schema.String,
13
+ name: Schema.String,
14
+ role: Schema.NullOr(Schema.String),
15
+ });
16
+ function unavailable() {
17
+ return new AuthUnavailable({ message: "Could not access app users" });
18
+ }
19
+
20
+ export const listUsers = Effect.fn("Platform.listUsers")(function* (input: typeof UserListInput.Type) {
21
+ const sql = yield* SqlClient.SqlClient;
22
+ const read = SqlSchema.findAll({
23
+ execute: () => sql`select id, name, email, role, "createdAt" from "user"
24
+ where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
25
+ Request: Schema.Void,
26
+ Result: StoredUser,
27
+ });
28
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
29
+ const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
30
+ ...user,
31
+ createdAt: DateTime.makeUnsafe(createdAt),
32
+ roles: role?.split(",").filter(Boolean) ?? [],
33
+ }));
34
+ return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
35
+ });
36
+
37
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input: typeof ChangeRoleInput.Type) {
38
+ const actor = yield* SessionUser;
39
+ if (!hasRole(actor, "owner")) {
40
+ return yield* Effect.fail(new Forbidden({ message: "Owner role required" }));
41
+ }
42
+ const sql = yield* SqlClient.SqlClient;
43
+ const changed = yield* Effect.gen(function* () {
44
+ yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
45
+ const rows = yield* sql<{ readonly id: string; readonly role: string | null }>`select id, role from "user" where id = ${input.userId} for update`;
46
+ const target = rows[0];
47
+ if (target === undefined) {
48
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
49
+ }
50
+ const roles = target.role?.split(",").filter(Boolean) ?? [];
51
+ if (input.grant === roles.includes(input.role)) {
52
+ return false;
53
+ }
54
+ if (!input.grant && input.role === "owner") {
55
+ const owners = yield* sql<{ readonly id: string }>`select id from "user" where 'owner' = any(string_to_array(role, ','))`;
56
+ if (owners.length === 1) {
57
+ return yield* Effect.fail(new LastOwner({ userId: input.userId }));
58
+ }
59
+ }
60
+ const next = input.grant ? [...roles, input.role] : roles.filter((role) => role !== input.role);
61
+ yield* sql`update "user" set role = ${next.join(",")}, "updatedAt" = now() where id = ${input.userId}`;
62
+ yield* invalidateOnCommit(["admin.users"]);
63
+ return true;
64
+ }).pipe(transact({ onSqlError: unavailable }));
65
+ if (changed) {
66
+ const changedAt = DateTime.formatIso(yield* DateTime.now);
67
+ yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
68
+ }
69
+ });
@@ -1,4 +1,4 @@
1
- import type { Layer } from "effect";
1
+ import type { Duration, Layer } from "effect";
2
2
  import type { HttpRouter, HttpStaticServer } from "effect/http";
3
3
  import type { Rpc, RpcGroup } from "effect/rpc";
4
4
  import type { SessionPolicy, SessionShape } from "#server/rpc-server/session.ts";
@@ -13,9 +13,11 @@ export type HostOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THandle
13
13
  readonly maxBodySize?: number;
14
14
  readonly sensitiveKeys?: readonly string[];
15
15
  readonly disablePreemptiveShutdown?: boolean;
16
+ readonly gracefulShutdownTimeout?: Duration.Input;
16
17
  };
17
18
  readonly group: RpcGroup.RpcGroup<TRpcs>;
18
19
  readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements>;
20
+ readonly nativeOrigins?: readonly string[];
19
21
  readonly routes?: Layer.Layer<never, never, HttpRouter.HttpRouter | HttpRouter.Request<"Error", unknown>>;
20
22
  readonly rpcPath?: HttpRouter.PathInput;
21
23
  } & (
@@ -0,0 +1,26 @@
1
+ import { Config, Effect, Option, Schema } from "effect";
2
+ import { NativeOrigins } from "#server/nativeClientOrigins.ts";
3
+ import { TrustedProxy } from "#server/rpc-server/trustedProxy.ts";
4
+
5
+ interface Options {
6
+ readonly config?: { readonly maxBodySize?: number; readonly trustedProxy?: string };
7
+ readonly nativeOrigins?: readonly string[];
8
+ readonly policy?: "loopback" | undefined;
9
+ }
10
+ export const hostTransport = Effect.fn("Platform.hostTransport")(function* (options: Options) {
11
+ const maxBodySize = options.config?.maxBodySize ?? (yield* Config.Int("MAX_BODY_SIZE").pipe(Config.withDefault(1024 * 1024)));
12
+ const bodySize = yield* Schema.decodeUnknownEffect(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)))(maxBodySize).pipe(
13
+ Effect.mapError((cause) => new Config.ConfigError(cause)),
14
+ );
15
+ const trustedProxy =
16
+ options.policy === "loopback"
17
+ ? undefined
18
+ : (options.config?.trustedProxy ?? Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option)));
19
+ if (trustedProxy !== undefined) {
20
+ yield* Schema.decodeUnknownEffect(TrustedProxy)(trustedProxy).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
21
+ }
22
+ const nativeOrigins = yield* Schema.decodeUnknownEffect(NativeOrigins)(options.nativeOrigins ?? []).pipe(
23
+ Effect.mapError((cause) => new Config.ConfigError(cause)),
24
+ );
25
+ return { bodySize, nativeOrigins, trustedProxy };
26
+ });
@@ -0,0 +1,44 @@
1
+ import { Effect, Schema } from "effect";
2
+ import { Headers, HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
3
+ import { localTransport } from "#server/rpc-server/local.ts";
4
+
5
+ export const NativeOrigins = Schema.Array(
6
+ Schema.String.check(
7
+ Schema.makeFilter((origin) => {
8
+ try {
9
+ const url = new URL(origin);
10
+ const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
11
+ return url.host !== "" && !origin.includes("*") && authority === origin;
12
+ } catch {
13
+ return false;
14
+ }
15
+ }),
16
+ ),
17
+ );
18
+
19
+ export function nativeClientOrigins(origins: readonly string[], trustedProxy: string | undefined, auth = false) {
20
+ const allowed = localTransport(trustedProxy, origins);
21
+ const cors = HttpMiddleware.cors({
22
+ allowedHeaders: ["Authorization", "Content-Type"],
23
+ allowedMethods: auth ? ["GET", "POST"] : ["POST"],
24
+ allowedOrigins: (origin) => origins.includes(origin),
25
+ credentials: false,
26
+ exposedHeaders: auth ? ["set-auth-token"] : [],
27
+ });
28
+ return HttpRouter.middleware((effect) =>
29
+ Effect.gen(function* () {
30
+ const request = yield* HttpServerRequest.HttpServerRequest;
31
+ if (auth && !request.url.split("?")[0]?.startsWith("/api/auth/")) {
32
+ return yield* effect;
33
+ }
34
+ if ((auth || request.method === "OPTIONS") && !allowed(request)) {
35
+ return HttpServerResponse.text("Local same-origin requests only", { status: 403 });
36
+ }
37
+ if (!origins.includes(request.headers.origin ?? "")) {
38
+ return yield* effect;
39
+ }
40
+ const native = request.modify({ headers: Headers.remove(request.headers, "cookie") });
41
+ return yield* cors(effect).pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, native));
42
+ }),
43
+ ).layer;
44
+ }
@@ -1,6 +1,6 @@
1
1
  import { Effect, Option, Predicate } from "effect";
2
2
  import type { Headers } from "effect/http";
3
- import { AuthUnavailable, Unauthorized } from "#errors/taxonomy.ts";
3
+ import { AuthUnavailable, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
4
  import type { ProviderAccountValue } from "#rpc/identity.ts";
5
5
  import { redact } from "#server/rpc-server/redact.ts";
6
6
  import type { SessionProvider, SessionShape } from "#server/rpc-server/session.ts";
@@ -50,7 +50,7 @@ export function trustedProxyRanges(trustedProxy?: string): string[] {
50
50
  return normalizedRanges(trustedProxy);
51
51
  }
52
52
 
53
- function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProxy: (address: string) => boolean): boolean {
53
+ function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProxy: (address: string) => boolean, native: boolean): boolean {
54
54
  if (!Option.exists(request.remoteAddress, isTrustedProxy)) {
55
55
  return false;
56
56
  }
@@ -61,19 +61,30 @@ function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProx
61
61
  }
62
62
  try {
63
63
  const url = new URL(`${protocol}://${host}`);
64
- return request.headers.origin === undefined || request.headers.origin === url.origin;
64
+ return native || request.headers.origin === undefined || request.headers.origin === url.origin;
65
65
  } catch {
66
66
  return false;
67
67
  }
68
68
  }
69
- export function localRpcGuard<E, R>(effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>, trustedProxy?: string) {
69
+ export function localTransport(trustedProxy?: string, nativeOrigins: readonly string[] = []) {
70
70
  const isTrustedProxy = trustedProxyPeer(trustedProxy);
71
+ return (request: HttpServerRequest.HttpServerRequest): boolean => {
72
+ const native = nativeOrigins.includes(request.headers.origin ?? "");
73
+ const local = loopbackHost(request.headers.host) && Option.exists(request.remoteAddress, loopbackAddress);
74
+ return (local && (native || sameOrigin(request))) || proxyOrigin(request, isTrustedProxy, native);
75
+ };
76
+ }
77
+ export function localRpcGuard<E, R>(
78
+ effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>,
79
+ trustedProxy?: string,
80
+ nativeOrigins: readonly string[] = [],
81
+ ) {
82
+ const allowed = localTransport(trustedProxy, nativeOrigins);
71
83
  return Effect.gen(function* () {
72
84
  const request = yield* HttpServerRequest.HttpServerRequest;
73
85
  const serialization = yield* RpcSerialization.RpcSerialization;
74
- const local = loopbackHost(request.headers.host) && Option.exists(request.remoteAddress, loopbackAddress);
75
86
  const contentType = request.headers["content-type"]?.split(";")[0]?.trim().toLowerCase();
76
- return ((local && sameOrigin(request)) || proxyOrigin(request, isTrustedProxy)) && contentType === serialization.contentType
87
+ return allowed(request) && contentType === serialization.contentType
77
88
  ? yield* continueHttpTrace(effect, request)
78
89
  : HttpServerResponse.text("Local same-origin requests only", { status: 403 });
79
90
  });
@@ -1,6 +1,6 @@
1
1
  import { Effect, Option } from "effect";
2
2
  import { type Rpc, RpcSchema } from "effect/rpc";
3
- import { type AuthUnavailable, type Forbidden, Unauthorized } from "#errors/taxonomy.ts";
3
+ import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
4
  import type { SessionPolicy, SessionShape } from "./session.ts";
5
5
 
6
6
  export function revalidateStream<TSession extends SessionShape>(
@@ -1,7 +1,7 @@
1
1
  import { Effect, Layer, Option } from "effect";
2
2
  import { type HttpServerRequest, HttpServerResponse } from "effect/http";
3
3
  import type { RpcMiddleware } from "effect/rpc";
4
- import { type AuthUnavailable, Forbidden, type Unauthorized } from "#errors/taxonomy.ts";
4
+ import { type AuthUnavailable, Forbidden, type Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
5
5
  import { hasRole } from "#rpc/hasRole.ts";
6
6
  import { Identity, SessionUser, type SessionUserValue } from "#rpc/identity.ts";
7
7
  import { AuthenticatedAdmin, AuthenticatedOwner } from "#rpc/middleware.ts";
@@ -1,6 +1,6 @@
1
1
  import { Duration, Effect, Exit, Layer, Option } from "effect";
2
2
  import type { Headers } from "effect/http";
3
- import { type AuthUnavailable, Forbidden, Unauthorized } from "#errors/taxonomy.ts";
3
+ import { type AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
4
  import {
5
5
  Identity,
6
6
  OptionalIdentity,
@@ -1,7 +0,0 @@
1
- import { Option } from "effect";
2
- export interface RejectedField {
3
- readonly field: string;
4
- readonly message: string;
5
- }
6
- export declare function rejectedField(error: unknown): Option.Option<RejectedField>;
7
- //# sourceMappingURL=rejectedField.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"rejectedField.d.ts","sourceRoot":"","sources":["../../src/errors/rejectedField.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAGD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAE1E"}
@@ -1,7 +0,0 @@
1
- import { Option, Schema } from "effect";
2
- const Rejected = Schema.Struct({ _tag: Schema.String, field: Schema.String, message: Schema.String });
3
- const decode = Schema.decodeUnknownOption(Rejected);
4
- export function rejectedField(error) {
5
- return Option.map(decode(error), ({ field, message }) => ({ field, message }));
6
- }
7
- //# sourceMappingURL=rejectedField.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"rejectedField.js","sourceRoot":"","sources":["../../src/errors/rejectedField.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKxC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACtG,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AACpD,MAAM,UAAU,aAAa,CAAC,KAAc;IAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;AAChF,CAAC"}
@@ -1,55 +0,0 @@
1
- import { Schema } from "effect";
2
- declare const NotFound_base: Schema.Class<NotFound, Schema.TaggedStruct<"NotFound", {
3
- message: Schema.String;
4
- }>, import("effect/Cause").YieldableError>;
5
- export declare class NotFound extends NotFound_base {
6
- }
7
- declare const Unauthorized_base: Schema.Class<Unauthorized, Schema.TaggedStruct<"Unauthorized", {
8
- message: Schema.String;
9
- }>, import("effect/Cause").YieldableError>;
10
- export declare class Unauthorized extends Unauthorized_base {
11
- }
12
- declare const Forbidden_base: Schema.Class<Forbidden, Schema.TaggedStruct<"Forbidden", {
13
- message: Schema.String;
14
- }>, import("effect/Cause").YieldableError>;
15
- export declare class Forbidden extends Forbidden_base {
16
- }
17
- declare const BadRequest_base: Schema.Class<BadRequest, Schema.TaggedStruct<"BadRequest", {
18
- field: Schema.optionalKey<Schema.String>;
19
- message: Schema.String;
20
- }>, import("effect/Cause").YieldableError>;
21
- export declare class BadRequest extends BadRequest_base {
22
- }
23
- declare const Conflict_base: Schema.Class<Conflict, Schema.TaggedStruct<"Conflict", {
24
- field: Schema.optionalKey<Schema.String>;
25
- message: Schema.String;
26
- }>, import("effect/Cause").YieldableError>;
27
- export declare class Conflict extends Conflict_base {
28
- }
29
- declare const PreconditionFailed_base: Schema.Class<PreconditionFailed, Schema.TaggedStruct<"PreconditionFailed", {
30
- message: Schema.String;
31
- }>, import("effect/Cause").YieldableError>;
32
- export declare class PreconditionFailed extends PreconditionFailed_base {
33
- }
34
- declare const TooManyRequests_base: Schema.Class<TooManyRequests, Schema.TaggedStruct<"TooManyRequests", {
35
- message: Schema.String;
36
- }>, import("effect/Cause").YieldableError>;
37
- export declare class TooManyRequests extends TooManyRequests_base {
38
- }
39
- declare const AuthUnavailable_base: Schema.Class<AuthUnavailable, Schema.TaggedStruct<"AuthUnavailable", {
40
- message: Schema.String;
41
- }>, import("effect/Cause").YieldableError>;
42
- export declare class AuthUnavailable extends AuthUnavailable_base {
43
- }
44
- declare const InternalServerError_base: Schema.Class<InternalServerError, Schema.TaggedStruct<"InternalServerError", {
45
- message: Schema.String;
46
- }>, import("effect/Cause").YieldableError>;
47
- export declare class InternalServerError extends InternalServerError_base {
48
- }
49
- declare const ServiceUnavailable_base: Schema.Class<ServiceUnavailable, Schema.TaggedStruct<"ServiceUnavailable", {
50
- message: Schema.String;
51
- }>, import("effect/Cause").YieldableError>;
52
- export declare class ServiceUnavailable extends ServiceUnavailable_base {
53
- }
54
- export {};
55
- //# sourceMappingURL=taxonomy.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"taxonomy.d.ts","sourceRoot":"","sources":["../../src/errors/taxonomy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;AAIhC,qBAAa,QAAS,SAAQ,aAAqD;CAAG;;;;AACtF,qBAAa,YAAa,SAAQ,iBAA6D;CAAG;;;;AAClG,qBAAa,SAAU,SAAQ,cAAuD;CAAG;;;;;AACzF,qBAAa,UAAW,SAAQ,eAAwD;CAAG;;;;;AAC3F,qBAAa,QAAS,SAAQ,aAAoD;CAAG;;;;AACrF,qBAAa,kBAAmB,SAAQ,uBAAyE;CAAG;;;;AACpH,qBAAa,eAAgB,SAAQ,oBAAmE;CAAG;;;;AAC3G,qBAAa,eAAgB,SAAQ,oBAAmE;CAAG;;;;AAC3G,qBAAa,mBAAoB,SAAQ,wBAA2E;CAAG;;;;AACvH,qBAAa,kBAAmB,SAAQ,uBAAyE;CAAG"}
@@ -1,24 +0,0 @@
1
- import { Schema } from "effect";
2
- const described = { message: Schema.String };
3
- const perField = { field: Schema.optionalKey(Schema.String), message: Schema.String };
4
- export class NotFound extends Schema.TaggedError()("NotFound", described) {
5
- }
6
- export class Unauthorized extends Schema.TaggedError()("Unauthorized", described) {
7
- }
8
- export class Forbidden extends Schema.TaggedError()("Forbidden", described) {
9
- }
10
- export class BadRequest extends Schema.TaggedError()("BadRequest", perField) {
11
- }
12
- export class Conflict extends Schema.TaggedError()("Conflict", perField) {
13
- }
14
- export class PreconditionFailed extends Schema.TaggedError()("PreconditionFailed", described) {
15
- }
16
- export class TooManyRequests extends Schema.TaggedError()("TooManyRequests", described) {
17
- }
18
- export class AuthUnavailable extends Schema.TaggedError()("AuthUnavailable", described) {
19
- }
20
- export class InternalServerError extends Schema.TaggedError()("InternalServerError", described) {
21
- }
22
- export class ServiceUnavailable extends Schema.TaggedError()("ServiceUnavailable", described) {
23
- }
24
- //# sourceMappingURL=taxonomy.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"taxonomy.js","sourceRoot":"","sources":["../../src/errors/taxonomy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAC7C,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AACtF,MAAM,OAAO,QAAS,SAAQ,MAAM,CAAC,WAAW,EAAY,CAAC,UAAU,EAAE,SAAS,CAAC;CAAG;AACtF,MAAM,OAAO,YAAa,SAAQ,MAAM,CAAC,WAAW,EAAgB,CAAC,cAAc,EAAE,SAAS,CAAC;CAAG;AAClG,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,WAAW,EAAa,CAAC,WAAW,EAAE,SAAS,CAAC;CAAG;AACzF,MAAM,OAAO,UAAW,SAAQ,MAAM,CAAC,WAAW,EAAc,CAAC,YAAY,EAAE,QAAQ,CAAC;CAAG;AAC3F,MAAM,OAAO,QAAS,SAAQ,MAAM,CAAC,WAAW,EAAY,CAAC,UAAU,EAAE,QAAQ,CAAC;CAAG;AACrF,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC,WAAW,EAAsB,CAAC,oBAAoB,EAAE,SAAS,CAAC;CAAG;AACpH,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,WAAW,EAAmB,CAAC,iBAAiB,EAAE,SAAS,CAAC;CAAG;AAC3G,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,WAAW,EAAmB,CAAC,iBAAiB,EAAE,SAAS,CAAC;CAAG;AAC3G,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,WAAW,EAAuB,CAAC,qBAAqB,EAAE,SAAS,CAAC;CAAG;AACvH,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC,WAAW,EAAsB,CAAC,oBAAoB,EAAE,SAAS,CAAC;CAAG"}
@@ -1,10 +0,0 @@
1
- import { Option, Schema } from "effect";
2
- export interface RejectedField {
3
- readonly field: string;
4
- readonly message: string;
5
- }
6
- const Rejected = Schema.Struct({ _tag: Schema.String, field: Schema.String, message: Schema.String });
7
- const decode = Schema.decodeUnknownOption(Rejected);
8
- export function rejectedField(error: unknown): Option.Option<RejectedField> {
9
- return Option.map(decode(error), ({ field, message }) => ({ field, message }));
10
- }
@@ -1,14 +0,0 @@
1
- import { Schema } from "effect";
2
-
3
- const described = { message: Schema.String };
4
- const perField = { field: Schema.optionalKey(Schema.String), message: Schema.String };
5
- export class NotFound extends Schema.TaggedError<NotFound>()("NotFound", described) {}
6
- export class Unauthorized extends Schema.TaggedError<Unauthorized>()("Unauthorized", described) {}
7
- export class Forbidden extends Schema.TaggedError<Forbidden>()("Forbidden", described) {}
8
- export class BadRequest extends Schema.TaggedError<BadRequest>()("BadRequest", perField) {}
9
- export class Conflict extends Schema.TaggedError<Conflict>()("Conflict", perField) {}
10
- export class PreconditionFailed extends Schema.TaggedError<PreconditionFailed>()("PreconditionFailed", described) {}
11
- export class TooManyRequests extends Schema.TaggedError<TooManyRequests>()("TooManyRequests", described) {}
12
- export class AuthUnavailable extends Schema.TaggedError<AuthUnavailable>()("AuthUnavailable", described) {}
13
- export class InternalServerError extends Schema.TaggedError<InternalServerError>()("InternalServerError", described) {}
14
- export class ServiceUnavailable extends Schema.TaggedError<ServiceUnavailable>()("ServiceUnavailable", described) {}