@shivaedev/http 0.1.0 → 0.2.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/README.md +12 -12
- package/dist/filterStatus.d.ts.map +1 -1
- package/dist/filterStatus.js +6 -5
- package/dist/filterStatus.js.map +1 -1
- package/dist/server/boundedBody.d.ts +2 -2
- package/dist/server/boundedBody.d.ts.map +1 -1
- package/dist/server/boundedBody.js +12 -28
- package/dist/server/boundedBody.js.map +1 -1
- package/package.json +6 -12
- package/src/filterStatus.ts +6 -5
- package/src/server/boundedBody.ts +17 -30
package/README.md
CHANGED
|
@@ -14,12 +14,12 @@ import { filterStatus } from "@shivaedev/http/filterStatus.ts";
|
|
|
14
14
|
import { paginate } from "@shivaedev/http/paginate.ts";
|
|
15
15
|
|
|
16
16
|
const items = Effect.gen(function* () {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
const client = filterStatus(yield* HttpClient.HttpClient);
|
|
18
|
+
return yield* paginate(client, HttpClientRequest.get("https://api.example/items")).pipe(
|
|
19
|
+
Stream.mapEffect((response) => readBoundedJson(response, 64 * 1024, Schema.Array(Schema.String))),
|
|
20
|
+
Stream.runCollect,
|
|
21
|
+
Effect.map((pages) => pages.flat()),
|
|
22
|
+
);
|
|
23
23
|
});
|
|
24
24
|
```
|
|
25
25
|
|
|
@@ -49,15 +49,15 @@ import { HttpIncomingMessage, HttpRouter, HttpServerResponse } from "effect/http
|
|
|
49
49
|
import { readBoundedBody } from "@shivaedev/http/server/boundedBody.ts";
|
|
50
50
|
|
|
51
51
|
const routes = HttpRouter.add("POST", "/webhook", (request) =>
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
readBoundedBody(request).pipe(
|
|
53
|
+
Effect.map((body) => HttpServerResponse.uint8Array(new Uint8Array(body))),
|
|
54
|
+
Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(64 * 1024)),
|
|
55
|
+
),
|
|
56
56
|
);
|
|
57
57
|
```
|
|
58
58
|
|
|
59
|
-
Oversized `content-length` headers are rejected before reading
|
|
59
|
+
Oversized `content-length` headers are rejected before reading. Native Effect owns body collection and connection cleanup after chunked overflow; connection reuse depends on its unread-body drain limit. `RequestBodyTooLarge` is a typed failure that implements Effect's `HttpServerRespondable` protocol with status 413. Consume the body once through this reader and decode the result in the application.
|
|
60
60
|
|
|
61
61
|
### Install and limits
|
|
62
62
|
|
|
63
|
-
Install `@shivaedev/http` with `effect` as its peer.
|
|
63
|
+
Install `@shivaedev/http` with `effect` as its peer. The package has no root entry; import the module that defines the name.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterStatus.d.ts","sourceRoot":"","sources":["../src/filterStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA2B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"filterStatus.d.ts","sourceRoot":"","sources":["../src/filterStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA2B,MAAM,aAAa,CAAC;AAElE,OAAO,EAAkE,KAAK,iBAAiB,EAAsB,MAAM,aAAa,CAAC;AAiCzI,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,iBAAiB,EAAE,CAAC,CAAC,CAEjI"}
|
package/dist/filterStatus.js
CHANGED
|
@@ -1,27 +1,28 @@
|
|
|
1
1
|
import { DateTime, Effect } from "effect";
|
|
2
2
|
import { HttpClient } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
4
|
import { RemoteGone, RemoteHttpError, RemoteNotFound, RemoteRateLimited, RemoteUnauthorized } from "./errors.js";
|
|
4
5
|
import { parseRetryAfter } from "./parseRetryAfter.js";
|
|
5
6
|
const checkStatus = Effect.fnUntraced(function* (response) {
|
|
6
7
|
const { status, request } = response;
|
|
7
|
-
if (status >=
|
|
8
|
+
if (status >= HttpStatus.fromLiteral("OK") && status < HttpStatus.fromLiteral("MultipleChoices")) {
|
|
8
9
|
return response;
|
|
9
10
|
}
|
|
10
11
|
const fields = { method: request.method, status, url: request.url.split(/[?#]/u)[0] ?? request.url };
|
|
11
12
|
let error;
|
|
12
13
|
switch (status) {
|
|
13
|
-
case
|
|
14
|
+
case HttpStatus.fromLiteral("Unauthorized"):
|
|
14
15
|
error = new RemoteUnauthorized(fields);
|
|
15
16
|
break;
|
|
16
|
-
case
|
|
17
|
+
case HttpStatus.fromLiteral("NotFound"):
|
|
17
18
|
error = new RemoteNotFound(fields);
|
|
18
19
|
break;
|
|
19
|
-
case
|
|
20
|
+
case HttpStatus.fromLiteral("Gone"):
|
|
20
21
|
error = new RemoteGone(fields);
|
|
21
22
|
break;
|
|
22
23
|
default: {
|
|
23
24
|
const header = response.headers["retry-after"];
|
|
24
|
-
if (status ===
|
|
25
|
+
if (status === HttpStatus.fromLiteral("TooManyRequests") || (status === HttpStatus.fromLiteral("ServiceUnavailable") && header !== undefined)) {
|
|
25
26
|
const retryAfter = parseRetryAfter(header, yield* DateTime.now);
|
|
26
27
|
error = new RemoteRateLimited({ ...fields, ...(retryAfter === undefined ? {} : { retryAfter }) });
|
|
27
28
|
}
|
package/dist/filterStatus.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterStatus.js","sourceRoot":"","sources":["../src/filterStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,UAAU,EAA2B,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAA0B,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzI,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAA+C;IAC/F,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;IACrC,IAAI,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"filterStatus.js","sourceRoot":"","sources":["../src/filterStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,UAAU,EAA2B,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAA0B,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzI,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAA+C;IAC/F,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;IACrC,IAAI,MAAM,IAAI,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAClG,OAAO,QAAQ,CAAC;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACrG,IAAI,KAAwB,CAAC;IAC7B,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC;YAC1C,KAAK,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM;QACP,KAAK,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC;YACtC,KAAK,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM;QACP,KAAK,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC;YAClC,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/B,MAAM;QACP,SAAS,CAAC;YACT,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC/C,IAAI,MAAM,KAAK,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,MAAM,KAAK,SAAS,CAAC,EAAE,CAAC;gBAC/I,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAChE,KAAK,GAAG,IAAI,iBAAiB,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;YACnG,CAAC;iBAAM,CAAC;gBACP,KAAK,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,YAAY,CAAO,MAAwC;IAC1E,OAAO,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { type HttpServerRequest, HttpServerRespondable, HttpServerResponse } from "effect/http";
|
|
3
3
|
declare const RequestBodyTooLarge_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
|
|
4
4
|
readonly _tag: "RequestBodyTooLarge";
|
|
5
5
|
} & Readonly<A>;
|
|
@@ -9,6 +9,6 @@ export declare class RequestBodyTooLarge extends RequestBodyTooLarge_base<{
|
|
|
9
9
|
}> implements HttpServerRespondable.Respondable {
|
|
10
10
|
[HttpServerRespondable.symbol](): Effect.Effect<HttpServerResponse.HttpServerResponse, never, never>;
|
|
11
11
|
}
|
|
12
|
-
export declare const readBoundedBody: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<ArrayBuffer, HttpServerError.HttpServerError | RequestBodyTooLarge, never>;
|
|
12
|
+
export declare const readBoundedBody: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<ArrayBuffer, import("effect/http/HttpServerError").HttpServerError | RequestBodyTooLarge, never>;
|
|
13
13
|
export {};
|
|
14
14
|
//# sourceMappingURL=boundedBody.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boundedBody.d.ts","sourceRoot":"","sources":["../../src/server/boundedBody.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"boundedBody.d.ts","sourceRoot":"","sources":["../../src/server/boundedBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAuB,KAAK,iBAAiB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;;;;AAGrH,qBAAa,mBACZ,SAAQ,yBAAwC;IAC/C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB,CACD,YAAW,qBAAqB,CAAC,WAAW;IAE5C,CAAC,qBAAqB,CAAC,MAAM,CAAC,uEAE7B;CACD;AAED,eAAO,MAAM,eAAe,kKAe1B,CAAC"}
|
|
@@ -1,36 +1,20 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
1
|
+
import { Data, Effect } from "effect";
|
|
2
|
+
import { HttpIncomingMessage, HttpServerRespondable, HttpServerResponse } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
export class RequestBodyTooLarge extends Data.TaggedError("RequestBodyTooLarge") {
|
|
5
5
|
[HttpServerRespondable.symbol]() {
|
|
6
|
-
return Effect.succeed(HttpServerResponse.empty({ status:
|
|
6
|
+
return Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("PayloadTooLarge") }));
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
export const readBoundedBody = Effect.fnUntraced(function* (request) {
|
|
10
|
-
const incoming = NodeHttpServerRequest.toIncomingMessage(request);
|
|
11
10
|
const limit = yield* HttpIncomingMessage.MaxBodySize;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
closeOnDone: false,
|
|
21
|
-
evaluate: () => incoming,
|
|
22
|
-
onError: (cause) => new HttpServerError.HttpServerError({ reason: new HttpServerError.RequestParseError({ cause, request }) }),
|
|
23
|
-
}).pipe(Stream.runForEach((chunk) => {
|
|
24
|
-
size += BigInt(chunk.byteLength);
|
|
25
|
-
if (limit !== undefined && size > limit) {
|
|
26
|
-
return Effect.fail(new RequestBodyTooLarge({ limit, request }));
|
|
27
|
-
}
|
|
28
|
-
chunks.push(chunk);
|
|
29
|
-
return Effect.void;
|
|
30
|
-
}));
|
|
31
|
-
return Uint8Array.from(Buffer.concat(chunks)).buffer;
|
|
32
|
-
});
|
|
33
|
-
// Drain unread bytes without destroying the socket so the server can send a response.
|
|
34
|
-
return yield* read.pipe(Effect.onError(() => Effect.sync(() => incoming.resume())));
|
|
11
|
+
if (limit === undefined) {
|
|
12
|
+
return yield* request.arrayBuffer;
|
|
13
|
+
}
|
|
14
|
+
const length = request.headers["content-length"];
|
|
15
|
+
if (length !== undefined && BigInt(length) > limit) {
|
|
16
|
+
return yield* new RequestBodyTooLarge({ limit, request });
|
|
17
|
+
}
|
|
18
|
+
return yield* request.arrayBuffer.pipe(Effect.catchIf((error) => error.reason._tag === "RequestParseError" && error.reason.reason === "BodyTooLarge", () => new RequestBodyTooLarge({ limit, request })));
|
|
35
19
|
});
|
|
36
20
|
//# sourceMappingURL=boundedBody.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boundedBody.js","sourceRoot":"","sources":["../../src/server/boundedBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"boundedBody.js","sourceRoot":"","sources":["../../src/server/boundedBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAA0B,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACrH,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAErD,MAAM,OAAO,mBACZ,SAAQ,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAG5C;IAGF,CAAC,qBAAqB,CAAC,MAAM,CAAC;QAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC;CACD;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAA4C;IACvG,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,mBAAmB,CAAC,WAAW,CAAC;IACrD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACnC,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CACrC,MAAM,CAAC,OAAO,CACb,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,cAAc,EAC9F,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CACjD,CACD,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/http",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Bounded HTTP bodies, status failures and paginated clients over Effect HTTP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -44,22 +44,16 @@
|
|
|
44
44
|
"README.md"
|
|
45
45
|
],
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@effect/platform-node": "4.0.
|
|
48
|
-
"@shivaedev/quality": "0.
|
|
49
|
-
"@shivaedev/test-story": "0.
|
|
47
|
+
"@effect/platform-node": "4.0.6",
|
|
48
|
+
"@shivaedev/quality": "0.45.0",
|
|
49
|
+
"@shivaedev/test-story": "0.24.0",
|
|
50
50
|
"@types/node": "24.19.2",
|
|
51
|
-
"effect": "4.0.
|
|
51
|
+
"effect": "4.0.6",
|
|
52
52
|
"typescript": "7.0.2",
|
|
53
53
|
"vitest": "5.0.5"
|
|
54
54
|
},
|
|
55
55
|
"peerDependencies": {
|
|
56
|
-
"
|
|
57
|
-
"effect": "4.0.5"
|
|
58
|
-
},
|
|
59
|
-
"peerDependenciesMeta": {
|
|
60
|
-
"@effect/platform-node": {
|
|
61
|
-
"optional": true
|
|
62
|
-
}
|
|
56
|
+
"effect": "4.0.6"
|
|
63
57
|
},
|
|
64
58
|
"engines": {
|
|
65
59
|
"node": ">=24"
|
package/src/filterStatus.ts
CHANGED
|
@@ -1,28 +1,29 @@
|
|
|
1
1
|
import { DateTime, Effect } from "effect";
|
|
2
2
|
import { HttpClient, type HttpClientResponse } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
4
|
import { RemoteGone, RemoteHttpError, RemoteNotFound, RemoteRateLimited, type RemoteStatusError, RemoteUnauthorized } from "./errors.ts";
|
|
4
5
|
import { parseRetryAfter } from "./parseRetryAfter.ts";
|
|
5
6
|
|
|
6
7
|
const checkStatus = Effect.fnUntraced(function* (response: HttpClientResponse.HttpClientResponse) {
|
|
7
8
|
const { status, request } = response;
|
|
8
|
-
if (status >=
|
|
9
|
+
if (status >= HttpStatus.fromLiteral("OK") && status < HttpStatus.fromLiteral("MultipleChoices")) {
|
|
9
10
|
return response;
|
|
10
11
|
}
|
|
11
12
|
const fields = { method: request.method, status, url: request.url.split(/[?#]/u)[0] ?? request.url };
|
|
12
13
|
let error: RemoteStatusError;
|
|
13
14
|
switch (status) {
|
|
14
|
-
case
|
|
15
|
+
case HttpStatus.fromLiteral("Unauthorized"):
|
|
15
16
|
error = new RemoteUnauthorized(fields);
|
|
16
17
|
break;
|
|
17
|
-
case
|
|
18
|
+
case HttpStatus.fromLiteral("NotFound"):
|
|
18
19
|
error = new RemoteNotFound(fields);
|
|
19
20
|
break;
|
|
20
|
-
case
|
|
21
|
+
case HttpStatus.fromLiteral("Gone"):
|
|
21
22
|
error = new RemoteGone(fields);
|
|
22
23
|
break;
|
|
23
24
|
default: {
|
|
24
25
|
const header = response.headers["retry-after"];
|
|
25
|
-
if (status ===
|
|
26
|
+
if (status === HttpStatus.fromLiteral("TooManyRequests") || (status === HttpStatus.fromLiteral("ServiceUnavailable") && header !== undefined)) {
|
|
26
27
|
const retryAfter = parseRetryAfter(header, yield* DateTime.now);
|
|
27
28
|
error = new RemoteRateLimited({ ...fields, ...(retryAfter === undefined ? {} : { retryAfter }) });
|
|
28
29
|
} else {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
1
|
+
import { Data, Effect } from "effect";
|
|
2
|
+
import { HttpIncomingMessage, type HttpServerRequest, HttpServerRespondable, HttpServerResponse } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
|
|
5
5
|
export class RequestBodyTooLarge
|
|
6
6
|
extends Data.TaggedError("RequestBodyTooLarge")<{
|
|
@@ -10,36 +10,23 @@ export class RequestBodyTooLarge
|
|
|
10
10
|
implements HttpServerRespondable.Respondable
|
|
11
11
|
{
|
|
12
12
|
[HttpServerRespondable.symbol]() {
|
|
13
|
-
return Effect.succeed(HttpServerResponse.empty({ status:
|
|
13
|
+
return Effect.succeed(HttpServerResponse.empty({ status: HttpStatus.fromLiteral("PayloadTooLarge") }));
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
export const readBoundedBody = Effect.fnUntraced(function* (request: HttpServerRequest.HttpServerRequest) {
|
|
18
|
-
const incoming = NodeHttpServerRequest.toIncomingMessage(request);
|
|
19
18
|
const limit = yield* HttpIncomingMessage.MaxBodySize;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
size += BigInt(chunk.byteLength);
|
|
34
|
-
if (limit !== undefined && size > limit) {
|
|
35
|
-
return Effect.fail(new RequestBodyTooLarge({ limit, request }));
|
|
36
|
-
}
|
|
37
|
-
chunks.push(chunk);
|
|
38
|
-
return Effect.void;
|
|
39
|
-
}),
|
|
40
|
-
);
|
|
41
|
-
return Uint8Array.from(Buffer.concat(chunks)).buffer;
|
|
42
|
-
});
|
|
43
|
-
// Drain unread bytes without destroying the socket so the server can send a response.
|
|
44
|
-
return yield* read.pipe(Effect.onError(() => Effect.sync(() => incoming.resume())));
|
|
19
|
+
if (limit === undefined) {
|
|
20
|
+
return yield* request.arrayBuffer;
|
|
21
|
+
}
|
|
22
|
+
const length = request.headers["content-length"];
|
|
23
|
+
if (length !== undefined && BigInt(length) > limit) {
|
|
24
|
+
return yield* new RequestBodyTooLarge({ limit, request });
|
|
25
|
+
}
|
|
26
|
+
return yield* request.arrayBuffer.pipe(
|
|
27
|
+
Effect.catchIf(
|
|
28
|
+
(error) => error.reason._tag === "RequestParseError" && error.reason.reason === "BodyTooLarge",
|
|
29
|
+
() => new RequestBodyTooLarge({ limit, request }),
|
|
30
|
+
),
|
|
31
|
+
);
|
|
45
32
|
});
|