@shivaedev/server 0.43.0 → 0.44.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +21 -0
- package/README.md +2 -2
- package/dist/HostModels.d.ts +9 -0
- package/dist/HostModels.d.ts.map +1 -0
- package/dist/HostModels.js +27 -0
- package/dist/HostModels.js.map +1 -0
- package/dist/appDatabase.d.ts +1 -2
- package/dist/appDatabase.d.ts.map +1 -1
- package/dist/appDatabase.js +6 -9
- package/dist/appDatabase.js.map +1 -1
- package/dist/appDatabaseHttp.d.ts +68 -68
- package/dist/appDatabaseHttp.d.ts.map +1 -1
- package/dist/appDatabaseHttp.js +4 -2
- package/dist/appDatabaseHttp.js.map +1 -1
- package/dist/appHost.d.ts +34 -34
- package/dist/appHost.d.ts.map +1 -1
- package/dist/appHost.js +2 -1
- package/dist/appHost.js.map +1 -1
- package/dist/appHostHttp.d.ts +178 -34
- package/dist/appHostHttp.d.ts.map +1 -1
- package/dist/appHostHttp.js +6 -2
- package/dist/appHostHttp.js.map +1 -1
- package/dist/defaultChangesChannel.d.ts +4 -0
- package/dist/defaultChangesChannel.d.ts.map +1 -0
- package/dist/defaultChangesChannel.js +8 -0
- package/dist/defaultChangesChannel.js.map +1 -0
- package/dist/hostPreflight.d.ts +3 -2
- package/dist/hostPreflight.d.ts.map +1 -1
- package/dist/hostPreflight.js.map +1 -1
- package/dist/hostSensitiveKeys.d.ts +8 -10
- package/dist/hostSensitiveKeys.d.ts.map +1 -1
- package/dist/hostSensitiveKeys.js +25 -18
- package/dist/hostSensitiveKeys.js.map +1 -1
- package/dist/nativeClientOrigins.d.ts.map +1 -1
- package/dist/nativeClientOrigins.js +3 -1
- package/dist/nativeClientOrigins.js.map +1 -1
- package/dist/redactedHost.d.ts +1 -1
- package/dist/redactedHost.d.ts.map +1 -1
- package/dist/redactedHost.js +3 -14
- package/dist/redactedHost.js.map +1 -1
- package/dist/workerHost.d.ts +1 -1
- package/dist/workerHost.d.ts.map +1 -1
- package/dist/workerHost.js +2 -1
- package/dist/workerHost.js.map +1 -1
- package/package.json +6 -6
- package/src/HostModels.ts +30 -0
- package/src/appDatabase.ts +6 -10
- package/src/appDatabaseHttp.ts +8 -2
- package/src/appHost.ts +6 -1
- package/src/appHostHttp.ts +55 -30
- package/src/defaultChangesChannel.ts +8 -0
- package/src/hostPreflight.ts +4 -3
- package/src/hostSensitiveKeys.ts +37 -22
- package/src/nativeClientOrigins.ts +4 -1
- package/src/redactedHost.ts +2 -18
- package/src/workerHost.ts +2 -1
|
@@ -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;AAOtC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,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;AAOtC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAItF,OAAO,EAAE,KAAK,mBAAmB,EAAgB,MAAM,kBAAkB,CAAC;AAE1E,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,EAC1C,gBAAgB,GAAG,KAAK,EACxB,oBAAoB,GAAG,KAAK,EAE5B,OAAO,EAAE,WAAW,CACnB,KAAK,EACL,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,CACpB,GACA,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+7BAGX;AAGD,wBAAgB,UAAU,CACzB,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,EAC1C,gBAAgB,GAAG,KAAK,EACxB,oBAAoB,GAAG,KAAK,EAE5B,OAAO,EAAE,WAAW,CACnB,KAAK,EACL,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,CACpB,GACA,UAAU,EACX,SAAS,EAAE,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;u3BAyB9B"}
|
package/dist/appHostHttp.js
CHANGED
|
@@ -11,8 +11,12 @@ import { hostTransport } from "#hostTransport.ts";
|
|
|
11
11
|
import { nativeClientOrigins } from "#nativeClientOrigins.ts";
|
|
12
12
|
import { redactedHost } from "#redactedHost.ts";
|
|
13
13
|
export function appHostHttp(options) {
|
|
14
|
+
return redactedHost(options, (sensitive) => servedHost(options, sensitive));
|
|
15
|
+
}
|
|
16
|
+
// The host inside its redaction policy; a deferred application runs inside the same policy before it names this host.
|
|
17
|
+
export function servedHost(options, sensitive) {
|
|
14
18
|
const assets = options.assets === undefined ? Layer.empty : hostAssets(options.assets);
|
|
15
|
-
return
|
|
19
|
+
return Layer.unwrap(Effect.gen(function* () {
|
|
16
20
|
const transport = yield* hostTransport(options);
|
|
17
21
|
const { bodySize, host, trustedProxy } = transport;
|
|
18
22
|
const routes = options.group === undefined ? Layer.empty : hostRpcRoutes(options, transport, sensitive);
|
|
@@ -24,6 +28,6 @@ export function appHostHttp(options) {
|
|
|
24
28
|
return Layer.unwrap(HttpRouter.toHttpEffect(httpRoutes).pipe(
|
|
25
29
|
// Building the routes built every repository, so the policy is complete before the server takes a request.
|
|
26
30
|
Effect.tap(() => sensitive.complete), Effect.map((handler) => HttpServer.serve(handler).pipe(HttpServer.withLogAddress, Layer.provideMerge(server))))).pipe(Layer.provideMerge(application), Layer.provide(sessions), Layer.provideMerge(hostHttpServices));
|
|
27
|
-
}))
|
|
31
|
+
}));
|
|
28
32
|
}
|
|
29
33
|
//# sourceMappingURL=appHostHttp.js.map
|
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,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"appHostHttp.js","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultChangesChannel.d.ts","sourceRoot":"","sources":["../src/defaultChangesChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,eAAO,MAAM,qBAAqB,+DAIhC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { Digest } from "effect/crypto";
|
|
3
|
+
export const defaultChangesChannel = Effect.fnUntraced(function* (name) {
|
|
4
|
+
const digest = yield* Digest.Digest;
|
|
5
|
+
const hash = yield* digest.digestHex(Digest.sha256, new TextEncoder().encode(name));
|
|
6
|
+
return `changes_${hash.slice(0, 32)}`;
|
|
7
|
+
});
|
|
8
|
+
//# sourceMappingURL=defaultChangesChannel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultChangesChannel.js","sourceRoot":"","sources":["../src/defaultChangesChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAY;IAC7E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpF,OAAO,WAAW,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AACvC,CAAC,CAAC,CAAC"}
|
package/dist/hostPreflight.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
|
+
import type { HostModels } from "#HostModels.ts";
|
|
2
3
|
import type { hostCrypto } from "#hostCrypto.ts";
|
|
3
4
|
export type HostPreflight<TServices = never, TError = never, TRequirements = never> = {
|
|
4
5
|
readonly preflight: Layer.Layer<TServices, TError, TRequirements>;
|
|
@@ -6,7 +7,7 @@ export type HostPreflight<TServices = never, TError = never, TRequirements = nev
|
|
|
6
7
|
readonly preflight?: never;
|
|
7
8
|
} : never);
|
|
8
9
|
type HostCrypto = Layer.Success<typeof hostCrypto>;
|
|
9
|
-
export type PreflightHost<THost extends Layer.Any, TServices, TError, TRequirements> = Layer.Layer<Layer.Success<THost> | TServices, Layer.Error<THost> | TError, Exclude<Layer.Services<THost>, TServices | HostCrypto> | Exclude<TRequirements, HostCrypto>>;
|
|
10
|
-
export declare function hostPreflight<TServices, TError, TRequirements, TSensitiveError>(startup: Layer.Layer<TServices, TError, TRequirements> | undefined, sensitive: Effect.Effect<(key: string) => boolean, TSensitiveError>): Layer.Layer<TServices, TError | TSensitiveError, Exclude<TRequirements, never>>;
|
|
10
|
+
export type PreflightHost<THost extends Layer.Any, TServices, TError, TRequirements> = Layer.Layer<Layer.Success<THost> | TServices, Layer.Error<THost> | TError, Exclude<Layer.Services<THost>, TServices | HostCrypto | HostModels> | Exclude<TRequirements, HostCrypto>>;
|
|
11
|
+
export declare function hostPreflight<TServices, TError, TRequirements, TSensitiveError, TSensitiveRequirements>(startup: Layer.Layer<TServices, TError, TRequirements> | undefined, sensitive: Effect.Effect<(key: string) => boolean, TSensitiveError, TSensitiveRequirements>): Layer.Layer<TServices, TError | TSensitiveError, Exclude<TRequirements, never> | Exclude<TSensitiveRequirements, import("effect/Scope").Scope>>;
|
|
11
12
|
export {};
|
|
12
13
|
//# sourceMappingURL=hostPreflight.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostPreflight.d.ts","sourceRoot":"","sources":["../src/hostPreflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,aAAa,CAAC,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,aAAa,GAAG,KAAK,IAC/E;IAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;CAAE,GACrE,CAAC,CAAC,SAAS,GAAG,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,KAAK,CAAC,CAAC;AAEnG,KAAK,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,IAAI,KAAK,CAAC,KAAK,CACjG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,EAChC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,EAC3B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,GAAG,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"hostPreflight.d.ts","sourceRoot":"","sources":["../src/hostPreflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,MAAM,aAAa,CAAC,SAAS,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,aAAa,GAAG,KAAK,IAC/E;IAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;CAAE,GACrE,CAAC,CAAC,SAAS,GAAG,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,KAAK,CAAC,CAAC;AAEnG,KAAK,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,IAAI,KAAK,CAAC,KAAK,CACjG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,EAChC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,EAC3B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC,GAAG,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CACxG,CAAC;AAEF,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,sBAAsB,EACtG,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,EAClE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,EAAE,eAAe,EAAE,sBAAsB,CAAC,mJAM3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostPreflight.js","sourceRoot":"","sources":["../src/hostPreflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"hostPreflight.js","sourceRoot":"","sources":["../src/hostPreflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAgBzE,MAAM,UAAU,aAAa,CAC5B,OAAkE,EAClE,SAA2F;IAE3F,OAAO,KAAK,CAAC,QAAQ,CACpB,KAAK,CAAC,KAAK,EACX,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9I,CAAC;AACH,CAAC"}
|
|
@@ -1,20 +1,18 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { type Rpc, RpcGroup } from "effect/rpc";
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
readonly group?: RpcGroup.RpcGroup<TRpcs>;
|
|
3
|
+
import { HostModels } from "#HostModels.ts";
|
|
4
|
+
interface SensitiveSources<TRpcs extends Rpc.Any> {
|
|
6
5
|
readonly config?: {
|
|
7
6
|
readonly sensitiveKeys?: readonly string[];
|
|
8
7
|
};
|
|
9
|
-
|
|
8
|
+
readonly group?: RpcGroup.RpcGroup<TRpcs>;
|
|
9
|
+
}
|
|
10
|
+
export declare const hostSensitiveKeys: <TRpcs extends Rpc.Any>(options: SensitiveSources<TRpcs>) => Effect.Effect<((key: string) => boolean) & {
|
|
10
11
|
complete: Effect.Effect<void, import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, never>;
|
|
12
|
+
configure: <TConfigured extends Rpc.Any>(sources: SensitiveSources<TConfigured>) => Effect.Effect<void, import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, never>;
|
|
11
13
|
forRpc: (tag: string | undefined) => (key: string) => boolean;
|
|
12
14
|
maskFailure: (tag: string | undefined, reason: "Fail" | "Die") => boolean;
|
|
13
|
-
models: {
|
|
14
|
-
declare: (model: {
|
|
15
|
-
readonly ast: Parameters<typeof schemaFieldKeys>[0];
|
|
16
|
-
}) => Effect.Effect<void, never, never>;
|
|
17
|
-
};
|
|
18
15
|
redactFailure: (tag: string | undefined, reason: "Fail" | "Die", value: unknown) => unknown;
|
|
19
|
-
}, import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict,
|
|
16
|
+
}, import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, HostModels>;
|
|
17
|
+
export {};
|
|
20
18
|
//# sourceMappingURL=hostSensitiveKeys.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostSensitiveKeys.d.ts","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,KAAK,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"hostSensitiveKeys.d.ts","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,KAAK,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,gBAAgB,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC;IACjE,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;CAC1C;AAcD,eAAO,MAAM,iBAAiB,GAAgC,KAAK,SAAS,GAAG,CAAC,GAAG,4DAK1D,MAAM;;gBAajB,WAAW,SAAS,GAAG,CAAC,GAAG,WAAW,gBAAgB,CAAC,WAAW,CAAC;kBAQjE,MAAM,GAAG,SAAS,WAElB,MAAM;uBAED,MAAM,GAAG,SAAS,UAAU,MAAM,GAAG,KAAK;yBACxC,MAAM,GAAG,SAAS,UAAU,MAAM,GAAG,KAAK,SAAS,OAAO;qJAE/E,CAAC"}
|
|
@@ -1,33 +1,40 @@
|
|
|
1
1
|
import { Effect, MutableRef } from "effect";
|
|
2
2
|
import { RpcGroup } from "effect/rpc";
|
|
3
|
-
import { schemaFieldKeys } from "@shivaedev/errors/schemaFieldScope.ts";
|
|
4
3
|
import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
|
|
4
|
+
import { HostModels } from "#HostModels.ts";
|
|
5
|
+
function policySource({ config, group }) {
|
|
6
|
+
return {
|
|
7
|
+
compile: (extra) => (group === undefined ? schemaSensitiveKeys(RpcGroup.make(), extra) : schemaSensitiveKeys(group, extra)),
|
|
8
|
+
configured: config?.sensitiveKeys ?? [],
|
|
9
|
+
};
|
|
10
|
+
}
|
|
5
11
|
export const hostSensitiveKeys = Effect.fnUntraced(function* (options) {
|
|
6
|
-
const
|
|
7
|
-
function policy(extra) {
|
|
8
|
-
return options.group === undefined ? schemaSensitiveKeys(RpcGroup.make(), extra) : schemaSensitiveKeys(options.group, extra);
|
|
9
|
-
}
|
|
12
|
+
const source = MutableRef.make(policySource(options));
|
|
10
13
|
// Model names only widen masking, so the configured policy already holds the startup's conflict verdict.
|
|
11
|
-
const current = MutableRef.make(yield*
|
|
12
|
-
const
|
|
14
|
+
const current = MutableRef.make(yield* MutableRef.get(source).compile(MutableRef.get(source).configured));
|
|
15
|
+
const { fieldNames } = yield* HostModels;
|
|
13
16
|
function sensitive(key) {
|
|
14
|
-
return
|
|
17
|
+
return fieldNames.has(key) || MutableRef.get(current)(key);
|
|
15
18
|
}
|
|
16
19
|
return Object.assign(sensitive, {
|
|
17
|
-
// Repositories declare their models while the host builds them
|
|
18
|
-
|
|
20
|
+
// Repositories declare their models while the host builds them, and a deferred application names its RPC group and configured keys
|
|
21
|
+
// only when it returns, after running inside this policy: complete and configure recompile every RPC's policy from what is known then.
|
|
22
|
+
complete: Effect.suspend(() => {
|
|
23
|
+
const { compile, configured } = MutableRef.get(source);
|
|
24
|
+
return compile([...configured, ...fieldNames]);
|
|
25
|
+
}).pipe(Effect.map((completed) => MutableRef.set(current, completed)), Effect.asVoid),
|
|
26
|
+
configure: (sources) => Effect.suspend(() => {
|
|
27
|
+
const next = policySource(sources);
|
|
28
|
+
return Effect.map(next.compile(next.configured), (compiled) => {
|
|
29
|
+
MutableRef.set(source, next);
|
|
30
|
+
MutableRef.set(current, compiled);
|
|
31
|
+
});
|
|
32
|
+
}),
|
|
19
33
|
forRpc: (tag) => {
|
|
20
34
|
const forTag = MutableRef.get(current).forRpc(tag);
|
|
21
|
-
return (key) =>
|
|
35
|
+
return (key) => fieldNames.has(key) || forTag(key);
|
|
22
36
|
},
|
|
23
37
|
maskFailure: (tag, reason) => MutableRef.get(current).maskFailure(tag, reason),
|
|
24
|
-
models: {
|
|
25
|
-
declare: (model) => Effect.sync(() => {
|
|
26
|
-
for (const key of schemaFieldKeys(model.ast, [])) {
|
|
27
|
-
models.add(key);
|
|
28
|
-
}
|
|
29
|
-
}),
|
|
30
|
-
},
|
|
31
38
|
redactFailure: (tag, reason, value) => MutableRef.get(current).redactFailure(tag, reason, value),
|
|
32
39
|
});
|
|
33
40
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostSensitiveKeys.js","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAY,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"hostSensitiveKeys.js","sourceRoot":"","sources":["../src/hostSensitiveKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAY,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAY5C,SAAS,YAAY,CAAwB,EAAE,MAAM,EAAE,KAAK,EAA2B;IACtF,OAAO;QACN,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3H,UAAU,EAAE,MAAM,EAAE,aAAa,IAAI,EAAE;KACvC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAyB,OAAgC;IACpH,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,yGAAyG;IACzG,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1G,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;IACzC,SAAS,SAAS,CAAC,GAAW;QAC7B,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC/B,mIAAmI;QACnI,uIAAuI;QACvI,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YAC7B,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC,IAAI,CACN,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,EAC7D,MAAM,CAAC,MAAM,CACb;QACD,SAAS,EAAE,CAA8B,OAAsC,EAAE,EAAE,CAClF,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YACnB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC7D,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC7B,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,GAAuB,EAAE,EAAE;YACnC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnD,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5D,CAAC;QACD,WAAW,EAAE,CAAC,GAAuB,EAAE,MAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC;QAClH,aAAa,EAAE,CAAC,GAAuB,EAAE,MAAsB,EAAE,KAAc,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC;KAC7I,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nativeClientOrigins.d.ts","sourceRoot":"","sources":["../src/nativeClientOrigins.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,UAAU,EAAyC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"nativeClientOrigins.d.ts","sourceRoot":"","sources":["../src/nativeClientOrigins.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,UAAU,EAAyC,MAAM,aAAa,CAAC;AAMzG,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,GAAE,UAAU,CAAC,SAAkB,qDAsBlI"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers, HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
+
import { accountPreferenceHeaders } from "@shivaedev/identity/accountPreferenceHeaders.ts";
|
|
4
5
|
import { localTransport } from "@shivaedev/identity/server/adapters/local.ts";
|
|
5
6
|
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
6
7
|
export function nativeClientOrigins(trustedProxy, route, rpcPath = "/rpc") {
|
|
@@ -24,6 +25,7 @@ export function nativeClientOrigins(trustedProxy, route, rpcPath = "/rpc") {
|
|
|
24
25
|
return yield* withClientCors(effect, native, declared, auth);
|
|
25
26
|
})).layer;
|
|
26
27
|
}
|
|
28
|
+
const CLIENT_HEADERS = ["Authorization", "Content-Type"];
|
|
27
29
|
const withClientCors = Effect.fnUntraced(function* (effect, nativeOrigins, declared, auth) {
|
|
28
30
|
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
29
31
|
const origin = request.headers.origin ?? "";
|
|
@@ -34,7 +36,7 @@ const withClientCors = Effect.fnUntraced(function* (effect, nativeOrigins, decla
|
|
|
34
36
|
}
|
|
35
37
|
const transport = native ? request.modify({ headers: Headers.remove(request.headers, "cookie") }) : request;
|
|
36
38
|
return yield* HttpMiddleware.cors({
|
|
37
|
-
allowedHeaders: [
|
|
39
|
+
allowedHeaders: auth ? [...CLIENT_HEADERS, ...Object.values(accountPreferenceHeaders)] : CLIENT_HEADERS,
|
|
38
40
|
allowedMethods: auth ? ["GET", "POST"] : ["POST"],
|
|
39
41
|
allowedOrigins: [origin],
|
|
40
42
|
credentials: credentialed,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nativeClientOrigins.js","sourceRoot":"","sources":["../src/nativeClientOrigins.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nativeClientOrigins.js","sourceRoot":"","sources":["../src/nativeClientOrigins.ts"],"names":[],"mappings":"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"}
|
package/dist/redactedHost.d.ts
CHANGED
|
@@ -7,5 +7,5 @@ export declare function redactedHost<TRpcs extends Rpc.Any, A, E, R>(options: {
|
|
|
7
7
|
readonly config?: {
|
|
8
8
|
readonly sensitiveKeys?: readonly string[];
|
|
9
9
|
};
|
|
10
|
-
}, host: (sensitive: HostSensitivePolicy) => Layer.Layer<A, E, R>): Layer.Layer<A, E | import("effect/Config").ConfigError | import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, Exclude<Exclude<Exclude<
|
|
10
|
+
}, host: (sensitive: HostSensitivePolicy) => Layer.Layer<A, E, R>): Layer.Layer<A, E | import("effect/Config").ConfigError | import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict, import("./HostModels.ts").HostModels | Exclude<Exclude<Exclude<R, never>, never>, never>>;
|
|
11
11
|
//# sourceMappingURL=redactedHost.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redactedHost.d.ts","sourceRoot":"","sources":["../src/redactedHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"redactedHost.d.ts","sourceRoot":"","sources":["../src/redactedHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI1D,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;AAGvF,wBAAgB,YAAY,CAAC,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAC1D,OAAO,EAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAA;CAAE,EACxH,IAAI,EAAE,CAAC,SAAS,EAAE,mBAAmB,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,6RAW9D"}
|
package/dist/redactedHost.js
CHANGED
|
@@ -1,21 +1,10 @@
|
|
|
1
|
-
import { Effect, Layer
|
|
2
|
-
import { collectRepositoryModels, RepositoryModels } from "@shivaedev/sql/RepositoryModels.ts";
|
|
1
|
+
import { Effect, Layer } from "effect";
|
|
3
2
|
import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
|
|
4
3
|
import { hostSensitiveKeys } from "#hostSensitiveKeys.ts";
|
|
5
4
|
import { otlpTracing } from "#otlpTracing.ts";
|
|
6
5
|
import { RedactionPolicy } from "#RedactionPolicy.ts";
|
|
7
|
-
//
|
|
8
|
-
function maskedModels(sensitive) {
|
|
9
|
-
return Layer.effect(RepositoryModels, Effect.gen(function* () {
|
|
10
|
-
const collected = yield* RepositoryModels;
|
|
11
|
-
return RepositoryModels.of({
|
|
12
|
-
declare: (declared) => Effect.andThen(sensitive.models.declare(Schema.Struct(declared.model.fields)), collected.declare(declared)),
|
|
13
|
-
owned: collected.owned,
|
|
14
|
-
});
|
|
15
|
-
})).pipe(Layer.provide(collectRepositoryModels));
|
|
16
|
-
}
|
|
17
|
-
// Both hosts build their process inside one policy, so repositories declare their models to the same policy that masks every log, error report and exported span.
|
|
6
|
+
// Both hosts build their process inside one policy, so every log, error report and exported span masks the same names, including the fields their repositories' models declare.
|
|
18
7
|
export function redactedHost(options, host) {
|
|
19
|
-
return Layer.unwrap(Effect.map(hostSensitiveKeys(options), (sensitive) => host(sensitive).pipe(Layer.provide(redactingDiagnostics(sensitive)), Layer.provide(otlpTracing), Layer.provide(Layer.succeed(RedactionPolicy, sensitive))
|
|
8
|
+
return Layer.unwrap(Effect.map(hostSensitiveKeys(options), (sensitive) => host(sensitive).pipe(Layer.provide(redactingDiagnostics(sensitive)), Layer.provide(otlpTracing), Layer.provide(Layer.succeed(RedactionPolicy, sensitive)))));
|
|
20
9
|
}
|
|
21
10
|
//# sourceMappingURL=redactedHost.js.map
|
package/dist/redactedHost.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redactedHost.js","sourceRoot":"","sources":["../src/redactedHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"redactedHost.js","sourceRoot":"","sources":["../src/redactedHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAItD,gLAAgL;AAChL,MAAM,UAAU,YAAY,CAC3B,OAAwH,EACxH,IAA8D;IAE9D,OAAO,KAAK,CAAC,MAAM,CAClB,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CACpD,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CACnB,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,EAC9C,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAC1B,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CACxD,CACD,CACD,CAAC;AACH,CAAC"}
|
package/dist/workerHost.d.ts
CHANGED
|
@@ -7,5 +7,5 @@ export declare function workerHost<R, E, TRequirements, TServices, TServiceError
|
|
|
7
7
|
readonly config?: WorkerHostConfig;
|
|
8
8
|
readonly workers: Layer.Layer<R, E, TRequirements>;
|
|
9
9
|
readonly services: Layer.Layer<TServices, TServiceError, TServiceRequirements>;
|
|
10
|
-
}): Layer.Layer<"@shivaedev/contract/LiveServer" | R | TServices | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient, E | TMigrationError | TServiceError | import("effect/Config").ConfigError | import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("effect/sql/Migrator").MigrationError | import("@shivaedev/sql/PostgresListenerError.ts").PostgresListenerError | import("effect/Schema").SchemaError | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict | import("effect/sql/SqlError").SqlError, Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<TServiceRequirements, "@shivaedev/contract/LiveServer" | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, never>, never>, never>,
|
|
10
|
+
}): Layer.Layer<"@shivaedev/contract/LiveServer" | R | TServices | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient, E | TMigrationError | TServiceError | import("effect/Config").ConfigError | import("@shivaedev/errors/wireMask.ts").InvalidRedactionMask | import("effect/sql/Migrator").MigrationError | import("@shivaedev/sql/PostgresListenerError.ts").PostgresListenerError | import("effect/Schema").SchemaError | import("@shivaedev/errors/schemaFieldScope.ts").SensitiveFieldConflict | import("effect/sql/SqlError").SqlError, Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<TServiceRequirements, "@shivaedev/contract/LiveServer" | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, never>, never>, never>, import("effect/crypto/Aead").Aead | import("effect/crypto/Cipher").Cipher | import("@shivaedev/sql/ColumnKey.ts").ColumnKey | import("effect/crypto/Digest").Digest | import("effect/crypto/Kdf").Kdf | import("effect/crypto/KeyAgreement").KeyAgreement | import("effect/crypto/KeyWrap").KeyWrap | import("effect/crypto/Mac").Mac | import("effect/crypto/SecureRandom").SecureRandom | import("effect/crypto/Signature").Signature>, import("#HostModels.ts").HostModels> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<TMigrations, import("effect/Scope").Scope>, "@shivaedev/contract/LiveServer" | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, never>, never>, never>, import("effect/crypto/Aead").Aead | import("effect/crypto/Cipher").Cipher | import("@shivaedev/sql/ColumnKey.ts").ColumnKey | import("effect/crypto/Digest").Digest | import("effect/crypto/Kdf").Kdf | import("effect/crypto/KeyAgreement").KeyAgreement | import("effect/crypto/KeyWrap").KeyWrap | import("effect/crypto/Mac").Mac | import("effect/crypto/SecureRandom").SecureRandom | import("effect/crypto/Signature").Signature>, import("#HostModels.ts").HostModels> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<TRequirements, TServices>, "@shivaedev/contract/LiveServer" | import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, never>, never>, never>, import("effect/crypto/Aead").Aead | import("effect/crypto/Cipher").Cipher | import("@shivaedev/sql/ColumnKey.ts").ColumnKey | import("effect/crypto/Digest").Digest | import("effect/crypto/Kdf").Kdf | import("effect/crypto/KeyAgreement").KeyAgreement | import("effect/crypto/KeyWrap").KeyWrap | import("effect/crypto/Mac").Mac | import("effect/crypto/SecureRandom").SecureRandom | import("effect/crypto/Signature").Signature>, import("#HostModels.ts").HostModels>>;
|
|
11
11
|
//# sourceMappingURL=workerHost.d.ts.map
|
package/dist/workerHost.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerHost.d.ts","sourceRoot":"","sources":["../src/workerHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,kBAAkB,EAAe,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"workerHost.d.ts","sourceRoot":"","sources":["../src/workerHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,kBAAkB,EAAe,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAK5F,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACvD,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,oBAAoB,EAAE,WAAW,GAAG,KAAK,EAAE,eAAe,GAAG,KAAK,EAC3I,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG;IAC3D,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;CAC/E,g9FAWD"}
|
package/dist/workerHost.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
2
|
import { appDatabase } from "#appDatabase.ts";
|
|
3
|
+
import { hostModels } from "#HostModels.ts";
|
|
3
4
|
import { hostCrypto } from "#hostCrypto.ts";
|
|
4
5
|
import { redactedHost } from "#redactedHost.ts";
|
|
5
6
|
export function workerHost(options) {
|
|
6
7
|
// A worker serves no RPC group, so its policy holds the built-in rules, config.sensitiveKeys and the models its repositories declare as they are built.
|
|
7
8
|
// The host announces readiness itself: an effect composed around the returned Layer runs outside its policy and exporter.
|
|
8
|
-
return redactedHost(options, () => Layer.effectDiscard(Effect.logInfo("Worker ready to take jobs")).pipe(Layer.provideMerge(options.workers), Layer.provideMerge(options.services), Layer.provideMerge(appDatabase(options)))).pipe(Layer.provide(hostCrypto));
|
|
9
|
+
return redactedHost(options, () => Layer.effectDiscard(Effect.logInfo("Worker ready to take jobs")).pipe(Layer.provideMerge(options.workers), Layer.provideMerge(options.services), Layer.provideMerge(appDatabase(options)))).pipe(Layer.provide(hostCrypto), Layer.provide(hostModels()));
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=workerHost.js.map
|
package/dist/workerHost.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerHost.js","sourceRoot":"","sources":["../src/workerHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAA2B,WAAW,EAAuB,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD,MAAM,UAAU,UAAU,CACzB,OAIC;IAED,wJAAwJ;IACxJ,0HAA0H;IAC1H,OAAO,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,CACjC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CACpE,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EACnC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EACpC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CACxC,CACD,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"workerHost.js","sourceRoot":"","sources":["../src/workerHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAA2B,WAAW,EAAuB,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD,MAAM,UAAU,UAAU,CACzB,OAIC;IAED,wJAAwJ;IACxJ,0HAA0H;IAC1H,OAAO,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,CACjC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CACpE,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EACnC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EACpC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CACxC,CACD,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.44.1",
|
|
4
4
|
"description": "The Effect application host: HTTP and RPC serving, health, OTLP export, database and migrations, and development mode",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@shivaedev/contract": "0.58.0",
|
|
51
51
|
"@shivaedev/errors": "0.14.1",
|
|
52
52
|
"@shivaedev/http": "0.9.2",
|
|
53
|
-
"@shivaedev/identity": "0.
|
|
53
|
+
"@shivaedev/identity": "0.41.0",
|
|
54
54
|
"@shivaedev/local-postgres": "0.17.0",
|
|
55
55
|
"@shivaedev/sql": "0.55.0"
|
|
56
56
|
},
|
|
@@ -59,12 +59,12 @@
|
|
|
59
59
|
"@effect/sql-pg": "4.1.4",
|
|
60
60
|
"@effect/vitest": "4.1.4",
|
|
61
61
|
"@shivaedev/access": "0.7.0",
|
|
62
|
-
"@shivaedev/admin": "0.29.
|
|
62
|
+
"@shivaedev/admin": "0.29.3",
|
|
63
63
|
"@shivaedev/jobs": "0.44.1",
|
|
64
|
-
"@shivaedev/quality": "0.
|
|
64
|
+
"@shivaedev/quality": "0.84.0",
|
|
65
65
|
"@shivaedev/rate-limit": "0.8.1",
|
|
66
66
|
"@shivaedev/service": "0.9.2",
|
|
67
|
-
"@shivaedev/test-kits": "0.16.
|
|
67
|
+
"@shivaedev/test-kits": "0.16.7",
|
|
68
68
|
"@shivaedev/test-sql": "0.26.1",
|
|
69
69
|
"@shivaedev/test-story": "0.52.5",
|
|
70
70
|
"@types/node": "24.19.2",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"@effect/platform-node": "4.1.4",
|
|
79
79
|
"@effect/sql-pg": "4.1.4",
|
|
80
80
|
"@effect/vitest": "4.1.4",
|
|
81
|
-
"@shivaedev/admin": "0.29.
|
|
81
|
+
"@shivaedev/admin": "0.29.3",
|
|
82
82
|
"better-auth": "1.7.23",
|
|
83
83
|
"effect": "4.1.4"
|
|
84
84
|
},
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Context, Effect, Layer, Schema } from "effect";
|
|
2
|
+
import { schemaFieldKeys } from "@shivaedev/errors/schemaFieldScope.ts";
|
|
3
|
+
import { collectRepositoryModels, type RepositoryModel, RepositoryModels } from "@shivaedev/sql/RepositoryModels.ts";
|
|
4
|
+
|
|
5
|
+
// The field names of every model the host's repositories declare, which its redaction policy masks.
|
|
6
|
+
export class HostModels extends Context.Service<HostModels, { readonly fieldNames: ReadonlySet<string> }>()("@shivaedev/server/HostModels") {}
|
|
7
|
+
|
|
8
|
+
function recordFields(fieldNames: Set<string>, { model }: RepositoryModel) {
|
|
9
|
+
return Effect.sync(() => {
|
|
10
|
+
for (const key of schemaFieldKeys(Schema.Struct(model.fields).ast, [])) {
|
|
11
|
+
fieldNames.add(key);
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
// Each host provides its own collector around everything it builds, including a deferred application Effect, so a
|
|
17
|
+
// repository built there reports its owned models and sensitive fields to the same host that serves and masks them.
|
|
18
|
+
export function hostModels() {
|
|
19
|
+
return Layer.effectContext(
|
|
20
|
+
Effect.gen(function* () {
|
|
21
|
+
const collected = yield* RepositoryModels;
|
|
22
|
+
const fieldNames = new Set<string>();
|
|
23
|
+
const models = RepositoryModels.of({
|
|
24
|
+
declare: (declared) => Effect.andThen(recordFields(fieldNames, declared), collected.declare(declared)),
|
|
25
|
+
owned: collected.owned,
|
|
26
|
+
});
|
|
27
|
+
return Context.make(HostModels, { fieldNames }).pipe(Context.add(RepositoryModels, models));
|
|
28
|
+
}),
|
|
29
|
+
).pipe(Layer.provide(Layer.fresh(collectRepositoryModels)));
|
|
30
|
+
}
|
package/src/appDatabase.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as PgClient from "@effect/sql-pg/PgClient";
|
|
2
2
|
import { Clock, Config, Context, Effect, Layer, Option, Redacted } from "effect";
|
|
3
|
-
import { Digest } from "effect/crypto";
|
|
4
3
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
5
4
|
import type { Rpc } from "effect/rpc";
|
|
6
5
|
import { liveServerLayer } from "@shivaedev/contract/live-server/layer.ts";
|
|
@@ -15,6 +14,8 @@ import type { AppHostFactory } from "#AppHostFactory.ts";
|
|
|
15
14
|
import type { AppHostInput } from "#AppHostInput.ts";
|
|
16
15
|
import { deferredHost, migratedHost } from "#appDatabaseHttp.ts";
|
|
17
16
|
import { appHostHttp } from "#appHostHttp.ts";
|
|
17
|
+
import { defaultChangesChannel } from "#defaultChangesChannel.ts";
|
|
18
|
+
import { hostModels } from "#HostModels.ts";
|
|
18
19
|
import { hostCrypto } from "#hostCrypto.ts";
|
|
19
20
|
import type { HostRouteRequirements } from "#hostOptions.ts";
|
|
20
21
|
import { hostPreflight } from "#hostPreflight.ts";
|
|
@@ -90,12 +91,6 @@ export function appDatabase<R, E = never>(options: AppDatabaseOptions<R, E>) {
|
|
|
90
91
|
return worker.pipe(Layer.provideMerge(prepared));
|
|
91
92
|
}
|
|
92
93
|
|
|
93
|
-
const defaultChangesChannel = Effect.fnUntraced(function* (name: string) {
|
|
94
|
-
const digest = yield* Digest.Digest;
|
|
95
|
-
const hash = yield* digest.digestHex(Digest.sha256, new TextEncoder().encode(name));
|
|
96
|
-
return `changes_${hash.slice(0, 32)}`;
|
|
97
|
-
});
|
|
98
|
-
|
|
99
94
|
export const appHost: AppHostFactory = <
|
|
100
95
|
TRpcs extends Rpc.Any = never,
|
|
101
96
|
THandlers = never,
|
|
@@ -138,13 +133,14 @@ export const appHost: AppHostFactory = <
|
|
|
138
133
|
>,
|
|
139
134
|
) => {
|
|
140
135
|
const preflight = hostPreflight(options.preflight, "application" in options ? Effect.succeed(isSensitiveKey) : hostSensitiveKeys(options));
|
|
136
|
+
const hosted = Layer.merge(hostCrypto, hostModels());
|
|
141
137
|
if ("application" in options) {
|
|
142
|
-
return deferredHost(options.application, appDatabase(options)).pipe(Layer.provideMerge(preflight), Layer.provide(
|
|
138
|
+
return deferredHost(options.application, appDatabase(options)).pipe(Layer.provideMerge(preflight), Layer.provide(hosted));
|
|
143
139
|
}
|
|
144
140
|
return options.migrations === undefined
|
|
145
|
-
? appHostHttp(options).pipe(Layer.provideMerge(preflight), Layer.provide(
|
|
141
|
+
? appHostHttp(options).pipe(Layer.provideMerge(preflight), Layer.provide(hosted))
|
|
146
142
|
: migratedHost({ ...options, migrations: options.migrations }, appDatabase({ ...options, migrations: options.migrations })).pipe(
|
|
147
143
|
Layer.provideMerge(preflight),
|
|
148
|
-
Layer.provide(
|
|
144
|
+
Layer.provide(hosted),
|
|
149
145
|
);
|
|
150
146
|
};
|
package/src/appDatabaseHttp.ts
CHANGED
|
@@ -2,9 +2,10 @@ import { Effect, Layer } from "effect";
|
|
|
2
2
|
import type { Rpc } from "effect/rpc";
|
|
3
3
|
import type { appDatabase } from "#appDatabase.ts";
|
|
4
4
|
import type { AppHttpHostOptions } from "#appHost.ts";
|
|
5
|
-
import { appHostHttp } from "#appHostHttp.ts";
|
|
5
|
+
import { appHostHttp, servedHost } from "#appHostHttp.ts";
|
|
6
6
|
import type { HostOptions, HostPolicy, HostRouteRequirements } from "#hostOptions.ts";
|
|
7
7
|
import type { MigrationOptions } from "#MigrationOptions.ts";
|
|
8
|
+
import { redactedHost } from "#redactedHost.ts";
|
|
8
9
|
|
|
9
10
|
export function migratedHost<
|
|
10
11
|
TRpcs extends Rpc.Any,
|
|
@@ -82,5 +83,10 @@ export function deferredHost<
|
|
|
82
83
|
>,
|
|
83
84
|
database: ReturnType<typeof appDatabase<TMigrations, TMigrationError>>,
|
|
84
85
|
) {
|
|
85
|
-
|
|
86
|
+
// The application and the database it runs on build inside the host's one policy, so whatever they log, fork or capture is masked too.
|
|
87
|
+
return redactedHost({}, (sensitive) =>
|
|
88
|
+
Layer.unwrap(Effect.flatMap(application, (options) => Effect.as(sensitive.configure(options), servedHost(options, sensitive)))).pipe(
|
|
89
|
+
Layer.provideMerge(database),
|
|
90
|
+
),
|
|
91
|
+
);
|
|
86
92
|
}
|
package/src/appHost.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Layer } from "effect";
|
|
2
2
|
import type { Rpc } from "effect/rpc";
|
|
3
3
|
import { appHostHttp } from "#appHostHttp.ts";
|
|
4
|
+
import { hostModels } from "#HostModels.ts";
|
|
4
5
|
import { hostCrypto } from "#hostCrypto.ts";
|
|
5
6
|
import type { HostCoreOptions, HostPolicy, HostRouteRequirements, HostRoutes } from "#hostOptions.ts";
|
|
6
7
|
import type { HostPreflight } from "#hostPreflight.ts";
|
|
@@ -69,7 +70,11 @@ function buildHttpHost<
|
|
|
69
70
|
TRequestRequirements
|
|
70
71
|
>,
|
|
71
72
|
) {
|
|
72
|
-
return appHostHttp(options).pipe(
|
|
73
|
+
return appHostHttp(options).pipe(
|
|
74
|
+
Layer.provideMerge(hostPreflight(options.preflight, hostSensitiveKeys(options))),
|
|
75
|
+
Layer.provide(hostCrypto),
|
|
76
|
+
Layer.provide(hostModels()),
|
|
77
|
+
);
|
|
73
78
|
}
|
|
74
79
|
|
|
75
80
|
type HttpHostFactory = <
|