@shivaedev/platform 0.16.1 → 0.18.0

package/dist/server/rpc-server/publicConfigLayer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publicConfigLayer.js","sourceRoot":"","sources":["../../../src/server/rpc-server/publicConfigLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAuB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG7D,MAAM,UAAU,iBAAiB,CAAO,WAAkD,EAAE,IAAmC;IAC9H,OAAO,WAAW,CAAC,OAAO,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrF,OAAO,WAAW,CAAC,EAAE,CAAC,EAAE,2BAA2B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}

package/dist/server/rpc-server/session.d.ts

@@ -1,8 +1,8 @@
 import { Effect, Layer, Option } from "effect";
 import type { Headers } from "effect/http";
 import { type AuthUnavailable, Forbidden, Unauthorized } from "#errors/taxonomy.ts";
-import { Identity, SessionUser, type SessionUserValue } from "#rpc/identity.ts";
-import { Authenticated, AuthenticatedUser, MaybeAuthenticated } from "#rpc/middleware.ts";
+import { Identity, SessionUser, type SessionUserValue, type SessionUserWithProviderAccountsValue } from "#rpc/identity.ts";
+import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#rpc/middleware.ts";
 import { type OriginPolicy } from "./origin.ts";
 export interface SessionShape {
     readonly user: {
@@ -24,4 +24,8 @@ export interface UserSessionShape extends SessionShape {
 }
 export declare function withSessionUser<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers, operation: string): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | Unauthorized, Exclude<Exclude<R, Identity>, SessionUser>>;
 export declare function authenticatedUserLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedUser>;
+export interface ProviderAccountsSessionShape extends UserSessionShape {
+    readonly user: SessionUserWithProviderAccountsValue;
+}
+export declare function authenticatedUserWithProviderAccountsLayer<TSession extends ProviderAccountsSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedUserWithProviderAccounts>;
 //# sourceMappingURL=session.d.ts.map

package/dist/server/rpc-server/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,QAAQ,EAAoB,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,aAAa,CAAC;AAE/D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,MAAM,WAAW,aAAa,CAAC,QAAQ,SAAS,YAAY;IAC3D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;CAC7C;AACD,eAAO,MAAM,cAAc,EAAE,CAAC,QAAQ,SAAS,YAAY,EAC1D,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,GAAG,EAAE,MAAM,KACP,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAQrE,CAAC;AAIH,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAW7H;AACD,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAWvI;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IACtI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kHAsB/C;AACD,wBAAgB,sBAAsB,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAEzI"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EACN,QAAQ,EAER,WAAW,EACX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACjI,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,aAAa,CAAC;AAE/D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,MAAM,WAAW,aAAa,CAAC,QAAQ,SAAS,YAAY;IAC3D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;CAC7C;AACD,eAAO,MAAM,cAAc,EAAE,CAAC,QAAQ,SAAS,YAAY,EAC1D,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,GAAG,EAAE,MAAM,KACP,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAQrE,CAAC;AAIH,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAW7H;AACD,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAWvI;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IACtI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kHAmB/C;AACD,wBAAgB,sBAAsB,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAEzI;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,CAAC,QAAQ,SAAS,4BAA4B,EACvG,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC7B,KAAK,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAqBpD"}

package/dist/server/rpc-server/session.js

@@ -1,7 +1,7 @@
 import { Effect, Layer, Option } from "effect";
 import { Forbidden, Unauthorized } from "#errors/taxonomy.ts";
