@qaick/http-executor 0.1.0-alpha.3 → 0.1.0-alpha.5

package/dist/http-action-executor.d.ts

@@ -13,6 +13,8 @@ export interface HttpTransport {
         timeoutMs?: number;
     }): Promise<HttpResponse>;
 }
+/** Host-owned cookies that already exist before a QAick execution starts. */
+export type HttpAmbientCookieProvider = (url: string) => Promise<string | undefined>;
 /** Internal Runtime-to-HTTP execution key. It is not part of persisted Action data. */
 export declare const HTTP_EXECUTION_ID_KEY = "__qaick_execution_id";
 export interface HttpCookie {
@@ -34,7 +36,8 @@ export declare class HttpCookieJar {
 export declare class HttpExecutionSession implements HttpTransport {
     private readonly transport;
     readonly cookies: HttpCookieJar;
-    constructor(transport: HttpTransport, cookies?: HttpCookieJar);
+    private readonly ambientCookies?;
+    constructor(transport: HttpTransport, cookies?: HttpCookieJar, ambientCookies?: HttpAmbientCookieProvider | undefined);
     request(url: string, init: {
         method: string;
         body?: unknown;

package/dist/http-action-executor.js

@@ -39,21 +39,39 @@ export class HttpCookieJar {
 export class HttpExecutionSession {
     transport;
     cookies;
-    constructor(transport, cookies = new HttpCookieJar()) {
+    ambientCookies;
+    constructor(transport, cookies = new HttpCookieJar(), ambientCookies) {
         this.transport = transport;
         this.cookies = cookies;
+        this.ambientCookies = ambientCookies;
     }
     async request(url, init) {
-        const headers = { ...(init.headers ?? {}) };
-        const cookieHeader = headerName(headers, 'cookie');
-        const managed = this.cookies.header(url);
-        const merged = mergeCookieHeaders(cookieHeader ? headers[cookieHeader] : undefined, managed);
-        if (merged)
-            headers[cookieHeader ?? 'cookie'] = merged;
-        const response = await this.transport.request(url, { ...init, headers });
-        const setCookie = response.headers && headerValue(response.headers, 'set-cookie');
-        this.cookies.store(url, setCookie);
-        return response;
+        let currentUrl = url;
+        let currentInit = { ...init };
+        for (let redirect = 0; redirect <= 10; redirect += 1) {
+            const headers = { ...(currentInit.headers ?? {}) };
+            const cookieHeader = headerName(headers, 'cookie');
+            const managed = this.cookies.header(currentUrl);
+            const ambient = this.ambientCookies ? await this.ambientCookies(currentUrl).catch(() => undefined) : undefined;
+            const merged = mergeCookieHeaders(cookieHeader ? headers[cookieHeader] : undefined, managed, ambient);
+            if (merged)
+                headers[cookieHeader ?? 'cookie'] = merged;
+            const response = await this.transport.request(currentUrl, { ...currentInit, headers });
+            const setCookie = response.headers && headerValue(response.headers, 'set-cookie');
+            this.cookies.store(currentUrl, setCookie);
+            if (!isRedirect(response.status) || !response.headers)
+                return response;
+            const location = headerValue(response.headers, 'location');
+            if (!location)
+                return response;
+            if (redirect === 10)
+                return response;
+            const nextUrl = new URL(location, currentUrl).toString();
+            const nextMethod = response.status === 303 || ((response.status === 301 || response.status === 302) && currentInit.method.toUpperCase() === 'POST') ? 'GET' : currentInit.method;
+            currentUrl = nextUrl;
+            currentInit = nextMethod === 'GET' ? { ...currentInit, method: nextMethod, body: undefined } : { ...currentInit, method: nextMethod };
+        }
+        throw new Error('HTTP redirect limit exceeded.');
     }
 }
 export class HttpActionError extends Error {
@@ -73,9 +91,10 @@ function headerValue(headers, expected) {
     const name = Object.keys(headers).find(key => key.toLowerCase() === expected);
     return name ? headers[name] : undefined;
 }
-function mergeCookieHeaders(explicit, managed) {
+function isRedirect(status) { return status === 301 || status === 302 || status === 303 || status === 307 || status === 308; }
+function mergeCookieHeaders(explicit, managed, ambient) {
     const cookies = new Map();
-    for (const value of [managed, explicit]) {
+    for (const value of [ambient, managed, explicit]) {
         for (const item of value?.split(';') ?? []) {
             const separator = item.indexOf('=');
             if (separator <= 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qaick/http-executor",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.5",
   "description": "Reusable QAick HTTP Action execution with browser and native Node transports.",
   "keywords": [
     "qaick",