@shivaedev/server 0.32.3 → 0.33.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.
Files changed (60) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/README.md +17 -15
  3. package/dist/adapters/makePlatformRuntime.d.ts +1 -1
  4. package/dist/adapters/makePlatformRuntime.d.ts.map +1 -1
  5. package/dist/{runtime/types.d.ts → adapters/platformRuntime.d.ts} +1 -1
  6. package/dist/adapters/platformRuntime.d.ts.map +1 -0
  7. package/dist/adapters/platformRuntime.js +2 -0
  8. package/dist/adapters/platformRuntime.js.map +1 -0
  9. package/dist/adapters/redactingDiagnostics.d.ts.map +1 -0
  10. package/dist/adapters/redactingDiagnostics.js.map +1 -0
  11. package/dist/appDatabaseHttp.d.ts +12 -48
  12. package/dist/appDatabaseHttp.d.ts.map +1 -1
  13. package/dist/appHost.d.ts +6 -24
  14. package/dist/appHost.d.ts.map +1 -1
  15. package/dist/appHostHttp.d.ts +6 -24
  16. package/dist/appHostHttp.d.ts.map +1 -1
  17. package/dist/appHostHttp.js +1 -1
  18. package/dist/appHostHttp.js.map +1 -1
  19. package/dist/hostPreflight.js +1 -1
  20. package/dist/hostPreflight.js.map +1 -1
  21. package/dist/hostRpc.d.ts +2 -6
  22. package/dist/hostRpc.d.ts.map +1 -1
  23. package/dist/hostRpcRoutes.d.ts +2 -8
  24. package/dist/hostRpcRoutes.d.ts.map +1 -1
  25. package/dist/hostRpcRoutes.js +1 -1
  26. package/dist/hostRpcRoutes.js.map +1 -1
  27. package/dist/localTracing.js +1 -1
  28. package/dist/localTracing.js.map +1 -1
  29. package/dist/nativeClientOrigins.d.ts.map +1 -1
  30. package/dist/nativeClientOrigins.js +4 -6
  31. package/dist/nativeClientOrigins.js.map +1 -1
  32. package/dist/otlpTracing.js +1 -1
  33. package/dist/otlpTracing.js.map +1 -1
  34. package/dist/redactingRpcSerialization.d.ts +15 -4
  35. package/dist/redactingRpcSerialization.d.ts.map +1 -1
  36. package/dist/redactingRpcSerialization.js +5 -3
  37. package/dist/redactingRpcSerialization.js.map +1 -1
  38. package/dist/tracedGroup.d.ts +2 -3
  39. package/dist/tracedGroup.d.ts.map +1 -1
  40. package/dist/tracedGroup.js +23 -9
  41. package/dist/tracedGroup.js.map +1 -1
  42. package/package.json +12 -12
  43. package/src/adapters/makePlatformRuntime.ts +1 -1
  44. package/src/appHostHttp.ts +1 -1
  45. package/src/hostPreflight.ts +1 -1
  46. package/src/hostRpcRoutes.ts +1 -1
  47. package/src/localTracing.ts +1 -1
  48. package/src/nativeClientOrigins.ts +4 -5
  49. package/src/otlpTracing.ts +1 -1
  50. package/src/redactingRpcSerialization.ts +7 -9
  51. package/src/tracedGroup.ts +27 -10
  52. package/dist/redactingDiagnostics.d.ts.map +0 -1
  53. package/dist/redactingDiagnostics.js.map +0 -1
  54. package/dist/runtime/types.d.ts.map +0 -1
  55. package/dist/runtime/types.js +0 -2
  56. package/dist/runtime/types.js.map +0 -1
  57. /package/dist/{redactingDiagnostics.d.ts → adapters/redactingDiagnostics.d.ts} +0 -0
  58. /package/dist/{redactingDiagnostics.js → adapters/redactingDiagnostics.js} +0 -0
  59. /package/src/{runtime/types.ts → adapters/platformRuntime.ts} +0 -0
  60. /package/src/{redactingDiagnostics.ts → adapters/redactingDiagnostics.ts} +0 -0
