@shivaedev/server 0.35.0 → 0.36.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.
@@ -1,8 +1,34 @@
1
+ import { Effect, MutableRef } from "effect";
1
2
  import { RpcGroup } from "effect/rpc";
3
+ import { schemaFieldKeys } from "@shivaedev/errors/schemaFieldScope.ts";
2
4
  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
- }
5
+ export const hostSensitiveKeys = Effect.fnUntraced(function* (options) {
6
+ const configured = options.config?.sensitiveKeys ?? [];
7
+ function policy(extra) {
8
+ return options.group === undefined ? schemaSensitiveKeys(RpcGroup.make(), extra) : schemaSensitiveKeys(options.group, extra);
9
+ }
10
+ // Model names only widen masking, so the configured policy already holds the startup's conflict verdict.
11
+ const current = MutableRef.make(yield* policy(configured));
12
+ const models = new Set();
13
+ function sensitive(key) {
14
+ return models.has(key) || MutableRef.get(current)(key);
15
+ }
16
+ return Object.assign(sensitive, {
17
+ // Repositories declare their models while the host builds them; complete recompiles every RPC's policy with their names, as config.sensitiveKeys.
18
+ complete: Effect.suspend(() => policy([...configured, ...models])).pipe(Effect.map((completed) => MutableRef.set(current, completed)), Effect.asVoid),
19
+ forRpc: (tag) => {
20
+ const forTag = MutableRef.get(current).forRpc(tag);
21
+ return (key) => models.has(key) || forTag(key);
22
+ },
23
+ 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
+ redactFailure: (tag, reason, value) => MutableRef.get(current).redactFailure(tag, reason, value),
32
+ });
33
+ });
8
34
  //# sourceMappingURL=hostSensitiveKeys.js.map
@@ -1 +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"}
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,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAyB,OAGpF;IACA,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,IAAI,EAAE,CAAC;IACvD,SAAS,MAAM,CAAC,KAAwB;QACvC,OAAO,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC9H,CAAC;IACD,yGAAyG;IACzG,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,SAAS,SAAS,CAAC,GAAW;QAC7B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC/B,kJAAkJ;QAClJ,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CACtE,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,EAC7D,MAAM,CAAC,MAAM,CACb;QACD,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,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACxD,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,MAAM,EAAE;YACP,OAAO,EAAE,CAAC,KAA8D,EAAE,EAAE,CAC3E,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;oBAClD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;YACF,CAAC,CAAC;SACH;QACD,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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/server",
3
- "version": "0.35.0",
3
+ "version": "0.36.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,27 +46,27 @@
46
46
  "README.md"
47
47
  ],
48
48
  "dependencies": {
49
- "@shivaedev/changes": "0.13.0",
50
- "@shivaedev/contract": "0.46.0",
51
- "@shivaedev/errors": "0.12.0",
49
+ "@shivaedev/changes": "0.14.0",
50
+ "@shivaedev/contract": "0.48.0",
51
+ "@shivaedev/errors": "0.13.0",
52
52
  "@shivaedev/http": "0.8.2",
53
- "@shivaedev/identity": "0.32.2",
53
+ "@shivaedev/identity": "0.33.0",
54
54
  "@shivaedev/local-postgres": "0.16.1",
55
- "@shivaedev/sql": "0.49.0"
55
+ "@shivaedev/sql": "0.50.0"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@effect/platform-node": "4.1.2",
59
59
  "@effect/sql-pg": "4.1.2",
60
60
  "@effect/vitest": "4.1.2",
61
- "@shivaedev/access": "0.6.3",
62
- "@shivaedev/admin": "0.26.1",
63
- "@shivaedev/jobs": "0.42.4",
64
- "@shivaedev/quality": "0.78.2",
65
- "@shivaedev/rate-limit": "0.6.12",
61
+ "@shivaedev/access": "0.6.4",
62
+ "@shivaedev/admin": "0.26.3",
63
+ "@shivaedev/jobs": "0.42.5",
64
+ "@shivaedev/quality": "0.78.4",
65
+ "@shivaedev/rate-limit": "0.6.13",
66
66
  "@shivaedev/service": "0.9.1",
67
- "@shivaedev/test-kits": "0.13.1",
68
- "@shivaedev/test-sql": "0.25.2",
69
- "@shivaedev/test-story": "0.47.3",
67
+ "@shivaedev/test-kits": "0.13.3",
68
+ "@shivaedev/test-sql": "0.25.3",
69
+ "@shivaedev/test-story": "0.48.1",
70
70
  "@types/node": "24.19.2",
71
71
  "better-auth": "1.7.16",
72
72
  "effect": "4.1.2",
@@ -78,7 +78,7 @@
78
78
  "@effect/platform-node": "4.1.2",
79
79
  "@effect/sql-pg": "4.1.2",
80
80
  "@effect/vitest": "4.1.2",
81
- "@shivaedev/admin": "0.26.1",
81
+ "@shivaedev/admin": "0.26.3",
82
82
  "better-auth": "1.7.16",
83
83
  "effect": "4.1.2"
84
84
  },
