@qaick/http-executor 0.1.0-alpha.2 → 0.1.0-alpha.4

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

@@ -13,6 +13,8 @@ export interface HttpTransport {
         timeoutMs?: number;
     }): Promise<HttpResponse>;
 }
+/** 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 {
     name: string;
     value: string;
@@ -58,7 +60,9 @@ export declare class FetchHttpTransport implements HttpTransport {
 }
 export declare class HttpActionExecutor implements ActionExecutor {
     private readonly transport;
+    private readonly sessions;
     constructor(transport: HttpTransport);
     supports(action: string): boolean;
     execute(context: ActionExecutionContext): Promise<ActionExecutionResult>;
+    private sessionFor;
 }

package/dist/http-action-executor.js

@@ -1,3 +1,5 @@
+/** Internal Runtime-to-HTTP execution key. It is not part of persisted Action data. */
+export const HTTP_EXECUTION_ID_KEY = '__qaick_execution_id';
 /** Cookie state shared by HTTP Actions during one execution. */
 export class HttpCookieJar {
     cookies = new Map();
@@ -42,16 +44,31 @@ export class HttpExecutionSession {
         this.cookies = cookies;
     }
     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 merged = mergeCookieHeaders(cookieHeader ? headers[cookieHeader] : undefined, managed);
+            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 {
@@ -71,6 +88,7 @@ function headerValue(headers, expected) {
     const name = Object.keys(headers).find(key => key.toLowerCase() === expected);
     return name ? headers[name] : undefined;
 }
+function isRedirect(status) { return status === 301 || status === 302 || status === 303 || status === 307 || status === 308; }
 function mergeCookieHeaders(explicit, managed) {
     const cookies = new Map();
     for (const value of [managed, explicit]) {
@@ -187,6 +205,7 @@ export class FetchHttpTransport {
 }
 export class HttpActionExecutor {
     transport;
+    sessions = new Map();
     constructor(transport) {
         this.transport = transport;
     }
@@ -209,7 +228,9 @@ export class HttpActionExecutor {
             throw new HttpActionError('HTTP_REQUEST_CONSTRUCTION_ERROR', `HTTP Action request could not be constructed. ${detail}`);
         }
         const timeoutMs = typeof context.step.adapterConfig?.timeoutMs === 'number' ? context.step.adapterConfig.timeoutMs : undefined;
-        const response = await this.transport.request(request.url, { ...request, signal: context.signal, ...(timeoutMs !== undefined ? { timeoutMs } : {}) });
+        const executionId = typeof context.runtimeValues[HTTP_EXECUTION_ID_KEY] === 'string' ? context.runtimeValues[HTTP_EXECUTION_ID_KEY] : undefined;
+        const transport = executionId ? this.sessionFor(executionId) : this.transport;
+        const response = await transport.request(request.url, { ...request, signal: context.signal, ...(timeoutMs !== undefined ? { timeoutMs } : {}) });
         if (response.status < 200 || response.status >= 300) {
             const serializedBody = typeof response.body === 'string' ? response.body : JSON.stringify(response.body) ?? '';
             throw new HttpActionError('HTTP_STATUS_ERROR', `HTTP Action returned status ${response.status}.${serializedBody ? ` Response: ${serializedBody.slice(0, 500)}` : ''}`, { status: response.status });
@@ -225,6 +246,14 @@ export class HttpActionExecutor {
         const finishedAt = new Date().toISOString();
         return { outputs, evidence: { request: { url: request.url, method: request.method, headers: request.headers }, response: { status: response.status, headers: response.headers, body: response.body } }, timing: { startedAt, finishedAt, durationMs: Date.now() - startedMs } };
     }
+    sessionFor(executionId) {
+        let session = this.sessions.get(executionId);
+        if (!session) {
+            session = new HttpExecutionSession(this.transport);
+            this.sessions.set(executionId, session);
+        }
+        return session;
+    }
 }
 function appendQuery(url, query) {
     if (query === undefined || query === null)

package/package.json

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