@shivaedev/server 0.4.0 → 0.6.0

package/src/databaseLayer.ts

@@ -1,57 +1,29 @@
 import { createHash } from "node:crypto";
-import { createConnection } from "node:net";
 import * as PgClient from "@effect/sql-pg/PgClient";
-import { Config, Duration, Effect, Fiber, Layer, Redacted, Schedule } from "effect";
+import { Config, Context, Duration, Effect, Fiber, Layer, Option, Redacted, Schedule } from "effect";
 import * as Reactivity from "effect/reactivity/Reactivity";
+import { Migrator } from "effect/sql";
 import { makeLiveServer } from "@shivaedev/contract/makeLiveServer.ts";
 import { assertPostgresMigrations, postgresMigrationError } from "@shivaedev/sql/assertPostgresMigrations.ts";
-import type { SqlNameTransforms } from "@shivaedev/sql/clientOptions.ts";
 import { coordinateWorkerRelease } from "@shivaedev/sql/coordinateWorkerRelease.ts";
 import { migratePostgres } from "@shivaedev/sql/migrations.ts";
 import { type PendingPostgresMigrations, pendingPostgresMigrations } from "@shivaedev/sql/pendingPostgresMigrations.ts";
 import { type PostgresChangesOptions, postgresChanges } from "@shivaedev/sql/postgresChanges.ts";
+import { type PostgresOptions, postgresLayer } from "@shivaedev/sql/postgresLayer.ts";
 import { WorkerRelease } from "@shivaedev/sql/WorkerRelease.ts";
 import type { AppChanges, AppDatabaseOptions } from "#appHost.ts";
-import { databaseAddress } from "./databaseAddress.ts";
 
-export interface DatabaseConfig extends SqlNameTransforms {
-	readonly applicationName?: string;
-	readonly changes?: Partial<Omit<PostgresChangesOptions, "client" | "resync">>;
+export interface DatabaseConfig extends PostgresOptions {
+	readonly changes?: Partial<Omit<PostgresChangesOptions, "client" | "listenerClient" | "connectionSetting" | "resync">>;
 	readonly databaseUrl?: Redacted.Redacted<string>;
-	readonly maxConnections?: number;
+	readonly listenDatabaseUrl?: Redacted.Redacted<string>;
 }
 
-export function databaseLayer<R>(options: AppDatabaseOptions<R>, changesService: typeof AppChanges) {
+export function databaseLayer<R, E>(options: AppDatabaseOptions<R, E>, changesService: typeof AppChanges) {
 	const pool = Layer.unwrap(
-		Effect.gen(function* () {
-			const url = options.config?.databaseUrl ?? (yield* Config.Redacted("DATABASE_URL"));
-			const address = databaseAddress(url);
-			const disconnected = new Set<Promise<void>>();
-			// Native pool shutdown sends Terminate without waiting for its sockets to close.
-			yield* Effect.addFinalizer(() => Effect.promise(() => Promise.all([...disconnected])));
-			return PgClient.layer({
-				stream: () => {
-					const target = new URL(Redacted.value(url));
-					const host = address.host ?? target.searchParams.getAll("host").at(-1) ?? (decodeURIComponent(target.hostname) || "localhost");
-					const port = address.port ?? 5432;
-					const socket = createConnection(host.startsWith("/") ? { path: `${host}/.s.PGSQL.${port}` } : { host, noDelay: true, port });
-					const closed = new Promise<void>((resolve) =>
-						socket.once("close", () => {
-							disconnected.delete(closed);
-							resolve();
-						}),
-					);
-					disconnected.add(closed);
-					return socket;
-				},
-				transformQueryNames: options.config?.transformQueryNames,
-				transformResultNames: options.config?.transformResultNames,
-				url,
-				...address,
-				...(options.config?.maxConnections === undefined ? {} : { maxConnections: options.config.maxConnections }),
-				...(options.config?.applicationName === undefined ? {} : { applicationName: options.config.applicationName }),
-			});
-		}),
+		Effect.map(options.config?.databaseUrl === undefined ? Config.Redacted("DATABASE_URL") : Effect.succeed(options.config.databaseUrl), (url) =>
+			postgresLayer(url, options.config),
+		),
 	);
 	const prepared = Layer.effectDiscard(prepareMigrations(options.migrations)).pipe(Layer.provideMerge(pool));
 	const live = Layer.effect(changesService, makeLiveServer).pipe(Layer.provideMerge(Reactivity.layer));
@@ -69,12 +41,24 @@ export function databaseLayer<R>(options: AppDatabaseOptions<R>, changesService:
 			const url = options.config?.databaseUrl ?? (yield* Config.Redacted("DATABASE_URL"));
 			const name = yield* Config.String("APP_NAME").pipe(Config.withDefault(new URL(Redacted.value(url)).pathname));
 			const channel = changes?.channel ?? `changes_${createHash("sha256").update(name).digest("hex").slice(0, 32)}`;
-			return postgresChanges({ ...changes, channel, client, resync: hints.resync });
+			const listenUrl = options.config?.listenDatabaseUrl ?? Option.getOrUndefined(yield* Config.Redacted("LISTEN_DATABASE_URL").pipe(Config.option));
+			const listenerClient =
+				listenUrl === undefined
+					? client
+					: yield* Effect.map(
+							Layer.build(postgresLayer(listenUrl, { applicationName: options.config?.applicationName, maxConnections: 1 })),
+							(context) => Context.get(context, PgClient.PgClient),
+						);
+			let connectionSetting = options.config?.databaseUrl === undefined ? "DATABASE_URL" : "config.databaseUrl";
+			if (listenUrl !== undefined) {
+				connectionSetting = options.config?.listenDatabaseUrl === undefined ? "LISTEN_DATABASE_URL" : "config.listenDatabaseUrl";
+			}
+			return postgresChanges({ ...changes, channel, client, connectionSetting, listenerClient, resync: hints.resync });
 		}),
 	).pipe(Layer.provideMerge(base));
 }
 