@@ -4,14 +4,12 @@ import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import { localTransport } from "@shivaedev/identity/server/adapters/local.ts";
5
5
  import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
6
6
  export const NativeOrigins = Schema.Array(Schema.String.check(Schema.makeFilter((origin) => {
7
- try {
8
- const url = new URL(origin);
9
- const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
10
- return url.host !== "" && !origin.includes("*") && authority === origin;
11
- }
12
- catch {
7
+ if (!URL.canParse(origin)) {
13
8
  return false;
14
9
  }
10
+ const url = new URL(origin);
11
+ const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
12
+ return url.host !== "" && !origin.includes("*") && authority === origin;
15
13
  })));
16
14
  export function nativeClientOrigins(origins, trustedProxy, auth = false, rpcPath = "/rpc") {
17
15
  const matchesPath = auth ? (path) => path === "/api/auth" || path.startsWith("/api/auth/") : (path) => path === rpcPath;
@@ -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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"}
@@ -1,10 +1,10 @@
1
1
  import { Config, ConfigProvider, Context, Effect, Layer, Schema } from "effect";
2
2
  import { OtlpSerialization, OtlpTracer } from "effect/observability";
3
+ import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
3
4
  import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
4
5
  import { localTracing } from "#localTracing.ts";
5
6
  import { otlpHttpClient } from "#otlpHttpClient.ts";
6
7
  import { RedactionPolicy } from "#RedactionPolicy.ts";
7
- import { redactingDiagnostics } from "#redactingDiagnostics.ts";
8
8
  import { redactingTracer } from "#redactingTracer.ts";
9
9
  import { safeOtlpSerialization } from "#safeOtlpSerialization.ts";
10
10
  const endpointUrl = Schema.URL.check(Schema.makeFilter((url) => url.protocol === "http:" || url.protocol === "https:"));
@@ -1 +1 @@
1
- {"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,16 @@
1
- import { type Effect } from "effect";
2
- import type { RpcSerialization } from "effect/rpc";
3
- import type { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
4
- export declare function redactingRpcSerialization(wire: RpcSerialization.RpcSerialization["Service"], sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): typeof wire;
1
+ import { Effect } from "effect";
2
+ import { RpcSerialization } from "effect/rpc";
3
+ export declare const redactingRpcSerialization: (sensitive: ((key: string) => boolean) & {
4
+ forRpc: (tag: string | undefined) => (key: string) => boolean;
5
+ maskFailure: (tag: string | undefined, reason: "Fail" | "Die") => boolean;
6
+ redactFailure: (tag: string | undefined, reason: "Fail" | "Die", value: unknown) => unknown;
7
+ }) => Effect.Effect<{
8
+ contentType: string;
9
+ includesFraming: boolean;
10
+ codecFor: RpcSerialization.CodecFor;
11
+ makeUnsafe: () => {
12
+ decode: (data: Uint8Array | string) => readonly unknown[];
13
+ encode: (value: unknown) => string | Uint8Array<ArrayBufferLike> | undefined;
14
+ };
15
+ }, never, RpcSerialization.RpcSerialization>;
5
16
  //# sourceMappingURL=redactingRpcSerialization.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"redactingRpcSerialization.d.ts","sourceRoot":"","sources":["../src/redactingRpcSerialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAMpF,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAClD,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,GAC/D,OAAO,IAAI,CAwEb"}
1
+ {"version":3,"file":"redactingRpcSerialization.d.ts","sourceRoot":"","sources":["../src/redactingRpcSerialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAQ9C,eAAO,MAAM,yBAAyB;;;;;;;;;uBAqDnB,UAAU,GAAG,MAAM;wBAgBlB,OAAO;;4CAIzB,CAAC"}
@@ -1,10 +1,12 @@
1
- import { Predicate } from "effect";
1
+ import { Effect, Predicate } from "effect";
2
+ import { RpcSerialization } from "effect/rpc";
2
3
  import { redactWire } from "@shivaedev/errors/redact.ts";
3
4
  import { REDACTED } from "@shivaedev/errors/sensitive.ts";
4
5
  function isRequestId(value) {
5
6
  return typeof value === "string" || typeof value === "number";
6
7
  }
7
- export function redactingRpcSerialization(wire, sensitive) {
8
+ export const redactingRpcSerialization = Effect.fnUntraced(function* (sensitive) {
9
+ const wire = yield* RpcSerialization.RpcSerialization;
8
10
  function reason(value, tag) {
9
11
  const redacted = redactWire(value, sensitive.forRpc(tag));
10
12
  if (Predicate.isObjectOrArray(redacted)) {
@@ -70,5 +72,5 @@ export function redactingRpcSerialization(wire, sensitive) {
70
72
  };
71
73
  },
72
74
  };
73
- }
75
+ });
74
76
  //# sourceMappingURL=redactingRpcSerialization.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"redactingRpcSerialization.js","sourceRoot":"","sources":["../src/redactingRpcSerialization.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redactingRpcSerialization.js","sourceRoot":"","sources":["../src/redactingRpcSerialization.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import type { Rpc, RpcGroup } from "effect/rpc";
2
- import { RequestTracing } from "@shivaedev/identity/middleware.ts";
3
- export declare function tracedGroup<R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>): RpcGroup.RpcGroup<Rpc.AddMiddleware<R, typeof RequestTracing>>;
1
+ import { RpcGroup, type Rpc as RpcType } from "effect/rpc";
2
+ export declare function tracedGroup<R extends RpcType.Any>(group: RpcGroup.RpcGroup<R>): RpcGroup.RpcGroup<R>;
4
3
  //# sourceMappingURL=tracedGroup.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tracedGroup.d.ts","sourceRoot":"","sources":["../src/tracedGroup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,wBAAgB,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,kEAUzE"}
1
+ {"version":3,"file":"tracedGroup.d.ts","sourceRoot":"","sources":["../src/tracedGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,QAAQ,EAAiC,KAAK,GAAG,IAAI,OAAO,EAAE,MAAM,YAAY,CAAC;AAyB/F,wBAAgB,WAAW,CAAC,CAAC,SAAS,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC"}
@@ -1,13 +1,27 @@
1
+ import { Rpc, RpcGroup, RpcSchema } from "effect/rpc";
1
2
  import { RequestTracing } from "@shivaedev/identity/middleware.ts";
2
- export function tracedGroup(group) {
3
- const traced = group.middleware(RequestTracing);
4
- for (const rpc of traced.requests.values()) {
5
- const middlewares = new Set(rpc.middlewares);
6
- middlewares.delete(RequestTracing);
7
- middlewares.add(RequestTracing);
8
- // Native middleware() clones each RPC but cannot move an existing middleware to the outermost position.
9
- Object.assign(rpc, { middlewares });
3
+ function hasNativeProps(rpc) {
4
+ return "payloadSchema" in rpc && "successSchema" in rpc && "errorSchema" in rpc && "defectSchema" in rpc && "middlewares" in rpc;
5
+ }
6
+ function rebuild(rpc) {
7
+ const stream = RpcSchema.isStreamSchema(rpc.successSchema) ? rpc.successSchema : undefined;
8
+ let rebuilt = Rpc.make(rpc._tag, {
9
+ defect: rpc.defectSchema,
10
+ error: stream?.error ?? rpc.errorSchema,
11
+ payload: rpc.payloadSchema,
12
+ ...(stream === undefined ? {} : { stream: true }),
13
+ success: stream?.success ?? rpc.successSchema,
14
+ });
15
+ rebuilt = rebuilt.annotateMerge(rpc.annotations);
16
+ for (const middleware of rpc.middlewares) {
17
+ if (middleware.key !== RequestTracing.key) {
18
+ rebuilt = rebuilt.middleware(middleware);
19
+ }
10
20
  }
11
- return traced;
21
+ return rebuilt.middleware(RequestTracing);
22
+ }
23
+ export function tracedGroup(group) {
24
+ const requests = [...group.requests.values()].map((rpc) => (hasNativeProps(rpc) ? rebuild(rpc) : rpc));
25
+ return RpcGroup.make(...requests).annotateMerge(group.annotations);
12
26
  }
13
27
  //# sourceMappingURL=tracedGroup.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tracedGroup.js","sourceRoot":"","sources":["../src/tracedGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,MAAM,UAAU,WAAW,CAAoB,KAA2B;IACzE,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAChD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC7C,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAChC,wGAAwG;QACxG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"tracedGroup.js","sourceRoot":"","sources":["../src/tracedGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAsB,SAAS,EAAuB,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,SAAS,cAAc,CAAC,GAAgB;IACvC,OAAO,eAAe,IAAI,GAAG,IAAI,eAAe,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,cAAc,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,CAAC;AAClI,CAAC;AAED,SAAS,OAAO,CAAC,GAA2E;IAC3F,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI,OAAO,GAA+F,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QAC5H,MAAM,EAAE,GAAG,CAAC,YAAY;QACxB,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,CAAC,WAAW;QACvC,OAAO,EAAE,GAAG,CAAC,aAAa;QAC1B,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAa,EAAE,CAAC;QAC1D,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,GAAG,CAAC,aAAa;KAC7C,CAAC,CAAC;IACH,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjD,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,UAAU,CAAC,GAAG,KAAK,cAAc,CAAC,GAAG,EAAE,CAAC;YAC3C,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;IACD,OAAO,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AAC3C,CAAC;AAGD,MAAM,UAAU,WAAW,CAAC,KAAqC;IAChE,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvG,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;AACpE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/server",
3
- "version": "0.32.3",
3
+ "version": "0.33.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"
@@ -47,26 +47,26 @@
47
47
  ],
48
48
  "dependencies": {
49
49
  "@shivaedev/changes": "0.11.1",
50
- "@shivaedev/contract": "0.43.2",
50
+ "@shivaedev/contract": "0.43.3",
51
51
  "@shivaedev/errors": "0.10.1",
52
52
  "@shivaedev/http": "0.8.1",
53
- "@shivaedev/identity": "0.30.3",
53
+ "@shivaedev/identity": "0.30.5",
54
54
  "@shivaedev/local-postgres": "0.16.0",
55
- "@shivaedev/sql": "0.46.2"
55
+ "@shivaedev/sql": "0.46.3"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@effect/platform-node": "4.1.1",
59
59
  "@effect/sql-pg": "4.1.1",
60
60
  "@effect/vitest": "4.1.1",
61
61
  "@shivaedev/access": "0.6.1",
62
- "@shivaedev/admin": "0.23.4",
63
- "@shivaedev/jobs": "0.41.3",
64
- "@shivaedev/quality": "0.72.2",
65
- "@shivaedev/rate-limit": "0.6.6",
62
+ "@shivaedev/admin": "0.23.6",
63
+ "@shivaedev/jobs": "0.41.4",
64
+ "@shivaedev/quality": "0.74.0",
65
+ "@shivaedev/rate-limit": "0.6.7",
66
66
  "@shivaedev/service": "0.8.2",
67
- "@shivaedev/test-kits": "0.10.4",
68
- "@shivaedev/test-sql": "0.24.6",
69
- "@shivaedev/test-story": "0.45.3",
67
+ "@shivaedev/test-kits": "0.10.6",
68
+ "@shivaedev/test-sql": "0.24.7",
69
+ "@shivaedev/test-story": "0.45.5",
70
70
  "@types/node": "24.19.2",
71
71
  "better-auth": "1.7.14",
72
72
  "effect": "4.1.1",
@@ -78,7 +78,7 @@
78
78
  "@effect/platform-node": "4.1.1",
79
79
  "@effect/sql-pg": "4.1.1",
80
80
  "@effect/vitest": "4.1.1",
81
- "@shivaedev/admin": "0.23.4",
81
+ "@shivaedev/admin": "0.23.6",
82
82
  "better-auth": "1.7.14",
83
83
  "effect": "4.1.1"
84
84
  },
@@ -1,7 +1,7 @@
1
1
  import { AsyncLocalStorage } from "node:async_hooks";
2
2
  import type { Layer } from "effect";
3
3
  import { Cause, Config, Context, Effect, Exit, ManagedRuntime } from "effect";
4
- import type { PlatformRuntime, PlatformRuntimeOptions } from "#runtime/types.ts";
4
+ import type { PlatformRuntime, PlatformRuntimeOptions } from "#adapters/platformRuntime.ts";
5
5
 
6
6
  const RuntimeCacheKey = Symbol.for("@shivaedev/server/runtime-cache");
7
7
  const sharedCache: unknown = Reflect.get(globalThis, RuntimeCacheKey);
@@ -3,6 +3,7 @@ import { HttpRouter, HttpServer } from "effect/http";
3
3
  import type { Rpc } from "effect/rpc";
4
4
  import { hostHttpServices } from "#adapters/hostHttpServices.ts";
5
5
  import { nodeHttpServer } from "#adapters/nodeHttpServer.ts";
6
+ import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
6
7
  import { browserErrorRoute } from "#browserErrorRoute.ts";
7
8
  import { healthRoute } from "#healthRoute.ts";
8
9
  import { hostApplicationRoutes } from "#hostApplicationRoutes.ts";
@@ -14,7 +15,6 @@ import { hostTransport } from "#hostTransport.ts";
14
15
  import { nativeClientOrigins } from "#nativeClientOrigins.ts";
15
16
  import { otlpTracing } from "#otlpTracing.ts";
16
17
  import { RedactionPolicy } from "#RedactionPolicy.ts";
17
- import { redactingDiagnostics } from "#redactingDiagnostics.ts";
18
18
 
19
19
  export function appHostHttp<
20
20
  TRpcs extends Rpc.Any,
@@ -1,6 +1,6 @@
1
1
  import type * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
2
  import { Effect, Layer } from "effect";
3
- import { redactingDiagnostics } from "#redactingDiagnostics.ts";
3
+ import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
4
4
 
5
5
  export type HostPreflight<TServices = never, TError = never, TRequirements = never> =
6
6
  | { readonly preflight: Layer.Layer<TServices, TError, TRequirements> }
@@ -79,7 +79,7 @@ function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements,
79
79
  return HttpRouter.use((router) =>
80
80
  Effect.gen(function* () {
81
81
  yield* validateReadPolicies(options.group);
82
- const wire = redactingRpcSerialization(yield* RpcSerialization.RpcSerialization, sensitive);
82
+ const wire = yield* redactingRpcSerialization(sensitive);
83
83
  const httpWire: typeof wire = {
84
84
  ...wire,
85
85
  makeUnsafe: () => {
@@ -1,9 +1,9 @@
1
1
  import { Clock, Effect, Layer, Tracer } from "effect";
2
2
  import { localTraceDatabase } from "#adapters/localTraceDatabase.ts";
3
+ import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
3
4
  import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
4
5
  import { type LocalTraceEvent, type LocalTraceRow, localTraceRow } from "#localTraceRow.ts";
5
6
  import { RedactionPolicy } from "#RedactionPolicy.ts";
6
- import { redactingDiagnostics } from "#redactingDiagnostics.ts";
7
7
 
8
8
  export interface LocalTracingOptions {
9
9
  readonly clock?: Clock.Clock;
@@ -7,13 +7,12 @@ import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
7
7
  export const NativeOrigins = Schema.Array(
8
8
  Schema.String.check(
9
9
  Schema.makeFilter((origin) => {
10
- try {
11
- const url = new URL(origin);
12
- const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
13
- return url.host !== "" && !origin.includes("*") && authority === origin;
14
- } catch {
10
+ if (!URL.canParse(origin)) {
15
11
  return false;
16
12
  }
13
+ const url = new URL(origin);
14
+ const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
15
+ return url.host !== "" && !origin.includes("*") && authority === origin;
17
16
  }),
18
17
  ),
19
18
  );
@@ -1,10 +1,10 @@
1
1
  import { Config, ConfigProvider, Context, Effect, Layer, Schema } from "effect";
2
2
  import { OtlpSerialization, OtlpTracer } from "effect/observability";
3
+ import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
3
4
  import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
4
5
  import { localTracing } from "#localTracing.ts";
5
6
  import { otlpHttpClient } from "#otlpHttpClient.ts";
6
7
  import { RedactionPolicy } from "#RedactionPolicy.ts";
7
- import { redactingDiagnostics } from "#redactingDiagnostics.ts";
8
8
  import { redactingTracer } from "#redactingTracer.ts";
9
9
  import { safeOtlpSerialization } from "#safeOtlpSerialization.ts";
10
10
 
@@ -1,5 +1,5 @@
1
- import { type Effect, Predicate } from "effect";
2
- import type { RpcSerialization } from "effect/rpc";
1
+ import { Effect, Predicate } from "effect";
2
+ import { RpcSerialization } from "effect/rpc";
3
3
  import { redactWire } from "@shivaedev/errors/redact.ts";
4
4
  import type { schemaSensitiveKeys } from "@shivaedev/errors/schemaSensitiveKeys.ts";
5
5
  import { REDACTED } from "@shivaedev/errors/sensitive.ts";
@@ -7,10 +7,8 @@ import { REDACTED } from "@shivaedev/errors/sensitive.ts";
7
7
  function isRequestId(value: unknown): value is string | number {
8
8
  return typeof value === "string" || typeof value === "number";
9
9
  }
10
- export function redactingRpcSerialization(
11
- wire: RpcSerialization.RpcSerialization["Service"],
12
- sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>,
13
- ): typeof wire {
10
+ export const redactingRpcSerialization = Effect.fnUntraced(function* (sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>) {
11
+ const wire: RpcSerialization.RpcSerialization["Service"] = yield* RpcSerialization.RpcSerialization;
14
12
  function reason(value: unknown, tag: string | undefined): unknown {
15
13
  const redacted = redactWire(value, sensitive.forRpc(tag));
16
14
  if (Predicate.isObjectOrArray(redacted)) {
@@ -62,7 +60,7 @@ export function redactingRpcSerialization(
62
60
  }
63
61
  return {
64
62
  ...parser,
65
- decode: (data) => {
63
+ decode: (data: Uint8Array | string) => {
66
64
  const decoded = parser.decode(data);
67
65
  for (const request of decoded) {
68
66
  if (
@@ -78,8 +76,8 @@ export function redactingRpcSerialization(
78
76
  }
79
77
  return decoded;
80
78
  },
81
- encode: (value) => parser.encode(response(value)),
79
+ encode: (value: unknown) => parser.encode(response(value)),
82
80
  };
83
81
  },
84
82
  };
85
- }
83
+ });
@@ -1,14 +1,31 @@
1
- import type { Rpc, RpcGroup } from "effect/rpc";
1
+ import type { Schema } from "effect";
2
+ import { Rpc, RpcGroup, type RpcMiddleware, RpcSchema, type Rpc as RpcType } from "effect/rpc";
2
3
  import { RequestTracing } from "@shivaedev/identity/middleware.ts";
3
4
 
4
- export function tracedGroup<R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>) {
5
- const traced = group.middleware(RequestTracing);
6
- for (const rpc of traced.requests.values()) {
7
- const middlewares = new Set(rpc.middlewares);
8
- middlewares.delete(RequestTracing);
9
- middlewares.add(RequestTracing);
10
- // Native middleware() clones each RPC but cannot move an existing middleware to the outermost position.
11
- Object.assign(rpc, { middlewares });
5
+ function hasNativeProps(rpc: RpcType.Any): rpc is RpcType.AnyWithProps & { readonly defectSchema: RpcType.DefectSchema } {
6
+ return "payloadSchema" in rpc && "successSchema" in rpc && "errorSchema" in rpc && "defectSchema" in rpc && "middlewares" in rpc;
7
+ }
8
+
9
+ function rebuild(rpc: RpcType.AnyWithProps & { readonly defectSchema: RpcType.DefectSchema }): RpcType.Any {
10
+ const stream = RpcSchema.isStreamSchema(rpc.successSchema) ? rpc.successSchema : undefined;
11
+ let rebuilt: RpcType.Rpc<string, Schema.Top, Schema.Top, Schema.Top, RpcMiddleware.AnyService, unknown> = Rpc.make(rpc._tag, {
12
+ defect: rpc.defectSchema,
13
+ error: stream?.error ?? rpc.errorSchema,
14
+ payload: rpc.payloadSchema,
15
+ ...(stream === undefined ? {} : { stream: true as const }),
16
+ success: stream?.success ?? rpc.successSchema,
17
+ });
18
+ rebuilt = rebuilt.annotateMerge(rpc.annotations);
19
+ for (const middleware of rpc.middlewares) {
20
+ if (middleware.key !== RequestTracing.key) {
21
+ rebuilt = rebuilt.middleware(middleware);
22
+ }
12
23
  }
13
- return traced;
24
+ return rebuilt.middleware(RequestTracing);
25
+ }
26
+
27
+ export function tracedGroup<R extends RpcType.Any>(group: RpcGroup.RpcGroup<R>): RpcGroup.RpcGroup<R>;
28
+ export function tracedGroup(group: RpcGroup.RpcGroup<RpcType.Any>): RpcGroup.RpcGroup<RpcType.Any> {
29
+ const requests = [...group.requests.values()].map((rpc) => (hasNativeProps(rpc) ? rebuild(rpc) : rpc));
30
+ return RpcGroup.make(...requests).annotateMerge(group.annotations);
14
31
  }
@@ -1 +0,0 @@
1
- {"version":3,"file":"redactingDiagnostics.d.ts","sourceRoot":"","sources":["../src/redactingDiagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,EAAsB,MAAM,QAAQ,CAAC;AAGnF,OAAO,EAAE,KAAK,mBAAmB,EAAmB,MAAM,qBAAqB,CAAC;AAWhF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,oCA0B/D"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"redactingDiagnostics.js","sourceRoot":"","sources":["../src/redactingDiagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAA4B,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEhF,SAAS,oBAAoB,CAAC,QAAqC,EAAE,MAA2B;IAC/F,OAAO;QACN,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM;QAC5C,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;YACnB,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YAChH,OAAO,sBAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpE,CAAC;KACD,CAAC;AACH,CAAC;AACD,MAAM,UAAU,oBAAoB,CAAC,MAA2B;IAC/D,OAAO,KAAK,CAAC,aAAa,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;QAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,qBAAqB,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,GAAG,CAC1B,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACtC,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;YACnE,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC;YAC9F,IAAI,CAAC;gBACJ,OAAO,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACxI,CAAC;oBAAS,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACF,CAAC,CAAC,CACF,CACD,CAAC;QACF,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,IAAI,CAC3D,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,qBAAqB,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CACnI,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACpD,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/C;AACD,MAAM,WAAW,eAAe,CAAC,SAAS,EAAE,WAAW;IACtD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,SAAS,SAAS,EAC1D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EAC1C,OAAO,CAAC,EAAE;QACT,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;KAC9B,KACG,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,SAAS,SAAS,EAC9D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EAC1C,OAAO,CAAC,EAAE;QACT,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;KAC9B,KACG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,MAAM,KAAK,MAAM,CAAC;CACtH;AACD,MAAM,MAAM,uBAAuB,CAAC,QAAQ,IAAI,QAAQ,SAAS,eAAe,CAAC,MAAM,SAAS,EAAE,MAAM,YAAY,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC;AAC1I,MAAM,MAAM,yBAAyB,CAAC,QAAQ,IAAI,QAAQ,SAAS,eAAe,CAAC,MAAM,UAAU,EAAE,MAAM,WAAW,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=types.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":""}