@shivaedev/server 0.22.0 → 0.23.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.
- package/CHANGELOG.md +11 -0
- package/README.md +35 -0
- package/dist/AppHostFactory.d.ts +2 -2
- package/dist/AppHostFactory.d.ts.map +1 -1
- package/dist/appHost.d.ts +3 -6
- package/dist/appHost.d.ts.map +1 -1
- package/dist/appHost.js +2 -2
- package/dist/appHost.js.map +1 -1
- package/dist/appHostHttp.d.ts +129 -75
- package/dist/appHostHttp.d.ts.map +1 -1
- package/dist/appHostHttp.js +5 -5
- package/dist/appHostHttp.js.map +1 -1
- package/dist/hostOptions.d.ts +11 -2
- package/dist/hostOptions.d.ts.map +1 -1
- package/dist/hostRpcRoutes.d.ts +18 -9
- package/dist/hostRpcRoutes.d.ts.map +1 -1
- package/dist/hostRpcRoutes.js +6 -3
- package/dist/hostRpcRoutes.js.map +1 -1
- package/dist/hostSensitiveKeys.d.ts +12 -0
- package/dist/hostSensitiveKeys.d.ts.map +1 -0
- package/dist/hostSensitiveKeys.js +8 -0
- package/dist/hostSensitiveKeys.js.map +1 -0
- package/dist/hostVersionLayer.d.ts +2 -0
- package/dist/hostVersionLayer.d.ts.map +1 -0
- package/dist/hostVersionLayer.js +8 -0
- package/dist/hostVersionLayer.js.map +1 -0
- package/package.json +10 -10
- package/src/AppHostFactory.ts +8 -8
- package/src/appHost.ts +21 -23
- package/src/appHostHttp.ts +5 -5
- package/src/hostOptions.ts +10 -6
- package/src/hostRpcRoutes.ts +7 -2
- package/src/hostSensitiveKeys.ts +11 -0
- package/src/hostVersionLayer.ts +8 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appHostHttp.d.ts","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"appHostHttp.d.ts","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKtD,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAItF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAM7D,wBAAgB,WAAW,CAC1B,KAAK,SAAS,GAAG,CAAC,GAAG,EACrB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,GAAG,KAAK,EACnB,kBAAkB,GAAG,qBAAqB,EAE1C,OAAO,EAAE,WAAW,CACnB,KAAK,EACL,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,kBAAkB,CAClB,GACA,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mdAiCX;AAED,wBAAgB,YAAY,CAC3B,KAAK,SAAS,GAAG,CAAC,GAAG,EACrB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,WAAW,GAAG,KAAK,EACnB,kBAAkB,GAAG,qBAAqB,EAC1C,eAAe,GAAG,KAAK,EAEvB,OAAO,EAAE,WAAW,CACnB,KAAK,EACL,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,kBAAkB,CAClB,GACA,UAAU,GAAG;IACZ,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;CACpE,EACF,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2qBAItE;AAED,wBAAgB,YAAY,CAC3B,KAAK,SAAS,GAAG,CAAC,GAAG,EACrB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,wBAAwB,EACxB,WAAW,GAAG,KAAK,EACnB,kBAAkB,GAAG,qBAAqB,EAC1C,eAAe,GAAG,KAAK,EAEvB,WAAW,EAAE,MAAM,CAAC,MAAM,CACzB,kBAAkB,CACjB,KAAK,EACL,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,KAAK,EACL,WAAW,EACX,kBAAkB,CAClB,EACD,iBAAiB,EACjB,wBAAwB,CACxB,EACD,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2qBAGtE"}
|
package/dist/appHostHttp.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
2
|
import { HttpRouter, HttpServer } from "effect/http";
|
|
3
|
-
import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
|
|
4
3
|
import { hostHttpServices } from "#adapters/hostHttpServices.ts";
|
|
5
4
|
import { nodeHttpServer } from "#adapters/nodeHttpServer.ts";
|
|
6
5
|
import { browserErrorRoute } from "#browserErrorRoute.ts";
|
|
@@ -8,22 +7,23 @@ import { healthRoute } from "#healthRoute.ts";
|
|
|
8
7
|
import { hostApplicationRoutes } from "#hostApplicationRoutes.ts";
|
|
9
8
|
import { hostAssets } from "#hostAssets.ts";
|
|
10
9
|
import { hostRpcRoutes } from "#hostRpcRoutes.ts";
|
|
10
|
+
import { hostSensitiveKeys } from "#hostSensitiveKeys.ts";
|
|
11
11
|
import { hostTransport } from "#hostTransport.ts";
|
|
12
12
|
import { nativeClientOrigins } from "#nativeClientOrigins.ts";
|
|
13
13
|
import { otlpTracing } from "#otlpTracing.ts";
|
|
14
14
|
import { RedactionPolicy } from "#RedactionPolicy.ts";
|
|
15
15
|
import { redactingDiagnostics } from "#redactingDiagnostics.ts";
|
|
16
16
|
export function appHostHttp(options) {
|
|
17
|
-
|
|
17
|
+
const assets = options.assets === undefined ? Layer.empty : hostAssets(options.assets);
|
|
18
|
+
return Layer.unwrap(Effect.map(hostSensitiveKeys(options), (sensitive) => Layer.unwrap(Effect.gen(function* () {
|
|
18
19
|
const transport = yield* hostTransport(options);
|
|
19
20
|
const { bodySize, host, trustedProxy, nativeOrigins } = transport;
|
|
20
|
-
const routes = hostRpcRoutes(options, transport, sensitive);
|
|
21
|
-
const assets = options.assets === undefined ? Layer.empty : hostAssets(options.assets);
|
|
21
|
+
const routes = options.group === undefined ? Layer.empty : hostRpcRoutes(options, transport, sensitive);
|
|
22
22
|
const application = Layer.mergeAll(options.services ?? Layer.empty);
|
|
23
23
|
const sessions = Layer.mergeAll(Layer.empty, ...(options.sessions === undefined ? [] : [options.sessions]));
|
|
24
24
|
const server = nodeHttpServer(host, { ...options.config, maxBodySize: bodySize });
|
|
25
25
|
const applicationRoutes = hostApplicationRoutes(options.routes, bodySize);
|
|
26
|
-
const httpRoutes = Layer.mergeAll(routes, healthRoute, browserErrorRoute(trustedProxy, options.browserErrors), assets, applicationRoutes).pipe(Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy, false, options.rpcPath)), Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy, options.nativeOrigins === undefined ? "preflight" : true)));
|
|
26
|
+
const httpRoutes = Layer.mergeAll(routes, healthRoute, browserErrorRoute(trustedProxy, options.browserErrors), assets, applicationRoutes).pipe(Layer.provide(options.group === undefined ? Layer.empty : nativeClientOrigins(nativeOrigins, trustedProxy, false, options.rpcPath)), Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy, options.nativeOrigins === undefined ? "preflight" : true)));
|
|
27
27
|
return Layer.unwrap(HttpRouter.toHttpEffect(httpRoutes).pipe(Effect.map((handler) => HttpServer.serve(handler).pipe(HttpServer.withLogAddress, Layer.provideMerge(server))))).pipe(Layer.provideMerge(application), Layer.provide(sessions), Layer.provideMerge(hostHttpServices));
|
|
28
28
|
})).pipe(Layer.provide(redactingDiagnostics(sensitive)), Layer.provide(otlpTracing), Layer.provide(Layer.succeed(RedactionPolicy, sensitive)))));
|
|
29
29
|
}
|
package/dist/appHostHttp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appHostHttp.js","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"appHostHttp.js","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"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"}
|
package/dist/hostOptions.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export type HostCoreOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THa
|
|
|
10
10
|
readonly assets?: string | AssetOptions;
|
|
11
11
|
readonly browserErrors?: BrowserErrorOptions;
|
|
12
12
|
readonly config?: AppDatabaseOptions["config"] & {
|
|
13
|
+
readonly buildVersion?: string;
|
|
13
14
|
readonly port?: number;
|
|
14
15
|
readonly socketPath?: string;
|
|
15
16
|
readonly host?: string;
|
|
@@ -19,11 +20,15 @@ export type HostCoreOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THa
|
|
|
19
20
|
readonly disablePreemptiveShutdown?: boolean;
|
|
20
21
|
readonly gracefulShutdownTimeout?: Duration.Input;
|
|
21
22
|
};
|
|
22
|
-
readonly group: RpcGroup.RpcGroup<TRpcs>;
|
|
23
|
-
readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements>;
|
|
24
23
|
readonly nativeOrigins?: readonly string[];
|
|
25
24
|
readonly rpcPath?: HttpRouter.PathInput;
|
|
26
25
|
} & ({
|
|
26
|
+
readonly group: RpcGroup.RpcGroup<TRpcs>;
|
|
27
|
+
readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements>;
|
|
28
|
+
} | {
|
|
29
|
+
readonly group?: never;
|
|
30
|
+
readonly handlers?: never;
|
|
31
|
+
}) & ({
|
|
27
32
|
readonly services: Layer.Layer<TServices, TServiceError, TServiceRequirements>;
|
|
28
33
|
} | ([TServices | TServiceError | TServiceRequirements] extends [never] ? {
|
|
29
34
|
readonly services?: never;
|
|
@@ -38,5 +43,9 @@ export type HostPolicy = {
|
|
|
38
43
|
} | {
|
|
39
44
|
readonly policy: "loopback";
|
|
40
45
|
readonly sessions?: never;
|
|
46
|
+
} | {
|
|
47
|
+
readonly group?: never;
|
|
48
|
+
readonly policy?: undefined;
|
|
49
|
+
readonly sessions?: never;
|
|
41
50
|
};
|
|
42
51
|
//# sourceMappingURL=hostOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostOptions.d.ts","sourceRoot":"","sources":["../src/hostOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAEjG,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,oBAAoB,EAAE,SAAS,EAAE,aAAa,EAAE,oBAAoB,IAAI;IACpJ,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IACxC,QAAQ,CAAC,aAAa,CAAC,EAAE,mBAAmB,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,GAAG;QAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;QAC3C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QAC7C,QAAQ,CAAC,uBAAuB,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;KAClD,CAAC;IACF,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"hostOptions.d.ts","sourceRoot":"","sources":["../src/hostOptions.ts"],"names":[],"mappings":"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"}
|
package/dist/hostRpcRoutes.d.ts
CHANGED
|
@@ -7,6 +7,9 @@ import type { HostPolicy } from "#hostOptions.ts";
|
|
|
7
7
|
import type { hostTransport } from "#hostTransport.ts";
|
|
8
8
|
type BuiltRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements> = ReturnType<typeof buildRpcRoutes<TRpcs, THandlers, TError, TRequirements>>;
|
|
9
9
|
type RouteOptions<TRpcs extends Rpc.Any, THandlers, TError, TRequirements> = {
|
|
10
|
+
readonly config?: {
|
|
11
|
+
readonly buildVersion?: string;
|
|
12
|
+
};
|
|
10
13
|
readonly group: RpcGroup.RpcGroup<TRpcs>;
|
|
11
14
|
readonly handlers: Layer.Layer<THandlers, TError, TRequirements>;
|
|
12
15
|
readonly rpcPath?: HttpRouter.PathInput;
|
|
@@ -15,38 +18,44 @@ export declare function hostRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError,
|
|
|
15
18
|
readonly policy: "loopback";
|
|
16
19
|
}, transport: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<Layer.Success<BuiltRoutes<TRpcs, THandlers, TError, TRequirements>>, Layer.Error<BuiltRoutes<TRpcs, THandlers, TError, TRequirements>>, TRequirements | Exclude<Rpc.ServicesServer<TRpcs>, THandlers> | Exclude<Layer.Services<BuiltRoutes<TRpcs, THandlers, TError, TRequirements>>, SessionPolicy | HttpRouter.Request<"Requires", SessionPolicy>>>;
|
|
17
20
|
export declare function hostRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements>(...args: Parameters<typeof buildRpcRoutes<TRpcs, THandlers, TError, TRequirements>>): BuiltRoutes<TRpcs, THandlers, TError, TRequirements>;
|
|
18
|
-
declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements>(options: RouteOptions<TRpcs, THandlers, TError, TRequirements>, { bodySize, trustedProxy, nativeOrigins }: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<never, TError | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicies, SessionPolicy | Exclude<TRequirements, RpcSerialization.RpcSerialization> | Exclude<Exclude<HttpRouter.HttpRouter, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
21
|
+
declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements>(options: RouteOptions<TRpcs, THandlers, TError, TRequirements>, { bodySize, trustedProxy, nativeOrigins }: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<never, TError | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicies, SessionPolicy | Exclude<Exclude<TRequirements, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<HttpRouter.HttpRouter, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
19
22
|
readonly _tag: `${string}.$changes`;
|
|
20
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<HttpRouter.Request<"Requires", SessionPolicy>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
23
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<HttpRouter.Request<"Requires", SessionPolicy>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
21
24
|
readonly _tag: `${string}.$changes`;
|
|
22
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
25
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
23
26
|
readonly _tag: `${string}.$changes`;
|
|
24
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<
|
|
27
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
25
28
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
26
29
|
} ? Extract<TMiddleware, {
|
|
27
30
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
28
31
|
}> : never>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
29
32
|
readonly _tag: `${string}.$changes`;
|
|
30
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<
|
|
33
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<import("effect/Scope").Scope, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
31
34
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
32
35
|
} ? Extract<TMiddleware, {
|
|
33
36
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
34
37
|
}> : never>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
35
38
|
readonly _tag: `${string}.$changes`;
|
|
36
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.
|
|
39
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
37
40
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
38
41
|
} ? Extract<TMiddleware, {
|
|
39
42
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
40
43
|
}> : never>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
41
44
|
readonly _tag: `${string}.$changes`;
|
|
42
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<
|
|
45
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
46
|
+
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
47
|
+
} ? Extract<TMiddleware, {
|
|
48
|
+
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
49
|
+
}> : never>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
50
|
+
readonly _tag: `${string}.$changes`;
|
|
51
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Effect.Services<(TRpcs extends {
|
|
43
52
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
44
53
|
} ? Extract<TMiddleware, {
|
|
45
54
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
46
55
|
}> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
47
56
|
readonly _tag: `${string}.$changes`;
|
|
48
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
|
|
57
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
|
|
49
58
|
readonly _tag: `${string}.$changes`;
|
|
50
|
-
}>, `${string}.$changes`>, THandlers>, RpcSerialization.RpcSerialization>>;
|
|
59
|
+
}>, `${string}.$changes`>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization>>;
|
|
51
60
|
export {};
|
|
52
61
|
//# sourceMappingURL=hostRpcRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAmC,UAAU,EAAyC,MAAM,aAAa,CAAC;AAEjH,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
package/dist/hostRpcRoutes.js
CHANGED
|
@@ -2,6 +2,7 @@ import { ByteSize, Effect, Layer } from "effect";
|
|
|
2
2
|
import { HttpEffect, HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import { RpcSerialization } from "effect/rpc";
|
|
5
|
+
import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
|
|
5
6
|
import { validateReadPolicies } from "@shivaedev/contract/validateReadPolicies.ts";
|
|
6
7
|
import { localRpcGuard } from "@shivaedev/identity/server/adapters/local.ts";
|
|
7
8
|
import { authenticatedLayer, maybeAuthenticatedLayer } from "@shivaedev/identity/server/session.ts";
|
|
@@ -10,6 +11,7 @@ import { boundedRpcRequest } from "#boundedRpcRequest.ts";
|
|
|
10
11
|
import { boundedRpcSocket } from "#boundedRpcSocket.ts";
|
|
11
12
|
import { hostChanges } from "#hostChanges.ts";
|
|
12
13
|
import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
|
|
14
|
+
import { hostVersionLayer } from "#hostVersionLayer.ts";
|
|
13
15
|
import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
|
|
14
16
|
import { rpcRequestTracing } from "#rpcRequestTracing.ts";
|
|
15
17
|
import { socketRpc } from "#socketRpc.ts";
|
|
@@ -24,14 +26,15 @@ function buildRpcRoutes(options, { bodySize, trustedProxy, nativeOrigins }, sens
|
|
|
24
26
|
return HttpRouter.use((router) => Effect.gen(function* () {
|
|
25
27
|
yield* validateReadPolicies(options.group);
|
|
26
28
|
const wire = redactingRpcSerialization(yield* RpcSerialization.RpcSerialization, sensitive);
|
|
27
|
-
const
|
|
29
|
+
const group = options.group.merge(HostVersion.application);
|
|
30
|
+
const handler = yield* hostRpc(group).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire));
|
|
28
31
|
const guarded = Effect.flatMap(UnixSocketRequest, (unix) => (unix ? handler : localRpcGuard(handler, trustedProxy, nativeOrigins)));
|
|
29
|
-
const websocket = yield* hostRpc(
|
|
32
|
+
const websocket = yield* hostRpc(group, true).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire));
|
|
30
33
|
yield* router.add("OPTIONS", options.rpcPath ?? "/rpc", HttpServerResponse.text("Local same-origin requests only", {
|
|
31
34
|
status: HttpStatus.fromLiteral("Forbidden"),
|
|
32
35
|
}));
|
|
33
36
|
yield* router.add("GET", options.rpcPath ?? "/rpc", () => boundedRpcSocket(bodySize).pipe(Effect.flatMap((request) => socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.provideService(RpcSerialization.RpcSerialization, wire)))));
|
|
34
37
|
yield* router.add("POST", options.rpcPath ?? "/rpc", () => boundedRpcRequest().pipe(Effect.flatMap((request) => guarded.pipe(Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(bodySize)), Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.provideService(RpcSerialization.RpcSerialization, wire), HttpEffect.withPreResponseHandler(rpcCacheControl)))));
|
|
35
|
-
})).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(RpcSerialization.layerNdjson));
|
|
38
|
+
})).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(hostVersionLayer(options.config?.buildVersion)), Layer.provide(RpcSerialization.layerNdjson));
|
|
36
39
|
}
|
|
37
40
|
//# sourceMappingURL=hostRpcRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAA2B,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type Rpc, RpcGroup } from "effect/rpc";
|
|
2
|
+
export declare function hostSensitiveKeys<TRpcs extends Rpc.Any>(options: {
|
|
3
|
+
readonly group?: RpcGroup.RpcGroup<TRpcs>;
|
|
4
|
+
readonly config?: {
|
|
5
|
+
readonly sensitiveKeys?: readonly string[];
|
|
6
|
+
};
|
|
7
|
+
}): import("effect/Effect").Effect<((key: string) => boolean) & {
|
|
8
|
+
forRpc: (tag: string | undefined) => (key: string) => boolean;
|
|
9
|
+
maskFailure: (tag: string | undefined, reason: "Fail" | "Die") => boolean;
|
|
10
|
+
redactFailure: (tag: string | undefined, reason: "Fail" | "Die", value: unknown) => unknown;
|
|
11
|
+
}, import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, never>;
|
|
12
|
+
//# sourceMappingURL=hostSensitiveKeys.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostSensitiveKeys.d.ts","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGhD,wBAAgB,iBAAiB,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE;IACjE,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC;CACjE;;;;iJAIA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { RpcGroup } from "effect/rpc";
|
|
2
|
+
import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
|
|
3
|
+
export function hostSensitiveKeys(options) {
|
|
4
|
+
return options.group === undefined
|
|
5
|
+
? schemaSensitiveKeys(RpcGroup.make(), options.config?.sensitiveKeys)
|
|
6
|
+
: schemaSensitiveKeys(options.group, options.config?.sensitiveKeys);
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=hostSensitiveKeys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostSensitiveKeys.js","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,MAAM,UAAU,iBAAiB,CAAwB,OAGxD;IACA,OAAO,OAAO,CAAC,KAAK,KAAK,SAAS;QACjC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC;QACrE,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostVersionLayer.d.ts","sourceRoot":"","sources":["../src/hostVersionLayer.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,8GAI3D"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Stream } from "effect";
|
|
2
|
+
import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
|
|
3
|
+
export function hostVersionLayer(version) {
|
|
4
|
+
return HostVersion.application.toLayer({
|
|
5
|
+
"platform.hostVersion.watch": () => (version === undefined ? Stream.never : Stream.concat(Stream.succeed(version), Stream.never)),
|
|
6
|
+
});
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=hostVersionLayer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostVersionLayer.js","sourceRoot":"","sources":["../src/hostVersionLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAEjE,MAAM,UAAU,gBAAgB,CAAC,OAA2B;IAC3D,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC;QACtC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;KACjI,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"description": "The Effect application host: HTTP and RPC serving, health, OTLP export, database and migrations, and development mode",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -46,10 +46,10 @@
|
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@shivaedev/changes": "0.9.0",
|
|
49
|
-
"@shivaedev/contract": "0.
|
|
49
|
+
"@shivaedev/contract": "0.35.0",
|
|
50
50
|
"@shivaedev/errors": "0.8.0",
|
|
51
51
|
"@shivaedev/http": "0.5.0",
|
|
52
|
-
"@shivaedev/identity": "0.23.
|
|
52
|
+
"@shivaedev/identity": "0.23.1",
|
|
53
53
|
"@shivaedev/local-postgres": "0.12.0",
|
|
54
54
|
"@shivaedev/sql": "0.36.1"
|
|
55
55
|
},
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"@effect/sql-pg": "4.0.6",
|
|
59
59
|
"@effect/vitest": "4.0.6",
|
|
60
60
|
"@shivaedev/access": "0.4.2",
|
|
61
|
-
"@shivaedev/admin": "0.19.
|
|
61
|
+
"@shivaedev/admin": "0.19.5",
|
|
62
62
|
"@shivaedev/jobs": "0.34.0",
|
|
63
|
-
"@shivaedev/quality": "0.
|
|
63
|
+
"@shivaedev/quality": "0.59.0",
|
|
64
64
|
"@shivaedev/rate-limit": "0.3.3",
|
|
65
|
-
"@shivaedev/test-kits": "0.2.
|
|
66
|
-
"@shivaedev/test-sql": "0.
|
|
67
|
-
"@shivaedev/test-story": "0.37.
|
|
65
|
+
"@shivaedev/test-kits": "0.2.2",
|
|
66
|
+
"@shivaedev/test-sql": "0.19.0",
|
|
67
|
+
"@shivaedev/test-story": "0.37.1",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"better-auth": "1.7.14",
|
|
70
70
|
"effect": "4.0.6",
|
|
@@ -76,8 +76,8 @@
|
|
|
76
76
|
"@effect/platform-node": "4.0.6",
|
|
77
77
|
"@effect/sql-pg": "4.0.6",
|
|
78
78
|
"@effect/vitest": "4.0.6",
|
|
79
|
-
"@shivaedev/admin": "0.19.
|
|
80
|
-
"@shivaedev/test-sql": "0.
|
|
79
|
+
"@shivaedev/admin": "0.19.5",
|
|
80
|
+
"@shivaedev/test-sql": "0.19.0",
|
|
81
81
|
"better-auth": "1.7.14",
|
|
82
82
|
"effect": "4.0.6"
|
|
83
83
|
},
|
package/src/AppHostFactory.ts
CHANGED
|
@@ -13,10 +13,10 @@ type PreflightHost<THost extends Layer.Any, TServices, TError, TRequirements> =
|
|
|
13
13
|
|
|
14
14
|
export interface AppHostFactory {
|
|
15
15
|
<
|
|
16
|
-
TRpcs extends Rpc.Any,
|
|
17
|
-
THandlers,
|
|
18
|
-
THandlerError,
|
|
19
|
-
THandlerRequirements,
|
|
16
|
+
TRpcs extends Rpc.Any = never,
|
|
17
|
+
THandlers = never,
|
|
18
|
+
THandlerError = never,
|
|
19
|
+
THandlerRequirements = never,
|
|
20
20
|
TServices = never,
|
|
21
21
|
TServiceError = never,
|
|
22
22
|
TServiceRequirements = never,
|
|
@@ -72,10 +72,10 @@ export interface AppHostFactory {
|
|
|
72
72
|
>;
|
|
73
73
|
|
|
74
74
|
<
|
|
75
|
-
TRpcs extends Rpc.Any,
|
|
76
|
-
THandlers,
|
|
77
|
-
THandlerError,
|
|
78
|
-
THandlerRequirements,
|
|
75
|
+
TRpcs extends Rpc.Any = never,
|
|
76
|
+
THandlers = never,
|
|
77
|
+
THandlerError = never,
|
|
78
|
+
THandlerRequirements = never,
|
|
79
79
|
TServices = never,
|
|
80
80
|
TServiceError = never,
|
|
81
81
|
TServiceRequirements = never,
|
package/src/appHost.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
|
|
2
2
|
import { Effect, Layer } from "effect";
|
|
3
3
|
import type { Rpc } from "effect/rpc";
|
|
4
|
-
import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
|
|
5
4
|
import { isSensitiveKey } from "@shivaedev/errors/sensitive.ts";
|
|
6
|
-
import type { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
7
5
|
import type { AppHostFactory } from "#AppHostFactory.ts";
|
|
8
6
|
import type { AppHostInput, HostPreflight } from "#AppHostInput.ts";
|
|
9
7
|
import { appDatabase, type DatabaseConfig } from "#appDatabase.ts";
|
|
10
8
|
import { appHostHttp, deferredHost, migratedHost } from "#appHostHttp.ts";
|
|
11
9
|
import type { HostCoreOptions, HostPolicy, HostRouteRequirements, HostRoutes } from "#hostOptions.ts";
|
|
10
|
+
import { hostSensitiveKeys } from "#hostSensitiveKeys.ts";
|
|
12
11
|
import type { MigrationOptions } from "#MigrationOptions.ts";
|
|
13
12
|
import { redactingDiagnostics } from "#redactingDiagnostics.ts";
|
|
14
13
|
|
|
@@ -18,10 +17,10 @@ export interface AppDatabaseOptions<R = never, E = never> {
|
|
|
18
17
|
}
|
|
19
18
|
|
|
20
19
|
export type AppHostOptions<
|
|
21
|
-
TRpcs extends Rpc.Any,
|
|
22
|
-
THandlers,
|
|
23
|
-
THandlerError,
|
|
24
|
-
THandlerRequirements,
|
|
20
|
+
TRpcs extends Rpc.Any = never,
|
|
21
|
+
THandlers = never,
|
|
22
|
+
THandlerError = never,
|
|
23
|
+
THandlerRequirements = never,
|
|
25
24
|
TServices = never,
|
|
26
25
|
TServiceError = never,
|
|
27
26
|
TServiceRequirements = never,
|
|
@@ -34,17 +33,17 @@ export type AppHostOptions<
|
|
|
34
33
|
TMigrationError = never,
|
|
35
34
|
> = HostPreflight<TPreflight, TPreflightError, TPreflightRequirements> &
|
|
36
35
|
HostCoreOptions<TRpcs, THandlers, THandlerError, THandlerRequirements, TServices, TServiceError, TServiceRequirements> &
|
|
37
|
-
HostRoutes<TRouteError, TRouteRequirements> &
|
|
36
|
+
HostRoutes<TRouteError, TRouteRequirements> &
|
|
37
|
+
HostPolicy & {
|
|
38
38
|
readonly migrations: AppDatabaseOptions<TMigrations, TMigrationError>["migrations"];
|
|
39
39
|
readonly policy?: undefined;
|
|
40
|
-
readonly sessions: Layer.Layer<SessionPolicy>;
|
|
41
40
|
};
|
|
42
41
|
|
|
43
42
|
export type AppLocalHostOptions<
|
|
44
|
-
TRpcs extends Rpc.Any,
|
|
45
|
-
THandlers,
|
|
46
|
-
THandlerError,
|
|
47
|
-
THandlerRequirements,
|
|
43
|
+
TRpcs extends Rpc.Any = never,
|
|
44
|
+
THandlers = never,
|
|
45
|
+
THandlerError = never,
|
|
46
|
+
THandlerRequirements = never,
|
|
48
47
|
TServices = never,
|
|
49
48
|
TServiceError = never,
|
|
50
49
|
TServiceRequirements = never,
|
|
@@ -64,10 +63,10 @@ export type AppLocalHostOptions<
|
|
|
64
63
|
};
|
|
65
64
|
|
|
66
65
|
export type AppHttpHostOptions<
|
|
67
|
-
TRpcs extends Rpc.Any,
|
|
68
|
-
THandlers,
|
|
69
|
-
THandlerError,
|
|
70
|
-
THandlerRequirements,
|
|
66
|
+
TRpcs extends Rpc.Any = never,
|
|
67
|
+
THandlers = never,
|
|
68
|
+
THandlerError = never,
|
|
69
|
+
THandlerRequirements = never,
|
|
71
70
|
TServices = never,
|
|
72
71
|
TServiceError = never,
|
|
73
72
|
TServiceRequirements = never,
|
|
@@ -81,10 +80,10 @@ export type AppHttpHostOptions<
|
|
|
81
80
|
HostRoutes<TRouteError, TRouteRequirements> &
|
|
82
81
|
HostPolicy & { readonly migrations?: undefined };
|
|
83
82
|
export const appHost: AppHostFactory = <
|
|
84
|
-
TRpcs extends Rpc.Any,
|
|
85
|
-
THandlers,
|
|
86
|
-
THandlerError,
|
|
87
|
-
THandlerRequirements,
|
|
83
|
+
TRpcs extends Rpc.Any = never,
|
|
84
|
+
THandlers = never,
|
|
85
|
+
THandlerError = never,
|
|
86
|
+
THandlerRequirements = never,
|
|
88
87
|
TServices = never,
|
|
89
88
|
TServiceError = never,
|
|
90
89
|
TServiceRequirements = never,
|
|
@@ -122,9 +121,8 @@ export const appHost: AppHostFactory = <
|
|
|
122
121
|
startup === undefined
|
|
123
122
|
? Layer.empty
|
|
124
123
|
: Layer.unwrap(
|
|
125
|
-
Effect.map(
|
|
126
|
-
|
|
127
|
-
(sensitive) => startup.pipe(Layer.provide(redactingDiagnostics(sensitive))),
|
|
124
|
+
Effect.map("application" in options ? Effect.succeed(isSensitiveKey) : hostSensitiveKeys(options), (sensitive) =>
|
|
125
|
+
startup.pipe(Layer.provide(redactingDiagnostics(sensitive))),
|
|
128
126
|
),
|
|
129
127
|
);
|
|
130
128
|
if ("application" in options) {
|
package/src/appHostHttp.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
2
|
import { HttpRouter, HttpServer } from "effect/http";
|
|
3
3
|
import type { Rpc } from "effect/rpc";
|
|
4
|
-
import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
|
|
5
4
|
import { hostHttpServices } from "#adapters/hostHttpServices.ts";
|
|
6
5
|
import { nodeHttpServer } from "#adapters/nodeHttpServer.ts";
|
|
7
6
|
import type { appDatabase } from "#appDatabase.ts";
|
|
@@ -12,6 +11,7 @@ import { hostApplicationRoutes } from "#hostApplicationRoutes.ts";
|
|
|
12
11
|
import { hostAssets } from "#hostAssets.ts";
|
|
13
12
|
import type { HostOptions, HostPolicy, HostRouteRequirements } from "#hostOptions.ts";
|
|
14
13
|
import { hostRpcRoutes } from "#hostRpcRoutes.ts";
|
|
14
|
+
import { hostSensitiveKeys } from "#hostSensitiveKeys.ts";
|
|
15
15
|
import { hostTransport } from "#hostTransport.ts";
|
|
16
16
|
import type { MigrationOptions } from "#MigrationOptions.ts";
|
|
17
17
|
import { nativeClientOrigins } from "#nativeClientOrigins.ts";
|
|
@@ -43,14 +43,14 @@ export function appHostHttp<
|
|
|
43
43
|
> &
|
|
44
44
|
HostPolicy,
|
|
45
45
|
) {
|
|
46
|
+
const assets = options.assets === undefined ? Layer.empty : hostAssets(options.assets);
|
|
46
47
|
return Layer.unwrap(
|
|
47
|
-
Effect.map(
|
|
48
|
+
Effect.map(hostSensitiveKeys(options), (sensitive) =>
|
|
48
49
|
Layer.unwrap(
|
|
49
50
|
Effect.gen(function* () {
|
|
50
51
|
const transport = yield* hostTransport(options);
|
|
51
52
|
const { bodySize, host, trustedProxy, nativeOrigins } = transport;
|
|
52
|
-
const routes = hostRpcRoutes(options, transport, sensitive);
|
|
53
|
-
const assets = options.assets === undefined ? Layer.empty : hostAssets(options.assets);
|
|
53
|
+
const routes = options.group === undefined ? Layer.empty : hostRpcRoutes(options, transport, sensitive);
|
|
54
54
|
const application = Layer.mergeAll(options.services ?? Layer.empty);
|
|
55
55
|
const sessions = Layer.mergeAll(Layer.empty, ...(options.sessions === undefined ? [] : [options.sessions]));
|
|
56
56
|
const server = nodeHttpServer(host, { ...options.config, maxBodySize: bodySize });
|
|
@@ -62,7 +62,7 @@ export function appHostHttp<
|
|
|
62
62
|
assets,
|
|
63
63
|
applicationRoutes,
|
|
64
64
|
).pipe(
|
|
65
|
-
Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy, false, options.rpcPath)),
|
|
65
|
+
Layer.provide(options.group === undefined ? Layer.empty : nativeClientOrigins(nativeOrigins, trustedProxy, false, options.rpcPath)),
|
|
66
66
|
Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy, options.nativeOrigins === undefined ? "preflight" : true)),
|
|
67
67
|
);
|
|
68
68
|
return Layer.unwrap(
|
package/src/hostOptions.ts
CHANGED
|
@@ -12,6 +12,7 @@ export type HostCoreOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THa
|
|
|
12
12
|
readonly assets?: string | AssetOptions;
|
|
13
13
|
readonly browserErrors?: BrowserErrorOptions;
|
|
14
14
|
readonly config?: AppDatabaseOptions["config"] & {
|
|
15
|
+
readonly buildVersion?: string;
|
|
15
16
|
readonly port?: number;
|
|
16
17
|
readonly socketPath?: string;
|
|
17
18
|
readonly host?: string;
|
|
@@ -21,14 +22,16 @@ export type HostCoreOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THa
|
|
|
21
22
|
readonly disablePreemptiveShutdown?: boolean;
|
|
22
23
|
readonly gracefulShutdownTimeout?: Duration.Input;
|
|
23
24
|
};
|
|
24
|
-
readonly group: RpcGroup.RpcGroup<TRpcs>;
|
|
25
|
-
readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements>;
|
|
26
25
|
readonly nativeOrigins?: readonly string[];
|
|
27
26
|
readonly rpcPath?: HttpRouter.PathInput;
|
|
28
27
|
} & (
|
|
29
|
-
| { readonly
|
|
30
|
-
|
|
|
31
|
-
)
|
|
28
|
+
| { readonly group: RpcGroup.RpcGroup<TRpcs>; readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements> }
|
|
29
|
+
| { readonly group?: never; readonly handlers?: never }
|
|
30
|
+
) &
|
|
31
|
+
(
|
|
32
|
+
| { readonly services: Layer.Layer<TServices, TServiceError, TServiceRequirements> }
|
|
33
|
+
| ([TServices | TServiceError | TServiceRequirements] extends [never] ? { readonly services?: never } : never)
|
|
34
|
+
);
|
|
32
35
|
|
|
33
36
|
export interface HostRoutes<TRouteError = never, TRouteRequirements = HostRouteRequirements> {
|
|
34
37
|
readonly routes?: Layer.Layer<never, TRouteError, TRouteRequirements>;
|
|
@@ -49,4 +52,5 @@ export type HostOptions<
|
|
|
49
52
|
|
|
50
53
|
export type HostPolicy =
|
|
51
54
|
| { readonly policy?: undefined; readonly sessions: Layer.Layer<SessionPolicy> }
|
|
52
|
-
| { readonly policy: "loopback"; readonly sessions?: never }
|
|
55
|
+
| { readonly policy: "loopback"; readonly sessions?: never }
|
|
56
|
+
| { readonly group?: never; readonly policy?: undefined; readonly sessions?: never };
|