-import { Identity, OptionalIdentity, SessionUser } from "#rpc/identity.ts";
-import { Authenticated, AuthenticatedUser, MaybeAuthenticated } from "#rpc/middleware.ts";
+import { Identity, OptionalIdentity, SessionUser, SessionUserWithProviderAccounts, } from "#rpc/identity.ts";
+import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#rpc/middleware.ts";
 import { originRequest } from "./origin.js";
 import { transportHeaders } from "./transportHeaders.js";
 export const resolveSession = Effect.fn("PlatformRpc.resolveSession")(function* (policy, headers, rpc) {
@@ -40,20 +40,30 @@ export function withSessionUser(policy, headers, operation) {
         if (Option.isNone(session)) {
             return yield* new Unauthorized({ message: "Authentication required" });
         }
-        const { name, email, role, providerAccounts } = session.value.user;
+        const { name, email, role } = session.value.user;
         const id = yield* identified(session.value.user.id);
         return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, {
             email,
             id,
             name,
             ...(role === undefined ? {} : { role }),
-            ...(providerAccounts === undefined
-                ? {}
-                : { providerAccounts: providerAccounts.map(({ accountId, providerId }) => ({ accountId, providerId })) }),
         }), Effect.annotateLogs({ userId: id }));
     });
 }
 export function authenticatedUserLayer(policy) {
     return Layer.succeed(AuthenticatedUser, (effect, { headers, rpc }) => effect.pipe(withSessionUser(policy, headers, rpc._tag)));
 }
+export function authenticatedUserWithProviderAccountsLayer(policy) {
+    return Layer.succeed(AuthenticatedUserWithProviderAccounts, (effect, { headers, rpc }) => Effect.gen(function* () {
+        const session = yield* resolveSession(policy, headers, rpc._tag);
+        if (Option.isNone(session)) {
+            return yield* new Unauthorized({ message: "Authentication required" });
+        }
+        const { id, name, email, role, providerAccounts } = session.value.user;
+        const accounts = yield* Effect.cached(Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))));
+        const user = { email, id, name, ...(role === undefined ? {} : { role }) };
+        yield* identified(id);
+        return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts: accounts }), Effect.annotateLogs({ userId: id }));
+    }));
+}
 //# sourceMappingURL=session.js.map

