@effect/platform 0.37.5 → 0.37.6
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/dist/cjs/Http/Headers.js +19 -4
- package/dist/cjs/Http/Headers.js.map +1 -1
- package/dist/cjs/Http/Platform.js.map +1 -1
- package/dist/cjs/Http/UrlParams.js +13 -15
- package/dist/cjs/Http/UrlParams.js.map +1 -1
- package/dist/cjs/internal/http/middleware.js +2 -1
- package/dist/cjs/internal/http/middleware.js.map +1 -1
- package/dist/cjs/internal/http/platform.js +5 -7
- package/dist/cjs/internal/http/platform.js.map +1 -1
- package/dist/dts/Http/Headers.d.ts +29 -3
- package/dist/dts/Http/Headers.d.ts.map +1 -1
- package/dist/dts/Http/Platform.d.ts +3 -2
- package/dist/dts/Http/Platform.d.ts.map +1 -1
- package/dist/dts/Http/UrlParams.d.ts +2 -3
- package/dist/dts/Http/UrlParams.d.ts.map +1 -1
- package/dist/esm/Http/Headers.js +19 -4
- package/dist/esm/Http/Headers.js.map +1 -1
- package/dist/esm/Http/Platform.js.map +1 -1
- package/dist/esm/Http/UrlParams.js +13 -15
- package/dist/esm/Http/UrlParams.js.map +1 -1
- package/dist/esm/internal/http/middleware.js +2 -1
- package/dist/esm/internal/http/middleware.js.map +1 -1
- package/dist/esm/internal/http/platform.js +5 -7
- package/dist/esm/internal/http/platform.js.map +1 -1
- package/package.json +1 -1
- package/src/Http/Headers.ts +40 -6
- package/src/Http/Platform.ts +3 -2
- package/src/Http/UrlParams.ts +17 -19
- package/src/internal/http/middleware.ts +2 -1
- package/src/internal/http/platform.ts +12 -12
package/dist/cjs/Http/Headers.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.setAll = exports.set = exports.remove = exports.has = exports.get = exports.fromInput = exports.empty = void 0;
|
|
6
|
+
exports.unsafeFromRecord = exports.setAll = exports.set = exports.remove = exports.merge = exports.has = exports.get = exports.fromInput = exports.empty = exports.HeadersTypeId = void 0;
|
|
7
7
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
8
8
|
var ReadonlyArray = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/ReadonlyArray"));
|
|
9
9
|
var ReadonlyRecord = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/ReadonlyRecord"));
|
|
@@ -34,13 +34,14 @@ function _interopRequireWildcard(e, r) {
|
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
36
36
|
* @since 1.0.0
|
|
37
|
+
* @category type ids
|
|
37
38
|
*/
|
|
38
|
-
|
|
39
|
+
const HeadersTypeId = exports.HeadersTypeId = /*#__PURE__*/Symbol.for("@effect/platform/Http/Headers");
|
|
39
40
|
/**
|
|
40
41
|
* @since 1.0.0
|
|
41
42
|
* @category constructors
|
|
42
43
|
*/
|
|
43
|
-
const empty = exports.empty = /*#__PURE__*/
|
|
44
|
+
const empty = exports.empty = /*#__PURE__*/Object.create(null);
|
|
44
45
|
/**
|
|
45
46
|
* @since 1.0.0
|
|
46
47
|
* @category constructors
|
|
@@ -55,9 +56,15 @@ const fromInput = input => {
|
|
|
55
56
|
};
|
|
56
57
|
/**
|
|
57
58
|
* @since 1.0.0
|
|
58
|
-
* @category
|
|
59
|
+
* @category constructors
|
|
59
60
|
*/
|
|
60
61
|
exports.fromInput = fromInput;
|
|
62
|
+
const unsafeFromRecord = input => input;
|
|
63
|
+
/**
|
|
64
|
+
* @since 1.0.0
|
|
65
|
+
* @category combinators
|
|
66
|
+
*/
|
|
67
|
+
exports.unsafeFromRecord = unsafeFromRecord;
|
|
61
68
|
const has = exports.has = /*#__PURE__*/(0, _Function.dual)(2, (self, key) => ReadonlyRecord.has(self, key.toLowerCase()));
|
|
62
69
|
/**
|
|
63
70
|
* @since 1.0.0
|
|
@@ -80,6 +87,14 @@ const setAll = exports.setAll = /*#__PURE__*/(0, _Function.dual)(2, (self, heade
|
|
|
80
87
|
...self,
|
|
81
88
|
...fromInput(headers)
|
|
82
89
|
}));
|
|
90
|
+
/**
|
|
91
|
+
* @since 1.0.0
|
|
92
|
+
* @category combinators
|
|
93
|
+
*/
|
|
94
|
+
const merge = exports.merge = /*#__PURE__*/(0, _Function.dual)(2, (self, headers) => ({
|
|
95
|
+
...self,
|
|
96
|
+
...headers
|
|
97
|
+
}));
|
|
83
98
|
/**
|
|
84
99
|
* @since 1.0.0
|
|
85
100
|
* @category combinators
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Headers.js","names":["_Function","require","ReadonlyArray","_interopRequireWildcard","ReadonlyRecord","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","
|
|
1
|
+
{"version":3,"file":"Headers.js","names":["_Function","require","ReadonlyArray","_interopRequireWildcard","ReadonlyRecord","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","HeadersTypeId","exports","Symbol","for","empty","create","fromInput","input","undefined","iterator","fromEntries","map","fromIterable","k","v","toLowerCase","entries","unsafeFromRecord","dual","self","key","value","setAll","headers","merge","remove"],"sources":["../../../src/Http/Headers.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.js","names":["internal","_interopRequireWildcard","require","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","TypeId","exports","Platform","tag","make"],"sources":["../../../src/Http/Platform.ts"],"sourcesContent":[null],"mappings":";;;;;;AAOA,IAAAA,QAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAwD,SAAAC,yBAAAC,CAAA;EAAA,yBAAAC,OAAA;EAAA,IAAAC,CAAA,OAAAD,OAAA;IAAAE,CAAA,OAAAF,OAAA;EAAA,QAAAF,wBAAA,YAAAA,CAAAC,CAAA;IAAA,OAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA;EAAA,GAAAF,CAAA;AAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA;EAAA,KAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA;EAAA,aAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA;IAAAK,OAAA,EAAAL;EAAA;EAAA,IAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA;EAAA,IAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA;EAAA,IAAAQ,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA;EAAA,SAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA;IAAA,IAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA;IAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA;EAAA;EAAA,OAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA;
|
|
1
|
+
{"version":3,"file":"Platform.js","names":["internal","_interopRequireWildcard","require","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","TypeId","exports","Platform","tag","make"],"sources":["../../../src/Http/Platform.ts"],"sourcesContent":[null],"mappings":";;;;;;AAOA,IAAAA,QAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAwD,SAAAC,yBAAAC,CAAA;EAAA,yBAAAC,OAAA;EAAA,IAAAC,CAAA,OAAAD,OAAA;IAAAE,CAAA,OAAAF,OAAA;EAAA,QAAAF,wBAAA,YAAAA,CAAAC,CAAA;IAAA,OAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA;EAAA,GAAAF,CAAA;AAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA;EAAA,KAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA;EAAA,aAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA;IAAAK,OAAA,EAAAL;EAAA;EAAA,IAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA;EAAA,IAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA;EAAA,IAAAQ,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA;EAAA,SAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA;IAAA,IAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA;IAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA;EAAA;EAAA,OAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA;AAMxD;;;;AAIO,MAAMY,MAAM,GAAAC,OAAA,CAAAD,MAAA,GAAkBxB,QAAQ,CAACwB,MAAM;AAQpD;;;;AAIO,MAAME,QAAQ,GAAAD,OAAA,CAAAC,QAAA,GAAoC1B,QAAQ,CAAC2B,GAAG;AAkBrE;;;;AAIO,MAAMC,IAAI,GAAAH,OAAA,CAAAG,IAAA,GAmB6D5B,QAAQ,CAAC4B,IAAI"}
|
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.toString = exports.setAll = exports.set = exports.remove = exports.makeUrl = exports.fromInput = exports.empty = exports.appendAll = exports.append = void 0;
|
|
7
|
-
var Chunk = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Chunk"));
|
|
8
7
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
9
8
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
9
|
+
var ReadonlyArray = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/ReadonlyArray"));
|
|
10
10
|
function _getRequireWildcardCache(e) {
|
|
11
11
|
if ("function" != typeof WeakMap) return null;
|
|
12
12
|
var r = new WeakMap(),
|
|
@@ -41,53 +41,51 @@ function _interopRequireWildcard(e, r) {
|
|
|
41
41
|
* @category constructors
|
|
42
42
|
*/
|
|
43
43
|
const fromInput = input => {
|
|
44
|
-
if (
|
|
45
|
-
return input;
|
|
46
|
-
} else if (Symbol.iterator in input) {
|
|
47
|
-
return Chunk.fromIterable(input);
|
|
44
|
+
if (Symbol.iterator in input) {
|
|
45
|
+
return ReadonlyArray.fromIterable(input);
|
|
48
46
|
}
|
|
49
|
-
return
|
|
47
|
+
return ReadonlyArray.fromIterable(Object.entries(input));
|
|
50
48
|
};
|
|
51
49
|
/**
|
|
52
50
|
* @since 1.0.0
|
|
53
51
|
* @category constructors
|
|
54
52
|
*/
|
|
55
53
|
exports.fromInput = fromInput;
|
|
56
|
-
const empty = exports.empty =
|
|
54
|
+
const empty = exports.empty = [];
|
|
57
55
|
/**
|
|
58
56
|
* @since 1.0.0
|
|
59
57
|
* @category combinators
|
|
60
58
|
*/
|
|
61
|
-
const set = exports.set = /*#__PURE__*/(0, _Function.dual)(3, (self, key, value) =>
|
|
59
|
+
const set = exports.set = /*#__PURE__*/(0, _Function.dual)(3, (self, key, value) => ReadonlyArray.append(ReadonlyArray.filter(self, ([k]) => k !== key), [key, value]));
|
|
62
60
|
/**
|
|
63
61
|
* @since 1.0.0
|
|
64
62
|
* @category combinators
|
|
65
63
|
*/
|
|
66
64
|
const setAll = exports.setAll = /*#__PURE__*/(0, _Function.dual)(2, (self, input) => {
|
|
67
65
|
const toSet = fromInput(input);
|
|
68
|
-
const keys =
|
|
69
|
-
return
|
|
66
|
+
const keys = toSet.map(([k]) => k);
|
|
67
|
+
return ReadonlyArray.appendAll(ReadonlyArray.filter(self, ([k]) => keys.includes(k)), toSet);
|
|
70
68
|
});
|
|
71
69
|
/**
|
|
72
70
|
* @since 1.0.0
|
|
73
71
|
* @category combinators
|
|
74
72
|
*/
|
|
75
|
-
const append = exports.append = /*#__PURE__*/(0, _Function.dual)(3, (self, key, value) =>
|
|
73
|
+
const append = exports.append = /*#__PURE__*/(0, _Function.dual)(3, (self, key, value) => ReadonlyArray.append(self, [key, value]));
|
|
76
74
|
/**
|
|
77
75
|
* @since 1.0.0
|
|
78
76
|
* @category combinators
|
|
79
77
|
*/
|
|
80
|
-
const appendAll = exports.appendAll = /*#__PURE__*/(0, _Function.dual)(2, (self, input) =>
|
|
78
|
+
const appendAll = exports.appendAll = /*#__PURE__*/(0, _Function.dual)(2, (self, input) => ReadonlyArray.appendAll(self, fromInput(input)));
|
|
81
79
|
/**
|
|
82
80
|
* @since 1.0.0
|
|
83
81
|
* @category combinators
|
|
84
82
|
*/
|
|
85
|
-
const remove = exports.remove = /*#__PURE__*/(0, _Function.dual)(2, (self, key) =>
|
|
83
|
+
const remove = exports.remove = /*#__PURE__*/(0, _Function.dual)(2, (self, key) => ReadonlyArray.filter(self, ([k]) => k !== key));
|
|
86
84
|
/**
|
|
87
85
|
* @since 1.0.0
|
|
88
86
|
* @category combinators
|
|
89
87
|
*/
|
|
90
|
-
const toString = self => new URLSearchParams(
|
|
88
|
+
const toString = self => new URLSearchParams(self).toString();
|
|
91
89
|
/**
|
|
92
90
|
* @since 1.0.0
|
|
93
91
|
* @category constructors
|
|
@@ -96,7 +94,7 @@ exports.toString = toString;
|
|
|
96
94
|
const makeUrl = (url, params, onError) => Effect.try({
|
|
97
95
|
try: () => {
|
|
98
96
|
const urlInstance = new URL(url, baseUrl());
|
|
99
|
-
|
|
97
|
+
ReadonlyArray.forEach(params, ([key, value]) => {
|
|
100
98
|
if (value !== undefined) {
|
|
101
99
|
urlInstance.searchParams.append(key, value);
|
|
102
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlParams.js","names":["
|
|
1
|
+
{"version":3,"file":"UrlParams.js","names":["Effect","_interopRequireWildcard","require","_Function","ReadonlyArray","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","fromInput","input","Symbol","iterator","fromIterable","entries","exports","empty","dual","self","key","value","append","filter","k","setAll","toSet","keys","map","appendAll","includes","remove","toString","URLSearchParams","makeUrl","url","params","onError","try","urlInstance","URL","baseUrl","forEach","undefined","searchParams","catch","globalThis","location","origin","pathname"],"sources":["../../../src/Http/UrlParams.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.xForwardedHeaders = exports.withTracerDisabledWhen = exports.withLoggerDisabled = exports.tracer = exports.make = exports.loggerDisabled = exports.logger = exports.currentTracerDisabledWhen = void 0;
|
|
7
|
+
var Cause = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Cause"));
|
|
7
8
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
8
9
|
var FiberRef = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/FiberRef"));
|
|
9
10
|
var Function = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Function"));
|
|
@@ -58,7 +59,7 @@ const logger = exports.logger = /*#__PURE__*/make(httpApp => {
|
|
|
58
59
|
return exit._tag === "Failure" ? Effect.annotateLogs(Effect.log(exit.cause), {
|
|
59
60
|
"http.method": request.method,
|
|
60
61
|
"http.url": request.url,
|
|
61
|
-
"http.status": 500
|
|
62
|
+
"http.status": Cause.isInterruptedOnly(exit.cause) ? 499 : 500
|
|
62
63
|
}) : Effect.annotateLogs(Effect.log(""), {
|
|
63
64
|
"http.method": request.method,
|
|
64
65
|
"http.url": request.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["
|
|
1
|
+
{"version":3,"file":"middleware.js","names":["Cause","_interopRequireWildcard","require","Effect","FiberRef","Function","_GlobalValue","Headers","IncomingMessage","ServerRequest","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","make","middleware","exports","loggerDisabled","globalValue","Symbol","for","unsafeMake","withLoggerDisabled","self","zipRight","currentTracerDisabledWhen","constFalse","withTracerDisabledWhen","dual","pred","locally","logger","httpApp","counter","flatMap","request","withLogSpan","onExit","exit","disabled","unit","_tag","annotateLogs","log","cause","method","url","isInterruptedOnly","value","status","tracer","appWithStatus","tap","response","annotateCurrentSpan","zip","disabledWhen","headers","orElseSucceed","schemaExternalSpan","undefined","succeed","parent","withSpan","attributes","xForwardedHeaders","updateService","modify","remoteAddress","split","trim"],"sources":["../../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/
|
|
|
9
9
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
10
10
|
var FileSystem = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("../../FileSystem.js"));
|
|
11
11
|
var Etag = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("../../Http/Etag.js"));
|
|
12
|
+
var Headers = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("../../Http/Headers.js"));
|
|
12
13
|
function _getRequireWildcardCache(e) {
|
|
13
14
|
if ("function" != typeof WeakMap) return null;
|
|
14
15
|
var r = new WeakMap(),
|
|
@@ -53,11 +54,9 @@ const make = impl => Effect.gen(function* (_) {
|
|
|
53
54
|
}) => {
|
|
54
55
|
const start = Number(options?.offset ?? 0);
|
|
55
56
|
const end = options?.bytesToRead !== undefined ? start + Number(options.bytesToRead) : undefined;
|
|
56
|
-
const headers =
|
|
57
|
-
...(options?.headers ?? {}),
|
|
58
|
-
etag: Etag.toString(etag)
|
|
59
|
-
};
|
|
57
|
+
const headers = Headers.set(options?.headers ?? Headers.empty, "etag", Etag.toString(etag));
|
|
60
58
|
if (info.mtime._tag === "Some") {
|
|
59
|
+
;
|
|
61
60
|
headers["last-modified"] = info.mtime.value.toUTCString();
|
|
62
61
|
}
|
|
63
62
|
const contentLength = end !== undefined ? end - start : Number(info.size) - start;
|
|
@@ -66,11 +65,10 @@ const make = impl => Effect.gen(function* (_) {
|
|
|
66
65
|
},
|
|
67
66
|
fileWebResponse(file, options) {
|
|
68
67
|
return Effect.map(etagGen.fromFileWeb(file), etag => {
|
|
69
|
-
const headers = {
|
|
70
|
-
...(options?.headers ?? {}),
|
|
68
|
+
const headers = Headers.merge(options?.headers ?? Headers.empty, Headers.unsafeFromRecord({
|
|
71
69
|
etag: Etag.toString(etag),
|
|
72
70
|
"last-modified": new Date(file.lastModified).toUTCString()
|
|
73
|
-
};
|
|
71
|
+
}));
|
|
74
72
|
return impl.fileWebResponse(file, options?.status ?? 200, options?.statusText, headers, options);
|
|
75
73
|
});
|
|
76
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","names":["Context","_interopRequireWildcard","require","Effect","_Function","FileSystem","Etag","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","tag","Tag","make","impl","gen","_","fs","etagGen","Generator","of","fileResponse","path","options","pipe","bindTo","stat","bind","info","fromFileInfo","map","etag","start","Number","offset","end","bytesToRead","undefined","headers","toString","mtime","_tag","value","toUTCString","contentLength","size","status","statusText","fileWebResponse","file","fromFileWeb","Date","lastModified"],"sources":["../../../../src/internal/http/platform.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,MAAA,gBAAAF,uBAAA,eAAAC,OAAA;AACA,IAAAE,SAAA,gBAAAF,OAAA;AACA,IAAAG,UAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAEA,IAAAI,IAAA,gBAAAL,uBAAA,eAAAC,OAAA;
|
|
1
|
+
{"version":3,"file":"platform.js","names":["Context","_interopRequireWildcard","require","Effect","_Function","FileSystem","Etag","Headers","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","tag","Tag","make","impl","gen","_","fs","etagGen","Generator","of","fileResponse","path","options","pipe","bindTo","stat","bind","info","fromFileInfo","map","etag","start","Number","offset","end","bytesToRead","undefined","headers","empty","toString","mtime","_tag","value","toUTCString","contentLength","size","status","statusText","fileWebResponse","file","fromFileWeb","merge","unsafeFromRecord","Date","lastModified"],"sources":["../../../../src/internal/http/platform.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -1,16 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @since 1.0.0
|
|
3
|
+
*/
|
|
4
|
+
import type * as Brand from "effect/Brand";
|
|
1
5
|
import type * as Option from "effect/Option";
|
|
2
6
|
import * as ReadonlyRecord from "effect/ReadonlyRecord";
|
|
7
|
+
/**
|
|
8
|
+
* @since 1.0.0
|
|
9
|
+
* @category type ids
|
|
10
|
+
*/
|
|
11
|
+
export declare const HeadersTypeId: unique symbol;
|
|
12
|
+
/**
|
|
13
|
+
* @since 1.0.0
|
|
14
|
+
* @category type ids
|
|
15
|
+
*/
|
|
16
|
+
export type HeadersTypeId = typeof HeadersTypeId;
|
|
3
17
|
/**
|
|
4
18
|
* @since 1.0.0
|
|
5
19
|
* @category models
|
|
6
20
|
*/
|
|
7
|
-
export
|
|
8
|
-
}
|
|
21
|
+
export type Headers = Brand.Branded<ReadonlyRecord.ReadonlyRecord<string>, HeadersTypeId>;
|
|
9
22
|
/**
|
|
10
23
|
* @since 1.0.0
|
|
11
24
|
* @category models
|
|
12
25
|
*/
|
|
13
|
-
export type Input =
|
|
26
|
+
export type Input = ReadonlyRecord.ReadonlyRecord<string> | Iterable<readonly [string, string]>;
|
|
14
27
|
/**
|
|
15
28
|
* @since 1.0.0
|
|
16
29
|
* @category constructors
|
|
@@ -21,6 +34,11 @@ export declare const empty: Headers;
|
|
|
21
34
|
* @category constructors
|
|
22
35
|
*/
|
|
23
36
|
export declare const fromInput: (input?: Input) => Headers;
|
|
37
|
+
/**
|
|
38
|
+
* @since 1.0.0
|
|
39
|
+
* @category constructors
|
|
40
|
+
*/
|
|
41
|
+
export declare const unsafeFromRecord: (input: ReadonlyRecord.ReadonlyRecord<string>) => Headers;
|
|
24
42
|
/**
|
|
25
43
|
* @since 1.0.0
|
|
26
44
|
* @category combinators
|
|
@@ -53,6 +71,14 @@ export declare const setAll: {
|
|
|
53
71
|
(headers: Input): (self: Headers) => Headers;
|
|
54
72
|
(self: Headers, headers: Input): Headers;
|
|
55
73
|
};
|
|
74
|
+
/**
|
|
75
|
+
* @since 1.0.0
|
|
76
|
+
* @category combinators
|
|
77
|
+
*/
|
|
78
|
+
export declare const merge: {
|
|
79
|
+
(headers: Headers): (self: Headers) => Headers;
|
|
80
|
+
(self: Headers, headers: Headers): Headers;
|
|
81
|
+
};
|
|
56
82
|
/**
|
|
57
83
|
* @since 1.0.0
|
|
58
84
|
* @category combinators
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Headers.d.ts","sourceRoot":"","sources":["../../../src/Http/Headers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Headers.d.ts","sourceRoot":"","sources":["../../../src/Http/Headers.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAE5C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AAEvD;;;GAGG;AACH,eAAO,MAAM,aAAa,eAA8C,CAAA;AAExE;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAA;AAEhD;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,CAAA;AAEzF;;;GAGG;AACH,MAAM,MAAM,KAAK,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAE/F;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,OAAwC,CAAA;AAE5D;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,OAY1C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,UAAW,6BAA6B,CAAC,MAAM,CAAC,KAAG,OAA2B,CAAA;AAE3G;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;IACzC,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAIyB,CAAA;AAEhE;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACvD,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CAIW,CAAA;AAEhE;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE;IAChB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;IACxD,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;CAOnD,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;IAC5C,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAA;CAOvC,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE;IAClB,CAAC,OAAO,EAAE,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;IAC9C,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;CAOzC,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;IACzC,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAIuC,CAAA"}
|
|
@@ -7,6 +7,7 @@ import type * as Error from "../Error.js";
|
|
|
7
7
|
import type * as FileSystem from "../FileSystem.js";
|
|
8
8
|
import type * as Body from "./Body.js";
|
|
9
9
|
import type * as Etag from "./Etag.js";
|
|
10
|
+
import type * as Headers from "./Headers.js";
|
|
10
11
|
import type * as ServerResponse from "./ServerResponse.js";
|
|
11
12
|
/**
|
|
12
13
|
* @since 1.0.0
|
|
@@ -37,7 +38,7 @@ export interface Platform {
|
|
|
37
38
|
* @category constructors
|
|
38
39
|
*/
|
|
39
40
|
export declare const make: (impl: {
|
|
40
|
-
readonly fileResponse: (path: string, status: number, statusText: string | undefined, headers:
|
|
41
|
-
readonly fileWebResponse: (file: Body.Body.FileLike, status: number, statusText: string | undefined, headers:
|
|
41
|
+
readonly fileResponse: (path: string, status: number, statusText: string | undefined, headers: Headers.Headers, start: number, end: number | undefined, contentLength: number) => ServerResponse.ServerResponse;
|
|
42
|
+
readonly fileWebResponse: (file: Body.Body.FileLike, status: number, statusText: string | undefined, headers: Headers.Headers, options?: FileSystem.StreamOptions | undefined) => ServerResponse.ServerResponse;
|
|
42
43
|
}) => Effect.Effect<FileSystem.FileSystem | Etag.Generator, never, Platform>;
|
|
43
44
|
//# sourceMappingURL=Platform.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.d.ts","sourceRoot":"","sources":["../../../src/Http/Platform.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAEnD,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAE1D;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAwB,CAAA;AAEpD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAgB,CAAA;AAErE;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,YAAY,EAAE,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,KACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;IAC7E,QAAQ,CAAC,eAAe,EAAE,CACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EACxB,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,KACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;CAChE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CACjB,IAAI,EAAE;IACJ,QAAQ,CAAC,YAAY,EAAE,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Platform.d.ts","sourceRoot":"","sources":["../../../src/Http/Platform.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAEnD,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,KAAK,OAAO,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAE1D;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAwB,CAAA;AAEpD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAgB,CAAA;AAErE;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,YAAY,EAAE,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,KACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;IAC7E,QAAQ,CAAC,eAAe,EAAE,CACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EACxB,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,KACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,cAAc,CAAC,CAAA;CAChE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CACjB,IAAI,EAAE;IACJ,QAAQ,CAAC,YAAY,EAAE,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,aAAa,EAAE,MAAM,KAClB,cAAc,CAAC,cAAc,CAAA;IAClC,QAAQ,CAAC,eAAe,EAAE,CACxB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,OAAO,CAAC,EAAE,UAAU,CAAC,aAAa,GAAG,SAAS,KAC3C,cAAc,CAAC,cAAc,CAAA;CACnC,KACE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAiB,CAAA"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Chunk from "effect/Chunk";
|
|
5
4
|
import * as Effect from "effect/Effect";
|
|
6
5
|
/**
|
|
7
6
|
* @since 1.0.0
|
|
8
7
|
* @category models
|
|
9
8
|
*/
|
|
10
|
-
export interface UrlParams extends
|
|
9
|
+
export interface UrlParams extends ReadonlyArray<readonly [string, string]> {
|
|
11
10
|
}
|
|
12
11
|
/**
|
|
13
12
|
* @since 1.0.0
|
|
14
13
|
* @category models
|
|
15
14
|
*/
|
|
16
|
-
export type Input =
|
|
15
|
+
export type Input = Readonly<Record<string, string>> | Iterable<readonly [string, string]> | URLSearchParams;
|
|
17
16
|
/**
|
|
18
17
|
* @since 1.0.0
|
|
19
18
|
* @category constructors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlParams.d.ts","sourceRoot":"","sources":["../../../src/Http/UrlParams.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"UrlParams.d.ts","sourceRoot":"","sources":["../../../src/Http/UrlParams.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAIvC;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAAG;AAE9E;;;GAGG;AACH,MAAM,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,eAAe,CAAA;AAE5G;;;GAGG;AACH,eAAO,MAAM,SAAS,UAAW,KAAK,KAAG,SAKxC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,SAAc,CAAA;AAElC;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE;IAChB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAA;IAC5D,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAQtD,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAA;IAC9C,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;CAW1C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAA;IAC5D,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAQtD,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE;IACtB,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAA;IAC9C,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;CAQxC,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAA;IAC7C,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAIwB,CAAA;AAEnE;;;GAGG;AACH,eAAO,MAAM,QAAQ,SAAU,SAAS,KAAG,MAAqD,CAAA;AAEhG;;;GAGG;AACH,eAAO,MAAM,OAAO,WAAY,MAAM,UAAU,SAAS,eAAe,OAAO,uCAY3E,CAAA"}
|
package/dist/esm/Http/Headers.js
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @since 1.0.0
|
|
3
|
-
*/
|
|
4
1
|
import { dual } from "effect/Function";
|
|
5
2
|
import * as ReadonlyArray from "effect/ReadonlyArray";
|
|
6
3
|
import * as ReadonlyRecord from "effect/ReadonlyRecord";
|
|
4
|
+
/**
|
|
5
|
+
* @since 1.0.0
|
|
6
|
+
* @category type ids
|
|
7
|
+
*/
|
|
8
|
+
export const HeadersTypeId = /*#__PURE__*/Symbol.for("@effect/platform/Http/Headers");
|
|
7
9
|
/**
|
|
8
10
|
* @since 1.0.0
|
|
9
11
|
* @category constructors
|
|
10
12
|
*/
|
|
11
|
-
export const empty = /*#__PURE__*/
|
|
13
|
+
export const empty = /*#__PURE__*/Object.create(null);
|
|
12
14
|
/**
|
|
13
15
|
* @since 1.0.0
|
|
14
16
|
* @category constructors
|
|
@@ -21,6 +23,11 @@ export const fromInput = input => {
|
|
|
21
23
|
}
|
|
22
24
|
return ReadonlyRecord.fromEntries(Object.entries(input).map(([k, v]) => [k.toLowerCase(), v]));
|
|
23
25
|
};
|
|
26
|
+
/**
|
|
27
|
+
* @since 1.0.0
|
|
28
|
+
* @category constructors
|
|
29
|
+
*/
|
|
30
|
+
export const unsafeFromRecord = input => input;
|
|
24
31
|
/**
|
|
25
32
|
* @since 1.0.0
|
|
26
33
|
* @category combinators
|
|
@@ -47,6 +54,14 @@ export const setAll = /*#__PURE__*/dual(2, (self, headers) => ({
|
|
|
47
54
|
...self,
|
|
48
55
|
...fromInput(headers)
|
|
49
56
|
}));
|
|
57
|
+
/**
|
|
58
|
+
* @since 1.0.0
|
|
59
|
+
* @category combinators
|
|
60
|
+
*/
|
|
61
|
+
export const merge = /*#__PURE__*/dual(2, (self, headers) => ({
|
|
62
|
+
...self,
|
|
63
|
+
...headers
|
|
64
|
+
}));
|
|
50
65
|
/**
|
|
51
66
|
* @since 1.0.0
|
|
52
67
|
* @category combinators
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Headers.js","names":["dual","ReadonlyArray","ReadonlyRecord","empty","fromInput","input","undefined","
|
|
1
|
+
{"version":3,"file":"Headers.js","names":["dual","ReadonlyArray","ReadonlyRecord","HeadersTypeId","Symbol","for","empty","Object","create","fromInput","input","undefined","iterator","fromEntries","map","fromIterable","k","v","toLowerCase","entries","unsafeFromRecord","has","self","key","get","set","value","setAll","headers","merge","remove"],"sources":["../../../src/Http/Headers.ts"],"sourcesContent":[null],"mappings":"AAIA,SAASA,IAAI,QAAQ,iBAAiB;AAEtC,OAAO,KAAKC,aAAa,MAAM,sBAAsB;AACrD,OAAO,KAAKC,cAAc,MAAM,uBAAuB;AAEvD;;;;AAIA,OAAO,MAAMC,aAAa,gBAAGC,MAAM,CAACC,GAAG,CAAC,+BAA+B,CAAC;AAoBxE;;;;AAIA,OAAO,MAAMC,KAAK,gBAAYC,MAAM,CAACC,MAAM,CAAC,IAAI,CAAY;AAE5D;;;;AAIA,OAAO,MAAMC,SAAS,GAAgCC,KAAK,IAAI;EAC7D,IAAIA,KAAK,KAAKC,SAAS,EAAE;IACvB,OAAOL,KAAK;EACd,CAAC,MAAM,IAAIF,MAAM,CAACQ,QAAQ,IAAIF,KAAK,EAAE;IACnC,OAAOR,cAAc,CAACW,WAAW,CAACZ,aAAa,CAACa,GAAG,CACjDb,aAAa,CAACc,YAAY,CAACL,KAAK,CAAC,EACjC,CAAC,CAACM,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAU,CAC1C,CAAY;EACf;EACA,OAAOf,cAAc,CAACW,WAAW,CAC/BN,MAAM,CAACY,OAAO,CAACT,KAAK,CAAC,CAACI,GAAG,CAAC,CAAC,CAACE,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAC,CAAC,CACjD;AACd,CAAC;AAED;;;;AAIA,OAAO,MAAMG,gBAAgB,GAAIV,KAA4C,IAAcA,KAAgB;AAE3G;;;;AAIA,OAAO,MAAMW,GAAG,gBAGZrB,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEC,GAAG,KAAKrB,cAAc,CAACmB,GAAG,CAACC,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEhE;;;;AAIA,OAAO,MAAMM,GAAG,gBAGZxB,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEC,GAAG,KAAKrB,cAAc,CAACsB,GAAG,CAACF,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEhE;;;;AAIA,OAAO,MAAMO,GAAG,gBAGZzB,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEC,GAAG,EAAEG,KAAK,MAAM;EAC1B,GAAGJ,IAAI;EACP,CAACC,GAAG,CAACL,WAAW,EAAE,GAAGQ;CACtB,CAAC,CAAC;AAEH;;;;AAIA,OAAO,MAAMC,MAAM,gBAGf3B,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEM,OAAO,MAAM;EACvB,GAAGN,IAAI;EACP,GAAGb,SAAS,CAACmB,OAAO;CACrB,CAAC,CAAC;AAEH;;;;AAIA,OAAO,MAAMC,KAAK,gBAGd7B,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEM,OAAO,MAAM;EACvB,GAAGN,IAAI;EACP,GAAGM;CACJ,CAAC,CAAC;AAEH;;;;AAIA,OAAO,MAAME,MAAM,gBAGf9B,IAAI,CAGN,CAAC,EAAE,CAACsB,IAAI,EAAEC,GAAG,KAAKrB,cAAc,CAAC4B,MAAM,CAACR,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.js","names":["internal","TypeId","Platform","tag","make"],"sources":["../../../src/Http/Platform.ts"],"sourcesContent":[null],"mappings":"AAOA,OAAO,KAAKA,QAAQ,MAAM,8BAA8B;
|
|
1
|
+
{"version":3,"file":"Platform.js","names":["internal","TypeId","Platform","tag","make"],"sources":["../../../src/Http/Platform.ts"],"sourcesContent":[null],"mappings":"AAOA,OAAO,KAAKA,QAAQ,MAAM,8BAA8B;AAMxD;;;;AAIA,OAAO,MAAMC,MAAM,GAAkBD,QAAQ,CAACC,MAAM;AAQpD;;;;AAIA,OAAO,MAAMC,QAAQ,GAAoCF,QAAQ,CAACG,GAAG;AAkBrE;;;;AAIA,OAAO,MAAMC,IAAI,GAmB6DJ,QAAQ,CAACI,IAAI"}
|
|
@@ -1,60 +1,58 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Chunk from "effect/Chunk";
|
|
5
4
|
import * as Effect from "effect/Effect";
|
|
6
5
|
import { dual } from "effect/Function";
|
|
6
|
+
import * as ReadonlyArray from "effect/ReadonlyArray";
|
|
7
7
|
/**
|
|
8
8
|
* @since 1.0.0
|
|
9
9
|
* @category constructors
|
|
10
10
|
*/
|
|
11
11
|
export const fromInput = input => {
|
|
12
|
-
if (
|
|
13
|
-
return input;
|
|
14
|
-
} else if (Symbol.iterator in input) {
|
|
15
|
-
return Chunk.fromIterable(input);
|
|
12
|
+
if (Symbol.iterator in input) {
|
|
13
|
+
return ReadonlyArray.fromIterable(input);
|
|
16
14
|
}
|
|
17
|
-
return
|
|
15
|
+
return ReadonlyArray.fromIterable(Object.entries(input));
|
|
18
16
|
};
|
|
19
17
|
/**
|
|
20
18
|
* @since 1.0.0
|
|
21
19
|
* @category constructors
|
|
22
20
|
*/
|
|
23
|
-
export const empty =
|
|
21
|
+
export const empty = [];
|
|
24
22
|
/**
|
|
25
23
|
* @since 1.0.0
|
|
26
24
|
* @category combinators
|
|
27
25
|
*/
|
|
28
|
-
export const set = /*#__PURE__*/dual(3, (self, key, value) =>
|
|
26
|
+
export const set = /*#__PURE__*/dual(3, (self, key, value) => ReadonlyArray.append(ReadonlyArray.filter(self, ([k]) => k !== key), [key, value]));
|
|
29
27
|
/**
|
|
30
28
|
* @since 1.0.0
|
|
31
29
|
* @category combinators
|
|
32
30
|
*/
|
|
33
31
|
export const setAll = /*#__PURE__*/dual(2, (self, input) => {
|
|
34
32
|
const toSet = fromInput(input);
|
|
35
|
-
const keys =
|
|
36
|
-
return
|
|
33
|
+
const keys = toSet.map(([k]) => k);
|
|
34
|
+
return ReadonlyArray.appendAll(ReadonlyArray.filter(self, ([k]) => keys.includes(k)), toSet);
|
|
37
35
|
});
|
|
38
36
|
/**
|
|
39
37
|
* @since 1.0.0
|
|
40
38
|
* @category combinators
|
|
41
39
|
*/
|
|
42
|
-
export const append = /*#__PURE__*/dual(3, (self, key, value) =>
|
|
40
|
+
export const append = /*#__PURE__*/dual(3, (self, key, value) => ReadonlyArray.append(self, [key, value]));
|
|
43
41
|
/**
|
|
44
42
|
* @since 1.0.0
|
|
45
43
|
* @category combinators
|
|
46
44
|
*/
|
|
47
|
-
export const appendAll = /*#__PURE__*/dual(2, (self, input) =>
|
|
45
|
+
export const appendAll = /*#__PURE__*/dual(2, (self, input) => ReadonlyArray.appendAll(self, fromInput(input)));
|
|
48
46
|
/**
|
|
49
47
|
* @since 1.0.0
|
|
50
48
|
* @category combinators
|
|
51
49
|
*/
|
|
52
|
-
export const remove = /*#__PURE__*/dual(2, (self, key) =>
|
|
50
|
+
export const remove = /*#__PURE__*/dual(2, (self, key) => ReadonlyArray.filter(self, ([k]) => k !== key));
|
|
53
51
|
/**
|
|
54
52
|
* @since 1.0.0
|
|
55
53
|
* @category combinators
|
|
56
54
|
*/
|
|
57
|
-
export const toString = self => new URLSearchParams(
|
|
55
|
+
export const toString = self => new URLSearchParams(self).toString();
|
|
58
56
|
/**
|
|
59
57
|
* @since 1.0.0
|
|
60
58
|
* @category constructors
|
|
@@ -62,7 +60,7 @@ export const toString = self => new URLSearchParams(Chunk.toReadonlyArray(self))
|
|
|
62
60
|
export const makeUrl = (url, params, onError) => Effect.try({
|
|
63
61
|
try: () => {
|
|
64
62
|
const urlInstance = new URL(url, baseUrl());
|
|
65
|
-
|
|
63
|
+
ReadonlyArray.forEach(params, ([key, value]) => {
|
|
66
64
|
if (value !== undefined) {
|
|
67
65
|
urlInstance.searchParams.append(key, value);
|
|
68
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlParams.js","names":["
|
|
1
|
+
{"version":3,"file":"UrlParams.js","names":["Effect","dual","ReadonlyArray","fromInput","input","Symbol","iterator","fromIterable","Object","entries","empty","set","self","key","value","append","filter","k","setAll","toSet","keys","map","appendAll","includes","remove","toString","URLSearchParams","makeUrl","url","params","onError","try","urlInstance","URL","baseUrl","forEach","undefined","searchParams","catch","globalThis","location","origin","pathname"],"sources":["../../../src/Http/UrlParams.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as Cause from "effect/Cause";
|
|
1
2
|
import * as Effect from "effect/Effect";
|
|
2
3
|
import * as FiberRef from "effect/FiberRef";
|
|
3
4
|
import * as Function from "effect/Function";
|
|
@@ -25,7 +26,7 @@ export const logger = /*#__PURE__*/make(httpApp => {
|
|
|
25
26
|
return exit._tag === "Failure" ? Effect.annotateLogs(Effect.log(exit.cause), {
|
|
26
27
|
"http.method": request.method,
|
|
27
28
|
"http.url": request.url,
|
|
28
|
-
"http.status": 500
|
|
29
|
+
"http.status": Cause.isInterruptedOnly(exit.cause) ? 499 : 500
|
|
29
30
|
}) : Effect.annotateLogs(Effect.log(""), {
|
|
30
31
|
"http.method": request.method,
|
|
31
32
|
"http.url": request.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["Effect","FiberRef","Function","globalValue","Headers","IncomingMessage","ServerRequest","make","middleware","loggerDisabled","Symbol","for","unsafeMake","withLoggerDisabled","self","zipRight","set","currentTracerDisabledWhen","constFalse","withTracerDisabledWhen","dual","pred","locally","logger","httpApp","counter","flatMap","request","withLogSpan","onExit","exit","get","disabled","unit","_tag","annotateLogs","log","cause","method","url","value","status","tracer","appWithStatus","tap","response","annotateCurrentSpan","zip","disabledWhen","headers","orElseSucceed","schemaExternalSpan","undefined","succeed","parent","withSpan","attributes","xForwardedHeaders","updateService","modify","remoteAddress","split","trim"],"sources":["../../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,SAASC,WAAW,QAAQ,oBAAoB;AAEhD,OAAO,KAAKC,OAAO,MAAM,uBAAuB;AAChD,OAAO,KAAKC,eAAe,MAAM,+BAA+B;AAEhE,OAAO,KAAKC,aAAa,MAAM,6BAA6B;AAE5D;AACA,OAAO,MAAMC,IAAI,GAAqCC,UAAa,IAAQA,UAAU;AAErF;AACA,OAAO,MAAMC,cAAc,gBAAGN,WAAW,eACvCO,MAAM,CAACC,GAAG,CAAC,iDAAiD,CAAC,EAC7D,MAAMV,QAAQ,CAACW,UAAU,CAAC,KAAK,CAAC,CACjC;AAED;AACA,OAAO,MAAMC,kBAAkB,GAAaC,IAA4B,IACtEd,MAAM,CAACe,QAAQ,CACbd,QAAQ,CAACe,GAAG,CAACP,cAAc,EAAE,IAAI,CAAC,EAClCK,IAAI,CACL;AAEH;AACA,OAAO,MAAMG,yBAAyB,gBAAGd,WAAW,eAClDO,MAAM,CAACC,GAAG,CAAC,qDAAqD,CAAC,EACjE,MAAMV,QAAQ,CAACW,UAAU,CAAmDV,QAAQ,CAACgB,UAAU,CAAC,CACjG;AAED;AACA,OAAO,MAAMC,sBAAsB,gBAAGjB,QAAQ,CAACkB,IAAI,CAQjD,CAAC,EAAE,CAACN,IAAI,EAAEO,IAAI,KAAKrB,MAAM,CAACsB,OAAO,CAACR,IAAI,EAAEG,yBAAyB,EAAEI,IAAI,CAAC,CAAC;AAE3E;AACA,OAAO,MAAME,MAAM,gBAAGhB,IAAI,CAAEiB,OAAO,IAAI;EACrC,IAAIC,OAAO,GAAG,CAAC;EACf,OAAOzB,MAAM,CAAC0B,OAAO,CACnBpB,aAAa,CAACA,aAAa,EAC1BqB,OAAO,IACN3B,MAAM,CAAC4B,WAAW,CAChB5B,MAAM,CAAC6B,MAAM,CAACL,OAAO,EAAGM,IAAI,IAC1B9B,MAAM,CAAC0B,OAAO,CACZzB,QAAQ,CAAC8B,GAAG,CAACtB,cAAc,CAAC,EAC3BuB,QAAQ,IAAI;IACX,IAAIA,QAAQ,EAAE;MACZ,OAAOhC,MAAM,CAACiC,IAAI;IACpB;IACA,OAAOH,IAAI,CAACI,IAAI,KAAK,SAAS,GAC5BlC,MAAM,CAACmC,YAAY,CAACnC,MAAM,CAACoC,GAAG,CAACN,IAAI,CAACO,KAAK,CAAC,EAAE;MAC1C,aAAa,EAAEV,OAAO,CAACW,MAAM;MAC7B,UAAU,EAAEX,OAAO,CAACY,GAAG;MACvB,aAAa,
|
|
1
|
+
{"version":3,"file":"middleware.js","names":["Cause","Effect","FiberRef","Function","globalValue","Headers","IncomingMessage","ServerRequest","make","middleware","loggerDisabled","Symbol","for","unsafeMake","withLoggerDisabled","self","zipRight","set","currentTracerDisabledWhen","constFalse","withTracerDisabledWhen","dual","pred","locally","logger","httpApp","counter","flatMap","request","withLogSpan","onExit","exit","get","disabled","unit","_tag","annotateLogs","log","cause","method","url","isInterruptedOnly","value","status","tracer","appWithStatus","tap","response","annotateCurrentSpan","zip","disabledWhen","headers","orElseSucceed","schemaExternalSpan","undefined","succeed","parent","withSpan","attributes","xForwardedHeaders","updateService","modify","remoteAddress","split","trim"],"sources":["../../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import * as Effect from "effect/Effect";
|
|
|
3
3
|
import { pipe } from "effect/Function";
|
|
4
4
|
import * as FileSystem from "../../FileSystem.js";
|
|
5
5
|
import * as Etag from "../../Http/Etag.js";
|
|
6
|
+
import * as Headers from "../../Http/Headers.js";
|
|
6
7
|
/** @internal */
|
|
7
8
|
export const TypeId = /*#__PURE__*/Symbol.for("@effect/platform/Http/Platform");
|
|
8
9
|
/** @internal */
|
|
@@ -22,11 +23,9 @@ export const make = impl => Effect.gen(function* (_) {
|
|
|
22
23
|
}) => {
|
|
23
24
|
const start = Number(options?.offset ?? 0);
|
|
24
25
|
const end = options?.bytesToRead !== undefined ? start + Number(options.bytesToRead) : undefined;
|
|
25
|
-
const headers =
|
|
26
|
-
...(options?.headers ?? {}),
|
|
27
|
-
etag: Etag.toString(etag)
|
|
28
|
-
};
|
|
26
|
+
const headers = Headers.set(options?.headers ?? Headers.empty, "etag", Etag.toString(etag));
|
|
29
27
|
if (info.mtime._tag === "Some") {
|
|
28
|
+
;
|
|
30
29
|
headers["last-modified"] = info.mtime.value.toUTCString();
|
|
31
30
|
}
|
|
32
31
|
const contentLength = end !== undefined ? end - start : Number(info.size) - start;
|
|
@@ -35,11 +34,10 @@ export const make = impl => Effect.gen(function* (_) {
|
|
|
35
34
|
},
|
|
36
35
|
fileWebResponse(file, options) {
|
|
37
36
|
return Effect.map(etagGen.fromFileWeb(file), etag => {
|
|
38
|
-
const headers = {
|
|
39
|
-
...(options?.headers ?? {}),
|
|
37
|
+
const headers = Headers.merge(options?.headers ?? Headers.empty, Headers.unsafeFromRecord({
|
|
40
38
|
etag: Etag.toString(etag),
|
|
41
39
|
"last-modified": new Date(file.lastModified).toUTCString()
|
|
42
|
-
};
|
|
40
|
+
}));
|
|
43
41
|
return impl.fileWebResponse(file, options?.status ?? 200, options?.statusText, headers, options);
|
|
44
42
|
});
|
|
45
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","names":["Context","Effect","pipe","FileSystem","Etag","TypeId","Symbol","for","tag","Tag","make","impl","gen","_","fs","etagGen","Generator","of","fileResponse","path","options","bindTo","stat","bind","info","fromFileInfo","map","etag","start","Number","offset","end","bytesToRead","undefined","headers","toString","mtime","_tag","value","toUTCString","contentLength","size","status","statusText","fileWebResponse","file","fromFileWeb","Date","lastModified"],"sources":["../../../../src/internal/http/platform.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAEjD,OAAO,KAAKC,IAAI,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"platform.js","names":["Context","Effect","pipe","FileSystem","Etag","Headers","TypeId","Symbol","for","tag","Tag","make","impl","gen","_","fs","etagGen","Generator","of","fileResponse","path","options","bindTo","stat","bind","info","fromFileInfo","map","etag","start","Number","offset","end","bytesToRead","undefined","headers","set","empty","toString","mtime","_tag","value","toUTCString","contentLength","size","status","statusText","fileWebResponse","file","fromFileWeb","merge","unsafeFromRecord","Date","lastModified"],"sources":["../../../../src/internal/http/platform.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Http/Headers.ts
CHANGED
|
@@ -1,28 +1,41 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import type * as Brand from "effect/Brand"
|
|
4
5
|
import { dual } from "effect/Function"
|
|
5
6
|
import type * as Option from "effect/Option"
|
|
6
7
|
import * as ReadonlyArray from "effect/ReadonlyArray"
|
|
7
8
|
import * as ReadonlyRecord from "effect/ReadonlyRecord"
|
|
8
9
|
|
|
10
|
+
/**
|
|
11
|
+
* @since 1.0.0
|
|
12
|
+
* @category type ids
|
|
13
|
+
*/
|
|
14
|
+
export const HeadersTypeId = Symbol.for("@effect/platform/Http/Headers")
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* @since 1.0.0
|
|
18
|
+
* @category type ids
|
|
19
|
+
*/
|
|
20
|
+
export type HeadersTypeId = typeof HeadersTypeId
|
|
21
|
+
|
|
9
22
|
/**
|
|
10
23
|
* @since 1.0.0
|
|
11
24
|
* @category models
|
|
12
25
|
*/
|
|
13
|
-
export
|
|
26
|
+
export type Headers = Brand.Branded<ReadonlyRecord.ReadonlyRecord<string>, HeadersTypeId>
|
|
14
27
|
|
|
15
28
|
/**
|
|
16
29
|
* @since 1.0.0
|
|
17
30
|
* @category models
|
|
18
31
|
*/
|
|
19
|
-
export type Input =
|
|
32
|
+
export type Input = ReadonlyRecord.ReadonlyRecord<string> | Iterable<readonly [string, string]>
|
|
20
33
|
|
|
21
34
|
/**
|
|
22
35
|
* @since 1.0.0
|
|
23
36
|
* @category constructors
|
|
24
37
|
*/
|
|
25
|
-
export const empty: Headers =
|
|
38
|
+
export const empty: Headers = Object.create(null) as Headers
|
|
26
39
|
|
|
27
40
|
/**
|
|
28
41
|
* @since 1.0.0
|
|
@@ -35,13 +48,19 @@ export const fromInput: (input?: Input) => Headers = (input) => {
|
|
|
35
48
|
return ReadonlyRecord.fromEntries(ReadonlyArray.map(
|
|
36
49
|
ReadonlyArray.fromIterable(input),
|
|
37
50
|
([k, v]) => [k.toLowerCase(), v] as const
|
|
38
|
-
))
|
|
51
|
+
)) as Headers
|
|
39
52
|
}
|
|
40
53
|
return ReadonlyRecord.fromEntries(
|
|
41
54
|
Object.entries(input).map(([k, v]) => [k.toLowerCase(), v])
|
|
42
|
-
)
|
|
55
|
+
) as Headers
|
|
43
56
|
}
|
|
44
57
|
|
|
58
|
+
/**
|
|
59
|
+
* @since 1.0.0
|
|
60
|
+
* @category constructors
|
|
61
|
+
*/
|
|
62
|
+
export const unsafeFromRecord = (input: ReadonlyRecord.ReadonlyRecord<string>): Headers => input as Headers
|
|
63
|
+
|
|
45
64
|
/**
|
|
46
65
|
* @since 1.0.0
|
|
47
66
|
* @category combinators
|
|
@@ -96,6 +115,21 @@ export const setAll: {
|
|
|
96
115
|
...fromInput(headers)
|
|
97
116
|
}))
|
|
98
117
|
|
|
118
|
+
/**
|
|
119
|
+
* @since 1.0.0
|
|
120
|
+
* @category combinators
|
|
121
|
+
*/
|
|
122
|
+
export const merge: {
|
|
123
|
+
(headers: Headers): (self: Headers) => Headers
|
|
124
|
+
(self: Headers, headers: Headers): Headers
|
|
125
|
+
} = dual<
|
|
126
|
+
(headers: Headers) => (self: Headers) => Headers,
|
|
127
|
+
(self: Headers, headers: Headers) => Headers
|
|
128
|
+
>(2, (self, headers) => ({
|
|
129
|
+
...self,
|
|
130
|
+
...headers
|
|
131
|
+
}))
|
|
132
|
+
|
|
99
133
|
/**
|
|
100
134
|
* @since 1.0.0
|
|
101
135
|
* @category combinators
|
|
@@ -106,4 +140,4 @@ export const remove: {
|
|
|
106
140
|
} = dual<
|
|
107
141
|
(key: string) => (self: Headers) => Headers,
|
|
108
142
|
(self: Headers, key: string) => Headers
|
|
109
|
-
>(2, (self, key) => ReadonlyRecord.remove(self, key.toLowerCase()))
|
|
143
|
+
>(2, (self, key) => ReadonlyRecord.remove(self, key.toLowerCase()) as Headers)
|
package/src/Http/Platform.ts
CHANGED
|
@@ -8,6 +8,7 @@ import type * as FileSystem from "../FileSystem.js"
|
|
|
8
8
|
import * as internal from "../internal/http/platform.js"
|
|
9
9
|
import type * as Body from "./Body.js"
|
|
10
10
|
import type * as Etag from "./Etag.js"
|
|
11
|
+
import type * as Headers from "./Headers.js"
|
|
11
12
|
import type * as ServerResponse from "./ServerResponse.js"
|
|
12
13
|
|
|
13
14
|
/**
|
|
@@ -54,7 +55,7 @@ export const make: (
|
|
|
54
55
|
path: string,
|
|
55
56
|
status: number,
|
|
56
57
|
statusText: string | undefined,
|
|
57
|
-
headers:
|
|
58
|
+
headers: Headers.Headers,
|
|
58
59
|
start: number,
|
|
59
60
|
end: number | undefined,
|
|
60
61
|
contentLength: number
|
|
@@ -63,7 +64,7 @@ export const make: (
|
|
|
63
64
|
file: Body.Body.FileLike,
|
|
64
65
|
status: number,
|
|
65
66
|
statusText: string | undefined,
|
|
66
|
-
headers:
|
|
67
|
+
headers: Headers.Headers,
|
|
67
68
|
options?: FileSystem.StreamOptions | undefined
|
|
68
69
|
) => ServerResponse.ServerResponse
|
|
69
70
|
}
|
package/src/Http/UrlParams.ts
CHANGED
|
@@ -1,40 +1,38 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import * as Chunk from "effect/Chunk"
|
|
5
4
|
import * as Effect from "effect/Effect"
|
|
6
5
|
import { dual } from "effect/Function"
|
|
6
|
+
import * as ReadonlyArray from "effect/ReadonlyArray"
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* @since 1.0.0
|
|
10
10
|
* @category models
|
|
11
11
|
*/
|
|
12
|
-
export interface UrlParams extends
|
|
12
|
+
export interface UrlParams extends ReadonlyArray<readonly [string, string]> {}
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* @since 1.0.0
|
|
16
16
|
* @category models
|
|
17
17
|
*/
|
|
18
|
-
export type Input =
|
|
18
|
+
export type Input = Readonly<Record<string, string>> | Iterable<readonly [string, string]> | URLSearchParams
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* @since 1.0.0
|
|
22
22
|
* @category constructors
|
|
23
23
|
*/
|
|
24
24
|
export const fromInput = (input: Input): UrlParams => {
|
|
25
|
-
if (
|
|
26
|
-
return input
|
|
27
|
-
} else if (Symbol.iterator in input) {
|
|
28
|
-
return Chunk.fromIterable(input) as UrlParams
|
|
25
|
+
if (Symbol.iterator in input) {
|
|
26
|
+
return ReadonlyArray.fromIterable(input)
|
|
29
27
|
}
|
|
30
|
-
return
|
|
28
|
+
return ReadonlyArray.fromIterable(Object.entries(input))
|
|
31
29
|
}
|
|
32
30
|
|
|
33
31
|
/**
|
|
34
32
|
* @since 1.0.0
|
|
35
33
|
* @category constructors
|
|
36
34
|
*/
|
|
37
|
-
export const empty: UrlParams =
|
|
35
|
+
export const empty: UrlParams = []
|
|
38
36
|
|
|
39
37
|
/**
|
|
40
38
|
* @since 1.0.0
|
|
@@ -47,8 +45,8 @@ export const set: {
|
|
|
47
45
|
(key: string, value: string) => (self: UrlParams) => UrlParams,
|
|
48
46
|
(self: UrlParams, key: string, value: string) => UrlParams
|
|
49
47
|
>(3, (self, key, value) =>
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
ReadonlyArray.append(
|
|
49
|
+
ReadonlyArray.filter(self, ([k]) => k !== key),
|
|
52
50
|
[key, value]
|
|
53
51
|
))
|
|
54
52
|
|
|
@@ -64,9 +62,9 @@ export const setAll: {
|
|
|
64
62
|
(self: UrlParams, input: Input) => UrlParams
|
|
65
63
|
>(2, (self, input) => {
|
|
66
64
|
const toSet = fromInput(input)
|
|
67
|
-
const keys =
|
|
68
|
-
return
|
|
69
|
-
|
|
65
|
+
const keys = toSet.map(([k]) => k)
|
|
66
|
+
return ReadonlyArray.appendAll(
|
|
67
|
+
ReadonlyArray.filter(self, ([k]) => keys.includes(k)),
|
|
70
68
|
toSet
|
|
71
69
|
)
|
|
72
70
|
})
|
|
@@ -82,7 +80,7 @@ export const append: {
|
|
|
82
80
|
(key: string, value: string) => (self: UrlParams) => UrlParams,
|
|
83
81
|
(self: UrlParams, key: string, value: string) => UrlParams
|
|
84
82
|
>(3, (self, key, value) =>
|
|
85
|
-
|
|
83
|
+
ReadonlyArray.append(
|
|
86
84
|
self,
|
|
87
85
|
[key, value]
|
|
88
86
|
))
|
|
@@ -98,7 +96,7 @@ export const appendAll: {
|
|
|
98
96
|
(input: Input) => (self: UrlParams) => UrlParams,
|
|
99
97
|
(self: UrlParams, input: Input) => UrlParams
|
|
100
98
|
>(2, (self, input) =>
|
|
101
|
-
|
|
99
|
+
ReadonlyArray.appendAll(
|
|
102
100
|
self,
|
|
103
101
|
fromInput(input)
|
|
104
102
|
))
|
|
@@ -113,13 +111,13 @@ export const remove: {
|
|
|
113
111
|
} = dual<
|
|
114
112
|
(key: string) => (self: UrlParams) => UrlParams,
|
|
115
113
|
(self: UrlParams, key: string) => UrlParams
|
|
116
|
-
>(2, (self, key) =>
|
|
114
|
+
>(2, (self, key) => ReadonlyArray.filter(self, ([k]) => k !== key))
|
|
117
115
|
|
|
118
116
|
/**
|
|
119
117
|
* @since 1.0.0
|
|
120
118
|
* @category combinators
|
|
121
119
|
*/
|
|
122
|
-
export const toString = (self: UrlParams): string => new URLSearchParams(
|
|
120
|
+
export const toString = (self: UrlParams): string => new URLSearchParams(self as any).toString()
|
|
123
121
|
|
|
124
122
|
/**
|
|
125
123
|
* @since 1.0.0
|
|
@@ -129,7 +127,7 @@ export const makeUrl = <E>(url: string, params: UrlParams, onError: (e: unknown)
|
|
|
129
127
|
Effect.try({
|
|
130
128
|
try: () => {
|
|
131
129
|
const urlInstance = new URL(url, baseUrl())
|
|
132
|
-
|
|
130
|
+
ReadonlyArray.forEach(params, ([key, value]) => {
|
|
133
131
|
if (value !== undefined) {
|
|
134
132
|
urlInstance.searchParams.append(key, value)
|
|
135
133
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as Cause from "effect/Cause"
|
|
1
2
|
import * as Effect from "effect/Effect"
|
|
2
3
|
import * as FiberRef from "effect/FiberRef"
|
|
3
4
|
import * as Function from "effect/Function"
|
|
@@ -59,7 +60,7 @@ export const logger = make((httpApp) => {
|
|
|
59
60
|
Effect.annotateLogs(Effect.log(exit.cause), {
|
|
60
61
|
"http.method": request.method,
|
|
61
62
|
"http.url": request.url,
|
|
62
|
-
"http.status": 500
|
|
63
|
+
"http.status": Cause.isInterruptedOnly(exit.cause) ? 499 : 500
|
|
63
64
|
}) :
|
|
64
65
|
Effect.annotateLogs(Effect.log(""), {
|
|
65
66
|
"http.method": request.method,
|
|
@@ -4,6 +4,7 @@ import { pipe } from "effect/Function"
|
|
|
4
4
|
import * as FileSystem from "../../FileSystem.js"
|
|
5
5
|
import type * as Body from "../../Http/Body.js"
|
|
6
6
|
import * as Etag from "../../Http/Etag.js"
|
|
7
|
+
import * as Headers from "../../Http/Headers.js"
|
|
7
8
|
import type * as Platform from "../../Http/Platform.js"
|
|
8
9
|
import type * as ServerResponse from "../../Http/ServerResponse.js"
|
|
9
10
|
|
|
@@ -19,7 +20,7 @@ export const make = (impl: {
|
|
|
19
20
|
path: string,
|
|
20
21
|
status: number,
|
|
21
22
|
statusText: string | undefined,
|
|
22
|
-
headers:
|
|
23
|
+
headers: Headers.Headers,
|
|
23
24
|
start: number,
|
|
24
25
|
end: number | undefined,
|
|
25
26
|
contentLength: number
|
|
@@ -28,7 +29,7 @@ export const make = (impl: {
|
|
|
28
29
|
file: Body.Body.FileLike,
|
|
29
30
|
status: number,
|
|
30
31
|
statusText: string | undefined,
|
|
31
|
-
headers:
|
|
32
|
+
headers: Headers.Headers,
|
|
32
33
|
options?: FileSystem.StreamOptions
|
|
33
34
|
) => ServerResponse.ServerResponse
|
|
34
35
|
}): Effect.Effect<FileSystem.FileSystem | Etag.Generator, never, Platform.Platform> =>
|
|
@@ -45,12 +46,9 @@ export const make = (impl: {
|
|
|
45
46
|
Effect.map(({ etag, info }) => {
|
|
46
47
|
const start = Number(options?.offset ?? 0)
|
|
47
48
|
const end = options?.bytesToRead !== undefined ? start + Number(options.bytesToRead) : undefined
|
|
48
|
-
const headers
|
|
49
|
-
...(options?.headers ?? {}),
|
|
50
|
-
etag: Etag.toString(etag)
|
|
51
|
-
}
|
|
49
|
+
const headers = Headers.set(options?.headers ?? Headers.empty, "etag", Etag.toString(etag))
|
|
52
50
|
if (info.mtime._tag === "Some") {
|
|
53
|
-
headers["last-modified"] = info.mtime.value.toUTCString()
|
|
51
|
+
;(headers as any)["last-modified"] = info.mtime.value.toUTCString()
|
|
54
52
|
}
|
|
55
53
|
const contentLength = end !== undefined ? end - start : Number(info.size) - start
|
|
56
54
|
return impl.fileResponse(
|
|
@@ -67,11 +65,13 @@ export const make = (impl: {
|
|
|
67
65
|
},
|
|
68
66
|
fileWebResponse(file, options) {
|
|
69
67
|
return Effect.map(etagGen.fromFileWeb(file), (etag) => {
|
|
70
|
-
const headers
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
68
|
+
const headers = Headers.merge(
|
|
69
|
+
options?.headers ?? Headers.empty,
|
|
70
|
+
Headers.unsafeFromRecord({
|
|
71
|
+
etag: Etag.toString(etag),
|
|
72
|
+
"last-modified": new Date(file.lastModified).toUTCString()
|
|
73
|
+
})
|
|
74
|
+
)
|
|
75
75
|
return impl.fileWebResponse(
|
|
76
76
|
file,
|
|
77
77
|
options?.status ?? 200,
|