@shivaedev/server 0.19.0 → 0.20.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 +50 -0
- package/README.md +26 -16
- package/dist/{runtime/makePlatform.d.ts → adapters/makePlatformRuntime.d.ts} +2 -2
- package/dist/adapters/makePlatformRuntime.d.ts.map +1 -0
- package/dist/{runtime/makePlatform.js → adapters/makePlatformRuntime.js} +1 -1
- package/dist/adapters/makePlatformRuntime.js.map +1 -0
- package/dist/{nodeHttpServer.d.ts → adapters/nodeHttpServer.d.ts} +1 -0
- package/dist/adapters/nodeHttpServer.d.ts.map +1 -0
- package/dist/{nodeHttpServer.js → adapters/nodeHttpServer.js} +5 -0
- package/dist/adapters/nodeHttpServer.js.map +1 -0
- package/dist/adapters/subscriptionSignal.d.ts.map +1 -0
- package/dist/adapters/subscriptionSignal.js.map +1 -0
- package/dist/appDatabase.d.ts +2 -2
- package/dist/appDatabase.d.ts.map +1 -1
- package/dist/appDatabase.js +8 -3
- package/dist/appDatabase.js.map +1 -1
- package/dist/appHost.d.ts.map +1 -1
- package/dist/appHost.js +11 -4
- package/dist/appHost.js.map +1 -1
- package/dist/appHostHttp.d.ts +48 -30
- package/dist/appHostHttp.d.ts.map +1 -1
- package/dist/appHostHttp.js +2 -2
- package/dist/appHostHttp.js.map +1 -1
- package/dist/boundedRpcRequest.d.ts +3 -2
- package/dist/boundedRpcRequest.d.ts.map +1 -1
- package/dist/boundedRpcRequest.js +6 -5
- package/dist/boundedRpcRequest.js.map +1 -1
- package/dist/boundedRpcSocket.d.ts +4 -0
- package/dist/boundedRpcSocket.d.ts.map +1 -0
- package/dist/boundedRpcSocket.js +29 -0
- package/dist/boundedRpcSocket.js.map +1 -0
- package/dist/hostChanges.d.ts +4 -2
- package/dist/hostChanges.d.ts.map +1 -1
- package/dist/hostChanges.js +31 -33
- package/dist/hostChanges.js.map +1 -1
- package/dist/hostRpc.d.ts +4 -9
- package/dist/hostRpc.d.ts.map +1 -1
- package/dist/hostRpc.js +9 -17
- package/dist/hostRpc.js.map +1 -1
- package/dist/hostRpcRoutes.d.ts +5 -3
- package/dist/hostRpcRoutes.d.ts.map +1 -1
- package/dist/hostRpcRoutes.js +4 -3
- package/dist/hostRpcRoutes.js.map +1 -1
- package/dist/otlpHttpClient.js +2 -2
- package/dist/otlpHttpClient.js.map +1 -1
- package/dist/otlpTracing.d.ts.map +1 -1
- package/dist/otlpTracing.js +4 -4
- package/dist/otlpTracing.js.map +1 -1
- package/dist/publishCommand.d.ts +3 -0
- package/dist/publishCommand.d.ts.map +1 -0
- package/dist/publishCommand.js +36 -0
- package/dist/publishCommand.js.map +1 -0
- package/dist/redactingRpcSerialization.d.ts +3 -2
- package/dist/redactingRpcSerialization.d.ts.map +1 -1
- package/dist/redactingRpcSerialization.js +8 -8
- package/dist/redactingRpcSerialization.js.map +1 -1
- package/dist/rerunQuery.d.ts +7 -3
- package/dist/rerunQuery.d.ts.map +1 -1
- package/dist/rerunQuery.js +3 -4
- package/dist/rerunQuery.js.map +1 -1
- package/dist/setupDatabases.d.ts +1 -1
- package/dist/setupDatabases.d.ts.map +1 -1
- package/dist/setupDatabases.js +3 -3
- package/dist/setupDatabases.js.map +1 -1
- package/dist/testing/HostProcessError.d.ts +1 -1
- package/dist/testing/HostProcessError.d.ts.map +1 -1
- package/dist/testing/adapters/hostProcess.d.ts +4 -2
- package/dist/testing/adapters/hostProcess.d.ts.map +1 -1
- package/dist/testing/adapters/hostProcess.js +5 -2
- package/dist/testing/adapters/hostProcess.js.map +1 -1
- package/dist/testing/adapters/hostProcessReadouts.d.ts +10 -0
- package/dist/testing/adapters/hostProcessReadouts.d.ts.map +1 -0
- package/dist/testing/adapters/hostProcessReadouts.js +26 -0
- package/dist/testing/adapters/hostProcessReadouts.js.map +1 -0
- package/dist/testing/hostProcess.d.ts +4 -0
- package/dist/testing/hostProcess.d.ts.map +1 -1
- package/dist/testing/hostProcess.js +20 -2
- package/dist/testing/hostProcess.js.map +1 -1
- package/dist/testing/hostProcessChild.d.ts +1 -1
- package/dist/testing/hostProcessChild.d.ts.map +1 -1
- package/dist/testing/hostProcessChild.js +3 -4
- package/dist/testing/hostProcessChild.js.map +1 -1
- package/dist/testing/hostProcessProtocol.d.ts +6 -0
- package/dist/testing/hostProcessProtocol.d.ts.map +1 -1
- package/dist/testing/hostProcessProtocol.js +6 -0
- package/dist/testing/hostProcessProtocol.js.map +1 -1
- package/dist/testing/hostProcessReadouts.d.ts +7 -0
- package/dist/testing/hostProcessReadouts.d.ts.map +1 -0
- package/dist/testing/hostProcessReadouts.js +37 -0
- package/dist/testing/hostProcessReadouts.js.map +1 -0
- package/package.json +23 -19
- package/src/{runtime/makePlatform.ts → adapters/makePlatformRuntime.ts} +1 -1
- package/src/{nodeHttpServer.ts → adapters/nodeHttpServer.ts} +7 -0
- package/src/appDatabase.ts +9 -3
- package/src/appHost.ts +17 -7
- package/src/appHostHttp.ts +2 -2
- package/src/boundedRpcRequest.ts +6 -5
- package/src/boundedRpcSocket.ts +32 -0
- package/src/hostChanges.ts +60 -41
- package/src/hostRpc.ts +9 -23
- package/src/hostRpcRoutes.ts +21 -11
- package/src/otlpHttpClient.ts +2 -2
- package/src/otlpTracing.ts +8 -6
- package/src/publishCommand.ts +47 -0
- package/src/redactingRpcSerialization.ts +11 -12
- package/src/rerunQuery.ts +18 -6
- package/src/setupDatabases.ts +3 -3
- package/src/testing/HostProcessError.ts +1 -1
- package/src/testing/adapters/hostProcess.ts +8 -3
- package/src/testing/adapters/hostProcessReadouts.ts +29 -0
- package/src/testing/hostProcess.ts +26 -2
- package/src/testing/hostProcessChild.ts +3 -4
- package/src/testing/hostProcessProtocol.ts +6 -0
- package/src/testing/hostProcessReadouts.ts +46 -0
- package/dist/node-http/subscriptionSignal.d.ts.map +0 -1
- package/dist/node-http/subscriptionSignal.js.map +0 -1
- package/dist/nodeHttpServer.d.ts.map +0 -1
- package/dist/nodeHttpServer.js.map +0 -1
- package/dist/runtime/makePlatform.d.ts.map +0 -1
- package/dist/runtime/makePlatform.js.map +0 -1
- /package/dist/{node-http → adapters}/subscriptionSignal.d.ts +0 -0
- /package/dist/{node-http → adapters}/subscriptionSignal.js +0 -0
- /package/src/{node-http → adapters}/subscriptionSignal.ts +0 -0
package/dist/appHostHttp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appHostHttp.js","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"appHostHttp.js","sourceRoot":"","sources":["../src/appHostHttp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,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;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,MAAM,UAAU,WAAW,CAW1B,OAWW;IAEX,OAAO,KAAK,CAAC,MAAM,CAClB,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAC3F,KAAK,CAAC,MAAM,CACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;QAClE,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5G,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClF,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAChC,MAAM,EACN,WAAW,EACX,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,EACtD,MAAM,EACN,iBAAiB,CACjB,CAAC,IAAI,CACL,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,EACvF,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,EAAE,YAAY,EAAE,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACzH,CAAC;QACF,OAAO,KAAK,CAAC,MAAM,CAClB,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,IAAI,CACvC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAC9G,CACD,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACxH,CAAC,CAAC,CACF,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,CAC5I,CACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAa3B,OAaE,EACF,QAAsE;IAEtE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IACjE,OAAO,WAAW,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,YAAY,CAe3B,WAiBC,EACD,QAAsE;IAEtE,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest } from "effect/http";
|
|
3
|
+
export declare const boundedRpcRequest: () => Effect.Effect<HttpServerRequest.HttpServerRequest, never, HttpServerRequest.HttpServerRequest>;
|
|
3
4
|
//# sourceMappingURL=boundedRpcRequest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boundedRpcRequest.d.ts","sourceRoot":"","sources":["../src/boundedRpcRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"boundedRpcRequest.d.ts","sourceRoot":"","sources":["../src/boundedRpcRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAmB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGjE,eAAO,MAAM,iBAAiB,sGAwB5B,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import { HttpServerError } from "effect/http";
|
|
2
|
+
import { HttpServerError, HttpServerRequest } from "effect/http";
|
|
3
3
|
import { readBoundedBody } from "@shivaedev/http/server/boundedBody.ts";
|
|
4
|
-
export
|
|
5
|
-
const
|
|
4
|
+
export const boundedRpcRequest = Effect.fnUntraced(function* () {
|
|
5
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
6
|
+
const arrayBuffer = yield* readBoundedBody().pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, request), Effect.mapError((cause) => cause._tag === "RequestBodyTooLarge"
|
|
6
7
|
? new HttpServerError.HttpServerError({ reason: new HttpServerError.RequestParseError({ cause, request }) })
|
|
7
|
-
: cause), Effect.cached
|
|
8
|
+
: cause), Effect.cached);
|
|
8
9
|
const text = Effect.map(arrayBuffer, (body) => new TextDecoder().decode(body));
|
|
9
10
|
// The native text reader destroys the HTTP socket on overflow, preventing a 4xx response.
|
|
10
11
|
return new Proxy(request, {
|
|
@@ -18,5 +19,5 @@ export function boundedRpcRequest(request) {
|
|
|
18
19
|
return Reflect.get(target, key, receiver);
|
|
19
20
|
},
|
|
20
21
|
});
|
|
21
|
-
}
|
|
22
|
+
});
|
|
22
23
|
//# sourceMappingURL=boundedRpcRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boundedRpcRequest.js","sourceRoot":"","sources":["../src/boundedRpcRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"boundedRpcRequest.js","sourceRoot":"","sources":["../src/boundedRpcRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC,IAAI,CAChD,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,EACnE,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CACzB,KAAK,CAAC,IAAI,KAAK,qBAAqB;QACnC,CAAC,CAAC,IAAI,eAAe,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,eAAe,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC5G,CAAC,CAAC,KAAK,CACR,EACD,MAAM,CAAC,MAAM,CACb,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,0FAA0F;IAC1F,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACzB,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;YAC9B,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC;YACb,CAAC;YACD,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBAC3B,OAAO,WAAW,CAAC;YACpB,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,CAAC;KACD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest } from "effect/http";
|
|
3
|
+
export declare const boundedRpcSocket: (limit: number) => Effect.Effect<HttpServerRequest.HttpServerRequest, never, HttpServerRequest.HttpServerRequest>;
|
|
4
|
+
//# sourceMappingURL=boundedRpcSocket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"boundedRpcSocket.d.ts","sourceRoot":"","sources":["../src/boundedRpcSocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,eAAO,MAAM,gBAAgB,mHA2B3B,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest } from "effect/http";
|
|
3
|
+
import * as Socket from "effect/socket/Socket";
|
|
4
|
+
export const boundedRpcSocket = Effect.fnUntraced(function* (limit) {
|
|
5
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
6
|
+
const upgrade = Effect.map(request.upgrade, (socket) => ({
|
|
7
|
+
...socket,
|
|
8
|
+
reader: Effect.gen(function* () {
|
|
9
|
+
const reader = yield* socket.reader;
|
|
10
|
+
const writer = yield* socket.writer;
|
|
11
|
+
return {
|
|
12
|
+
...reader,
|
|
13
|
+
pull: Effect.flatMap(reader.pull, (frames) => {
|
|
14
|
+
if (frames.every((frame) => (typeof frame === "string" ? Buffer.byteLength(frame) : frame.byteLength) <= limit)) {
|
|
15
|
+
return Effect.succeed(frames);
|
|
16
|
+
}
|
|
17
|
+
const reason = new Socket.SocketCloseError({ closeReason: "RPC frame exceeds maxBodySize", code: 1009 });
|
|
18
|
+
return writer
|
|
19
|
+
.write(new Socket.CloseEvent(reason.code, reason.closeReason))
|
|
20
|
+
.pipe(Effect.andThen(Effect.fail(new Socket.SocketError({ reason }))));
|
|
21
|
+
}),
|
|
22
|
+
};
|
|
23
|
+
}),
|
|
24
|
+
}));
|
|
25
|
+
return new Proxy(request, {
|
|
26
|
+
get: (target, key, receiver) => (key === "upgrade" ? upgrade : Reflect.get(target, key, receiver)),
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
//# sourceMappingURL=boundedRpcSocket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"boundedRpcSocket.js","sourceRoot":"","sources":["../src/boundedRpcSocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAa;IACzE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CACzB,OAAO,CAAC,OAAO,EACf,CAAC,MAAM,EAAiB,EAAE,CAAC,CAAC;QAC3B,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,OAAO;gBACN,GAAG,MAAM;gBACT,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;oBAC5C,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;wBACjH,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAC/B,CAAC;oBACD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACzG,OAAO,MAAM;yBACX,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;yBAC7D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzE,CAAC,CAAC;aACF,CAAC;QACH,CAAC,CAAC;KACF,CAAC,CACF,CAAC;IACF,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACzB,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;KAClG,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/dist/hostChanges.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Layer } from "effect";
|
|
2
|
-
import { Rpc,
|
|
2
|
+
import type { Rpc, RpcGroup } from "effect/rpc";
|
|
3
3
|
export declare function hostChanges<R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>): Layer.Layer<Rpc.ToHandler<Extract<R, {
|
|
4
4
|
readonly _tag: `${string}.$changes`;
|
|
5
|
-
}>>, never,
|
|
5
|
+
}>>, never, Rpc.ExtractRequires<Extract<R, {
|
|
6
|
+
readonly _tag: `${string}.$changes`;
|
|
7
|
+
}>, `${string}.$changes`>>;
|
|
6
8
|
//# sourceMappingURL=hostChanges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostChanges.d.ts","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEhE,OAAO,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"hostChanges.d.ts","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEhE,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAYhD,wBAAgB,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAC5C,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GACzB,KAAK,CAAC,KAAK,CACb,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,CAAC,EAClE,KAAK,EACL,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,MAAM,WAAW,CAAA;CAAE,CAAC,EAAE,GAAG,MAAM,WAAW,CAAC,CAC9F,CAAC"}
|
package/dist/hostChanges.js
CHANGED
|
@@ -1,51 +1,49 @@
|
|
|
1
1
|
import { Context, Effect, Layer, Option, Stream } from "effect";
|
|
2
2
|
import { Headers } from "effect/http";
|
|
3
|
-
import {
|
|
3
|
+
import { changesHandlerLayer } from "@shivaedev/contract/changesHandlerLayer.ts";
|
|
4
4
|
import { LiveServer } from "@shivaedev/contract/LiveServer.ts";
|
|
5
5
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
6
6
|
import { currentSessionContext } from "@shivaedev/identity/server/currentSessionContext.ts";
|
|
7
7
|
import { recheckSession } from "@shivaedev/identity/server/recheckSession.ts";
|
|
8
|
+
import { resolveChanges } from "@shivaedev/identity/server/resolveChanges.ts";
|
|
8
9
|
import { revalidateStream } from "@shivaedev/identity/server/revalidateStream.ts";
|
|
9
10
|
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
10
|
-
import { resolveChanges } from "@shivaedev/identity/server/sessionKeys.ts";
|
|
11
11
|
import { rerunQuery } from "#rerunQuery.ts";
|
|
12
12
|
export function hostChanges(group) {
|
|
13
|
-
return Layer.
|
|
13
|
+
return Layer.unwrap(Effect.gen(function* () {
|
|
14
14
|
const changes = yield* Effect.serviceOption(LiveServer);
|
|
15
15
|
const sessions = yield* Effect.serviceOption(SessionPolicy);
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (Option.isNone(sessions) || Option.isNone(viewer)) {
|
|
27
|
-
return stream;
|
|
16
|
+
const retained = [];
|
|
17
|
+
if (Option.isNone(changes)) {
|
|
18
|
+
for (const rpc of group.requests.values()) {
|
|
19
|
+
if (!rpc._tag.endsWith(".$changes")) {
|
|
20
|
+
continue;
|
|
21
|
+
}
|
|
22
|
+
const key = Context.Service(rpc.key);
|
|
23
|
+
const provided = yield* Effect.serviceOption(key);
|
|
24
|
+
if (Option.isSome(provided)) {
|
|
25
|
+
retained.push(Layer.succeed(key, provided.value));
|
|
28
26
|
}
|
|
29
|
-
const revalidation = Effect.never.pipe(revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)), Effect.provideService(SessionPolicy, sessions.value));
|
|
30
|
-
return Stream.interruptWhen(stream, revalidation);
|
|
31
|
-
}));
|
|
32
|
-
}
|
|
33
|
-
for (const rpc of group.requests.values()) {
|
|
34
|
-
if (!(Rpc.isRpc(rpc) && rpc._tag.endsWith(".$changes"))) {
|
|
35
|
-
continue;
|
|
36
|
-
}
|
|
37
|
-
const provided = services.mapUnsafe.get(rpc.key);
|
|
38
|
-
if (Option.isNone(changes) && provided !== undefined) {
|
|
39
|
-
handlers.set(rpc.key, provided);
|
|
40
|
-
continue;
|
|
41
27
|
}
|
|
42
|
-
handlers.set(rpc.key, {
|
|
43
|
-
context: services,
|
|
44
|
-
handler: ({ queries }, options) => subscribe(rpc, queries, options),
|
|
45
|
-
tag: rpc._tag,
|
|
46
|
-
});
|
|
47
28
|
}
|
|
48
|
-
|
|
29
|
+
const hosted = changesHandlerLayer(group, (rpc) => ({ queries }, options) => subscribe(group, changes, sessions, rpc, queries, options));
|
|
30
|
+
return Layer.mergeAll(hosted, ...retained);
|
|
31
|
+
}));
|
|
32
|
+
}
|
|
33
|
+
function subscribe(group, changes, sessions, rpc, queries, options) {
|
|
34
|
+
return Stream.unwrap(Effect.gen(function* () {
|
|
35
|
+
const subscription = yield* resolveChanges(rpc, queries);
|
|
36
|
+
const viewer = yield* CurrentViewer;
|
|
37
|
+
const refresh = refreshSession(sessions, viewer, rpc._tag);
|
|
38
|
+
const read = rerunQuery(group, options);
|
|
39
|
+
const stream = Option.isSome(changes)
|
|
40
|
+
? Stream.unwrap(changes.value.subscribe({ ...subscription, refresh }, read))
|
|
41
|
+
: Stream.concat(Stream.succeed({ _tag: "Resync" }), Stream.never);
|
|
42
|
+
if (Option.isNone(sessions) || Option.isNone(viewer)) {
|
|
43
|
+
return stream;
|
|
44
|
+
}
|
|
45
|
+
const revalidation = Effect.never.pipe(revalidateStream(rpc, viewer.value.id, recheckSession(Headers.empty, rpc._tag)), Effect.provideService(SessionPolicy, sessions.value));
|
|
46
|
+
return Stream.interruptWhen(stream, revalidation);
|
|
49
47
|
}));
|
|
50
48
|
}
|
|
51
49
|
function refreshSession(sessions, viewer, tag) {
|
package/dist/hostChanges.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"hostChanges.js","sourceRoot":"","sources":["../src/hostChanges.ts"],"names":[],"mappings":"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"}
|
package/dist/hostRpc.d.ts
CHANGED
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import { Effect
|
|
1
|
+
import { Effect } from "effect";
|
|
2
2
|
import { type HttpEffect, HttpServerResponse } from "effect/http";
|
|
3
|
-
import { type Rpc, type RpcGroup
|
|
4
|
-
import {
|
|
5
|
-
import { WebSocketRequired } from "@shivaedev/contract/WebSocketRequired.ts";
|
|
6
|
-
declare const HostedReadPolicy_base: RpcMiddleware.ServiceClass<HostedReadPolicy, "@shivaedev/server/HostedReadPolicy", never, Schema.Union<readonly [typeof MissingReadPolicy, typeof QueryReadDenied, typeof WebSocketRequired]>, never, never, false>;
|
|
7
|
-
declare class HostedReadPolicy extends HostedReadPolicy_base {
|
|
8
|
-
}
|
|
9
|
-
export type { HostedReadPolicy };
|
|
3
|
+
import { type Rpc, type RpcGroup } from "effect/rpc";
|
|
4
|
+
import { CommandGuard } from "@shivaedev/contract/CommandGuard.ts";
|
|
10
5
|
export declare const rpcCacheControl: HttpEffect.PreResponseHandler;
|
|
11
|
-
export declare const hostRpc: <R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>, websocket?: boolean | undefined) => Effect.Effect<Effect.Effect<HttpServerResponse.HttpServerResponse, never, import("effect/http/HttpServerRequest").HttpServerRequest | import("effect/Scope").Scope>, never, import("effect/rpc/RpcSerialization").RpcSerialization | import("effect/Scope").Scope | Exclude<
|
|
6
|
+
export declare const hostRpc: <R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>, websocket?: boolean | undefined) => Effect.Effect<Effect.Effect<HttpServerResponse.HttpServerResponse, never, import("effect/http/HttpServerRequest").HttpServerRequest | import("effect/Scope").Scope>, never, import("effect/rpc/RpcSerialization").RpcSerialization | import("effect/Scope").Scope | Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<R, typeof CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, CommandGuard> | Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<R, typeof CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, CommandGuard>>;
|
|
12
7
|
//# sourceMappingURL=hostRpc.d.ts.map
|
package/dist/hostRpc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpc.d.ts","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"hostRpc.d.ts","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,KAAK,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAa,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,YAAY,EAAoC,MAAM,qCAAqC,CAAC;AAKrG,eAAO,MAAM,eAAe,EAAE,UAAU,CAAC,kBACoD,CAAC;AAE9F,eAAO,MAAM,OAAO,GAAgC,CAAC,SAAS,GAAG,CAAC,GAAG,0rBAOnE,CAAC"}
|
package/dist/hostRpc.js
CHANGED
|
@@ -1,25 +1,17 @@
|
|
|
1
|
-
import { Effect
|
|
1
|
+
import { Effect } from "effect";
|
|
2
2
|
import { HttpServerResponse } from "effect/http";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
3
|
+
import { RpcServer } from "effect/rpc";
|
|
4
|
+
import { CommandGuard, commandGuardLayer, guardCommands } from "@shivaedev/contract/CommandGuard.ts";
|
|
5
|
+
import { ReadPolicyGuard, readPolicyGuardLayer } from "@shivaedev/contract/ReadPolicyGuard.ts";
|
|
6
|
+
import { publishCommand } from "#publishCommand.ts";
|
|
7
7
|
import { tracedGroup } from "#tracedGroup.ts";
|
|
8
|
-
class HostedReadPolicy extends RpcMiddleware.Service()("@shivaedev/server/HostedReadPolicy", {
|
|
9
|
-
error: Schema.Union([MissingReadPolicy, QueryReadDenied, WebSocketRequired]),
|
|
10
|
-
}) {
|
|
11
|
-
}
|
|
12
8
|
export const rpcCacheControl = (_, response) => Effect.succeed(HttpServerResponse.setHeader(response, "cache-control", "private, no-store"));
|
|
13
9
|
export const hostRpc = Effect.fnUntraced(function* (group, websocket = false) {
|
|
14
|
-
const guarded = group
|
|
15
|
-
// Keep the policy inside identity middleware so it sees the request's viewer.
|
|
16
|
-
for (const rpc of guarded.requests.values()) {
|
|
17
|
-
Object.assign(rpc, { middlewares: new Set([HostedReadPolicy, ...rpc.middlewares]) });
|
|
18
|
-
}
|
|
10
|
+
const guarded = yield* guardCommands(group);
|
|
19
11
|
const traced = tracedGroup(guarded);
|
|
12
|
+
const readPolicy = yield* ReadPolicyGuard.pipe(Effect.provide(readPolicyGuardLayer({ websocket })));
|
|
13
|
+
const publication = yield* CommandGuard.pipe(Effect.provide(commandGuardLayer(publishCommand)));
|
|
20
14
|
const handler = websocket ? RpcServer.toHttpEffectWebsocket(traced) : RpcServer.toHttpEffect(traced);
|
|
21
|
-
return yield* handler.pipe(Effect.provideService(
|
|
22
|
-
? Effect.fail(new WebSocketRequired({ message: `${request.rpc._tag} needs the WebSocket protocol` }))
|
|
23
|
-
: Effect.flatMap(CurrentViewer, (viewer) => authorizeReads(effect, request, viewer))));
|
|
15
|
+
return yield* handler.pipe(Effect.provideService(ReadPolicyGuard, readPolicy), Effect.provideService(CommandGuard, publication));
|
|
24
16
|
});
|
|
25
17
|
//# sourceMappingURL=hostRpc.js.map
|
package/dist/hostRpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpc.js","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"hostRpc.js","sourceRoot":"","sources":["../src/hostRpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAmB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAA2B,SAAS,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,CAAC,MAAM,eAAe,GAAkC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAC7E,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAqB,KAA2B,EAAE,SAAS,GAAG,KAAK;IACpH,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACpG,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAChG,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACrG,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;AAClI,CAAC,CAAC,CAAC"}
|
package/dist/hostRpcRoutes.d.ts
CHANGED
|
@@ -21,10 +21,12 @@ declare function buildRpcRoutes<TRpcs extends Rpc.Any, THandlers, TError, TRequi
|
|
|
21
21
|
readonly _tag: `${string}.$changes`;
|
|
22
22
|
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<RpcSerialization.RpcSerialization, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | Rpc.ToHandler<Extract<TRpcs, {
|
|
23
23
|
readonly _tag: `${string}.$changes`;
|
|
24
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("
|
|
24
|
+
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ServicesServer<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | Rpc.ToHandler<Extract<TRpcs, {
|
|
25
25
|
readonly _tag: `${string}.$changes`;
|
|
26
|
-
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("
|
|
26
|
+
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<Rpc.ToHandler<Rpc.AddMiddleware<Rpc.AddMiddleware<TRpcs, typeof import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, typeof import("@shivaedev/identity/middleware.ts").RequestTracing>>, never>, import("@shivaedev/contract/CommandGuard.ts").CommandGuard>, RpcSerialization.RpcSerialization>, import("effect/Scope").Scope>, THandlers | import("@shivaedev/identity/middleware.ts").RequestTracing | Rpc.ToHandler<Extract<TRpcs, {
|
|
27
27
|
readonly _tag: `${string}.$changes`;
|
|
28
|
-
}>>>, RpcSerialization.RpcSerialization
|
|
28
|
+
}>>>, RpcSerialization.RpcSerialization> | Exclude<Exclude<Rpc.ExtractRequires<Extract<TRpcs, {
|
|
29
|
+
readonly _tag: `${string}.$changes`;
|
|
30
|
+
}>, `${string}.$changes`>, THandlers>, RpcSerialization.RpcSerialization>>;
|
|
29
31
|
export {};
|
|
30
32
|
//# 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;
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.d.ts","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
package/dist/hostRpcRoutes.js
CHANGED
|
@@ -6,6 +6,7 @@ import { validateReadPolicies } from "@shivaedev/contract/validateReadPolicies.t
|
|
|
6
6
|
import { localRpcGuard } from "@shivaedev/identity/server/adapters/local.ts";
|
|
7
7
|
import { authenticatedLayer, maybeAuthenticatedLayer } from "@shivaedev/identity/server/session.ts";
|
|
8
8
|
import { boundedRpcRequest } from "#boundedRpcRequest.ts";
|
|
9
|
+
import { boundedRpcSocket } from "#boundedRpcSocket.ts";
|
|
9
10
|
import { hostChanges } from "#hostChanges.ts";
|
|
10
11
|
import { hostRpc, rpcCacheControl } from "#hostRpc.ts";
|
|
11
12
|
import { redactingRpcSerialization } from "#redactingRpcSerialization.ts";
|
|
@@ -20,15 +21,15 @@ function buildRpcRoutes(options, { bodySize, trustedProxy, nativeOrigins }, sens
|
|
|
20
21
|
: Layer.mergeAll(authenticatedLayer(), maybeAuthenticatedLayer(), rpcRequestTracing(sensitive));
|
|
21
22
|
return HttpRouter.use((router) => Effect.gen(function* () {
|
|
22
23
|
yield* validateReadPolicies(options.group);
|
|
23
|
-
const wire = redactingRpcSerialization(yield* RpcSerialization.RpcSerialization, sensitive
|
|
24
|
+
const wire = redactingRpcSerialization(yield* RpcSerialization.RpcSerialization, sensitive);
|
|
24
25
|
const handler = yield* hostRpc(options.group).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire));
|
|
25
26
|
const guarded = localRpcGuard(handler, trustedProxy, nativeOrigins);
|
|
26
27
|
const websocket = yield* hostRpc(options.group, true).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire));
|
|
27
28
|
yield* router.add("OPTIONS", options.rpcPath ?? "/rpc", HttpServerResponse.text("Local same-origin requests only", {
|
|
28
29
|
status: HttpStatus.fromLiteral("Forbidden"),
|
|
29
30
|
}));
|
|
30
|
-
yield* router.add("GET", options.rpcPath ?? "/rpc", socketRpc(websocket, options, trustedProxy, nativeOrigins).pipe(Effect.provideService(RpcSerialization.RpcSerialization, wire)));
|
|
31
|
-
yield* router.add("POST", options.rpcPath ?? "/rpc", (request) => guarded.pipe(Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(bodySize)), Effect.provideService(HttpServerRequest.HttpServerRequest,
|
|
31
|
+
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)))));
|
|
32
|
+
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)))));
|
|
32
33
|
})).pipe(Layer.provide(Layer.merge(middleware, hostChanges(options.group).pipe(Layer.provideMerge(options.handlers)))), Layer.provide(RpcSerialization.layerNdjson));
|
|
33
34
|
}
|
|
34
35
|
//# sourceMappingURL=hostRpcRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAA2B,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAyB1C,MAAM,UAAU,aAAa,CAC5B,GAAG,IAAgF;IAEnF,OAAO,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CACtB,OAA8D,EAC9D,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAoD,EAC3F,SAAiE;IAEjE,MAAM,UAAU,GACf,OAAO,CAAC,MAAM,KAAK,UAAU;QAC5B,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAC9B,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,uBAAuB,EAAE,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;IAClG,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"hostRpcRoutes.js","sourceRoot":"","sources":["../src/hostRpcRoutes.ts"],"names":[],"mappings":"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"}
|
package/dist/otlpHttpClient.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
2
|
import { FetchHttpClient, HttpClient, HttpClientError } from "effect/http";
|
|
3
3
|
import { redactText } from "@shivaedev/errors/sensitive.ts";
|
|
4
|
-
import {
|
|
4
|
+
import { checkStatus } from "@shivaedev/http/checkStatus.ts";
|
|
5
5
|
import { boundedOtlpResponse } from "#adapters/boundedOtlpResponse.ts";
|
|
6
6
|
import { RedactionPolicy } from "#RedactionPolicy.ts";
|
|
7
7
|
function timeoutError(request) {
|
|
@@ -25,7 +25,7 @@ export function otlpHttpClient(timeout = 10_000) {
|
|
|
25
25
|
}
|
|
26
26
|
function recordStatus(response) {
|
|
27
27
|
const diagnostic = response.text.pipe(Effect.orElseSucceed(() => "Unable to read collector response"), Effect.map((body) => ({ "otlp.response": redactText(body, sensitive), "otlp.status": response.status })));
|
|
28
|
-
const checked =
|
|
28
|
+
const checked = checkStatus(response);
|
|
29
29
|
return Effect.matchEffect(checked, {
|
|
30
30
|
onFailure: () => warnOnce(diagnostic),
|
|
31
31
|
onSuccess: () => Effect.sync(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpHttpClient.js","sourceRoot":"","sources":["../src/otlpHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,EAAmD,MAAM,aAAa,CAAC;AAC5H,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"otlpHttpClient.js","sourceRoot":"","sources":["../src/otlpHttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpTracing.d.ts","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"otlpTracing.d.ts","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,KAAK,EAAU,MAAM,QAAQ,CAAC;AAWhE,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,CA0D9D,CAAC"}
|
package/dist/otlpTracing.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Config, Effect, Layer, Schema } from "effect";
|
|
1
|
+
import { Config, Context, Effect, Layer, Schema } from "effect";
|
|
2
2
|
import { OtlpSerialization, OtlpTracer } from "effect/observability";
|
|
3
3
|
import { traceDiagnostics } from "#adapters/traceDiagnostics.ts";
|
|
4
4
|
import { otlpHttpClient } from "#otlpHttpClient.ts";
|
|
@@ -7,7 +7,7 @@ import { redactingDiagnostics } from "#redactingDiagnostics.ts";
|
|
|
7
7
|
import { redactingTracer } from "#redactingTracer.ts";
|
|
8
8
|
import { safeOtlpSerialization } from "#safeOtlpSerialization.ts";
|
|
9
9
|
const endpointUrl = Schema.URL.check(Schema.makeFilter((url) => url.protocol === "http:" || url.protocol === "https:"));
|
|
10
|
-
export const otlpTracing = Layer.
|
|
10
|
+
export const otlpTracing = Layer.effectContext(Effect.gen(function* () {
|
|
11
11
|
const tracesEndpoint = yield* Config.schema(endpointUrl, "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT").pipe(Config.withDefault(undefined));
|
|
12
12
|
const endpoint = tracesEndpoint
|
|
13
13
|
?? (yield* Config.schema(endpointUrl, "OTEL_EXPORTER_OTLP_ENDPOINT").pipe(Config.map((url) => {
|
|
@@ -15,7 +15,7 @@ export const otlpTracing = Layer.unwrap(Effect.gen(function* () {
|
|
|
15
15
|
return url;
|
|
16
16
|
}), Config.withDefault(undefined)));
|
|
17
17
|
if (endpoint === undefined) {
|
|
18
|
-
return
|
|
18
|
+
return Context.empty();
|
|
19
19
|
}
|
|
20
20
|
const configuredProtocol = yield* Config.String("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL").pipe(Config.orElse(() => Config.String("OTEL_EXPORTER_OTLP_PROTOCOL")), Config.withDefault("http/protobuf"));
|
|
21
21
|
const protocol = yield* Schema.decodeUnknownEffect(Schema.Literals(["http/protobuf", "http/json"]), { reportInput: true })(configuredProtocol).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
|
|
@@ -36,6 +36,6 @@ export const otlpTracing = Layer.unwrap(Effect.gen(function* () {
|
|
|
36
36
|
url: endpoint.toString(),
|
|
37
37
|
}).pipe(Layer.provide(safeOtlpSerialization.pipe(Layer.provide(protocol === "http/protobuf" ? OtlpSerialization.layerProtobuf : OtlpSerialization.layerJson))), Layer.provide(otlpHttpClient(requestTimeout)));
|
|
38
38
|
const sensitive = yield* RedactionPolicy;
|
|
39
|
-
return redactingDiagnostics(sensitive).pipe(Layer.provideMerge(traceDiagnostics), Layer.provideMerge(redactingTracer(sensitive).pipe(Layer.provideMerge(tracer))));
|
|
39
|
+
return yield* Layer.build(redactingDiagnostics(sensitive).pipe(Layer.provideMerge(traceDiagnostics), Layer.provideMerge(redactingTracer(sensitive).pipe(Layer.provideMerge(tracer)))));
|
|
40
40
|
}));
|
|
41
41
|
//# sourceMappingURL=otlpTracing.js.map
|
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,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../src/otlpTracing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishCommand.d.ts","sourceRoot":"","sources":["../src/publishCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAalD,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,0BAiCtH"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { Effect, Option, Schedule } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { CommandPublication } from "@shivaedev/changes/commandPublication.ts";
|
|
4
|
+
import { ChangeObserver } from "@shivaedev/sql/transact.ts";
|
|
5
|
+
const recoverPublication = Effect.fnUntraced(function* (cause) {
|
|
6
|
+
yield* Effect.logError("Committed command invalidation failed; resynchronizing live streams", cause);
|
|
7
|
+
const publication = yield* CommandPublication;
|
|
8
|
+
yield* publication.recover.pipe(Effect.catch((error) => Effect.logError("Committed command Resync broadcast failed; other hosts may remain stale", error)));
|
|
9
|
+
});
|
|
10
|
+
export function publishCommand(effect, declaredKeys) {
|
|
11
|
+
return Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
|
|
12
|
+
const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
13
|
+
if (Option.isNone(reactivity)) {
|
|
14
|
+
return yield* restore(effect);
|
|
15
|
+
}
|
|
16
|
+
const published = new Set();
|
|
17
|
+
const observer = yield* ChangeObserver;
|
|
18
|
+
const result = yield* restore(effect).pipe(Effect.provideService(ChangeObserver, (event) => {
|
|
19
|
+
if (event._tag === "Published") {
|
|
20
|
+
for (const key of event.changes) {
|
|
21
|
+
published.add(key);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return observer(event);
|
|
25
|
+
}));
|
|
26
|
+
const keys = declaredKeys(result).filter((key) => !published.has(key));
|
|
27
|
+
if (keys.length > 0) {
|
|
28
|
+
const publication = yield* CommandPublication;
|
|
29
|
+
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));
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
}));
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=publishCommand.js.map
|
|
@@ -0,0 +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;AAClD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAgC,MAAM,0CAA0C,CAAC;AAC5G,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAA8B;IACrF,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,qEAAqE,EAAE,KAAK,CAAC,CAAC;IACrG,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC;IAC9C,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,yEAAyE,EAAE,KAAK,CAAC,CAAC,CAC1H,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,cAAc,CAAU,MAA8B,EAAE,YAA+C;IACtH,OAAO,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAW,CAAC;QACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/C,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBACjC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC;YACF,CAAC;YACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CACF,CAAC;QACF,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC;YAC9C,KAAK,CAAC,CAAC,WAAW;iBAChB,OAAO,CAAC,IAAI,CAAC;iBACb,IAAI,CACJ,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,EAC9D,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EACvE,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAChC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { type Effect } from "effect";
|
|
1
2
|
import type { RpcSerialization } from "effect/rpc";
|
|
2
|
-
import {
|
|
3
|
-
export declare function redactingRpcSerialization(wire: RpcSerialization.RpcSerialization["Service"], sensitive:
|
|
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;
|
|
4
5
|
//# sourceMappingURL=redactingRpcSerialization.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redactingRpcSerialization.d.ts","sourceRoot":"","sources":["../src/redactingRpcSerialization.ts"],"names":[],"mappings":"
|
|
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"}
|