package/dist/server/rpc-server/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/platform",
-  "version": "0.16.1",
+  "version": "0.18.0",
   "description": "Opinionated Effect application infrastructure for ShivaeDev services",
   "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/platform#readme",
   "bugs": {
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@shivaedev/effect-contract": "0.5.1",
-    "@shivaedev/effect-sql": "0.5.2",
+    "@shivaedev/effect-sql": "0.6.0",
     "@shivaedev/types": "0.2.1"
   },
   "devDependencies": {
@@ -55,10 +55,10 @@
     "@prisma-next/sql-orm-client": "0.16.0",
     "@prisma-next/target-postgres": "0.16.0",
     "@shivaedev/effect-prisma": "0.10.0",
-    "@shivaedev/effect-test-sql": "0.5.5",
+    "@shivaedev/effect-test-sql": "0.6.0",
     "@shivaedev/effect-trpc": "0.8.0",
-    "@shivaedev/quality": "0.26.0",
-    "@shivaedev/test-story": "0.8.0",
+    "@shivaedev/quality": "0.27.1",
+    "@shivaedev/test-story": "0.10.0",
     "@trpc/client": "11.19.0",
     "@trpc/server": "11.19.0",
     "@types/node": "24.19.2",
@@ -79,7 +79,8 @@
     "@shivaedev/effect-trpc": "0.8.0",
     "@trpc/server": "11.19.0",
     "better-auth": "1.7.7",
-    "effect": "4.0.4"
+    "effect": "4.0.4",
+    "pg": "8.23.0"
   },
   "peerDependenciesMeta": {
     "@effect/platform-node": {
@@ -105,6 +106,9 @@
     },
     "better-auth": {
       "optional": true
+    },
+    "pg": {
+      "optional": true
     }
   },
   "engines": {

package/src/rpc/identity.ts

@@ -1,4 +1,5 @@
-import { Context, type Option } from "effect";
+import { Context, type Effect, type Option } from "effect";
+import type { AuthUnavailable, Unauthorized } from "#errors/taxonomy.ts";
 export class RequestId extends Context.Service<RequestId, string>()("@shivaedev/platform/rpc/RequestId") {}
 export interface IdentityValue {
 	readonly id: string;
@@ -12,7 +13,12 @@ export interface ProviderAccountValue {
 export interface SessionUserValue extends IdentityValue {
 	readonly email: string;
 	readonly name: string;
-	readonly providerAccounts?: readonly ProviderAccountValue[];
 	readonly role?: string | null | undefined;
 }
 export class SessionUser extends Context.Service<SessionUser, SessionUserValue>()("@shivaedev/platform/rpc/SessionUser") {}
+export interface SessionUserWithProviderAccountsValue extends SessionUserValue {
+	readonly providerAccounts: Effect.Effect<readonly ProviderAccountValue[], AuthUnavailable | Unauthorized>;
+}
+export class SessionUserWithProviderAccounts extends Context.Service<SessionUserWithProviderAccounts, SessionUserWithProviderAccountsValue>()(
+	"@shivaedev/platform/rpc/SessionUserWithProviderAccounts",
+) {}

package/src/rpc/middleware.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect";
 import { RpcMiddleware } from "effect/rpc";
 import { AuthUnavailable, Forbidden, Unauthorized } from "#errors/taxonomy.ts";
-import type { Identity, OptionalIdentity, RequestId, SessionUser } from "./identity.ts";
+import type { Identity, OptionalIdentity, RequestId, SessionUser, SessionUserWithProviderAccounts } from "./identity.ts";
 export class RequestTracing extends RpcMiddleware.Service<
 	RequestTracing,
 	{
@@ -30,3 +30,9 @@ export class AuthenticatedUser extends RpcMiddleware.Service<
 >()("@shivaedev/platform/rpc/AuthenticatedUser", {
 	error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
 }) {}
+export class AuthenticatedUserWithProviderAccounts extends RpcMiddleware.Service<
+	AuthenticatedUserWithProviderAccounts,
+	{ provides: Identity | SessionUser | SessionUserWithProviderAccounts }
+>()("@shivaedev/platform/rpc/AuthenticatedUserWithProviderAccounts", {
+	error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
+}) {}

package/src/rpc/publicConfig.ts

@@ -0,0 +1,9 @@
+import type { Schema } from "effect";
+import { contract } from "@shivaedev/effect-contract/contract.ts";
+import { query } from "@shivaedev/effect-contract/operation.ts";
+
+export function publicConfig<T, E>(schema: Schema.Codec<T, E>) {
+	return contract("platform.publicConfig", {
+		queries: [query("get", { reads: () => [], success: schema })],
+	});
+}

package/src/rpc/requireAdmin.ts

@@ -1,14 +1,11 @@
-import { Effect, Option } from "effect";
-import { Forbidden, Unauthorized } from "#errors/taxonomy.ts";
+import { Effect } from "effect";
+import { Forbidden } from "#errors/taxonomy.ts";
 import { SessionUser, type SessionUserValue } from "./identity.ts";
 
-export const requireAdmin: Effect.Effect<SessionUserValue, Unauthorized | Forbidden> = Effect.gen(function* () {
-	const user = yield* Effect.serviceOption(SessionUser);
-	if (Option.isNone(user)) {
-		return yield* new Unauthorized({ message: "Authentication required" });
-	}
-	if (!user.value.role?.split(",").includes("admin")) {
+export const requireAdmin: Effect.Effect<SessionUserValue, Forbidden, SessionUser> = Effect.gen(function* () {
+	const user = yield* SessionUser;
+	if (!user.role?.split(",").includes("admin")) {
 		return yield* new Forbidden({ message: "Administrator role required" });
 	}
-	return user.value;
+	return user;
 });

package/src/server/AppHostFactory.ts

@@ -0,0 +1,121 @@
+import type { Effect, Layer } from "effect";
+import type { Rpc } from "effect/rpc";
+import type { HostPreflight } from "#server/AppHostInput.ts";
+import type { AppDatabaseOptions, AppHostOptions, AppHttpHostOptions, AppLocalHostOptions } from "#server/appHost.ts";
+import type { appHostHttp, deferredHost } from "#server/appHostHttp.ts";
+import type { SessionShape } from "#server/rpc-server/session.ts";
+
+type PreflightHost<THost extends Layer.Any, TServices, TError, TRequirements> = Layer.Layer<
+	Layer.Success<THost> | TServices,
+	Layer.Error<THost> | TError,
+	Exclude<Layer.Services<THost>, TServices> | TRequirements
+>;
+
+export interface AppHostFactory {
+	<
+		TRpcs extends Rpc.Any,
+		THandlers,
+		THandlerError,
+		THandlerRequirements,
+		TServices = never,
+		TServiceError = never,
+		TServiceRequirements = never,
+		TMigrations = never,
+		TSession extends SessionShape = SessionShape,
+		TApplicationError = never,
+		TApplicationRequirements = never,
+		TPreflight = never,
+		TPreflightError = never,
+		TPreflightRequirements = never,
+	>(
+		options: HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
+			(
+				| (AppDatabaseOptions<TMigrations> & {
+						readonly application: Effect.Effect<
+							AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
+							TApplicationError,
+							TApplicationRequirements
+						>;
+				  })
+				| AppHostOptions<
+						TRpcs,
+						THandlers,
+						THandlerError,
+						THandlerRequirements,
+						TServices,
+						TServiceError,
+						TServiceRequirements,
+						TMigrations,
+						TSession,
+						TPreflight,
+						TPreflightError,
+						TPreflightRequirements
+				  >
+				| AppLocalHostOptions<
+						TRpcs,
+						THandlers,
+						THandlerError,
+						THandlerRequirements,
+						TServices,
+						TServiceError,
+						TServiceRequirements,
+						TMigrations,
+						TPreflight,
+						TPreflightError,
+						TPreflightRequirements
+				  >
+			),
+	): PreflightHost<
+		ReturnType<
+			typeof deferredHost<
+				TRpcs,
+				THandlers,
+				THandlerError,
+				THandlerRequirements,
+				TServices,
+				TServiceError,
+				TServiceRequirements,
+				TMigrations,
+				TSession,
+				TApplicationError,
+				TApplicationRequirements
+			>
+		>,
+		NoInfer<TPreflight>,
+		NoInfer<TPreflightError>,
+		NoInfer<TPreflightRequirements>
+	>;
+
+	<
+		TRpcs extends Rpc.Any,
+		THandlers,
+		THandlerError,
+		THandlerRequirements,
+		TServices = never,
+		TServiceError = never,
+		TServiceRequirements = never,
+		TSession extends SessionShape = SessionShape,
+		TPreflight = never,
+		TPreflightError = never,
+		TPreflightRequirements = never,
+	>(
+		options: AppHttpHostOptions<
+			TRpcs,
+			THandlers,
+			THandlerError,
+			THandlerRequirements,
+			TServices,
+			TServiceError,
+			TServiceRequirements,
+			TSession,
+			TPreflight,
+			TPreflightError,
+			TPreflightRequirements
+		>,
+	): PreflightHost<
+		ReturnType<typeof appHostHttp<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>>,
+		NoInfer<TPreflight>,
+		NoInfer<TPreflightError>,
+		NoInfer<TPreflightRequirements>
+	>;
+}

package/src/server/AppHostInput.ts

@@ -0,0 +1,74 @@
+import type { Effect, Layer } from "effect";
+import type { Rpc } from "effect/rpc";
+import type { AppDatabaseOptions, AppHostOptions, AppHttpHostOptions, AppLocalHostOptions } from "#server/appHost.ts";
+import type { SessionShape } from "#server/rpc-server/session.ts";
+
+export type HostPreflight<TServices = never, TError = never, TRequirements = never> =
+	| { readonly preflight: Layer.Layer<TServices, TError, TRequirements> }
+	| ([TServices | TError | TRequirements] extends [never] ? { readonly preflight?: never } : never);
+
+export type AppHostInput<
+	TRpcs extends Rpc.Any,
+	THandlers,
+	THandlerError,
+	THandlerRequirements,
+	TServices = never,
+	TServiceError = never,
+	TServiceRequirements = never,
+	TMigrations = never,
+	TSession extends SessionShape = SessionShape,
+	TApplicationError = never,
+	TApplicationRequirements = never,
+	TPreflight = never,
+	TPreflightError = never,
+	TPreflightRequirements = never,
+> = HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
+	(
+		| (AppDatabaseOptions<TMigrations> & {
+				readonly application: Effect.Effect<
+					AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
+					TApplicationError,
+					TApplicationRequirements
+				>;
+		  })
+		| AppHostOptions<
+				TRpcs,
+				THandlers,
+				THandlerError,
+				THandlerRequirements,
+				TServices,
+				TServiceError,
+				TServiceRequirements,
+				TMigrations,
+				TSession,
+				TPreflight,
+				TPreflightError,
+				TPreflightRequirements
+		  >
+		| AppLocalHostOptions<
+				TRpcs,
+				THandlers,
+				THandlerError,
+				THandlerRequirements,
+				TServices,
+				TServiceError,
+				TServiceRequirements,
+				TMigrations,
+				TPreflight,
+				TPreflightError,
+				TPreflightRequirements
+		  >
+		| AppHttpHostOptions<
+				TRpcs,
+				THandlers,
+				THandlerError,
+				THandlerRequirements,
+				TServices,
+				TServiceError,
+				TServiceRequirements,
+				TSession,
+				TPreflight,
+				TPreflightError,
+				TPreflightRequirements
+		  >
+	);

package/src/server/appHost.ts

@@ -1,6 +1,8 @@
-import { Context, type Effect } from "effect";
+import { Context, type Effect, Layer } from "effect";
 import type { Rpc } from "effect/rpc";
 import type { makeLiveServer } from "@shivaedev/effect-contract/makeLiveServer.ts";
+import type { AppHostFactory } from "#server/AppHostFactory.ts";
+import type { AppHostInput, HostPreflight } from "#server/AppHostInput.ts";
 import { appHostHttp, deferredHost, migratedHost } from "#server/appHostHttp.ts";
 import { type DatabaseConfig, databaseLayer } from "#server/databaseLayer.ts";
 import type { HostOptions, HostPolicy } from "#server/hostOptions.ts";
@@ -27,11 +29,15 @@ export type AppHostOptions<
 	TServiceRequirements = never,
 	TMigrations = never,
 	TSession extends SessionShape = SessionShape,
-> = HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> & {
-	readonly migrations: AppDatabaseOptions<TMigrations>["migrations"];
-	readonly policy?: undefined;
-	readonly sessions: SessionPolicy<TSession>;
-};
+	TPreflight = never,
+	TPreflightError = never,
+	TPreflightRequirements = never,
+> = HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
+	HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> & {
+		readonly migrations: AppDatabaseOptions<TMigrations>["migrations"];
+		readonly policy?: undefined;
+		readonly sessions: SessionPolicy<TSession>;
+	};
 
 export type AppLocalHostOptions<
 	TRpcs extends Rpc.Any,
@@ -42,11 +48,15 @@ export type AppLocalHostOptions<
 	TServiceError = never,
 	TServiceRequirements = never,
 	TMigrations = never,
-> = HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> & {
-	readonly migrations: AppDatabaseOptions<TMigrations>["migrations"];
-	readonly policy: "loopback";
-	readonly sessions?: never;
-};
+	TPreflight = never,
+	TPreflightError = never,
+	TPreflightRequirements = never,
+> = HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
+	HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> & {
+		readonly migrations: AppDatabaseOptions<TMigrations>["migrations"];
+		readonly policy: "loopback";
+		readonly sessions?: never;
+	};
 
 export type AppHttpHostOptions<
 	TRpcs extends Rpc.Any,
@@ -57,10 +67,13 @@ export type AppHttpHostOptions<
 	TServiceError = never,
 	TServiceRequirements = never,
 	TSession extends SessionShape = SessionShape,
-> = HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> &
+	TPreflight = never,
+	TPreflightError = never,
+	TPreflightRequirements = never,
+> = HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
+	HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> &
 	HostPolicy<TSession> & { readonly migrations?: undefined };
-
-export function appHost<
+export const appHost: AppHostFactory = <
 	TRpcs extends Rpc.Any,
 	THandlers,
 	THandlerError,
@@ -72,19 +85,11 @@ export function appHost<
 	TSession extends SessionShape = SessionShape,
 	TApplicationError = never,
 	TApplicationRequirements = never,
+	TPreflight = never,
+	TPreflightError = never,
+	TPreflightRequirements = never,
 >(
-	options:
-		| (AppDatabaseOptions<TMigrations> & {
-				readonly application: Effect.Effect<
-					AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
-					TApplicationError,
-					TApplicationRequirements
-				>;
-		  })
-		| AppHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations, TSession>
-		| AppLocalHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations>,
-): ReturnType<
-	typeof deferredHost<
+	options: AppHostInput<
 		TRpcs,
 		THandlers,
 		THandlerError,
@@ -95,51 +100,18 @@ export function appHost<
 		TMigrations,
 		TSession,
 		TApplicationError,
-		TApplicationRequirements
-	>
->;
-
-export function appHost<
-	TRpcs extends Rpc.Any,
-	THandlers,
-	THandlerError,
-	THandlerRequirements,
-	TServices = never,
-	TServiceError = never,
-	TServiceRequirements = never,
-	TSession extends SessionShape = SessionShape,
->(
-	options: AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
-): ReturnType<typeof appHostHttp<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>>;
-export function appHost<
-	TRpcs extends Rpc.Any,
-	THandlers,
-	THandlerError,
-	THandlerRequirements,
-	TServices = never,
-	TServiceError = never,
-	TServiceRequirements = never,
-	TMigrations = never,
-	TSession extends SessionShape = SessionShape,
-	TApplicationError = never,
-	TApplicationRequirements = never,
->(
-	options:
-		| (AppDatabaseOptions<TMigrations> & {
-				readonly application: Effect.Effect<
-					AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
-					TApplicationError,
-					TApplicationRequirements
-				>;
-		  })
-		| AppHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations, TSession>
-		| AppLocalHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations>
-		| AppHttpHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TSession>,
-) {
+		TApplicationRequirements,
+		TPreflight,
+		TPreflightError,
+		TPreflightRequirements
+	>,
+) => {
 	if ("application" in options) {
-		return deferredHost(options.application, appDatabase(options));
+		return deferredHost(options.application, appDatabase(options)).pipe(Layer.provideMerge(options.preflight ?? Layer.empty));
 	}
 	return options.migrations === undefined
-		? appHostHttp(options)
-		: migratedHost({ ...options, migrations: options.migrations }, appDatabase({ ...options, migrations: options.migrations }));
-}
+		? appHostHttp(options).pipe(Layer.provideMerge(options.preflight ?? Layer.empty))
+		: migratedHost({ ...options, migrations: options.migrations }, appDatabase({ ...options, migrations: options.migrations })).pipe(
+				Layer.provideMerge(options.preflight ?? Layer.empty),
+			);
+};

package/src/server/appHostHttp.ts

@@ -4,11 +4,12 @@ import { ByteSize, Config, Effect, Layer, Option, Schema } from "effect";
 import { HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpStaticServer } from "effect/http";
 import { type Rpc, RpcSerialization, RpcServer } from "effect/rpc";
 import type { Authenticated, MaybeAuthenticated, RequestTracing } from "#rpc/middleware.ts";
-import type { AppHostOptions, AppHttpHostOptions, AppLocalHostOptions } from "#server/appHost.ts";
+import type { AppHttpHostOptions } from "#server/appHost.ts";
 import { boundedRpcRequest } from "#server/boundedRpcRequest.ts";
 import type { databaseLayer } from "#server/databaseLayer.ts";
 import { healthRoute } from "#server/healthRoute.ts";
 import type { HostOptions, HostPolicy } from "#server/hostOptions.ts";
+import type { MigrationOptions } from "#server/MigrationOptions.ts";
 import { otlpTracing } from "#server/otlpTracing.ts";
 import { localRpcGuard } from "#server/rpc-server/local.ts";
 import { authenticatedLayer, maybeAuthenticatedLayer, type SessionShape } from "#server/rpc-server/session.ts";
@@ -96,9 +97,8 @@ export function migratedHost<
 	TMigrations,
 	TSession extends SessionShape,
 >(
-	options:
-		| AppHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations, TSession>
-		| AppLocalHostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements, TMigrations>,
+	options: HostOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> &
+		HostPolicy<TSession> & { readonly migrations: MigrationOptions<TMigrations> },
 	database: ReturnType<typeof databaseLayer<TMigrations>>,
 ) {
 	const services = Layer.mergeAll(options.services ?? Layer.empty);