@gatling.io/http 3.12.0 → 3.13.2

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@gatling.io/http",
-  "version": "3.12.0",
+  "version": "3.13.2",
   "license": "Apache-2.0",
   "main": "target/index.js",
   "types": "target/index.d.ts",
   "dependencies": {
-    "@gatling.io/jvm-types": "3.12.0",
-    "@gatling.io/core": "3.12.0"
+    "@gatling.io/jvm-types": "3.13.2",
+    "@gatling.io/core": "3.13.2"
   },
   "devDependencies": {
-    "@types/jest": "29.5.12",
+    "@types/jest": "29.5.14",
     "jest": "29.7.0",
     "prettier": "3.3.3",
     "rimraf": "6.0.1",
     "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
-    "typescript": "5.5.4"
+    "typescript": "5.6.3"
   },
   "scripts": {
     "clean": "rimraf target",

package/src/protocol.ts

@@ -1,14 +1,15 @@
 import {
+  AllowListFilter,
   CheckBuilder,
   Condition,
+  DenyListFilter,
   Expression,
   ProtocolBuilder,
   Session,
   SessionTo,
+  asJava,
   underlyingSessionTo,
-  wrapCondition,
-  AllowListFilter,
-  DenyListFilter
+  wrapCondition
 } from "@gatling.io/core";
 
 import { Proxy } from "./proxy";
@@ -700,6 +701,14 @@ export interface HttpProtocolBuilder extends ProtocolBuilder {
 
   // Proxy part
 
+  /**
+   * Define a Proxy to be used for all requests
+   *
+   * @param proxy - the proxy
+   * @returns a new HttpProtocolBuilder instance
+   */
+  proxy(proxy: Proxy): HttpProtocolBuilder;
+
   /**
    * Ignore any configured proxy for some hosts
    *
@@ -709,12 +718,36 @@ export interface HttpProtocolBuilder extends ProtocolBuilder {
   noProxyFor(...hosts: string[]): HttpProtocolBuilder;
 
   /**
-   * Define a Proxy to be used for all requests
+   * Enable Proxy Protocol for IPv4
    *
-   * @param proxy - the proxy
+   * @param address - a fake local address in IPv4 format
    * @returns a new HttpProtocolBuilder instance
    */
-  proxy(proxy: Proxy): HttpProtocolBuilder;
+  proxyProtocolSourceIpV4Address(address: string): HttpProtocolBuilder;
+
+  /**
+   * Enable Proxy Protocol for IPv4
+   *
+   * @param address - a fake local address in IPv4 format
+   * @returns a new HttpProtocolBuilder instance
+   */
+  proxyProtocolSourceIpV4Address(address: (session: Session) => string): HttpProtocolBuilder;
+
+  /**
+   * Enable Proxy Protocol for IPv6
+   *
+   * @param address - a fake local address in IPv6 format
+   * @returns a new HttpProtocolBuilder instance
+   */
+  proxyProtocolSourceIpV6Address(address: string): HttpProtocolBuilder;
+
+  /**
+   * Enable Proxy Protocol for IPv6
+   *
+   * @param address - a fake local address in IPv6 format
+   * @returns a new HttpProtocolBuilder instance
+   */
+  proxyProtocolSourceIpV6Address(address: (session: Session) => string): HttpProtocolBuilder;
 
   // DNS part
 
@@ -776,7 +809,7 @@ export const wrapHttpProtocolBuilder = (_underlying: JvmHttpProtocolBuilder): Ht
         : _underlying.header(name, value)
     ),
   headers: (headers: Record<string, string>): HttpProtocolBuilder =>
-    wrapHttpProtocolBuilder(_underlying.headers(headers)),
+    wrapHttpProtocolBuilder(_underlying.headers(asJava(headers) as any)),
   acceptHeader: (value: Expression<string>): HttpProtocolBuilder =>
     wrapHttpProtocolBuilder(
       typeof value === "function"
@@ -954,8 +987,20 @@ export const wrapHttpProtocolBuilder = (_underlying: JvmHttpProtocolBuilder): Ht
 
   // Proxy part
 
-  noProxyFor: (...hosts: string[]): HttpProtocolBuilder => wrapHttpProtocolBuilder(_underlying.noProxyFor(...hosts)),
   proxy: (proxy: Proxy): HttpProtocolBuilder => wrapHttpProtocolBuilder(_underlying.proxy(proxy._underlying)),
+  noProxyFor: (...hosts: string[]): HttpProtocolBuilder => wrapHttpProtocolBuilder(_underlying.noProxyFor(...hosts)),
+  proxyProtocolSourceIpV4Address: (address: Expression<string>) =>
+    wrapHttpProtocolBuilder(
+      typeof address === "string"
+        ? _underlying.proxyProtocolSourceIpV4Address(address)
+        : _underlying.proxyProtocolSourceIpV4Address(underlyingSessionTo(address))
+    ),
+  proxyProtocolSourceIpV6Address: (address: Expression<string>) =>
+    wrapHttpProtocolBuilder(
+      typeof address === "string"
+        ? _underlying.proxyProtocolSourceIpV6Address(address)
+        : _underlying.proxyProtocolSourceIpV6Address(underlyingSessionTo(address))
+    ),
 
   // DNS part
 

package/src/request/index.ts

@@ -7,6 +7,7 @@ import {
   Expression,
   Session,
   SessionTo,
+  asJava,
   toJvmDuration,
   underlyingSessionTo,
   underlyingSessionToJava,
@@ -369,7 +370,7 @@ const requestWithParamsActionBuilderImpl = <T>(
     wrap(
       typeof value === "function" ? jvmBuilder.header(name, underlyingSessionTo(value)) : jvmBuilder.header(name, value)
     ),
-  headers: (headers: Record<string, string>): T => wrap(jvmBuilder.headers(headers)),
+  headers: (headers: Record<string, string>): T => wrap(jvmBuilder.headers(asJava(headers) as any)),
   ignoreProtocolHeaders: (): T => wrap(jvmBuilder.ignoreProtocolHeaders()),
   basicAuth: (username: Expression<string>, password: Expression<string>): T =>
     wrap(

package/src/request/request.ts

@@ -7,30 +7,31 @@ import JvmRequest = io.gatling.http.client.Request;
 
 export interface Request extends Wrapper<JvmRequest> {
   //copyWithCopiedHeaders(): Request;
-  //copyWithHttp2PriorKnowledge(arg0: any /*io.gatling.http.client.Http2PriorKnowledge*/): Request;
-  //copyWithNewBody(arg0: io.gatling.http.client.body.RequestBody): Request;
   //copyWithNewUri(arg0: any /*io.gatling.http.client.uri.Uri*/): Request;
-  body(): RequestBody;
-  //getCookies(): java.util.List<any /*io.netty.handler.codec.http.cookie.Cookie*/>;
+  //copyWithNewBody(arg0: io.gatling.http.client.body.RequestBody): Request;
+  //copyWithHttp2PriorKnowledge(arg0: any /*io.gatling.http.client.Http2PriorKnowledge*/): Request;
+  //getName(): string;
+  //getMethod(): any /*io.netty.handler.codec.http.HttpMethod*/;
+  //getUri(): any /*io.gatling.http.client.uri.Uri*/;
   headers(): HttpHeaders;
-  //getHttp2PriorKnowledge(): any /*io.gatling.http.client.Http2PriorKnowledge*/;
+  //getCookies(): java.util.List<any /*io.netty.handler.codec.http.cookie.Cookie*/>;
+  body(): RequestBody;
+  //getRequestTimeout(): long;
+  //isAutoOrigin(): boolean;
   //getLocalAddresses(): any /*io.gatling.http.client.LocalAddresses*/;
-  //getMethod(): any /*io.netty.handler.codec.http.HttpMethod*/;
-  //getName(): string;
-  //getNameResolver(): any /*io.gatling.http.client.resolver.InetAddressNameResolver*/;
-  //getProxyServer(): any /*io.gatling.http.client.proxy.ProxyServer*/;
   //getRealm(): any /*io.gatling.http.client.realm.Realm*/;
-  //getRequestTimeout(): long;
+  //getProxyServer(): any /*io.gatling.http.client.proxy.ProxyServer*/;
+  //getProxyProtocolSourceIpV4Address(): string;
+  //getProxyProtocolSourceIpV6Address(): string;
   //getSignatureCalculator(): Func<Request, Request>;
-  //getUri(): any /*io.gatling.http.client.uri.Uri*/;
-  //getVirtualHost(): string;
-  //getWsSubprotocol(): string;
-  //isAutoOrigin(): boolean;
+  //getNameResolver(): any /*io.gatling.http.client.resolver.InetAddressNameResolver*/;
   //isHttp2Enabled(): boolean;
+  //getHttp2PriorKnowledge(): any /*io.gatling.http.client.Http2PriorKnowledge*/;
+  //getWsSubprotocol(): string;
 }
 
 export const wrapRequest = (_underlying: JvmRequest): Request => ({
   _underlying,
-  body: (): RequestBody => wrapRequestBody(_underlying.getBody()),
-  headers: (): HttpHeaders => wrapHttpHeaders(_underlying.getHeaders())
+  headers: (): HttpHeaders => wrapHttpHeaders(_underlying.getHeaders()),
+  body: (): RequestBody => wrapRequestBody(_underlying.getBody())
 });

package/target/protocol.d.ts

@@ -1,4 +1,4 @@
-import { CheckBuilder, Condition, ProtocolBuilder, Session, AllowListFilter, DenyListFilter } from "@gatling.io/core";
+import { AllowListFilter, CheckBuilder, Condition, DenyListFilter, ProtocolBuilder, Session } from "@gatling.io/core";
 import { Proxy } from "./proxy";
 import JvmHttpProtocolBuilder = io.gatling.javaapi.http.HttpProtocolBuilder;
 /**
@@ -536,6 +536,13 @@ export interface HttpProtocolBuilder extends ProtocolBuilder {
      * @returns a new HttpProtocolBuilder instance
      */
     nameInferredHtmlResourcesAfterLastPathElement(): HttpProtocolBuilder;
+    /**
+     * Define a Proxy to be used for all requests
+     *
+     * @param proxy - the proxy
+     * @returns a new HttpProtocolBuilder instance
+     */
+    proxy(proxy: Proxy): HttpProtocolBuilder;
     /**
      * Ignore any configured proxy for some hosts
      *
@@ -544,12 +551,33 @@ export interface HttpProtocolBuilder extends ProtocolBuilder {
      */
     noProxyFor(...hosts: string[]): HttpProtocolBuilder;
     /**
-     * Define a Proxy to be used for all requests
+     * Enable Proxy Protocol for IPv4
      *
-     * @param proxy - the proxy
+     * @param address - a fake local address in IPv4 format
      * @returns a new HttpProtocolBuilder instance
      */
-    proxy(proxy: Proxy): HttpProtocolBuilder;
+    proxyProtocolSourceIpV4Address(address: string): HttpProtocolBuilder;
+    /**
+     * Enable Proxy Protocol for IPv4
+     *
+     * @param address - a fake local address in IPv4 format
+     * @returns a new HttpProtocolBuilder instance
+     */
+    proxyProtocolSourceIpV4Address(address: (session: Session) => string): HttpProtocolBuilder;
+    /**
+     * Enable Proxy Protocol for IPv6
+     *
+     * @param address - a fake local address in IPv6 format
+     * @returns a new HttpProtocolBuilder instance
+     */
+    proxyProtocolSourceIpV6Address(address: string): HttpProtocolBuilder;
+    /**
+     * Enable Proxy Protocol for IPv6
+     *
+     * @param address - a fake local address in IPv6 format
+     * @returns a new HttpProtocolBuilder instance
+     */
+    proxyProtocolSourceIpV6Address(address: (session: Session) => string): HttpProtocolBuilder;
     /**
      * Enable Gatling non-blocking DNS resolution instead of using Java's blocking implementation
      *

package/target/protocol.js

@@ -23,7 +23,7 @@ const wrapHttpProtocolBuilder = (_underlying) => ({
     header: (name, value) => (0, exports.wrapHttpProtocolBuilder)(typeof value === "function"
         ? _underlying.header(name, (0, core_1.underlyingSessionTo)(value))
         : _underlying.header(name, value)),
-    headers: (headers) => (0, exports.wrapHttpProtocolBuilder)(_underlying.headers(headers)),
+    headers: (headers) => (0, exports.wrapHttpProtocolBuilder)(_underlying.headers((0, core_1.asJava)(headers))),
     acceptHeader: (value) => (0, exports.wrapHttpProtocolBuilder)(typeof value === "function"
         ? _underlying.acceptHeader((0, core_1.underlyingSessionTo)(value))
         : _underlying.acceptHeader(value)),
@@ -109,8 +109,14 @@ const wrapHttpProtocolBuilder = (_underlying) => ({
     nameInferredHtmlResourcesAfterPath: () => (0, exports.wrapHttpProtocolBuilder)(_underlying.nameInferredHtmlResourcesAfterPath()),
     nameInferredHtmlResourcesAfterLastPathElement: () => (0, exports.wrapHttpProtocolBuilder)(_underlying.nameInferredHtmlResourcesAfterLastPathElement()),
     // Proxy part
-    noProxyFor: (...hosts) => (0, exports.wrapHttpProtocolBuilder)(_underlying.noProxyFor(...hosts)),
     proxy: (proxy) => (0, exports.wrapHttpProtocolBuilder)(_underlying.proxy(proxy._underlying)),
+    noProxyFor: (...hosts) => (0, exports.wrapHttpProtocolBuilder)(_underlying.noProxyFor(...hosts)),
+    proxyProtocolSourceIpV4Address: (address) => (0, exports.wrapHttpProtocolBuilder)(typeof address === "string"
+        ? _underlying.proxyProtocolSourceIpV4Address(address)
+        : _underlying.proxyProtocolSourceIpV4Address((0, core_1.underlyingSessionTo)(address))),
+    proxyProtocolSourceIpV6Address: (address) => (0, exports.wrapHttpProtocolBuilder)(typeof address === "string"
+        ? _underlying.proxyProtocolSourceIpV6Address(address)
+        : _underlying.proxyProtocolSourceIpV6Address((0, core_1.underlyingSessionTo)(address))),
     // DNS part
     asyncNameResolution: (...dnsServers) => (0, exports.wrapHttpProtocolBuilder)(_underlying.asyncNameResolution(...dnsServers)),
     hostNameAliases: (aliases) => (0, exports.wrapHttpProtocolBuilder)(_underlying.hostNameAliases(aliases)),

package/target/request/index.js

@@ -83,7 +83,7 @@ const requestWithParamsActionBuilderImpl = (jvmBuilder, wrap) => ({
         }
     },
     header: (name, value) => wrap(typeof value === "function" ? jvmBuilder.header(name, (0, core_1.underlyingSessionTo)(value)) : jvmBuilder.header(name, value)),
-    headers: (headers) => wrap(jvmBuilder.headers(headers)),
+    headers: (headers) => wrap(jvmBuilder.headers((0, core_1.asJava)(headers))),
     ignoreProtocolHeaders: () => wrap(jvmBuilder.ignoreProtocolHeaders()),
     basicAuth: (username, password) => wrap(typeof username === "function"
         ? typeof password === "function"

package/target/request/request.d.ts

@@ -3,7 +3,7 @@ import { HttpHeaders } from "../headers";
 import { RequestBody } from "./body";
 import JvmRequest = io.gatling.http.client.Request;
 export interface Request extends Wrapper<JvmRequest> {
-    body(): RequestBody;
     headers(): HttpHeaders;
+    body(): RequestBody;
 }
 export declare const wrapRequest: (_underlying: JvmRequest) => Request;

package/target/request/request.js

@@ -5,7 +5,7 @@ const headers_1 = require("../headers");
 const body_1 = require("./body");
 const wrapRequest = (_underlying) => ({
     _underlying,
-    body: () => (0, body_1.wrapRequestBody)(_underlying.getBody()),
-    headers: () => (0, headers_1.wrapHttpHeaders)(_underlying.getHeaders())
+    headers: () => (0, headers_1.wrapHttpHeaders)(_underlying.getHeaders()),
+    body: () => (0, body_1.wrapRequestBody)(_underlying.getBody())
 });
 exports.wrapRequest = wrapRequest;