@shivaedev/server 0.34.1 → 0.35.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 +16 -0
- package/README.md +6 -6
- package/dist/adapters/defaultTraceStore.d.ts +8 -0
- package/dist/adapters/defaultTraceStore.d.ts.map +1 -0
- package/dist/adapters/defaultTraceStore.js +40 -0
- package/dist/adapters/defaultTraceStore.js.map +1 -0
- package/dist/appDatabase.d.ts +1 -1
- package/dist/appDatabase.d.ts.map +1 -1
- package/dist/appDatabase.js +1 -0
- package/dist/appDatabase.js.map +1 -1
- package/dist/appDatabaseHttp.d.ts +98 -62
- package/dist/appDatabaseHttp.d.ts.map +1 -1
- package/dist/appHost.d.ts +49 -31
- package/dist/appHost.d.ts.map +1 -1
- package/dist/appHostHttp.d.ts +49 -31
- package/dist/appHostHttp.d.ts.map +1 -1
- package/dist/hostChanges.d.ts.map +1 -1
- package/dist/hostChanges.js +2 -1
- package/dist/hostChanges.js.map +1 -1
- package/dist/hostRpc.d.ts +4 -0
- package/dist/hostRpc.d.ts.map +1 -1
- package/dist/hostRpc.js +2 -1
- package/dist/hostRpc.js.map +1 -1
- package/dist/hostRpcRoutes.d.ts +17 -11
- package/dist/hostRpcRoutes.d.ts.map +1 -1
- package/dist/hostRpcRoutes.js +2 -1
- package/dist/hostRpcRoutes.js.map +1 -1
- package/dist/liveSyncLayer.d.ts +2 -0
- package/dist/liveSyncLayer.d.ts.map +1 -0
- package/dist/liveSyncLayer.js +4 -0
- package/dist/liveSyncLayer.js.map +1 -0
- package/dist/localTracing.d.ts +1 -1
- package/dist/localTracing.d.ts.map +1 -1
- package/dist/localTracing.js +15 -1
- package/dist/localTracing.js.map +1 -1
- package/dist/otlpTracing.js +2 -2
- package/dist/otlpTracing.js.map +1 -1
- package/dist/publishCommand.d.ts +2 -1
- package/dist/publishCommand.d.ts.map +1 -1
- package/dist/publishCommand.js +9 -5
- package/dist/publishCommand.js.map +1 -1
- package/package.json +13 -13
- package/src/adapters/defaultTraceStore.ts +43 -0
- package/src/appDatabase.ts +2 -1
- package/src/hostChanges.ts +5 -1
- package/src/hostRpc.ts +2 -1
- package/src/hostRpcRoutes.ts +2 -0
- package/src/liveSyncLayer.ts +4 -0
- package/src/localTracing.ts +18 -1
- package/src/otlpTracing.ts +2 -2
- package/src/publishCommand.ts +9 -4
package/dist/hostRpcRoutes.d.ts
CHANGED
|
@@ -20,46 +20,52 @@ export declare function hostRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError,
|
|
|
20
20
|
readonly policy: "loopback";
|
|
21
21
|
}, transport: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<Layer.Success<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, Layer.Error<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, Exclude<TRequirements, TRequestServices> | RequestRequirements<TRpcs, TRequestRequirements> | Exclude<Rpc.ServicesServer<TRpcs>, THandlers> | Exclude<Layer.Services<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, SessionPolicy | HttpRouter.Request<"Requires", SessionPolicy> | TRequestServices | TRequestRequirements>>;
|
|
22
22
|
export declare function hostRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements, TRequestServices = never, TRequestRequirements = never>(...args: Parameters<typeof buildRpcRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>): Layer.Layer<Layer.Success<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, Layer.Error<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, Exclude<Layer.Services<BuiltRoutes<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>>, TRequestServices | TRequestRequirements> | Exclude<TRequirements, TRequestServices> | RequestRequirements<TRpcs, TRequestRequirements>>;
|
|
23
|
-
declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements, TRequestServices = never, TRequestRequirements = never>(options: RouteOptions<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>, { bodySize, trustedProxy, nativeOrigins }: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<never, TError | import("./HandWrittenModuleHandlers.ts").HandWrittenModuleHandlers | 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, {
|
|
23
|
+
declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements, TRequestServices = never, TRequestRequirements = never>(options: RouteOptions<TRpcs, THandlers, TError, TRequirements, TRequestServices, TRequestRequirements>, { bodySize, trustedProxy, nativeOrigins }: Effect.Success<ReturnType<typeof hostTransport>>, sensitive: Effect.Success<ReturnType<typeof schemaSensitiveKeys>>): Layer.Layer<never, TError | import("./HandWrittenModuleHandlers.ts").HandWrittenModuleHandlers | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicies, SessionPolicy | Exclude<Exclude<Exclude<TRequirements, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<HttpRouter.HttpRouter, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
24
24
|
readonly _tag: `${string}.$changes`;
|
|
25
|
-
}>>>, 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, {
|
|
25
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<HttpRouter.Request<"Requires", SessionPolicy>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
26
26
|
readonly _tag: `${string}.$changes`;
|
|
27
|
-
}>>>, 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, {
|
|
27
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
28
28
|
readonly _tag: `${string}.$changes`;
|
|
29
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
29
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.hostVersion.watch">, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
30
30
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
31
31
|
} ? Extract<TMiddleware, {
|
|
32
32
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
33
33
|
}> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
34
34
|
readonly _tag: `${string}.$changes`;
|
|
35
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<
|
|
35
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.Handler<"platform.liveSync.request">, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
36
36
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
37
37
|
} ? Extract<TMiddleware, {
|
|
38
38
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
39
39
|
}> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
40
40
|
readonly _tag: `${string}.$changes`;
|
|
41
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<
|
|
41
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<import("effect/Scope").Scope, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
42
42
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
43
43
|
} ? Extract<TMiddleware, {
|
|
44
44
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
45
45
|
}> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
46
46
|
readonly _tag: `${string}.$changes`;
|
|
47
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.
|
|
47
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
48
48
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
49
49
|
} ? Extract<TMiddleware, {
|
|
50
50
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
51
51
|
}> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
52
52
|
readonly _tag: `${string}.$changes`;
|
|
53
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<
|
|
53
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, import("effect/rpc/RpcMiddleware").ServiceClass<import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>, "@shivaedev/server/RequestServices", TRequestServices, import("effect/Schema").Never, never, TRequestRequirements, false>>, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, import("effect/Context").Service.Identifier<TRpcs extends {
|
|
54
|
+
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
55
|
+
} ? Extract<TMiddleware, {
|
|
56
|
+
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
57
|
+
}> : never>>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
58
|
+
readonly _tag: `${string}.$changes`;
|
|
59
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Effect.Services<(TRpcs extends {
|
|
54
60
|
readonly middlewares: ReadonlySet<infer TMiddleware>;
|
|
55
61
|
} ? Extract<TMiddleware, {
|
|
56
62
|
readonly "@shivaedev/contract/SubjectDeclaration": import("@shivaedev/contract/subject.ts").SubjectDeclaration;
|
|
57
63
|
}> : never)["@shivaedev/contract/SubjectDeclaration"]["middleware"]>, import("#requestServices.ts").RequestServices<TRequestServices, TRequestRequirements>>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | import("@shivaedev/identity/subject.ts").SubjectResolver | Rpc.ToHandler<Extract<TRpcs, {
|
|
58
64
|
readonly _tag: `${string}.$changes`;
|
|
59
|
-
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
|
|
65
|
+
}>>>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
|
|
60
66
|
readonly _tag: `${string}.$changes`;
|
|
61
|
-
}>, `${string}.$changes`>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Rpc.ToHandler<Exclude<TRpcs, {
|
|
67
|
+
}>, `${string}.$changes`>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Exclude<TRpcs, {
|
|
62
68
|
readonly _tag: `${string}.$changes`;
|
|
63
|
-
}>>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, RpcSerialization.RpcSerialization>>;
|
|
69
|
+
}>>, THandlers>, Rpc.Handler<"platform.hostVersion.watch">>, Rpc.Handler<"platform.liveSync.request">>, RpcSerialization.RpcSerialization>>;
|
|
64
70
|
export {};
|
|
65
71
|
//# 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;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAMjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
package/dist/hostRpcRoutes.js
CHANGED
|
@@ -11,6 +11,7 @@ import { boundedRpcSocket } from "#boundedRpcSocket.ts";
|
|
|
11
11
|
import { hostChanges } from "#hostChanges.ts";
|
|
12
12
|
import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
|
|
13
13
|
import { hostVersionLayer } from "#hostVersionLayer.ts";
|
|
14
|
+
import { liveSyncLayer } from "#liveSyncLayer.ts";
|
|
14
15
|
import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
|
|
15
16
|
import { rpcRequestTracing } from "#rpcRequestTracing.ts";
|
|
16
17
|
import { servedModules } from "#servedModules.ts";
|
|
@@ -47,6 +48,6 @@ function buildRpcRoutes(options, { bodySize, trustedProxy, nativeOrigins }, sens
|
|
|
47
48
|
}));
|
|
48
49
|
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)))));
|
|
49
50
|
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)))));
|
|
50
|
-
})).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(hostVersionLayer(options.config?.buildVersion)), Layer.provide(RpcSerialization.layerNdjson));
|
|
51
|
+
})).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(hostVersionLayer(options.config?.buildVersion)), Layer.provide(liveSyncLayer), Layer.provide(RpcSerialization.layerNdjson));
|
|
51
52
|
}
|
|
52
53
|
//# sourceMappingURL=hostRpcRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"liveSyncLayer.d.ts","sourceRoot":"","sources":["../src/liveSyncLayer.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,2GAAmF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"liveSyncLayer.js","sourceRoot":"","sources":["../src/liveSyncLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,2BAA2B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC"}
|
package/dist/localTracing.d.ts
CHANGED
|
@@ -6,5 +6,5 @@ export interface LocalTracingOptions {
|
|
|
6
6
|
readonly path?: string;
|
|
7
7
|
readonly retainedRuns?: number;
|
|
8
8
|
}
|
|
9
|
-
export declare function localTracing({ clock, path, indexedAttributes, retainedRuns, flushInterval, }?: LocalTracingOptions): Layer.Layer<never, import("effect/Cause").UnknownError, never>;
|
|
9
|
+
export declare function localTracing({ clock, path: chosen, indexedAttributes, retainedRuns, flushInterval, }?: LocalTracingOptions): Layer.Layer<never, import("effect/Cause").UnknownError, never>;
|
|
10
10
|
//# sourceMappingURL=localTracing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localTracing.d.ts","sourceRoot":"","sources":["../src/localTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,KAAK,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"localTracing.d.ts","sourceRoot":"","sources":["../src/localTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,KAAK,EAAU,MAAM,QAAQ,CAAC;AAQtD,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAC/B;AAiBD,wBAAgB,YAAY,CAAC,EAC5B,KAAkC,EAClC,IAAI,EAAE,MAAM,EACZ,iBAAsB,EACtB,YAAgB,EAChB,aAAoB,GACpB,GAAE,mBAAwB,kEA0C1B"}
|
package/dist/localTracing.js
CHANGED
|
@@ -1,14 +1,28 @@
|
|
|
1
1
|
import { Clock, Effect, Layer, Tracer } from "effect";
|
|
2
|
+
import { defaultTraceStore } from "#adapters/defaultTraceStore.ts";
|
|
2
3
|
import { localTraceDatabase } from "#adapters/localTraceDatabase.ts";
|
|
3
4
|
import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
|
|
4
5
|
import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
|
|
5
6
|
import { localTraceRow } from "#localTraceRow.ts";
|
|
6
7
|
import { RedactionPolicy } from "#RedactionPolicy.ts";
|
|
7
|
-
|
|
8
|
+
// Untraced: the recorder is still being built, so a span here would reach the application's own tracer as one of its spans.
|
|
9
|
+
const storePath = Effect.fnUntraced(function* (chosen) {
|
|
10
|
+
if (chosen !== undefined) {
|
|
11
|
+
return chosen;
|
|
12
|
+
}
|
|
13
|
+
const store = yield* defaultTraceStore;
|
|
14
|
+
if (store.temporary) {
|
|
15
|
+
const refused = store.refused === undefined ? "" : ` and ${store.refused} is not a folder that only this user can reach`;
|
|
16
|
+
yield* Effect.logInfo(`Development traces are recorded to ${store.path}, because ${store.workingDirectory} has no node_modules folder${refused}.`);
|
|
17
|
+
}
|
|
18
|
+
return store.path;
|
|
19
|
+
});
|
|
20
|
+
export function localTracing({ clock = Clock.Clock.defaultValue(), path: chosen, indexedAttributes = [], retainedRuns = 5, flushInterval = 1000, } = {}) {
|
|
8
21
|
return Layer.unwrap(Effect.gen(function* () {
|
|
9
22
|
const policy = yield* RedactionPolicy;
|
|
10
23
|
const underlying = yield* Tracer.Tracer;
|
|
11
24
|
const startedAtMillis = yield* Clock.currentTimeMillis;
|
|
25
|
+
const path = yield* storePath(chosen);
|
|
12
26
|
const database = yield* Effect.acquireRelease(Effect.try(() => localTraceDatabase(path, retainedRuns, indexedAttributes, startedAtMillis)), (db) => Effect.sync(() => db.close()));
|
|
13
27
|
let pending = [];
|
|
14
28
|
const flush = Effect.sync(() => {
|
package/dist/localTracing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localTracing.js","sourceRoot":"","sources":["../src/localTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAA4C,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAUtD,MAAM,UAAU,YAAY,CAAC,EAC5B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,EAClC,IAAI,
|
|
1
|
+
{"version":3,"file":"localTracing.js","sourceRoot":"","sources":["../src/localTracing.ts"],"names":[],"mappings":"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"}
|
package/dist/otlpTracing.js
CHANGED
|
@@ -18,14 +18,14 @@ export const otlpTracing = Layer.effectContext(Effect.gen(function* () {
|
|
|
18
18
|
if (endpoint === undefined) {
|
|
19
19
|
const mode = yield* Config.String("NODE_ENV").pipe(Config.withDefault("production"));
|
|
20
20
|
if (mode === "development") {
|
|
21
|
-
const path = yield* Config.String("PLATFORM_TRACE_STORE").pipe(Config.withDefault(
|
|
21
|
+
const path = yield* Config.String("PLATFORM_TRACE_STORE").pipe(Config.withDefault(undefined));
|
|
22
22
|
const indexed = yield* Config.String("PLATFORM_TRACE_INDEXED_ATTRIBUTES").pipe(Config.withDefault(""));
|
|
23
23
|
return yield* Layer.build(localTracing({
|
|
24
24
|
indexedAttributes: indexed
|
|
25
25
|
.split(",")
|
|
26
26
|
.map((key) => key.trim())
|
|
27
27
|
.filter(Boolean),
|
|
28
|
-
path,
|
|
28
|
+
...(path === undefined ? {} : { path }),
|
|
29
29
|
})).pipe(Effect.mapError((cause) => new Config.ConfigError(new ConfigProvider.SourceError({ cause, message: "Cannot open local trace store" }))));
|
|
30
30
|
}
|
|
31
31
|
return Context.empty();
|
package/dist/otlpTracing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC;AAExH,MAAM,CAAC,MAAM,WAAW,GAA2C,KAAK,CAAC,aAAa,CACrF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IACnI,MAAM,QAAQ,GACb,cAAc;WACX,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,6BAA6B,CAAC,CAAC,IAAI,CACxE,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,GAAG,CAAC,QAAQ,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC;YAC/D,OAAO,GAAG,CAAC;QACZ,CAAC,CAAC,EACF,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAC7B,CAAC,CAAC;IACJ,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"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"}
|
package/dist/publishCommand.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
|
|
2
|
+
import { type SyncToken } from "@shivaedev/changes/syncToken.ts";
|
|
3
|
+
export declare function publishCommand<A, E, R>(effect: Effect.Effect<A, E, R>, declaredKeys: (result: A) => readonly unknown[], sync?: SyncToken): Effect.Effect<A, E, R>;
|
|
3
4
|
//# sourceMappingURL=publishCommand.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishCommand.d.ts","sourceRoot":"","sources":["../src/publishCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"publishCommand.d.ts","sourceRoot":"","sources":["../src/publishCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA8B,MAAM,QAAQ,CAAC;AAG5D,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAY/E,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,SAAS,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,SAAS,0BAoCxI"}
|
package/dist/publishCommand.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import { Effect, Option, Schedule } from "effect";
|
|
1
|
+
import { Effect, identity, Option, Schedule } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { CommandPublication } from "@shivaedev/changes/commandPublication.ts";
|
|
4
|
+
import { SyncDelivery } from "@shivaedev/changes/syncToken.ts";
|
|
5
|
+
import { LiveServer } from "@shivaedev/contract/live-server/service.ts";
|
|
4
6
|
import { ChangeObserver } from "@shivaedev/sql/transact.ts";
|
|
5
7
|
const recoverPublication = Effect.fnUntraced(function* (cause) {
|
|
6
8
|
yield* Effect.logError("Committed command invalidation failed; resynchronizing live streams", cause);
|
|
7
9
|
const publication = yield* CommandPublication;
|
|
8
10
|
yield* publication.recover.pipe(Effect.catch((error) => Effect.logError("Committed command Resync broadcast failed; other hosts may remain stale", error)));
|
|
9
11
|
});
|
|
10
|
-
export function publishCommand(effect, declaredKeys) {
|
|
12
|
+
export function publishCommand(effect, declaredKeys, sync) {
|
|
11
13
|
return Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
|
|
12
14
|
const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
13
15
|
if (Option.isNone(reactivity)) {
|
|
@@ -24,11 +26,13 @@ export function publishCommand(effect, declaredKeys) {
|
|
|
24
26
|
return observer(event);
|
|
25
27
|
}));
|
|
26
28
|
const keys = declaredKeys(result).filter((key) => !published.has(key));
|
|
27
|
-
if (keys.length > 0) {
|
|
29
|
+
if (keys.length > 0 || sync !== undefined) {
|
|
28
30
|
const publication = yield* CommandPublication;
|
|
31
|
+
const live = yield* Effect.serviceOption(LiveServer);
|
|
32
|
+
// The token leaves after the handler's last commit and behind the declared keys, so a stream that passes it has applied them all.
|
|
29
33
|
yield* publication
|
|
30
|
-
.publish(keys)
|
|
31
|
-
.pipe(Effect.provideService(Reactivity.Reactivity, reactivity.value), Effect.retry({ schedule: Schedule.exponential("50 millis"), times: 2 }), Effect.catch(recoverPublication));
|
|
34
|
+
.publish(keys, sync)
|
|
35
|
+
.pipe(Effect.provideService(Reactivity.Reactivity, reactivity.value), Option.isSome(live) ? Effect.provideService(SyncDelivery, live.value.synced) : identity, Effect.retry({ schedule: Schedule.exponential("50 millis"), times: 2 }), Effect.catch(recoverPublication));
|
|
32
36
|
}
|
|
33
37
|
return result;
|
|
34
38
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishCommand.js","sourceRoot":"","sources":["../src/publishCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"publishCommand.js","sourceRoot":"","sources":["../src/publishCommand.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.35.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.
|
|
50
|
-
"@shivaedev/contract": "0.
|
|
49
|
+
"@shivaedev/changes": "0.13.0",
|
|
50
|
+
"@shivaedev/contract": "0.46.0",
|
|
51
51
|
"@shivaedev/errors": "0.12.0",
|
|
52
52
|
"@shivaedev/http": "0.8.2",
|
|
53
|
-
"@shivaedev/identity": "0.32.
|
|
53
|
+
"@shivaedev/identity": "0.32.2",
|
|
54
54
|
"@shivaedev/local-postgres": "0.16.1",
|
|
55
|
-
"@shivaedev/sql": "0.
|
|
55
|
+
"@shivaedev/sql": "0.49.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
61
|
"@shivaedev/access": "0.6.3",
|
|
62
|
-
"@shivaedev/admin": "0.
|
|
63
|
-
"@shivaedev/jobs": "0.42.
|
|
64
|
-
"@shivaedev/quality": "0.78.
|
|
65
|
-
"@shivaedev/rate-limit": "0.6.
|
|
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",
|
|
66
66
|
"@shivaedev/service": "0.9.1",
|
|
67
|
-
"@shivaedev/test-kits": "0.
|
|
68
|
-
"@shivaedev/test-sql": "0.25.
|
|
69
|
-
"@shivaedev/test-story": "0.47.
|
|
67
|
+
"@shivaedev/test-kits": "0.13.1",
|
|
68
|
+
"@shivaedev/test-sql": "0.25.2",
|
|
69
|
+
"@shivaedev/test-story": "0.47.3",
|
|
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.
|
|
81
|
+
"@shivaedev/admin": "0.26.1",
|
|
82
82
|
"better-auth": "1.7.16",
|
|
83
83
|
"effect": "4.1.2"
|
|
84
84
|
},
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { existsSync, lstatSync, mkdirSync, mkdtempSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import process from "node:process";
|
|
6
|
+
import { Effect } from "effect";
|
|
7
|
+
|
|
8
|
+
const PREFIX = "shivaedev-server-";
|
|
9
|
+
|
|
10
|
+
function createPrivately(folder: string) {
|
|
11
|
+
try {
|
|
12
|
+
mkdirSync(folder, { mode: 0o700 });
|
|
13
|
+
} catch (cause) {
|
|
14
|
+
if (!(cause instanceof Error && "code" in cause && cause.code === "EEXIST")) {
|
|
15
|
+
throw cause;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function isPrivate(folder: string, user: number | undefined) {
|
|
21
|
+
const found = lstatSync(folder);
|
|
22
|
+
return found.isDirectory() && (user === undefined || (found.uid === user && (found.mode & 0o077) === 0));
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function temporaryFolder(workingDirectory: string) {
|
|
26
|
+
// Other users of a shared temporary directory can make a folder or a link under any name first. Windows has no user ids and gives each user a temporary directory of their own.
|
|
27
|
+
const user = process.getuid?.();
|
|
28
|
+
const name = createHash("sha256").update(workingDirectory).digest("hex").slice(0, 12);
|
|
29
|
+
const stable = join(tmpdir(), `${PREFIX}${user === undefined ? "" : `${user}-`}${name}`);
|
|
30
|
+
createPrivately(stable);
|
|
31
|
+
return isPrivate(stable, user) ? { folder: stable, refused: undefined } : { folder: mkdtempSync(join(tmpdir(), PREFIX)), refused: stable };
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export const defaultTraceStore = Effect.try(() => {
|
|
35
|
+
const workingDirectory = process.cwd();
|
|
36
|
+
const installed = join(workingDirectory, "node_modules");
|
|
37
|
+
if (existsSync(installed)) {
|
|
38
|
+
return { path: join(installed, ".cache", "@shivaedev", "server", "traces.db"), refused: undefined, temporary: false, workingDirectory };
|
|
39
|
+
}
|
|
40
|
+
// No node_modules folder is created here: an ignore rule anchored at a repository's root would not cover it, and the store could be committed.
|
|
41
|
+
const { folder, refused } = temporaryFolder(workingDirectory);
|
|
42
|
+
return { path: join(folder, "traces.db"), refused, temporary: true, workingDirectory };
|
|
43
|
+
});
|
package/src/appDatabase.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface AppDatabaseOptions<R = never, E = never> {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
export interface DatabaseConfig extends PostgresOptions {
|
|
32
|
-
readonly changes?: Partial<Omit<PostgresChangesOptions, "client" | "listenerClient" | "connectionSetting" | "resync">>;
|
|
32
|
+
readonly changes?: Partial<Omit<PostgresChangesOptions, "client" | "listenerClient" | "connectionSetting" | "resync" | "synced">>;
|
|
33
33
|
readonly clock?: Clock.Clock;
|
|
34
34
|
readonly databaseUrl?: Redacted.Redacted<string>;
|
|
35
35
|
readonly listenDatabaseUrl?: Redacted.Redacted<string>;
|
|
@@ -82,6 +82,7 @@ export function appDatabase<R, E = never>(options: AppDatabaseOptions<R, E>) {
|
|
|
82
82
|
connectionSetting,
|
|
83
83
|
listenerClient,
|
|
84
84
|
resync: hints.resync(),
|
|
85
|
+
synced: hints.synced,
|
|
85
86
|
}).pipe(Layer.provide(clock));
|
|
86
87
|
}),
|
|
87
88
|
).pipe(Layer.provideMerge(base));
|
package/src/hostChanges.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { LiveServer } from "@shivaedev/contract/live-server/service.ts";
|
|
|
7
7
|
import { subscribe as subscribeQueries } from "@shivaedev/contract/live-server/subscribe.ts";
|
|
8
8
|
import { CurrentViewer, type Viewer } from "@shivaedev/contract/readPolicy.ts";
|
|
9
9
|
import type { QueryReference } from "@shivaedev/contract/serverMetadata.ts";
|
|
10
|
+
import { syncClient } from "@shivaedev/contract/syncHeader.ts";
|
|
10
11
|
import { currentSessionContext } from "@shivaedev/identity/server/adapters/currentSessionContext.ts";
|
|
11
12
|
import { recheckSession } from "@shivaedev/identity/server/recheckSession.ts";
|
|
12
13
|
import { resolveChanges } from "@shivaedev/identity/server/resolveChanges.ts";
|
|
@@ -47,7 +48,10 @@ const initializeHostChanges = Effect.fnUntraced(function* (group: RpcGroup.RpcGr
|
|
|
47
48
|
return Effect.provide(rerun(query), requestServices);
|
|
48
49
|
}
|
|
49
50
|
type Failure = Effect.Error<typeof subscription.authorized | typeof refresh | ReturnType<typeof read>>;
|
|
50
|
-
const pending = subscribeQueries<Failure, Effect.Services<ReturnType<typeof read>>>(
|
|
51
|
+
const pending = subscribeQueries<Failure, Effect.Services<ReturnType<typeof read>>>(
|
|
52
|
+
{ ...subscription, refresh, syncClient: syncClient(options.headers) },
|
|
53
|
+
read,
|
|
54
|
+
);
|
|
51
55
|
const stream = Option.isSome(changes)
|
|
52
56
|
? Stream.unwrap(pending.pipe(Effect.provideService(LiveServer, changes.value)))
|
|
53
57
|
: Stream.concat(
|
package/src/hostRpc.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { type HttpEffect, HttpServerResponse } from "effect/http";
|
|
|
3
3
|
import { type Rpc, type RpcGroup, RpcMiddleware, RpcServer } from "effect/rpc";
|
|
4
4
|
import { CommandGuard, commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
|
|
5
5
|
import { HostVersion } from "@shivaedev/contract/HostVersion.ts";
|
|
6
|
+
import { LiveSync } from "@shivaedev/contract/LiveSync.ts";
|
|
6
7
|
import { prependMiddleware } from "@shivaedev/contract/prependMiddleware.ts";
|
|
7
8
|
import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
|
|
8
9
|
import { subjectLayers } from "@shivaedev/contract/subjectLayers.ts";
|
|
@@ -24,7 +25,7 @@ export const hostRpc = Effect.fnUntraced(function* <R extends Rpc.Any, TServices
|
|
|
24
25
|
const requestLayer = Layer.mergeAll(services ?? Layer.empty);
|
|
25
26
|
const requested = yield* prependMiddleware(group.middleware(requestsMiddleware), requestsMiddleware.key);
|
|
26
27
|
const requests = yield* prependMiddleware(requested, ReadPolicyGuard.key);
|
|
27
|
-
const guarded = yield* guardCommands(requests.merge(HostVersion.application));
|
|
28
|
+
const guarded = yield* guardCommands(requests.merge(HostVersion.application).merge(LiveSync.application));
|
|
28
29
|
const traced = tracedGroup(guarded);
|
|
29
30
|
const readPolicy = yield* ReadPolicyGuard.pipe(Effect.provide(readPolicyGuardLayer({ websocket })));
|
|
30
31
|
const publication = yield* CommandGuard.pipe(Effect.provide(commandGuardLayer(publishCommand)));
|
package/src/hostRpcRoutes.ts
CHANGED
|
@@ -15,6 +15,7 @@ import type { HostPolicy } from "#hostOptions.ts";
|
|
|
15
15
|
import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
|
|
16
16
|
import type { hostTransport } from "#hostTransport.ts";
|
|
17
17
|
import { hostVersionLayer } from "#hostVersionLayer.ts";
|
|
18
|
+
import { liveSyncLayer } from "#liveSyncLayer.ts";
|
|
18
19
|
import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
|
|
19
20
|
import type { RequestRequirements } from "#requestServices.ts";
|
|
20
21
|
import { rpcRequestTracing } from "#rpcRequestTracing.ts";
|
|
@@ -130,6 +131,7 @@ function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequirements,
|
|
|
130
131
|
).pipe(
|
|
131
132
|
Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))),
|
|
132
133
|
Layer.provide(hostVersionLayer(options.config?.buildVersion)),
|
|
134
|
+
Layer.provide(liveSyncLayer),
|
|
133
135
|
Layer.provide(RpcSerialization.layerNdjson),
|
|
134
136
|
);
|
|
135
137
|
}
|
package/src/localTracing.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Clock, Effect, Layer, Tracer } from "effect";
|
|
2
|
+
import { defaultTraceStore } from "#adapters/defaultTraceStore.ts";
|
|
2
3
|
import { localTraceDatabase } from "#adapters/localTraceDatabase.ts";
|
|
3
4
|
import { redactingDiagnostics } from "#adapters/redactingDiagnostics.ts";
|
|
4
5
|
import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
|
|
@@ -13,9 +14,24 @@ export interface LocalTracingOptions {
|
|
|
13
14
|
readonly retainedRuns?: number;
|
|
14
15
|
}
|
|
15
16
|
|
|
17
|
+
// Untraced: the recorder is still being built, so a span here would reach the application's own tracer as one of its spans.
|
|
18
|
+
const storePath = Effect.fnUntraced(function* (chosen: string | undefined) {
|
|
19
|
+
if (chosen !== undefined) {
|
|
20
|
+
return chosen;
|
|
21
|
+
}
|
|
22
|
+
const store = yield* defaultTraceStore;
|
|
23
|
+
if (store.temporary) {
|
|
24
|
+
const refused = store.refused === undefined ? "" : ` and ${store.refused} is not a folder that only this user can reach`;
|
|
25
|
+
yield* Effect.logInfo(
|
|
26
|
+
`Development traces are recorded to ${store.path}, because ${store.workingDirectory} has no node_modules folder${refused}.`,
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
return store.path;
|
|
30
|
+
});
|
|
31
|
+
|
|
16
32
|
export function localTracing({
|
|
17
33
|
clock = Clock.Clock.defaultValue(),
|
|
18
|
-
path
|
|
34
|
+
path: chosen,
|
|
19
35
|
indexedAttributes = [],
|
|
20
36
|
retainedRuns = 5,
|
|
21
37
|
flushInterval = 1000,
|
|
@@ -25,6 +41,7 @@ export function localTracing({
|
|
|
25
41
|
const policy = yield* RedactionPolicy;
|
|
26
42
|
const underlying = yield* Tracer.Tracer;
|
|
27
43
|
const startedAtMillis = yield* Clock.currentTimeMillis;
|
|
44
|
+
const path = yield* storePath(chosen);
|
|
28
45
|
const database = yield* Effect.acquireRelease(
|
|
29
46
|
Effect.try(() => localTraceDatabase(path, retainedRuns, indexedAttributes, startedAtMillis)),
|
|
30
47
|
(db) => Effect.sync(() => db.close()),
|
package/src/otlpTracing.ts
CHANGED
|
@@ -25,7 +25,7 @@ export const otlpTracing: Layer.Layer<never, Config.ConfigError> = Layer.effectC
|
|
|
25
25
|
if (endpoint === undefined) {
|
|
26
26
|
const mode = yield* Config.String("NODE_ENV").pipe(Config.withDefault("production"));
|
|
27
27
|
if (mode === "development") {
|
|
28
|
-
const path = yield* Config.String("PLATFORM_TRACE_STORE").pipe(Config.withDefault(
|
|
28
|
+
const path = yield* Config.String("PLATFORM_TRACE_STORE").pipe(Config.withDefault(undefined));
|
|
29
29
|
const indexed = yield* Config.String("PLATFORM_TRACE_INDEXED_ATTRIBUTES").pipe(Config.withDefault(""));
|
|
30
30
|
return yield* Layer.build(
|
|
31
31
|
localTracing({
|
|
@@ -33,7 +33,7 @@ export const otlpTracing: Layer.Layer<never, Config.ConfigError> = Layer.effectC
|
|
|
33
33
|
.split(",")
|
|
34
34
|
.map((key) => key.trim())
|
|
35
35
|
.filter(Boolean),
|
|
36
|
-
path,
|
|
36
|
+
...(path === undefined ? {} : { path }),
|
|
37
37
|
}),
|
|
38
38
|
).pipe(
|
|
39
39
|
Effect.mapError((cause) => new Config.ConfigError(new ConfigProvider.SourceError({ cause, message: "Cannot open local trace store" }))),
|