@@ -1,6 +1,7 @@
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 { RepositoryModels } from "@shivaedev/sql/RepositoryModels.ts";
4
5
  import { hostHttpServices } from "#adapters/hostHttpServices.ts";
5
6
  import { nodeHttpServer } from "#adapters/nodeHttpServer.ts";
6
7
  import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
@@ -68,11 +69,18 @@ export function appHostHttp<
68
69
  );
69
70
  return Layer.unwrap(
70
71
  HttpRouter.toHttpEffect(httpRoutes).pipe(
72
+ // Building the routes built every repository, so the policy is complete before the server takes a request.
73
+ Effect.tap(() => sensitive.complete),
71
74
  Effect.map((handler) => HttpServer.serve(handler).pipe(HttpServer.withLogAddress, Layer.provideMerge(server))),
72
75
  ),
73
76
  ).pipe(Layer.provideMerge(application), Layer.provide(sessions), Layer.provideMerge(hostHttpServices));
74
77
  }),
75
- ).pipe(Layer.provide(redactingDiagnostics(sensitive)), Layer.provide(otlpTracing), Layer.provide(Layer.succeed(RedactionPolicy, sensitive))),
78
+ ).pipe(
79
+ Layer.provide(redactingDiagnostics(sensitive)),
80
+ Layer.provide(otlpTracing),
81
+ Layer.provide(Layer.succeed(RedactionPolicy, sensitive)),
82
+ Layer.provide(Layer.succeed(RepositoryModels, sensitive.models)),
83
+ ),
76
84
  ),
77
85
  );
78
86
  }
@@ -1,11 +1,41 @@
1
+ import { Effect, MutableRef } from "effect";
1
2
  import { type Rpc, RpcGroup } from "effect/rpc";
3
+ import { schemaFieldKeys } from "@shivaedev/errors/schemaFieldScope.ts";
2
4
  import { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
3
5
 
4
- export function hostSensitiveKeys<TRpcs extends Rpc.Any>(options: {
6
+ export const hostSensitiveKeys = Effect.fnUntraced(function* <TRpcs extends Rpc.Any>(options: {
5
7
  readonly group?: RpcGroup.RpcGroup<TRpcs>;
6
8
  readonly config?: { readonly sensitiveKeys?: readonly string[] };
7
9
  }) {
8
- return options.group === undefined
9
- ? schemaSensitiveKeys(RpcGroup.make(), options.config?.sensitiveKeys)
10
- : schemaSensitiveKeys(options.group, options.config?.sensitiveKeys);
11
- }
10
+ const configured = options.config?.sensitiveKeys ?? [];
11
+ function policy(extra: readonly string[]) {
12
+ return options.group === undefined ? schemaSensitiveKeys(RpcGroup.make(), extra) : schemaSensitiveKeys(options.group, extra);
13
+ }
14
+ // Model names only widen masking, so the configured policy already holds the startup's conflict verdict.
15
+ const current = MutableRef.make(yield* policy(configured));
16
+ const models = new Set<string>();
17
+ function sensitive(key: string) {
18
+ return models.has(key) || MutableRef.get(current)(key);
19
+ }
20
+ return Object.assign(sensitive, {
21
+ // Repositories declare their models while the host builds them; complete recompiles every RPC's policy with their names, as config.sensitiveKeys.
22
+ complete: Effect.suspend(() => policy([...configured, ...models])).pipe(
23
+ Effect.map((completed) => MutableRef.set(current, completed)),
24
+ Effect.asVoid,
25
+ ),
26
+ forRpc: (tag: string | undefined) => {
27
+ const forTag = MutableRef.get(current).forRpc(tag);
28
+ return (key: string) => models.has(key) || forTag(key);
29
+ },
30
+ maskFailure: (tag: string | undefined, reason: "Fail" | "Die") => MutableRef.get(current).maskFailure(tag, reason),
31
+ models: {
32
+ declare: (model: { readonly ast: Parameters<typeof schemaFieldKeys>[0] }) =>
33
+ Effect.sync(() => {
34
+ for (const key of schemaFieldKeys(model.ast, [])) {
35
+ models.add(key);
36
+ }
37
+ }),
38
+ },
39
+ redactFailure: (tag: string | undefined, reason: "Fail" | "Die", value: unknown) => MutableRef.get(current).redactFailure(tag, reason, value),
40
+ });
41
+ });