@adonisjs/http-server 8.0.0-next.17 → 8.0.0-next.18
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.
|
@@ -15,7 +15,7 @@ import onFinished from "on-finished";
|
|
|
15
15
|
import fresh from "fresh";
|
|
16
16
|
import typeIs from "type-is";
|
|
17
17
|
import { isIP } from "node:net";
|
|
18
|
-
import
|
|
18
|
+
import proxyAddr from "proxy-addr";
|
|
19
19
|
import { MessageBuilder, safeEqual } from "@poppinss/utils";
|
|
20
20
|
import lodash from "@poppinss/utils/lodash";
|
|
21
21
|
import base64 from "@poppinss/utils/base64";
|
|
@@ -870,10 +870,10 @@ var HttpRequest = class extends Macroable {
|
|
|
870
870
|
ip() {
|
|
871
871
|
const ipFn = this.#config.getIp;
|
|
872
872
|
if (typeof ipFn === "function") return ipFn(this);
|
|
873
|
-
return
|
|
873
|
+
return proxyAddr(this.request, this.#config.trustProxy);
|
|
874
874
|
}
|
|
875
875
|
ips() {
|
|
876
|
-
return
|
|
876
|
+
return proxyAddr.all(this.request, this.#config.trustProxy);
|
|
877
877
|
}
|
|
878
878
|
protocol() {
|
|
879
879
|
if ("encrypted" in this.request.socket) return "https";
|
|
@@ -2259,8 +2259,8 @@ var Server = class {
|
|
|
2259
2259
|
#router;
|
|
2260
2260
|
#nodeHttpServer;
|
|
2261
2261
|
#middleware = [];
|
|
2262
|
-
#requestErrorResponder = (error, ctx) => {
|
|
2263
|
-
this.#resolvedErrorHandler.report(error, ctx);
|
|
2262
|
+
#requestErrorResponder = async (error, ctx) => {
|
|
2263
|
+
await this.#resolvedErrorHandler.report(error, ctx);
|
|
2264
2264
|
return httpExceptionHandler.tracePromise(this.#resolvedErrorHandler.handle, void 0, this.#resolvedErrorHandler, error, ctx);
|
|
2265
2265
|
};
|
|
2266
2266
|
get booted() {
|
|
@@ -2390,7 +2390,7 @@ function defineConfig(config) {
|
|
|
2390
2390
|
const { trustProxy: trustProxy$1, ...rest } = config;
|
|
2391
2391
|
const defaults = {
|
|
2392
2392
|
allowMethodSpoofing: false,
|
|
2393
|
-
trustProxy:
|
|
2393
|
+
trustProxy: proxyAddr.compile("loopback"),
|
|
2394
2394
|
subdomainOffset: 2,
|
|
2395
2395
|
generateRequestId: !!config.createRequestId,
|
|
2396
2396
|
createRequestId() {
|
|
@@ -2430,7 +2430,7 @@ function defineConfig(config) {
|
|
|
2430
2430
|
normalizedConfig.trustProxy = (_, __) => tpValue;
|
|
2431
2431
|
} else if (typeof trustProxy$1 === "string") {
|
|
2432
2432
|
const tpValue = trustProxy$1;
|
|
2433
|
-
normalizedConfig.trustProxy =
|
|
2433
|
+
normalizedConfig.trustProxy = proxyAddr.compile(tpValue);
|
|
2434
2434
|
} else if (trustProxy$1) normalizedConfig.trustProxy = trustProxy$1;
|
|
2435
2435
|
return normalizedConfig;
|
|
2436
2436
|
}
|
package/build/factories/main.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { s as parseRoute } from "../helpers-BIq3lNz1.js";
|
|
2
|
-
import { _ as Qs, c as HttpRequest, i as HttpResponse, n as Server, r as HttpContext, s as Router, t as defineConfig } from "../define_config-
|
|
2
|
+
import { _ as Qs, c as HttpRequest, i as HttpResponse, n as Server, r as HttpContext, s as Router, t as defineConfig } from "../define_config-Cg6Nym29.js";
|
|
3
3
|
import { t as createURL } from "../helpers-C_2HouOe.js";
|
|
4
4
|
import "../url_builder-piNQy-CF.js";
|
|
5
5
|
import { Container } from "@adonisjs/fold";
|
|
6
6
|
import { Socket } from "node:net";
|
|
7
|
-
import
|
|
7
|
+
import proxyAddr from "proxy-addr";
|
|
8
8
|
import { safeStringify } from "@poppinss/utils/json";
|
|
9
9
|
import { AppFactory } from "@adonisjs/application/factories";
|
|
10
10
|
import { EncryptionFactory } from "@boringnode/encryption/factories";
|
|
@@ -59,7 +59,7 @@ var HttpRequestFactory = class {
|
|
|
59
59
|
#getConfig() {
|
|
60
60
|
return {
|
|
61
61
|
allowMethodSpoofing: false,
|
|
62
|
-
trustProxy:
|
|
62
|
+
trustProxy: proxyAddr.compile("loopback"),
|
|
63
63
|
subdomainOffset: 2,
|
|
64
64
|
generateRequestId: false,
|
|
65
65
|
createRequestId() {
|
package/build/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { C as canWriteResponseBody, S as tracing_channels_exports, _ as Route, g as BriskRoute, h as RouteResource, m as RouteGroup, u as parseRange } from "./helpers-BIq3lNz1.js";
|
|
2
|
-
import { _ as Qs, a as CookieSerializer, c as HttpRequest, d as Redirect, f as E_CANNOT_LOOKUP_ROUTE, g as errors_exports, h as E_ROUTE_NOT_FOUND, i as HttpResponse, l as CookieParser, m as E_HTTP_REQUEST_ABORTED, n as Server, o as ResponseStatus, p as E_HTTP_EXCEPTION, r as HttpContext, s as Router, t as defineConfig, u as CookieClient } from "./define_config-
|
|
2
|
+
import { _ as Qs, a as CookieSerializer, c as HttpRequest, d as Redirect, f as E_CANNOT_LOOKUP_ROUTE, g as errors_exports, h as E_ROUTE_NOT_FOUND, i as HttpResponse, l as CookieParser, m as E_HTTP_REQUEST_ABORTED, n as Server, o as ResponseStatus, p as E_HTTP_EXCEPTION, r as HttpContext, s as Router, t as defineConfig, u as CookieClient } from "./define_config-Cg6Nym29.js";
|
|
3
3
|
import "./helpers-C_2HouOe.js";
|
|
4
4
|
import "./url_builder-piNQy-CF.js";
|
|
5
5
|
import Macroable from "@poppinss/macroable";
|