@moostjs/event-http 0.6.52 → 0.7.0

package/dist/index.cjs

@@ -6,6 +6,7 @@ let _wooksjs_http_body = require("@wooksjs/http-body");
 let _prostojs_infact = require("@prostojs/infact");
 let http = require("http");
 let https = require("https");
+let net = require("net");
 
 //#region packages/event-http/src/auth-guard.ts
 function _define_property$1(obj, key, value) {
@@ -294,7 +295,10 @@ function createRef(getter, setter) {
 	return (0, moost.Resolve)(() => (0, _wooksjs_event_http.useCookies)().getCookie(name), `cookie: ${name}`);
 }
 /**
-* Get Query Item value or the whole parsed Query as an object
+* Get Query Item value or the whole parsed Query as an object.
+*
+* Without `name`, resolves the parsed query — `{}` when the request has no query string.
+* With `name`, resolves that item's value, or `undefined` when it is absent.
 * @decorator
 * @param name - query item name (optional)
 * @paramType string | object
@@ -307,8 +311,7 @@ function createRef(getter, setter) {
 			const value = params().get(name);
 			return value === null ? void 0 : value;
 		}
-		const json = toJson();
-		return Object.keys(json).length > 0 ? json : void 0;
+		return toJson();
 	}, _name));
 }
 /**
@@ -348,16 +351,28 @@ function createRef(getter, setter) {
 	return (0, moost.Resolve)(() => (0, _wooksjs_event_http.useRequest)().reqId(), "reqId");
 }
 /**
-* Get Request IP Address
+* Get the client IP address.
+*
+* Without arguments it follows the app's `trustProxy` setting (`new MoostHttp({ trustProxy })`):
+* the socket peer when no proxy is trusted (the default), else the right-most untrusted
+* `X-Forwarded-For` / `Forwarded` hop. IPv4-mapped addresses are returned as plain IPv4;
+* `''` when the client is unknown (an in-process `fetch()` without a peer, a malformed
+* forwarding entry from a trusted proxy).
+*
+* @param opts - **Deprecated:** `{ trustProxy: true }` trusts exactly ONE proxy hop (the
+*   right-most `X-Forwarded-For` entry, no longer the forgeable left-most one);
+*   `{ trustProxy: false }` returns the socket peer. Configure `trustProxy` on `MoostHttp`
+*   instead and use `@Ip()`.
 * @decorator
 * @paramType string
 */ function Ip(opts) {
 	return (0, moost.Resolve)(() => (0, _wooksjs_event_http.useRequest)().getIp(opts), "ip");
 }
 /**
-* Get Request IP Address list
+* Get the raw address list: the socket peer and every `X-Forwarded-For` entry, unvalidated
+* (client-forgeable — use `@Ip()` for the client address).
 * @decorator
-* @paramType string[]
+* @paramType { remoteIp: string, forwarded: string[] }
 */ function IpList() {
 	return (0, moost.Resolve)(() => (0, _wooksjs_event_http.useRequest)().getIpList(), "ipList");
 }
@@ -603,15 +618,37 @@ function _define_property(obj, key, value) {
 	return obj;
 }
 /** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = (0, moost.globalKey)("moost-http.invocation");
+/**
+* Releases of queued (pipelined) responses per connection: one socket 'close' listener per
+* connection, however many requests are queued on it.
+*/ const queuedReleases = /* @__PURE__ */ new WeakMap();
+function releaseQueued() {
+	const releases = queuedReleases.get(this);
+	queuedReleases.delete(this);
+	releases?.forEach((release) => release());
+}
 const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
 	const ctx = (0, moost.current)();
-	if (ctx.hasOwn(invocationKey)) {
+	const res = ctx.hasOwn(invocationKey) ? void 0 : (0, _wooksjs_event_http.useResponse)(ctx).getRawRes(true);
+	const connection = res && !res.closed ? res.socket ?? res.req?.socket : void 0;
+	if (!res || !(connection instanceof net.Socket)) {
 		unscope();
 		return;
 	}
-	const res = (0, _wooksjs_event_http.useResponse)(ctx).getRawRes(true);
-	if (res.closed) unscope();
-	else res.on("close", unscope);
+	if (res.socket) {
+		res.on("close", unscope);
+		return;
+	}
+	let releases = queuedReleases.get(connection);
+	if (!releases) {
+		queuedReleases.set(connection, releases = /* @__PURE__ */ new Set());
+		connection.once("close", releaseQueued);
+	}
+	releases.add(unscope);
+	res.on("close", () => {
+		releases.delete(unscope);
+		unscope();
+	});
 } };
 const LOGGER_TITLE = "moost-http";
 /**
@@ -657,9 +694,18 @@ const LOGGER_TITLE = "moost-http";
 	* argument resolution, pipes, validation, and handler execution.
 	*
 	* When called from within an existing HTTP context (e.g. during SSR),
-	* identity headers (authorization, cookie) are automatically forwarded.
-	*/ fetch(request) {
-		return this.httpApp.fetch(request);
+	* identity headers (authorization, cookie) are automatically forwarded, and the
+	* inner request inherits the caller's client (`@Ip()`, protocol, host) and locale.
+	*
+	* Serving a fetch runtime (Bun, Deno, edge) with no calling request, pass the connection's
+	* `peer` — without it the client address is unknown (`@Ip()` is `''`) and an address-based
+	* `trustProxy` trusts nothing.
+	*
+	* @param request - A Web Standard Request.
+	* @param peer - `remoteAddress` of the connection (the client, or the proxy in front) and
+	*   `encrypted` (TLS; default: the URL scheme).
+	*/ fetch(request, peer) {
+		return this.httpApp.fetch(request, peer);
 	}
 	/**
 	* Convenience wrapper for programmatic route invocation.
@@ -822,7 +868,7 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.52"
+			version: "0.7.0"
 		});
 		if (httpApp && httpApp instanceof _wooksjs_event_http.WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = (0, _wooksjs_event_http.createHttpApp)({
@@ -890,6 +936,12 @@ exports.CompressedBodySizeLimit = CompressedBodySizeLimit;
 exports.Cookie = Cookie;
 exports.CookieAttrsRef = CookieAttrsRef;
 exports.CookieRef = CookieRef;
+Object.defineProperty(exports, 'DEFAULT_HTTP_STATUS', {
+  enumerable: true,
+  get: function () {
+    return _wooksjs_event_http.DEFAULT_HTTP_STATUS;
+  }
+});
 exports.Delete = Delete;
 exports.Get = Get;
 exports.Header = Header;
@@ -922,6 +974,12 @@ exports.Url = Url;
 exports.defineAuthGuard = defineAuthGuard;
 exports.enableLocalFetch = enableLocalFetch;
 exports.extractTransports = extractTransports;
+Object.defineProperty(exports, 'getDefaultHttpStatus', {
+  enumerable: true,
+  get: function () {
+    return _wooksjs_event_http.getDefaultHttpStatus;
+  }
+});
 exports.globalBodyReadTimeoutMs = globalBodyReadTimeoutMs;
 exports.globalBodySizeLimit = globalBodySizeLimit;
 exports.globalCompressedBodySizeLimit = globalCompressedBodySizeLimit;
@@ -943,6 +1001,12 @@ Object.defineProperty(exports, 'prerenderJson', {
     return _wooksjs_event_http.prerenderJson;
   }
 });
+Object.defineProperty(exports, 'useAcceptLanguage', {
+  enumerable: true,
+  get: function () {
+    return _wooksjs_event_http.useAcceptLanguage;
+  }
+});
 Object.defineProperty(exports, 'useHttpContext', {
   enumerable: true,
   get: function () {

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import * as moost from 'moost';
 import { TInterceptorPriority, TOvertakeFn, TInterceptorDef, TClassConstructor, TMoostAdapter, MOOST_ADAPTER_BRAND, TIsolatedSlot, EventContext, Moost, TConsoleBase, TMoostAdapterOptions } from 'moost';
 import * as _wooksjs_event_http from '@wooksjs/event-http';
-import { TCookieAttributes as TCookieAttributes$1, TCookieAttributesInput, THttpCompressionOptions, WooksHttp, TWooksHttpOptions } from '@wooksjs/event-http';
-export { HttpError, TCacheControl, TCookieAttributesInput, THttpCompressionEncoding, THttpCompressionOptions, TPrerenderJsonOptions, TSetCookieData, httpKind, isCompressibleType, prerenderJson, useHttpContext } from '@wooksjs/event-http';
+import { TCookieAttributes as TCookieAttributes$1, TCookieAttributesInput, THttpCompressionOptions, WooksHttp, TWooksHttpOptions, TFetchPeer } from '@wooksjs/event-http';
+export { DEFAULT_HTTP_STATUS, HttpError, TCacheControl, TCookieAttributesInput, TFetchPeer, TForwardedInfo, THttpCompressionEncoding, THttpCompressionOptions, THttpErrorBody, TPrerenderJsonOptions, TProxyHeaders, TSetCookieData, TTransformErrorBody, TTrustProxy, TTrustProxyFn, getDefaultHttpStatus, httpKind, isCompressibleType, prerenderJson, useAcceptLanguage, useHttpContext } from '@wooksjs/event-http';
 import { IncomingMessage, ServerResponse } from 'http';
 import { Buffer } from 'buffer';
 import { ListenOptions } from 'net';
@@ -155,7 +155,10 @@ declare function Header(name: string): ParameterDecorator & PropertyDecorator;
  */
 declare function Cookie(name: string): ParameterDecorator & PropertyDecorator;
 /**
- * Get Query Item value or the whole parsed Query as an object
+ * Get Query Item value or the whole parsed Query as an object.
+ *
+ * Without `name`, resolves the parsed query — `{}` when the request has no query string.
+ * With `name`, resolves that item's value, or `undefined` when it is absent.
  * @decorator
  * @param name - query item name (optional)
  * @paramType string | object
@@ -195,7 +198,18 @@ declare function Res(opts?: {
  */
 declare function ReqId(): ParameterDecorator & PropertyDecorator;
 /**
- * Get Request IP Address
+ * Get the client IP address.
+ *
+ * Without arguments it follows the app's `trustProxy` setting (`new MoostHttp({ trustProxy })`):
+ * the socket peer when no proxy is trusted (the default), else the right-most untrusted
+ * `X-Forwarded-For` / `Forwarded` hop. IPv4-mapped addresses are returned as plain IPv4;
+ * `''` when the client is unknown (an in-process `fetch()` without a peer, a malformed
+ * forwarding entry from a trusted proxy).
+ *
+ * @param opts - **Deprecated:** `{ trustProxy: true }` trusts exactly ONE proxy hop (the
+ *   right-most `X-Forwarded-For` entry, no longer the forgeable left-most one);
+ *   `{ trustProxy: false }` returns the socket peer. Configure `trustProxy` on `MoostHttp`
+ *   instead and use `@Ip()`.
  * @decorator
  * @paramType string
  */
@@ -203,9 +217,10 @@ declare function Ip(opts?: {
     trustProxy: boolean;
 }): ParameterDecorator & PropertyDecorator;
 /**
- * Get Request IP Address list
+ * Get the raw address list: the socket peer and every `X-Forwarded-For` entry, unvalidated
+ * (client-forgeable — use `@Ip()` for the client address).
  * @decorator
- * @paramType string[]
+ * @paramType { remoteIp: string, forwarded: string[] }
  */
 declare function IpList(): ParameterDecorator & PropertyDecorator;
 /**
@@ -482,9 +497,18 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
      * argument resolution, pipes, validation, and handler execution.
      *
      * When called from within an existing HTTP context (e.g. during SSR),
-     * identity headers (authorization, cookie) are automatically forwarded.
+     * identity headers (authorization, cookie) are automatically forwarded, and the
+     * inner request inherits the caller's client (`@Ip()`, protocol, host) and locale.
+     *
+     * Serving a fetch runtime (Bun, Deno, edge) with no calling request, pass the connection's
+     * `peer` — without it the client address is unknown (`@Ip()` is `''`) and an address-based
+     * `trustProxy` trusts nothing.
+     *
+     * @param request - A Web Standard Request.
+     * @param peer - `remoteAddress` of the connection (the client, or the proxy in front) and
+     *   `encrypted` (TLS; default: the URL scheme).
      */
-    fetch(request: Request): Promise<Response | null>;
+    fetch(request: Request, peer?: TFetchPeer): Promise<Response | null>;
     /**
      * Convenience wrapper for programmatic route invocation.
      * Accepts a URL string (relative paths auto-prefixed with `http://localhost`),

package/dist/index.mjs

@@ -1,10 +1,11 @@
 import { current, eventTypeKey, key } from "@wooksjs/event-core";
-import { HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, httpKind, httpKind as httpKind$1, isCompressibleType, prerenderJson, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams } from "@wooksjs/event-http";
+import { DEFAULT_HTTP_STATUS, HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, getDefaultHttpStatus, httpKind, httpKind as httpKind$1, isCompressibleType, prerenderJson, useAcceptLanguage, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams } from "@wooksjs/event-http";
 import { Before, Intercept, Interceptor, MOOST_ADAPTER_BRAND, Overtake, Resolve, TInterceptorPriority, current as current$1, defineBeforeInterceptor, defineMoostEventHandler, forkEventContext, getMoostMate, globalKey, run } from "moost";
 import { seedBody, useBody } from "@wooksjs/http-body";
 import { createProvideRegistry } from "@prostojs/infact";
 import { Server } from "http";
 import { Server as Server$1 } from "https";
+import { Socket } from "net";
 
 //#region packages/event-http/src/auth-guard.ts
 function _define_property$1(obj, key, value) {
@@ -293,7 +294,10 @@ function createRef(getter, setter) {
 	return Resolve(() => useCookies().getCookie(name), `cookie: ${name}`);
 }
 /**
-* Get Query Item value or the whole parsed Query as an object
+* Get Query Item value or the whole parsed Query as an object.
+*
+* Without `name`, resolves the parsed query — `{}` when the request has no query string.
+* With `name`, resolves that item's value, or `undefined` when it is absent.
 * @decorator
 * @param name - query item name (optional)
 * @paramType string | object
@@ -306,8 +310,7 @@ function createRef(getter, setter) {
 			const value = params().get(name);
 			return value === null ? void 0 : value;
 		}
-		const json = toJson();
-		return Object.keys(json).length > 0 ? json : void 0;
+		return toJson();
 	}, _name));
 }
 /**
@@ -347,16 +350,28 @@ function createRef(getter, setter) {
 	return Resolve(() => useRequest().reqId(), "reqId");
 }
 /**
-* Get Request IP Address
+* Get the client IP address.
+*
+* Without arguments it follows the app's `trustProxy` setting (`new MoostHttp({ trustProxy })`):
+* the socket peer when no proxy is trusted (the default), else the right-most untrusted
+* `X-Forwarded-For` / `Forwarded` hop. IPv4-mapped addresses are returned as plain IPv4;
+* `''` when the client is unknown (an in-process `fetch()` without a peer, a malformed
+* forwarding entry from a trusted proxy).
+*
+* @param opts - **Deprecated:** `{ trustProxy: true }` trusts exactly ONE proxy hop (the
+*   right-most `X-Forwarded-For` entry, no longer the forgeable left-most one);
+*   `{ trustProxy: false }` returns the socket peer. Configure `trustProxy` on `MoostHttp`
+*   instead and use `@Ip()`.
 * @decorator
 * @paramType string
 */ function Ip(opts) {
 	return Resolve(() => useRequest().getIp(opts), "ip");
 }
 /**
-* Get Request IP Address list
+* Get the raw address list: the socket peer and every `X-Forwarded-For` entry, unvalidated
+* (client-forgeable — use `@Ip()` for the client address).
 * @decorator
-* @paramType string[]
+* @paramType { remoteIp: string, forwarded: string[] }
 */ function IpList() {
 	return Resolve(() => useRequest().getIpList(), "ipList");
 }
@@ -602,15 +617,37 @@ function _define_property(obj, key, value) {
 	return obj;
 }
 /** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = globalKey("moost-http.invocation");
+/**
+* Releases of queued (pipelined) responses per connection: one socket 'close' listener per
+* connection, however many requests are queued on it.
+*/ const queuedReleases = /* @__PURE__ */ new WeakMap();
+function releaseQueued() {
+	const releases = queuedReleases.get(this);
+	queuedReleases.delete(this);
+	releases?.forEach((release) => release());
+}
 const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
 	const ctx = current$1();
-	if (ctx.hasOwn(invocationKey)) {
+	const res = ctx.hasOwn(invocationKey) ? void 0 : useResponse(ctx).getRawRes(true);
+	const connection = res && !res.closed ? res.socket ?? res.req?.socket : void 0;
+	if (!res || !(connection instanceof Socket)) {
 		unscope();
 		return;
 	}
-	const res = useResponse(ctx).getRawRes(true);
-	if (res.closed) unscope();
-	else res.on("close", unscope);
+	if (res.socket) {
+		res.on("close", unscope);
+		return;
+	}
+	let releases = queuedReleases.get(connection);
+	if (!releases) {
+		queuedReleases.set(connection, releases = /* @__PURE__ */ new Set());
+		connection.once("close", releaseQueued);
+	}
+	releases.add(unscope);
+	res.on("close", () => {
+		releases.delete(unscope);
+		unscope();
+	});
 } };
 const LOGGER_TITLE = "moost-http";
 /**
@@ -656,9 +693,18 @@ const LOGGER_TITLE = "moost-http";
 	* argument resolution, pipes, validation, and handler execution.
 	*
 	* When called from within an existing HTTP context (e.g. during SSR),
-	* identity headers (authorization, cookie) are automatically forwarded.
-	*/ fetch(request) {
-		return this.httpApp.fetch(request);
+	* identity headers (authorization, cookie) are automatically forwarded, and the
+	* inner request inherits the caller's client (`@Ip()`, protocol, host) and locale.
+	*
+	* Serving a fetch runtime (Bun, Deno, edge) with no calling request, pass the connection's
+	* `peer` — without it the client address is unknown (`@Ip()` is `''`) and an address-based
+	* `trustProxy` trusts nothing.
+	*
+	* @param request - A Web Standard Request.
+	* @param peer - `remoteAddress` of the connection (the client, or the proxy in front) and
+	*   `encrypted` (TLS; default: the URL scheme).
+	*/ fetch(request, peer) {
+		return this.httpApp.fetch(request, peer);
 	}
 	/**
 	* Convenience wrapper for programmatic route invocation.
@@ -821,7 +867,7 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.52"
+			version: "0.7.0"
 		});
 		if (httpApp && httpApp instanceof WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = createHttpApp({
@@ -872,4 +918,4 @@ function isLocalOrigin(url) {
 }
 
 //#endregion
-export { All, AuthGuard, Authenticate, Authorization, Body, BodyReadTimeoutMs, BodySizeLimit, Compress, CompressedBodySizeLimit, Cookie, CookieAttrsRef, CookieRef, Delete, Get, Header, HeaderRef, HttpError, HttpMethod, Ip, IpList, Method, MoostHttp, Patch, Post, Put, Query, RawBody, Req, ReqId, Res, SetCookie, SetHeader, SetStatus, StatusRef, Upgrade, Url, defineAuthGuard, enableLocalFetch, extractTransports, globalBodyReadTimeoutMs, globalBodySizeLimit, globalCompressedBodySizeLimit, httpKind, isCompressibleType, prerenderJson, useHttpContext };
+export { All, AuthGuard, Authenticate, Authorization, Body, BodyReadTimeoutMs, BodySizeLimit, Compress, CompressedBodySizeLimit, Cookie, CookieAttrsRef, CookieRef, DEFAULT_HTTP_STATUS, Delete, Get, Header, HeaderRef, HttpError, HttpMethod, Ip, IpList, Method, MoostHttp, Patch, Post, Put, Query, RawBody, Req, ReqId, Res, SetCookie, SetHeader, SetStatus, StatusRef, Upgrade, Url, defineAuthGuard, enableLocalFetch, extractTransports, getDefaultHttpStatus, globalBodyReadTimeoutMs, globalBodySizeLimit, globalCompressedBodySizeLimit, httpKind, isCompressibleType, prerenderJson, useAcceptLanguage, useHttpContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.6.52",
+  "version": "0.7.0",
   "description": "@moostjs/event-http",
   "keywords": [
     "composables",
@@ -38,17 +38,17 @@
     }
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.7.30",
-    "@wooksjs/http-body": "^0.7.30"
+    "@wooksjs/event-http": "^0.8.0",
+    "@wooksjs/http-body": "^0.8.0"
   },
   "devDependencies": {
     "vitest": "3.2.7",
-    "@moostjs/event-wf": "^0.6.52"
+    "@moostjs/event-wf": "^0.7.0"
   },
   "peerDependencies": {
     "@prostojs/infact": "^0.6.1",
-    "@wooksjs/event-core": "^0.7.30",
-    "moost": "^0.6.52"
+    "@wooksjs/event-core": "^0.8.0",
+    "moost": "^0.7.0"
   },
   "scripts": {
     "pub": "pnpm publish --access public",