effect-app 2.30.0 → 2.31.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
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAY,UAAU,EAAyC,MAAM,YAAY,CAAA;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAQ,OAAO,EAAE,KAAK,EAAE,MAAM,EAAwC,MAAM,oBAAoB,CAAA;AAEhI,OAAO,KAAK,EAAU,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAOtD,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,UACxC,UAAU,CAAC,UAAU,KAC5B,eAAe,CAAC,eAAe,CAChC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EACjC,MAAM,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CA6BrD,CAAA;AAER,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CACzC;AAED,eAAO,MAAM,gBAAgB;;;EAQ3B,CAAA;kFA0HmD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAGvE,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;+CAJoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAGvE,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;+EAJoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAGvE,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;;;;;;4CAJoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAGvE,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;;;AAejB;;GAEG;AACH,qBAAa,gBACX,SAAQ,qBAA8G;IAEtH,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAY,SAAS,iEAA+C;IACzF,MAAM,CAAC,QAAQ,CAAC,eAAe,iGAAoE;IAEnG,MAAM,CAAC,QAAQ,CAAC,OAAO,uBACA,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,QAAQ,YAAY,CAAC;;;;2CAGjD;CAC5C"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
import { RpcResolver, RpcResolverNoStream } from "@effect/rpc";
|
|
2
|
+
import { redact } from "effect/Inspectable";
|
|
2
3
|
import { HttpBody, HttpClient, HttpClientRequest, HttpClientResponse } from "../http.js";
|
|
3
|
-
import { Config, Context, Effect, flow, HashMap, Layer, Option, Predicate, S, Struct } from "../internal/lib.js";
|
|
4
|
+
import { Config, Context, Effect, flow, HashMap, Layer, Option, pipe, Predicate, Redacted, S, Struct } from "../internal/lib.js";
|
|
4
5
|
import { typedKeysOf } from "../utils.js";
|
|
6
|
+
const redactUnwrap = (x) => Object.entries(redact(x)).reduce((acc, [k, v]) => {
|
|
7
|
+
acc[k] = Redacted.isRedacted(v) ? "**redacted**" : v;
|
|
8
|
+
return acc;
|
|
9
|
+
}, {});
|
|
5
10
|
export const make = (client) => RpcResolverNoStream.make((requests) => client
|
|
6
11
|
.post("", {
|
|
7
12
|
body: HttpBody.unsafeJson(requests)
|
|
8
13
|
})
|
|
9
|
-
.pipe(Effect.flatMap(HttpClientResponse.filterStatus((_) => _ === 200 || _ === 418 || _ === 422)), Effect.flatMap((_) => _.json), Effect.scoped))();
|
|
14
|
+
.pipe(Effect.flatMap((_) => pipe(_, HttpClientResponse.filterStatus((_) => _ === 200 || _ === 418 || _ === 422), Effect.tapErrorCause(() => _.text.pipe(Effect.orElseSucceed(() => undefined), Effect.flatMap((body) => Effect.annotateCurrentSpan({ "response.headers": redactUnwrap(_.headers), "response.body": body }).pipe(Effect.andThen(Effect.logError("RPC error", { responseHeaders: redactUnwrap(_.headers), responseBody: body })))))))), Effect.flatMap((_) => _.json), Effect.scoped))();
|
|
10
15
|
export const DefaultApiConfig = Config.all({
|
|
11
16
|
url: Config.string("apiUrl").pipe(Config.withDefault("/api")),
|
|
12
17
|
headers: Config
|
|
@@ -103,4 +108,4 @@ export class ApiClientFactory extends Context.TagId("ApiClientFactory")() {
|
|
|
103
108
|
.use((apiClientFactory) => apiClientFactory(requestLevelLayers))
|
|
104
109
|
.pipe(Effect.map((f) => f(resource))); // don't rename f to clientFor or integration in vue project linked fucks up
|
|
105
110
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "effect-app",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.31.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@effect/rpc": "^0.52.
|
|
8
|
-
"@effect/rpc-http": "^0.50.
|
|
7
|
+
"@effect/rpc": "^0.52.4",
|
|
8
|
+
"@effect/rpc-http": "^0.50.4",
|
|
9
9
|
"@tsconfig/strictest": "^2.0.5",
|
|
10
10
|
"date-fns": "^4.1.0",
|
|
11
11
|
"nanoid": "^5.1.2",
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"vitest": "^3.0.7"
|
|
33
33
|
},
|
|
34
34
|
"peerDependencies": {
|
|
35
|
-
"@effect/platform": "^0.77.
|
|
36
|
-
"effect": "^3.13.
|
|
35
|
+
"@effect/platform": "^0.77.4",
|
|
36
|
+
"effect": "^3.13.4"
|
|
37
37
|
},
|
|
38
38
|
"typesVersions": {
|
|
39
39
|
"*": {
|
|
@@ -2,12 +2,18 @@
|
|
|
2
2
|
import type { Rpc } from "@effect/rpc"
|
|
3
3
|
import { RpcResolver, RpcResolverNoStream } from "@effect/rpc"
|
|
4
4
|
import type { RpcRouter } from "@effect/rpc/RpcRouter"
|
|
5
|
+
import { redact } from "effect/Inspectable"
|
|
5
6
|
import { HttpBody, HttpClient, HttpClientRequest, HttpClientResponse } from "../http.js"
|
|
6
7
|
import type { RequestResolver, Schema } from "../internal/lib.js"
|
|
7
|
-
import { Config, Context, Effect, flow, HashMap, Layer, Option, Predicate, S, Struct } from "../internal/lib.js"
|
|
8
|
+
import { Config, Context, Effect, flow, HashMap, Layer, Option, pipe, Predicate, Redacted, S, Struct } from "../internal/lib.js"
|
|
8
9
|
import { typedKeysOf } from "../utils.js"
|
|
9
10
|
import type { Client, Requests } from "./clientFor.js"
|
|
10
11
|
|
|
12
|
+
const redactUnwrap = (x: any) => Object.entries(redact(x) as any).reduce((acc, [k, v]) => {
|
|
13
|
+
acc[k] = Redacted.isRedacted(v) ? "**redacted**" : v
|
|
14
|
+
return acc
|
|
15
|
+
}, {} as Record<string, unknown>)
|
|
16
|
+
|
|
11
17
|
export const make = <R extends RpcRouter<any, any>>(
|
|
12
18
|
client: HttpClient.HttpClient
|
|
13
19
|
): RequestResolver.RequestResolver<
|
|
@@ -20,7 +26,24 @@ export const make = <R extends RpcRouter<any, any>>(
|
|
|
20
26
|
body: HttpBody.unsafeJson(requests)
|
|
21
27
|
})
|
|
22
28
|
.pipe(
|
|
23
|
-
Effect.flatMap(
|
|
29
|
+
Effect.flatMap((_) =>
|
|
30
|
+
pipe(
|
|
31
|
+
_,
|
|
32
|
+
HttpClientResponse.filterStatus((_) => _ === 200 || _ === 418 || _ === 422),
|
|
33
|
+
Effect.tapErrorCause(() =>
|
|
34
|
+
_.text.pipe(
|
|
35
|
+
Effect.orElseSucceed(() => undefined),
|
|
36
|
+
Effect.flatMap((body) =>
|
|
37
|
+
Effect.annotateCurrentSpan({ "response.headers": redactUnwrap(_.headers), "response.body": body }).pipe(
|
|
38
|
+
Effect.andThen(
|
|
39
|
+
Effect.logError("RPC error", { responseHeaders: redactUnwrap(_.headers), responseBody: body })
|
|
40
|
+
)
|
|
41
|
+
)
|
|
42
|
+
)
|
|
43
|
+
)
|
|
44
|
+
)
|
|
45
|
+
)
|
|
46
|
+
),
|
|
24
47
|
Effect.flatMap((_) => _.json),
|
|
25
48
|
Effect.scoped
|
|
26
49
|
)
|