-function prepareMigrations<R>(migrations: AppDatabaseOptions<R>["migrations"]) {
+function prepareMigrations<R, E>(migrations: AppDatabaseOptions<R, E>["migrations"]) {
 	switch (migrations.mode) {
 		case "check": {
 			const schema = { ...migrations };
@@ -88,7 +72,7 @@ function prepareMigrations<R>(migrations: AppDatabaseOptions<R>["migrations"]) {
 	}
 }
 
-function waitForMigrations<R>(migrations: AppDatabaseOptions<R>["migrations"]) {
+function waitForMigrations<R, E>(migrations: AppDatabaseOptions<R, E>["migrations"]) {
 	return Effect.gen(function* () {
 		const progressInterval = Duration.fromInputUnsafe(migrations.progressInterval ?? "30 seconds");
 		let pending: PendingPostgresMigrations = { components: [], migrations: [] };
@@ -113,10 +97,10 @@ function waitForMigrations<R>(migrations: AppDatabaseOptions<R>["migrations"]) {
 		}).pipe(
 			Effect.retry({
 				schedule: Schedule.max([Schedule.spaced(migrations.pollInterval ?? "1 second"), Schedule.during(migrations.waitTimeout ?? "5 minutes")]),
-				while: (error) => error._tag === "MigrationError" && error.kind === "BadState",
+				while: (error) => error instanceof Migrator.MigrationError && error.kind === "BadState",
 			}),
 			Effect.tapError((error) =>
-				error._tag === "MigrationError" && error.kind === "BadState" ? log("Timed out waiting for database migrations") : Effect.void,
+				error instanceof Migrator.MigrationError && error.kind === "BadState" ? log("Timed out waiting for database migrations") : Effect.void,
 			),
 		);
 		if (progress !== undefined) {

package/src/hostRpcRoutes.ts

@@ -49,14 +49,14 @@ export function hostRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequire
 				options.rpcPath ?? "/rpc",
 				socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire)),
 			);
-			yield* router.add("POST", options.rpcPath ?? "/rpc", (request) => {
-				HttpEffect.appendPreResponseHandlerUnsafe(request, rpcCacheControl);
-				return guarded.pipe(
+			yield* router.add("POST", options.rpcPath ?? "/rpc", (request) =>
+				guarded.pipe(
 					Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(bodySize)),
 					Effect.provideService(HttpServerRequest.HttpServerRequest, boundedRpcRequest(request)),
 					Effect.provideService(RpcSerialization.RpcSerialization, wire),
-				);
-			});
+					HttpEffect.withPreResponseHandler(rpcCacheControl),
+				),
+			);
 		}),
 	).pipe(
 		Layer.provide(

package/src/hostTransport.ts

@@ -2,6 +2,7 @@ import { Config, Effect, Option, Result, Schema } from "effect";
 import * as NetAddress from "effect/net/NetAddress";
 import { TrustedProxy } from "@shivaedev/identity/server/trustedProxy.ts";
 import { NativeOrigins } from "#nativeClientOrigins.ts";
+import { TrustedProxyRequired } from "#TrustedProxyRequired.ts";
 
 interface Options {
 	readonly config?: { readonly host?: string; readonly maxBodySize?: number; readonly trustedProxy?: string };
@@ -28,9 +29,7 @@ export const hostTransport = Effect.fn("Platform.hostTransport")(function* (opti
 			onSuccess: (address) => NetAddress.isLoopback(NetAddress.toCanonical(address)),
 		});
 	if (options.policy !== "loopback" && !loopback && trustedProxy === undefined) {
-		yield* Effect.logWarning(
-			"RPC forwarding is refused without a trusted proxy. Set TRUSTED_PROXY or config.trustedProxy for this non-loopback HOST.",
-		);
+		return yield* Effect.fail(new TrustedProxyRequired());
 	}
 	const nativeOrigins = yield* Schema.decodeUnknownEffect(NativeOrigins)(options.nativeOrigins ?? []).pipe(
 		Effect.mapError((cause) => new Config.ConfigError(cause)),

package/src/node-http/subscriptionSignal.ts

@@ -46,7 +46,7 @@ export function nodeSubscriptionSignal(options: NodeSubscriptionSignalOptions):
 	}
 	nodeRequest.once("close", onRequestClose);
 	socket.once("close", onSocketClose);
-	if (nodeRequest.destroyed || socket.destroyed) {
+	if ((nodeRequest.destroyed && !nodeRequest.complete) || socket.destroyed) {
 		controller.abort();
 	}
 	let disposed = false;

package/dist/databaseAddress.d.ts

@@ -1,4 +0,0 @@
-import type { PgPoolConfig } from "@effect/sql-pg/PgClient";
-import { Redacted } from "effect";
-export declare function databaseAddress(value: Redacted.Redacted<string>): Pick<PgPoolConfig, "host" | "port">;
-//# sourceMappingURL=databaseAddress.d.ts.map

package/dist/databaseAddress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"databaseAddress.d.ts","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAqBrG"}

package/dist/databaseAddress.js

@@ -1,25 +0,0 @@
-import { Redacted } from "effect";
-export function databaseAddress(value) {
-    try {
-        const url = new URL(Redacted.value(value));
-        if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
-            return {};
-        }
-        const hostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : decodeURIComponent(url.hostname);
-        // PgConnection applies query parameters in order, after the authority.
-        const host = url.searchParams.getAll("host").at(-1) ?? hostname;
-        const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
-        const port = rawPort === "" ? undefined : Number(rawPort);
-        if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
-            return {};
-        }
-        return {
-            ...(host === "" && !url.searchParams.has("host") ? {} : { host }),
-            ...(port === undefined ? {} : { port }),
-        };
-    }
-    catch {
-        return {};
-    }
-}
-//# sourceMappingURL=databaseAddress.js.map

package/dist/databaseAddress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"databaseAddress.js","sourceRoot":"","sources":["../src/databaseAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,UAAU,eAAe,CAAC,KAAgC;IAC/D,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,IAAI,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YACpE,OAAO,EAAE,CAAC;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7G,uEAAuE;QACvE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;QAChE,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC;QACnE,MAAM,IAAI,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;YAC1G,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO;YACN,GAAG,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;YACjE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;SACvC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC"}

package/src/databaseAddress.ts

@@ -1,25 +0,0 @@
-import type { PgPoolConfig } from "@effect/sql-pg/PgClient";
-import { Redacted } from "effect";
-
-export function databaseAddress(value: Redacted.Redacted<string>): Pick<PgPoolConfig, "host" | "port"> {
-	try {
-		const url = new URL(Redacted.value(value));
-		if (url.protocol !== "postgres:" && url.protocol !== "postgresql:") {
-			return {};
-		}
-		const hostname = url.hostname.startsWith("[") ? url.hostname.slice(1, -1) : decodeURIComponent(url.hostname);
-		// PgConnection applies query parameters in order, after the authority.
-		const host = url.searchParams.getAll("host").at(-1) ?? hostname;
-		const rawPort = url.searchParams.getAll("port").at(-1) ?? url.port;
-		const port = rawPort === "" ? undefined : Number(rawPort);
-		if (host.includes(",") || (port !== undefined && (!Number.isInteger(port) || port < 1 || port > 65_535))) {
-			return {};
-		}
-		return {
-			...(host === "" && !url.searchParams.has("host") ? {} : { host }),
-			...(port === undefined ? {} : { port }),
-		};
-	} catch {
-		return {};
-	}
-}