@shivaedev/server 0.33.1 → 0.33.2
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":"browserErrorRoute.d.ts","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"browserErrorRoute.d.ts","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAC9F,OAAO,EAAuB,UAAU,EAAyC,MAAM,aAAa,CAAC;AAgBrG,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CAClC;AAqCD,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,oDA+CzF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ByteSize, Cause, Effect, ErrorReporter, Layer, Option, Schema } from "effect";
|
|
1
|
+
import { ByteSize, Cause, Clock, Effect, ErrorReporter, Layer, Option, Schema } from "effect";
|
|
2
2
|
import { HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import { RateLimiter } from "effect/persistence";
|
|
@@ -38,6 +38,8 @@ const receiveReport = Effect.fnUntraced(function* (options, userId) {
|
|
|
38
38
|
}).pipe(Effect.annotateLogs({ "browser.kind": parsed.value.kind, "url.full": parsed.value.url, ...(userId === undefined ? {} : { "user.id": userId }) }));
|
|
39
39
|
return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Accepted") });
|
|
40
40
|
});
|
|
41
|
+
// The store's cleanup sleeps forever, so on the application clock a long TestClock step would wake it once per simulated minute.
|
|
42
|
+
const rateLimiterStore = RateLimiter.layerStoreMemory.pipe(Layer.provide(Layer.succeed(Clock.Clock, Clock.Clock.defaultValue())));
|
|
41
43
|
export function browserErrorRoute(trustedProxy, options = {}) {
|
|
42
44
|
return HttpRouter.use((router) => Effect.gen(function* () {
|
|
43
45
|
const limiter = yield* RateLimiter.RateLimiter;
|
|
@@ -71,6 +73,6 @@ export function browserErrorRoute(trustedProxy, options = {}) {
|
|
|
71
73
|
}
|
|
72
74
|
return yield* receiveForSession();
|
|
73
75
|
}).pipe(Effect.catchIf(isAuthUnavailable, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("ServiceUnavailable") }))), Effect.catchIf(isForbidden, () => Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Forbidden") })))));
|
|
74
|
-
})).pipe(Layer.provide(RateLimiter.layer.pipe(Layer.provide(
|
|
76
|
+
})).pipe(Layer.provide(RateLimiter.layer.pipe(Layer.provide(rateLimiterStore))));
|
|
75
77
|
}
|
|
76
78
|
//# sourceMappingURL=browserErrorRoute.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserErrorRoute.js","sourceRoot":"","sources":["../src/browserErrorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"browserErrorRoute.js","sourceRoot":"","sources":["../src/browserErrorRoute.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.33.
|
|
3
|
+
"version": "0.33.2",
|
|
4
4
|
"description": "The Effect application host: HTTP and RPC serving, health, OTLP export, database and migrations, and development mode",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -47,26 +47,26 @@
|
|
|
47
47
|
],
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@shivaedev/changes": "0.11.1",
|
|
50
|
-
"@shivaedev/contract": "0.43.
|
|
50
|
+
"@shivaedev/contract": "0.43.4",
|
|
51
51
|
"@shivaedev/errors": "0.10.1",
|
|
52
52
|
"@shivaedev/http": "0.8.1",
|
|
53
|
-
"@shivaedev/identity": "0.30.
|
|
53
|
+
"@shivaedev/identity": "0.30.6",
|
|
54
54
|
"@shivaedev/local-postgres": "0.16.0",
|
|
55
|
-
"@shivaedev/sql": "0.46.
|
|
55
|
+
"@shivaedev/sql": "0.46.4"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@effect/platform-node": "4.1.1",
|
|
59
59
|
"@effect/sql-pg": "4.1.1",
|
|
60
60
|
"@effect/vitest": "4.1.1",
|
|
61
61
|
"@shivaedev/access": "0.6.1",
|
|
62
|
-
"@shivaedev/admin": "0.
|
|
63
|
-
"@shivaedev/jobs": "0.
|
|
64
|
-
"@shivaedev/quality": "0.74.
|
|
65
|
-
"@shivaedev/rate-limit": "0.6.
|
|
66
|
-
"@shivaedev/service": "0.
|
|
67
|
-
"@shivaedev/test-kits": "0.10.
|
|
68
|
-
"@shivaedev/test-sql": "0.24.
|
|
69
|
-
"@shivaedev/test-story": "0.45.
|
|
62
|
+
"@shivaedev/admin": "0.24.0",
|
|
63
|
+
"@shivaedev/jobs": "0.42.0",
|
|
64
|
+
"@shivaedev/quality": "0.74.3",
|
|
65
|
+
"@shivaedev/rate-limit": "0.6.8",
|
|
66
|
+
"@shivaedev/service": "0.9.0",
|
|
67
|
+
"@shivaedev/test-kits": "0.10.7",
|
|
68
|
+
"@shivaedev/test-sql": "0.24.8",
|
|
69
|
+
"@shivaedev/test-story": "0.45.6",
|
|
70
70
|
"@types/node": "24.19.2",
|
|
71
71
|
"better-auth": "1.7.14",
|
|
72
72
|
"effect": "4.1.1",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"@effect/platform-node": "4.1.1",
|
|
79
79
|
"@effect/sql-pg": "4.1.1",
|
|
80
80
|
"@effect/vitest": "4.1.1",
|
|
81
|
-
"@shivaedev/admin": "0.
|
|
81
|
+
"@shivaedev/admin": "0.24.0",
|
|
82
82
|
"better-auth": "1.7.14",
|
|
83
83
|
"effect": "4.1.1"
|
|
84
84
|
},
|
package/src/browserErrorRoute.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ByteSize, Cause, Effect, ErrorReporter, Layer, Option, Schema } from "effect";
|
|
1
|
+
import { ByteSize, Cause, Clock, Effect, ErrorReporter, Layer, Option, Schema } from "effect";
|
|
2
2
|
import { HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import { RateLimiter } from "effect/persistence";
|
|
@@ -53,6 +53,9 @@ const receiveReport = Effect.fnUntraced(function* (options: BrowserErrorOptions,
|
|
|
53
53
|
return HttpServerResponse.empty({ status: HttpStatus.fromLiteral("Accepted") });
|
|
54
54
|
});
|
|
55
55
|
|
|
56
|
+
// The store's cleanup sleeps forever, so on the application clock a long TestClock step would wake it once per simulated minute.
|
|
57
|
+
const rateLimiterStore = RateLimiter.layerStoreMemory.pipe(Layer.provide(Layer.succeed(Clock.Clock, Clock.Clock.defaultValue())));
|
|
58
|
+
|
|
56
59
|
export function browserErrorRoute(trustedProxy?: string, options: BrowserErrorOptions = {}) {
|
|
57
60
|
return HttpRouter.use((router) =>
|
|
58
61
|
Effect.gen(function* () {
|
|
@@ -99,5 +102,5 @@ export function browserErrorRoute(trustedProxy?: string, options: BrowserErrorOp
|
|
|
99
102
|
),
|
|
100
103
|
);
|
|
101
104
|
}),
|
|
102
|
-
).pipe(Layer.provide(RateLimiter.layer.pipe(Layer.provide(
|
|
105
|
+
).pipe(Layer.provide(RateLimiter.layer.pipe(Layer.provide(rateLimiterStore))));
|
|
103
106
|
}
|