@effect/platform-node 0.16.0 → 0.16.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/internal/commandExecutor.js +7 -0
- package/internal/commandExecutor.js.map +1 -1
- package/internal/http/incomingMessage.js +5 -1
- package/internal/http/incomingMessage.js.map +1 -1
- package/internal/http/server.js +5 -8
- package/internal/http/server.js.map +1 -1
- package/mjs/internal/commandExecutor.mjs +7 -0
- package/mjs/internal/commandExecutor.mjs.map +1 -1
- package/mjs/internal/http/incomingMessage.mjs +5 -1
- package/mjs/internal/http/incomingMessage.mjs.map +1 -1
- package/mjs/internal/http/server.mjs +5 -8
- package/mjs/internal/http/server.mjs.map +1 -1
- package/package.json +2 -2
- package/src/internal/commandExecutor.ts +18 -0
- package/src/internal/http/incomingMessage.ts +6 -1
- package/src/internal/http/server.ts +19 -20
|
@@ -48,6 +48,10 @@ const runCommand = fileSystem => command => {
|
|
|
48
48
|
...Object.fromEntries(command.env)
|
|
49
49
|
}
|
|
50
50
|
});
|
|
51
|
+
let exited = false;
|
|
52
|
+
handle.on("exit", () => {
|
|
53
|
+
exited = true;
|
|
54
|
+
});
|
|
51
55
|
// If starting the process throws an error, make sure to capture it
|
|
52
56
|
handle.on("error", err => {
|
|
53
57
|
handle.kill("SIGKILL");
|
|
@@ -61,6 +65,9 @@ const runCommand = fileSystem => command => {
|
|
|
61
65
|
stdin = (0, _sink.fromWritable)(() => handle.stdin, err => toPlatformError("toWritable", toError(err), command));
|
|
62
66
|
}
|
|
63
67
|
const exitCode = Effect.async(resume => {
|
|
68
|
+
if (exited) {
|
|
69
|
+
return resume(handle.exitCode !== null ? Effect.succeed(CommandExecutor.ExitCode(handle.exitCode)) : Effect.fail(toPlatformError("exitCode", new globalThis.Error(`Process interrupted due to receipt of signal: ${handle.signalCode}`), command)));
|
|
70
|
+
}
|
|
64
71
|
handle.on("exit", (code, signal) => {
|
|
65
72
|
if (code !== null) {
|
|
66
73
|
resume(Effect.succeed(CommandExecutor.ExitCode(code)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecutor.js","names":["_Function","require","Option","_interopRequireWildcard","Effect","Layer","_error","_sink","_stream","Command","CommandExecutor","FileSystem","Sink","Stream","ChildProcess","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","inputToStdioOption","stdin","match","onNone","onSome","outputToStdioOption","output","toError","err","globalThis","Error","String","toPlatformError","method","error","command","flattened","flatten","reduce","acc","curr","args","join","length","handleErrnoException","runCommand","fileSystem","_tag","tap","process","unit","forkDaemon","run","flatMap","env","async","resume","handle","spawn","stdio","stdout","stderr","cwd","getOrElse","constUndefined","fromEntries","on","kill","fail","pid","drain","fromWritable","exitCode","
|
|
1
|
+
{"version":3,"file":"commandExecutor.js","names":["_Function","require","Option","_interopRequireWildcard","Effect","Layer","_error","_sink","_stream","Command","CommandExecutor","FileSystem","Sink","Stream","ChildProcess","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","inputToStdioOption","stdin","match","onNone","onSome","outputToStdioOption","output","toError","err","globalThis","Error","String","toPlatformError","method","error","command","flattened","flatten","reduce","acc","curr","args","join","length","handleErrnoException","runCommand","fileSystem","_tag","tap","process","unit","forkDaemon","run","flatMap","env","async","resume","handle","spawn","stdio","stdout","stderr","cwd","getOrElse","constUndefined","fromEntries","exited","on","kill","fail","pid","drain","fromWritable","exitCode","succeed","ExitCode","signalCode","code","signal","sync","isRunning","killed","ProcessId","fromReadable","transduce","ProcessTypeId","zipRight","dir","access","head","tail","slice","initial","last","stream","layer","effect","map","makeExecutor","exports"],"sources":["../src/internal/commandExecutor.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -15,14 +15,18 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
15
15
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
16
|
/** @internal */
|
|
17
17
|
class IncomingMessageImpl {
|
|
18
|
-
constructor(source, onError) {
|
|
18
|
+
constructor(source, onError, remoteAddressOverride) {
|
|
19
19
|
this.source = source;
|
|
20
20
|
this.onError = onError;
|
|
21
|
+
this.remoteAddressOverride = remoteAddressOverride;
|
|
21
22
|
this[IncomingMessage.TypeId] = IncomingMessage.TypeId;
|
|
22
23
|
}
|
|
23
24
|
get headers() {
|
|
24
25
|
return Headers.fromInput(this.source.headers);
|
|
25
26
|
}
|
|
27
|
+
get remoteAddress() {
|
|
28
|
+
return Option.fromNullable(this.remoteAddressOverride ?? this.source.socket.remoteAddress);
|
|
29
|
+
}
|
|
26
30
|
get text() {
|
|
27
31
|
if (this.textEffect) {
|
|
28
32
|
return this.textEffect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incomingMessage.js","names":["Option","_interopRequireWildcard","require","Effect","FiberRef","NodeStream","Headers","IncomingMessage","UrlParams","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","IncomingMessageImpl","constructor","source","onError","TypeId","headers","fromInput","text","textEffect","runSync","cached","flatMap","maxBodySize","toString","readable","onFailure","maxBytes","getOrUndefined","json","tryMap","try","_","JSON","parse","catch","urlParamsBody","URLSearchParams","stream","fromReadable","arrayBuffer","toUint8Array","exports"],"sources":["../../src/internal/http/incomingMessage.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,MAAA,gBAAAF,uBAAA,eAAAC,OAAA;AACA,IAAAE,QAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,UAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AACA,IAAAI,OAAA,gBAAAL,uBAAA,eAAAC,OAAA;AACA,IAAAK,eAAA,gBAAAN,uBAAA,eAAAC,OAAA;AACA,IAAAM,SAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAA4D,SAAAO,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAT,wBAAAa,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAI5D;AACM,MAAOW,mBAAmB;EAG9BC,YACWC,MAA4B,EAC5BC,OAA8B;
|
|
1
|
+
{"version":3,"file":"incomingMessage.js","names":["Option","_interopRequireWildcard","require","Effect","FiberRef","NodeStream","Headers","IncomingMessage","UrlParams","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","IncomingMessageImpl","constructor","source","onError","remoteAddressOverride","TypeId","headers","fromInput","remoteAddress","fromNullable","socket","text","textEffect","runSync","cached","flatMap","maxBodySize","toString","readable","onFailure","maxBytes","getOrUndefined","json","tryMap","try","_","JSON","parse","catch","urlParamsBody","URLSearchParams","stream","fromReadable","arrayBuffer","toUint8Array","exports"],"sources":["../../src/internal/http/incomingMessage.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/internal/http/server.js
CHANGED
|
@@ -89,18 +89,21 @@ const respond = /*#__PURE__*/Middleware.make(httpApp => Effect.flatMap(ServerReq
|
|
|
89
89
|
}
|
|
90
90
|
}))));
|
|
91
91
|
class ServerRequestImpl extends _incomingMessage.IncomingMessageImpl {
|
|
92
|
-
constructor(source, response, url = source.url, headersOverride) {
|
|
92
|
+
constructor(source, response, url = source.url, headersOverride, remoteAddressOverride) {
|
|
93
93
|
super(source, _ => Error.RequestError({
|
|
94
94
|
request: this,
|
|
95
95
|
reason: "Decode",
|
|
96
96
|
error: _
|
|
97
|
-
}));
|
|
97
|
+
}), remoteAddressOverride);
|
|
98
98
|
this.source = source;
|
|
99
99
|
this.response = response;
|
|
100
100
|
this.url = url;
|
|
101
101
|
this.headersOverride = headersOverride;
|
|
102
102
|
this[ServerRequest.TypeId] = ServerRequest.TypeId;
|
|
103
103
|
}
|
|
104
|
+
modify(options) {
|
|
105
|
+
return new ServerRequestImpl(this.source, this.response, options.url ?? this.url, options.headers ?? this.headersOverride, options.remoteAddress ?? this.remoteAddressOverride);
|
|
106
|
+
}
|
|
104
107
|
get originalUrl() {
|
|
105
108
|
return this.source.url;
|
|
106
109
|
}
|
|
@@ -121,12 +124,6 @@ class ServerRequestImpl extends _incomingMessage.IncomingMessageImpl {
|
|
|
121
124
|
get formDataStream() {
|
|
122
125
|
return internalFormData.stream(this.source, this.source.headers);
|
|
123
126
|
}
|
|
124
|
-
setUrl(url) {
|
|
125
|
-
return new ServerRequestImpl(this.source, this.response, url, this.headersOverride);
|
|
126
|
-
}
|
|
127
|
-
replaceHeaders(headers) {
|
|
128
|
-
return new ServerRequestImpl(this.source, this.response, this.url, headers);
|
|
129
|
-
}
|
|
130
127
|
toString() {
|
|
131
128
|
return `ServerRequest(${this.method} ${this.url})`;
|
|
132
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","names":["Option","_interopRequireWildcard","require","Config","Effect","Fiber","Layer","Runtime","internalFormData","_incomingMessage","internalPlatform","NodeSink","FileSystem","IncomingMessage","Middleware","Server","Error","ServerRequest","Stream","_nodeStream","_promises","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","evaluate","options","gen","_","server","serverFiber","addFinalizer","async","resume","close","error","die","unit","zipRight","on","fail","ServeError","scoped","forkScoped","listen","address","_tag","path","hostname","port","serve","httpApp","middleware","handledApp","respond","flatMap","all","runtime","fiberId","runFork","handler","nodeRequest","nodeResponse","fiber","provideService","ServerRequestImpl","writableEnded","interruptAsFork","acquireRelease","sync","off","join","discard","concurrency","pipe","locally","maxBodySize","some","Size","exports","request","tapErrorCause","tap","response","handleResponse","_cause","headersSent","writeHead","end","IncomingMessageImpl","constructor","source","url","headersOverride","RequestError","reason","TypeId","originalUrl","method","headers","formData","formDataEffect","runSync","cached","formDataStream","stream","setUrl","replaceHeaders","toString","toJSON","layer","merge","layerConfig","config","unwrap","suspend","status","body","tryPromise","try","signal","pipeline","catch","ResponseError","r","Response","fromEntries","Readable","fromWeb","once","run","mapError","fromWritable"],"sources":["../../src/internal/http/server.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","names":["Option","_interopRequireWildcard","require","Config","Effect","Fiber","Layer","Runtime","internalFormData","_incomingMessage","internalPlatform","NodeSink","FileSystem","IncomingMessage","Middleware","Server","Error","ServerRequest","Stream","_nodeStream","_promises","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","evaluate","options","gen","_","server","serverFiber","addFinalizer","async","resume","close","error","die","unit","zipRight","on","fail","ServeError","scoped","forkScoped","listen","address","_tag","path","hostname","port","serve","httpApp","middleware","handledApp","respond","flatMap","all","runtime","fiberId","runFork","handler","nodeRequest","nodeResponse","fiber","provideService","ServerRequestImpl","writableEnded","interruptAsFork","acquireRelease","sync","off","join","discard","concurrency","pipe","locally","maxBodySize","some","Size","exports","request","tapErrorCause","tap","response","handleResponse","_cause","headersSent","writeHead","end","IncomingMessageImpl","constructor","source","url","headersOverride","remoteAddressOverride","RequestError","reason","TypeId","modify","headers","remoteAddress","originalUrl","method","formData","formDataEffect","runSync","cached","formDataStream","stream","toString","toJSON","layer","merge","layerConfig","config","unwrap","suspend","status","body","tryPromise","try","signal","pipeline","catch","ResponseError","r","Response","fromEntries","Readable","fromWeb","once","run","mapError","fromWritable"],"sources":["../../src/internal/http/server.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -40,6 +40,10 @@ const runCommand = fileSystem => command => {
|
|
|
40
40
|
...Object.fromEntries(command.env)
|
|
41
41
|
}
|
|
42
42
|
});
|
|
43
|
+
let exited = false;
|
|
44
|
+
handle.on("exit", () => {
|
|
45
|
+
exited = true;
|
|
46
|
+
});
|
|
43
47
|
// If starting the process throws an error, make sure to capture it
|
|
44
48
|
handle.on("error", err => {
|
|
45
49
|
handle.kill("SIGKILL");
|
|
@@ -53,6 +57,9 @@ const runCommand = fileSystem => command => {
|
|
|
53
57
|
stdin = fromWritable(() => handle.stdin, err => toPlatformError("toWritable", toError(err), command));
|
|
54
58
|
}
|
|
55
59
|
const exitCode = Effect.async(resume => {
|
|
60
|
+
if (exited) {
|
|
61
|
+
return resume(handle.exitCode !== null ? Effect.succeed(CommandExecutor.ExitCode(handle.exitCode)) : Effect.fail(toPlatformError("exitCode", new globalThis.Error(`Process interrupted due to receipt of signal: ${handle.signalCode}`), command)));
|
|
62
|
+
}
|
|
56
63
|
handle.on("exit", (code, signal) => {
|
|
57
64
|
if (code !== null) {
|
|
58
65
|
resume(Effect.succeed(CommandExecutor.ExitCode(code)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecutor.mjs","names":["constUndefined","Option","Effect","Layer","handleErrnoException","fromWritable","fromReadable","Command","CommandExecutor","FileSystem","Sink","Stream","ChildProcess","inputToStdioOption","stdin","match","onNone","onSome","outputToStdioOption","output","toError","err","globalThis","Error","String","toPlatformError","method","error","command","flattened","flatten","reduce","acc","curr","args","join","length","runCommand","fileSystem","_tag","tap","process","unit","forkDaemon","run","flatMap","env","async","resume","handle","spawn","stdio","stdout","stderr","cwd","getOrElse","Object","fromEntries","on","kill","fail","pid","drain","exitCode","
|
|
1
|
+
{"version":3,"file":"commandExecutor.mjs","names":["constUndefined","Option","Effect","Layer","handleErrnoException","fromWritable","fromReadable","Command","CommandExecutor","FileSystem","Sink","Stream","ChildProcess","inputToStdioOption","stdin","match","onNone","onSome","outputToStdioOption","output","toError","err","globalThis","Error","String","toPlatformError","method","error","command","flattened","flatten","reduce","acc","curr","args","join","length","runCommand","fileSystem","_tag","tap","process","unit","forkDaemon","run","flatMap","env","async","resume","handle","spawn","stdio","stdout","stderr","cwd","getOrElse","Object","fromEntries","exited","on","kill","fail","pid","drain","exitCode","succeed","ExitCode","signalCode","code","signal","sync","isRunning","killed","ProcessId","transduce","ProcessTypeId","zipRight","dir","access","head","tail","slice","initial","last","stream","layer","effect","map","makeExecutor"],"sources":["../../src/internal/commandExecutor.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,cAAc,QAAc,uBAAuB;AAC5D,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,SAASC,oBAAoB,QAAQ,sCAAsC;AAC3E,SAASC,YAAY,QAAQ,qCAAqC;AAClE,SAASC,YAAY,QAAQ,uCAAuC;AACpE,OAAO,KAAKC,OAAO,MAAM,0BAA0B;AACnD,OAAO,KAAKC,eAAe,MAAM,kCAAkC;AAEnE,OAAO,KAAKC,UAAU,MAAM,6BAA6B;AACzD,OAAO,KAAKC,IAAI,MAAM,qBAAqB;AAC3C,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAC/C,OAAO,KAAKC,YAAY,MAAM,oBAAoB;AAElD,MAAMC,kBAAkB,GAAIC,KAA2C,IACrEb,MAAM,CAACc,KAAK,CAACD,KAAK,EAAE;EAAEE,MAAM,EAAEA,CAAA,KAAM,SAAS;EAAEC,MAAM,EAAEA,CAAA,KAAM;AAAM,CAAE,CAAC;AAExE,MAAMC,mBAAmB,GAAIC,MAA8B,IACzD,OAAOA,MAAM,KAAK,QAAQ,GAAGA,MAAM,GAAG,MAAM;AAE9C,MAAMC,OAAO,GAAIC,GAAY,IAAYA,GAAG,YAAYC,UAAU,CAACC,KAAK,GAAGF,GAAG,GAAG,IAAIC,UAAU,CAACC,KAAK,CAACC,MAAM,CAACH,GAAG,CAAC,CAAC;AAElH,MAAMI,eAAe,GAAGA,CACtBC,MAAc,EACdC,KAA4B,EAC5BC,OAAwB,KACD;EACvB,MAAMC,SAAS,GAAGtB,OAAO,CAACuB,OAAO,CAACF,OAAO,CAAC,CAACG,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAI;IAC9D,MAAML,OAAO,GAAG,GAAGK,IAAI,CAACL,OAAO,IAAIK,IAAI,CAACC,IAAI,CAACC,IAAI,CAAC,GAAG,CAAC,EAAE;IACxD,OAAOH,GAAG,CAACI,MAAM,KAAK,CAAC,GAAGR,OAAO,GAAG,GAAGI,GAAG,MAAMJ,OAAO,EAAE;EAC3D,CAAC,EAAE,EAAE,CAAC;EACN,OAAOxB,oBAAoB,CAAC,SAAS,EAAEsB,MAAM,CAAC,CAACC,KAAK,EAAE,CAACE,SAAS,CAAC,CAAC;AACpE,CAAC;AAED,MAAMQ,UAAU,GACbC,UAAiC,IACjCV,OAAwB,IAAwE;EAC/F,QAAQA,OAAO,CAACW,IAAI;IAClB,KAAK,iBAAiB;MAAE;QACtB,OA2IErC,MAAM,CAACsC,GAAG,CAAEC,OAAO,IACjBxC,MAAM,CAACc,KAAK,CAACa,OAAO,CAACd,KAAK,EAAE;UAC1BE,MAAM,EAAEA,CAAA,KAAMd,MAAM,CAACwC,IAAI;UACzBzB,MAAM,EAAGH,KAAK,IAAKZ,MAAM,CAACyC,UAAU,CAAChC,MAAM,CAACiC,GAAG,CAAC9B,KAAK,EAAE2B,OAAO,CAAC3B,KAAK,CAAC;SACtE,CAAC,CACH,CAzIDZ,MAAM,CAAC2C,OAAO,CAAEC,GAAG,IACjB5C,MAAM,CAAC6C,KAAK,CAAuDC,MAAM,IAAI;UAC3E,MAAMC,MAAM,GAAGrC,YAAY,CAACsC,KAAK,CAACtB,OAAO,CAACA,OAAO,EAAEA,OAAO,CAACM,IAAI,EAAE;YAC/DiB,KAAK,EAAE,CACLtC,kBAAkB,CAACe,OAAO,CAACd,KAAK,CAAC,EACjCI,mBAAmB,CAACU,OAAO,CAACwB,MAAM,CAAC,EACnClC,mBAAmB,CAACU,OAAO,CAACyB,MAAM,CAAC,CACpC;YACDC,GAAG,EAAErD,MAAM,CAACsD,SAAS,CAAC3B,OAAO,CAAC0B,GAAG,EAAEtD,cAAc,CAAC;YAClD8C,GAAG,EAAE;cAAE,GAAGA,GAAG;cAAE,GAAGU,MAAM,CAACC,WAAW,CAAC7B,OAAO,CAACkB,GAAG;YAAC;WAClD,CAAC;UACF,IAAIY,MAAM,GAAG,KAAK;UAClBT,MAAM,CAACU,EAAE,CAAC,MAAM,EAAE,MAAK;YACrBD,MAAM,GAAG,IAAI;UACf,CAAC,CAAC;UAEF;UACAT,MAAM,CAACU,EAAE,CAAC,OAAO,EAAGtC,GAAG,IAAI;YACzB4B,MAAM,CAACW,IAAI,CAAC,SAAS,CAAC;YACtBZ,MAAM,CAAC9C,MAAM,CAAC2D,IAAI,CAACpC,eAAe,CAAC,OAAO,EAAEJ,GAAG,EAAEO,OAAO,CAAC,CAAC,CAAC;UAC7D,CAAC,CAAC;UAEF;UACA;UACA,IAAIqB,MAAM,CAACa,GAAG,EAAE;YACd,IAAIhD,KAAK,GAAgEJ,IAAI,CAACqD,KAAK;YAEnF,IAAId,MAAM,CAACnC,KAAK,KAAK,IAAI,EAAE;cACzBA,KAAK,GAAGT,YAAY,CAClB,MAAM4C,MAAM,CAACnC,KAAM,EAClBO,GAAG,IAAKI,eAAe,CAAC,YAAY,EAAEL,OAAO,CAACC,GAAG,CAAC,EAAEO,OAAO,CAAC,CAC9D;;YAGH,MAAMoC,QAAQ,GAAwC9D,MAAM,CAAC6C,KAAK,CAAEC,MAAM,IAAI;cAC5E,IAAIU,MAAM,EAAE;gBACV,OAAOV,MAAM,CACXC,MAAM,CAACe,QAAQ,KAAK,IAAI,GACpB9D,MAAM,CAAC+D,OAAO,CAACzD,eAAe,CAAC0D,QAAQ,CAACjB,MAAM,CAACe,QAAQ,CAAC,CAAC,GACzD9D,MAAM,CAAC2D,IAAI,CACXpC,eAAe,CACb,UAAU,EACV,IAAIH,UAAU,CAACC,KAAK,CAAC,iDAAiD0B,MAAM,CAACkB,UAAU,EAAE,CAAC,EAC1FvC,OAAO,CACR,CACF,CACJ;;cAGHqB,MAAM,CAACU,EAAE,CAAC,MAAM,EAAE,CAACS,IAAI,EAAEC,MAAM,KAAI;gBACjC,IAAID,IAAI,KAAK,IAAI,EAAE;kBACjBpB,MAAM,CAAC9C,MAAM,CAAC+D,OAAO,CAACzD,eAAe,CAAC0D,QAAQ,CAACE,IAAI,CAAC,CAAC,CAAC;iBACvD,MAAM;kBACL;kBACA;kBACA;kBACApB,MAAM,CACJ9C,MAAM,CAAC2D,IAAI,CACTpC,eAAe,CACb,UAAU,EACV,IAAIH,UAAU,CAACC,KAAK,CAAC,iDAAiD8C,MAAM,EAAE,CAAC,EAC/EzC,OAAO,CACR,CACF,CACF;;cAEL,CAAC,CAAC;cACF;cACA;cACA,OAAO1B,MAAM,CAACoE,IAAI,CAAC,MAAK;gBACtBrB,MAAM,CAACW,IAAI,CAAC,SAAS,CAAC;cACxB,CAAC,CAAC;YACJ,CAAC,CAAC;YAEF,MAAMW,SAAS,GAAGrE,MAAM,CAACoE,IAAI,CAAC,MAC5BrB,MAAM,CAACe,QAAQ,KAAK,IAAI,IACxBf,MAAM,CAACkB,UAAU,KAAK,IAAI,IAC1B,CAAClB,MAAM,CAACuB,MAAM,CACf;YAED,MAAMZ,IAAI,GAAoCA,CAACS,MAAM,GAAG,SAAS,KAC/DnE,MAAM,CAAC6C,KAAK,CAAEC,MAAM,IAAI;cACtBC,MAAM,CAACW,IAAI,CAACS,MAAM,CAAC;cACnBpB,MAAM,CAACU,EAAE,CAAC,MAAM,EAAE,MAAK;gBACrBX,MAAM,CAAC9C,MAAM,CAACwC,IAAI,CAAC;cACrB,CAAC,CAAC;cACF;cACA;cACA,OAAOxC,MAAM,CAACoE,IAAI,CAAC,MAAK;gBACtBrB,MAAM,CAACW,IAAI,CAAC,SAAS,CAAC;cACxB,CAAC,CAAC;YACJ,CAAC,CAAC;YAEJZ,MAAM,CAAC9C,MAAM,CAACoE,IAAI,CAA0B,MAAK;cAC/C,MAAMR,GAAG,GAAGtD,eAAe,CAACiE,SAAS,CAACxB,MAAM,CAACa,GAAI,CAAC;cAClD,MAAMT,MAAM,GAAG/C,YAAY,CACzB,MAAM2C,MAAM,CAACI,MAAO,EACnBhC,GAAG,IAAKI,eAAe,CAAC,sBAAsB,EAAEL,OAAO,CAACC,GAAG,CAAC,EAAEO,OAAO,CAAC,CACxE;cACD,IAAIwB,MAAM,GAA0D9C,YAAY,CAI9E,MAAM2C,MAAM,CAACG,MAAO,EACnB/B,GAAG,IAAKI,eAAe,CAAC,sBAAsB,EAAEL,OAAO,CAACC,GAAG,CAAC,EAAEO,OAAO,CAAC,CACxE;cACD;cACA,IAAI,OAAOA,OAAO,CAACwB,MAAM,KAAK,QAAQ,EAAE;gBACtCA,MAAM,GAAGzC,MAAM,CAAC+D,SAAS,CAACtB,MAAM,EAAExB,OAAO,CAACwB,MAAM,CAAC;;cAEnD,OAAO;gBACL,CAAC5C,eAAe,CAACmE,aAAa,GAAGnE,eAAe,CAACmE,aAAa;gBAC9Db,GAAG;gBACHE,QAAQ;gBACRO,SAAS;gBACTX,IAAI;gBACJ9C,KAAK;gBACLuC,MAAM;gBACND;eACD;YACH,CAAC,CAAC,CAAC;;UAEL,OAAOlD,MAAM,CAAC6C,KAAK,CAAsBC,MAAM,IAAI;YACjD,IAAIC,MAAM,CAACa,GAAG,EAAE;cACdb,MAAM,CAACW,IAAI,CAAC,SAAS,CAAC;;YAExBX,MAAM,CAACU,EAAE,CAAC,MAAM,EAAE,MAAK;cACrBX,MAAM,CAAC9C,MAAM,CAACwC,IAAI,CAAC;YACrB,CAAC,CAAC;UACJ,CAAC,CAAC;QACJ,CAAC,CAAC,CACH,CApIDxC,MAAM,CAAC0E,QAAQ,CAAC1E,MAAM,CAACoE,IAAI,CAAC,MAAMhD,UAAU,CAACmB,OAAO,CAACK,GAAG,CAAC,CAAC;QAL1D;QACA7C,MAAM,CAACc,KAAK,CAACa,OAAO,CAAC0B,GAAG,EAAE;UACxBtC,MAAM,EAAEA,CAAA,KAAMd,MAAM,CAACwC,IAAI;UACzBzB,MAAM,EAAG4D,GAAG,IAAKvC,UAAU,CAACwC,MAAM,CAACD,GAAG;SACvC,CAAC;;IA8IN,KAAK,cAAc;MAAE;QACnB,MAAMhD,SAAS,GAAGtB,OAAO,CAACuB,OAAO,CAACF,OAAO,CAAC;QAC1C,IAAIC,SAAS,CAACO,MAAM,KAAK,CAAC,EAAE;UAC1B,OAA0BC,UAAU,CAACC,UAAU,CAAC,CAApCT,SAAS,CAAC,CAAC,CAAC;;QAE1B,MAAMkD,IAAI,GAAGlD,SAAS,CAAC,CAAC,CAAC;QACzB,MAAMmD,IAAI,GAAGnD,SAAS,CAACoD,KAAK,CAAC,CAAC,CAAC;QAC/B,MAAMC,OAAO,GAAGF,IAAI,CAACC,KAAK,CAAC,CAAC,EAAED,IAAI,CAAC5C,MAAM,GAAG,CAAC,CAAC;QAC9C,MAAM+C,IAAI,GAAGH,IAAI,CAACA,IAAI,CAAC5C,MAAM,GAAG,CAAC,CAAC;QAClC,MAAMgD,MAAM,GAAGF,OAAO,CAACnD,MAAM,CAC3B,CAACjB,KAAK,EAAEc,OAAO,KAIXjB,MAAM,CAACkC,OAAO,CAAEJ,OAAO,IAAKA,OAAO,CAACW,MAAM,CAAC,CAD3Cf,UAAU,CAACC,UAAU,CAAC,CADtB/B,OAAO,CAACO,KAAK,CAACc,OAAO,EAAEd,KAAK,CAAC,EAG9B,EAGDH,MAAM,CAACkC,OAAO,CAAEJ,OAAO,IAAKA,OAAO,CAACW,MAAM,CAAC,CAD3Cf,UAAU,CAACC,UAAU,CAAC,CAACyC,IAAI,CAAC,CAE7B,CACF;QACD,OAAyC1C,UAAU,CAACC,UAAU,CAAC,CAAnD/B,OAAO,CAACO,KAAK,CAACqE,IAAI,EAAEC,MAAM,CAAC;;;AAG7C,CAAC;AAEH;AACA,OAAO,MAAMC,KAAK,gBAA+ElF,KAAK,CAACmF,MAAM,CAC3G9E,eAAe,CAACA,eAAe,eAG7BN,MAAM,CAACqF,GAAG,CAAEjD,UAAU,IAAK9B,eAAe,CAACgF,YAAY,CAACnD,UAAU,CAACC,UAAU,CAAC,CAAC,CAAC,CADhF7B,UAAU,CAACA,UAAU,CAEtB,CACF"}
|
|
@@ -7,14 +7,18 @@ import * as IncomingMessage from "@effect/platform/Http/IncomingMessage";
|
|
|
7
7
|
import * as UrlParams from "@effect/platform/Http/UrlParams";
|
|
8
8
|
/** @internal */
|
|
9
9
|
export class IncomingMessageImpl {
|
|
10
|
-
constructor(source, onError) {
|
|
10
|
+
constructor(source, onError, remoteAddressOverride) {
|
|
11
11
|
this.source = source;
|
|
12
12
|
this.onError = onError;
|
|
13
|
+
this.remoteAddressOverride = remoteAddressOverride;
|
|
13
14
|
this[IncomingMessage.TypeId] = IncomingMessage.TypeId;
|
|
14
15
|
}
|
|
15
16
|
get headers() {
|
|
16
17
|
return Headers.fromInput(this.source.headers);
|
|
17
18
|
}
|
|
19
|
+
get remoteAddress() {
|
|
20
|
+
return Option.fromNullable(this.remoteAddressOverride ?? this.source.socket.remoteAddress);
|
|
21
|
+
}
|
|
18
22
|
get text() {
|
|
19
23
|
if (this.textEffect) {
|
|
20
24
|
return this.textEffect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incomingMessage.mjs","names":["Option","Effect","FiberRef","NodeStream","Headers","IncomingMessage","UrlParams","IncomingMessageImpl","constructor","source","onError","TypeId","headers","fromInput","text","textEffect","runSync","cached","flatMap","get","maxBodySize","toString","readable","onFailure","maxBytes","getOrUndefined","json","tryMap","try","_","JSON","parse","catch","urlParamsBody","URLSearchParams","stream","fromReadable","arrayBuffer","toUint8Array"],"sources":["../../../src/internal/http/incomingMessage.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAC/C,OAAO,KAAKC,UAAU,MAAM,8BAA8B;AAC1D,OAAO,KAAKC,OAAO,MAAM,+BAA+B;AACxD,OAAO,KAAKC,eAAe,MAAM,uCAAuC;AACxE,OAAO,KAAKC,SAAS,MAAM,iCAAiC;AAI5D;AACA,OAAM,MAAOC,mBAAmB;EAG9BC,YACWC,MAA4B,EAC5BC,OAA8B;
|
|
1
|
+
{"version":3,"file":"incomingMessage.mjs","names":["Option","Effect","FiberRef","NodeStream","Headers","IncomingMessage","UrlParams","IncomingMessageImpl","constructor","source","onError","remoteAddressOverride","TypeId","headers","fromInput","remoteAddress","fromNullable","socket","text","textEffect","runSync","cached","flatMap","get","maxBodySize","toString","readable","onFailure","maxBytes","getOrUndefined","json","tryMap","try","_","JSON","parse","catch","urlParamsBody","URLSearchParams","stream","fromReadable","arrayBuffer","toUint8Array"],"sources":["../../../src/internal/http/incomingMessage.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -80,18 +80,21 @@ const respond = /*#__PURE__*/Middleware.make(httpApp => Effect.flatMap(ServerReq
|
|
|
80
80
|
}
|
|
81
81
|
}))));
|
|
82
82
|
class ServerRequestImpl extends IncomingMessageImpl {
|
|
83
|
-
constructor(source, response, url = source.url, headersOverride) {
|
|
83
|
+
constructor(source, response, url = source.url, headersOverride, remoteAddressOverride) {
|
|
84
84
|
super(source, _ => Error.RequestError({
|
|
85
85
|
request: this,
|
|
86
86
|
reason: "Decode",
|
|
87
87
|
error: _
|
|
88
|
-
}));
|
|
88
|
+
}), remoteAddressOverride);
|
|
89
89
|
this.source = source;
|
|
90
90
|
this.response = response;
|
|
91
91
|
this.url = url;
|
|
92
92
|
this.headersOverride = headersOverride;
|
|
93
93
|
this[ServerRequest.TypeId] = ServerRequest.TypeId;
|
|
94
94
|
}
|
|
95
|
+
modify(options) {
|
|
96
|
+
return new ServerRequestImpl(this.source, this.response, options.url ?? this.url, options.headers ?? this.headersOverride, options.remoteAddress ?? this.remoteAddressOverride);
|
|
97
|
+
}
|
|
95
98
|
get originalUrl() {
|
|
96
99
|
return this.source.url;
|
|
97
100
|
}
|
|
@@ -112,12 +115,6 @@ class ServerRequestImpl extends IncomingMessageImpl {
|
|
|
112
115
|
get formDataStream() {
|
|
113
116
|
return internalFormData.stream(this.source, this.source.headers);
|
|
114
117
|
}
|
|
115
|
-
setUrl(url) {
|
|
116
|
-
return new ServerRequestImpl(this.source, this.response, url, this.headersOverride);
|
|
117
|
-
}
|
|
118
|
-
replaceHeaders(headers) {
|
|
119
|
-
return new ServerRequestImpl(this.source, this.response, this.url, headers);
|
|
120
|
-
}
|
|
121
118
|
toString() {
|
|
122
119
|
return `ServerRequest(${this.method} ${this.url})`;
|
|
123
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.mjs","names":["Option","Config","Effect","Fiber","Layer","Runtime","internalFormData","IncomingMessageImpl","internalPlatform","NodeSink","FileSystem","IncomingMessage","Middleware","Server","Error","ServerRequest","Stream","Readable","pipeline","make","evaluate","options","gen","_","server","serverFiber","addFinalizer","async","resume","close","error","die","unit","zipRight","on","fail","ServeError","scoped","forkScoped","listen","address","_tag","path","hostname","port","serve","httpApp","middleware","handledApp","respond","flatMap","all","runtime","fiberId","runFork","handler","nodeRequest","nodeResponse","fiber","provideService","ServerRequestImpl","writableEnded","interruptAsFork","acquireRelease","sync","off","join","discard","concurrency","pipe","locally","maxBodySize","some","Size","request","tapErrorCause","tap","response","handleResponse","_cause","headersSent","writeHead","end","constructor","source","url","headersOverride","RequestError","reason","TypeId","
|
|
1
|
+
{"version":3,"file":"server.mjs","names":["Option","Config","Effect","Fiber","Layer","Runtime","internalFormData","IncomingMessageImpl","internalPlatform","NodeSink","FileSystem","IncomingMessage","Middleware","Server","Error","ServerRequest","Stream","Readable","pipeline","make","evaluate","options","gen","_","server","serverFiber","addFinalizer","async","resume","close","error","die","unit","zipRight","on","fail","ServeError","scoped","forkScoped","listen","address","_tag","path","hostname","port","serve","httpApp","middleware","handledApp","respond","flatMap","all","runtime","fiberId","runFork","handler","nodeRequest","nodeResponse","fiber","provideService","ServerRequestImpl","writableEnded","interruptAsFork","acquireRelease","sync","off","join","discard","concurrency","pipe","locally","maxBodySize","some","Size","request","tapErrorCause","tap","response","handleResponse","_cause","headersSent","writeHead","end","constructor","source","url","headersOverride","remoteAddressOverride","RequestError","reason","TypeId","modify","headers","remoteAddress","originalUrl","method","formData","formDataEffect","runSync","cached","formDataStream","stream","toString","toJSON","layer","merge","layerConfig","config","unwrap","suspend","status","body","tryPromise","try","signal","catch","ResponseError","r","Response","Object","fromEntries","fromWeb","once","run","mapError","fromWritable"],"sources":["../../../src/internal/http/server.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/platform-node",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"description": "Unified interfaces for common platform-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -32,6 +32,6 @@
|
|
|
32
32
|
"@effect/data": "^0.18.5",
|
|
33
33
|
"@effect/io": "^0.40.1",
|
|
34
34
|
"@effect/stream": "^0.36.0",
|
|
35
|
-
"@effect/platform": "^0.16.
|
|
35
|
+
"@effect/platform": "^0.16.1"
|
|
36
36
|
}
|
|
37
37
|
}
|
|
@@ -56,6 +56,10 @@ const runCommand =
|
|
|
56
56
|
cwd: Option.getOrElse(command.cwd, constUndefined),
|
|
57
57
|
env: { ...env, ...Object.fromEntries(command.env) }
|
|
58
58
|
})
|
|
59
|
+
let exited = false
|
|
60
|
+
handle.on("exit", () => {
|
|
61
|
+
exited = true
|
|
62
|
+
})
|
|
59
63
|
|
|
60
64
|
// If starting the process throws an error, make sure to capture it
|
|
61
65
|
handle.on("error", (err) => {
|
|
@@ -76,6 +80,20 @@ const runCommand =
|
|
|
76
80
|
}
|
|
77
81
|
|
|
78
82
|
const exitCode: CommandExecutor.Process["exitCode"] = Effect.async((resume) => {
|
|
83
|
+
if (exited) {
|
|
84
|
+
return resume(
|
|
85
|
+
handle.exitCode !== null
|
|
86
|
+
? Effect.succeed(CommandExecutor.ExitCode(handle.exitCode))
|
|
87
|
+
: Effect.fail(
|
|
88
|
+
toPlatformError(
|
|
89
|
+
"exitCode",
|
|
90
|
+
new globalThis.Error(`Process interrupted due to receipt of signal: ${handle.signalCode}`),
|
|
91
|
+
command
|
|
92
|
+
)
|
|
93
|
+
)
|
|
94
|
+
)
|
|
95
|
+
}
|
|
96
|
+
|
|
79
97
|
handle.on("exit", (code, signal) => {
|
|
80
98
|
if (code !== null) {
|
|
81
99
|
resume(Effect.succeed(CommandExecutor.ExitCode(code)))
|
|
@@ -14,7 +14,8 @@ export class IncomingMessageImpl<E> implements IncomingMessage.IncomingMessage<E
|
|
|
14
14
|
|
|
15
15
|
constructor(
|
|
16
16
|
readonly source: Http.IncomingMessage,
|
|
17
|
-
readonly onError: (error: unknown) => E
|
|
17
|
+
readonly onError: (error: unknown) => E,
|
|
18
|
+
readonly remoteAddressOverride?: string
|
|
18
19
|
) {
|
|
19
20
|
this[IncomingMessage.TypeId] = IncomingMessage.TypeId
|
|
20
21
|
}
|
|
@@ -23,6 +24,10 @@ export class IncomingMessageImpl<E> implements IncomingMessage.IncomingMessage<E
|
|
|
23
24
|
return Headers.fromInput(this.source.headers as any)
|
|
24
25
|
}
|
|
25
26
|
|
|
27
|
+
get remoteAddress() {
|
|
28
|
+
return Option.fromNullable(this.remoteAddressOverride ?? this.source.socket.remoteAddress)
|
|
29
|
+
}
|
|
30
|
+
|
|
26
31
|
private textEffect: Effect.Effect<never, E, string> | undefined
|
|
27
32
|
get text(): Effect.Effect<never, E, string> {
|
|
28
33
|
if (this.textEffect) {
|
|
@@ -136,17 +136,34 @@ class ServerRequestImpl extends IncomingMessageImpl<Error.RequestError> implemen
|
|
|
136
136
|
readonly source: Http.IncomingMessage,
|
|
137
137
|
readonly response: Http.ServerResponse,
|
|
138
138
|
readonly url = source.url!,
|
|
139
|
-
private headersOverride?: Headers.Headers
|
|
139
|
+
private headersOverride?: Headers.Headers,
|
|
140
|
+
remoteAddressOverride?: string
|
|
140
141
|
) {
|
|
141
142
|
super(source, (_) =>
|
|
142
143
|
Error.RequestError({
|
|
143
144
|
request: this,
|
|
144
145
|
reason: "Decode",
|
|
145
146
|
error: _
|
|
146
|
-
}))
|
|
147
|
+
}), remoteAddressOverride)
|
|
147
148
|
this[ServerRequest.TypeId] = ServerRequest.TypeId
|
|
148
149
|
}
|
|
149
150
|
|
|
151
|
+
modify(
|
|
152
|
+
options: {
|
|
153
|
+
readonly url?: string | undefined
|
|
154
|
+
readonly headers?: Headers.Headers | undefined
|
|
155
|
+
readonly remoteAddress?: string | undefined
|
|
156
|
+
}
|
|
157
|
+
) {
|
|
158
|
+
return new ServerRequestImpl(
|
|
159
|
+
this.source,
|
|
160
|
+
this.response,
|
|
161
|
+
options.url ?? this.url,
|
|
162
|
+
options.headers ?? this.headersOverride,
|
|
163
|
+
options.remoteAddress ?? this.remoteAddressOverride
|
|
164
|
+
)
|
|
165
|
+
}
|
|
166
|
+
|
|
150
167
|
get originalUrl(): string {
|
|
151
168
|
return this.source.url!
|
|
152
169
|
}
|
|
@@ -185,24 +202,6 @@ class ServerRequestImpl extends IncomingMessageImpl<Error.RequestError> implemen
|
|
|
185
202
|
return internalFormData.stream(this.source, this.source.headers)
|
|
186
203
|
}
|
|
187
204
|
|
|
188
|
-
setUrl(url: string): ServerRequest.ServerRequest {
|
|
189
|
-
return new ServerRequestImpl(
|
|
190
|
-
this.source,
|
|
191
|
-
this.response,
|
|
192
|
-
url,
|
|
193
|
-
this.headersOverride
|
|
194
|
-
)
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
replaceHeaders(headers: Headers.Headers): ServerRequest.ServerRequest {
|
|
198
|
-
return new ServerRequestImpl(
|
|
199
|
-
this.source,
|
|
200
|
-
this.response,
|
|
201
|
-
this.url,
|
|
202
|
-
headers
|
|
203
|
-
)
|
|
204
|
-
}
|
|
205
|
-
|
|
206
205
|
toString(): string {
|
|
207
206
|
return `ServerRequest(${this.method} ${this.url})`
|
|
208
207
|
}
|