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

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

@@ -2,7 +2,7 @@ import type { ActionExecutionContext, ActionExecutionResult, ActionExecutor } fr
 export interface HttpResponse {
     status: number;
     body: unknown;
-    headers?: Record<string, string>;
+    headers?: Record<string, string | string[]>;
 }
 export interface HttpTransport {
     request(url: string, init: {
@@ -13,39 +13,6 @@ 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 {
-    name: string;
-    value: string;
-    domain: string;
-    path: string;
-    hostOnly: boolean;
-    secure: boolean;
-    expiresAt?: number;
-}
-/** Cookie state shared by HTTP Actions during one execution. */
-export declare class HttpCookieJar {
-    private readonly cookies;
-    store(url: string, setCookie: string | string[] | undefined): void;
-    header(url: string): string | undefined;
-}
-/** HTTP-specific session boundary. One instance must be created per QAick execution. */
-export declare class HttpExecutionSession implements HttpTransport {
-    private readonly transport;
-    readonly cookies: HttpCookieJar;
-    private readonly ambientCookies?;
-    constructor(transport: HttpTransport, cookies?: HttpCookieJar, ambientCookies?: HttpAmbientCookieProvider | undefined);
-    request(url: string, init: {
-        method: string;
-        body?: unknown;
-        headers?: Record<string, string>;
-        signal: AbortSignal;
-        timeoutMs?: number;
-    }): Promise<HttpResponse>;
-}
 export type HttpActionErrorCode = 'HTTP_INVALID_URL' | 'HTTP_REQUEST_CONSTRUCTION_ERROR' | 'HTTP_ABORTED' | 'HTTP_TIMEOUT' | 'HTTP_NETWORK_ERROR' | 'HTTP_RESPONSE_PARSE_ERROR' | 'HTTP_STATUS_ERROR';
 export declare class HttpActionError extends Error {
     readonly code: HttpActionErrorCode;
@@ -63,9 +30,7 @@ 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,79 +1,3 @@
-/** 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();
-    store(url, setCookie) {
-        if (!setCookie)
-            return;
-        const parsedUrl = new URL(url);
-        for (const header of (Array.isArray(setCookie) ? setCookie : splitSetCookieHeader(setCookie))) {
-            const cookie = parseSetCookie(header, parsedUrl);
-            if (!cookie)
-                continue;
-            const key = cookieKey(cookie);
-            if (cookie.expiresAt !== undefined && cookie.expiresAt <= Date.now())
-                this.cookies.delete(key);
-            else
-                this.cookies.set(key, cookie);
-        }
-    }
-    header(url) {
-        const parsedUrl = new URL(url);
-        const now = Date.now();
-        const applicable = [];
-        for (const [key, cookie] of this.cookies) {
-            if (cookie.expiresAt !== undefined && cookie.expiresAt <= now) {
-                this.cookies.delete(key);
-                continue;
-            }
-            if (!cookieMatches(cookie, parsedUrl))
-                continue;
-            applicable.push(cookie);
-        }
-        applicable.sort((left, right) => right.path.length - left.path.length);
-        return applicable.length ? applicable.map(cookie => `${cookie.name}=${cookie.value}`).join('; ') : undefined;
-    }
-}
-/** HTTP-specific session boundary. One instance must be created per QAick execution. */
-export class HttpExecutionSession {
-    transport;
-    cookies;
-    ambientCookies;
-    constructor(transport, cookies = new HttpCookieJar(), ambientCookies) {
-        this.transport = transport;
-        this.cookies = cookies;
-        this.ambientCookies = ambientCookies;
-    }
-    async request(url, init) {
-        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 {
     code;
     details;
@@ -84,84 +8,6 @@ export class HttpActionError extends Error {
         this.name = 'HttpActionError';
     }
 }
-function headerName(headers, expected) {
-    return Object.keys(headers).find(name => name.toLowerCase() === expected);
-}
-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, ambient) {
-    const cookies = new Map();
-    for (const value of [ambient, managed, explicit]) {
-        for (const item of value?.split(';') ?? []) {
-            const separator = item.indexOf('=');
-            if (separator <= 0)
-                continue;
-            cookies.set(item.slice(0, separator).trim(), item.slice(separator + 1).trim());
-        }
-    }
-    return cookies.size ? [...cookies.entries()].map(([name, value]) => `${name}=${value}`).join('; ') : undefined;
-}
-function splitSetCookieHeader(value) {
-    return value.split(/\r?\n|,(?=\s*[^;,=\s]+=[^;,]*)/).map(item => item.trim()).filter(Boolean);
-}
-function parseSetCookie(header, requestUrl) {
-    const parts = header.split(';').map(part => part.trim());
-    const pair = parts.shift();
-    if (!pair)
-        return undefined;
-    const separator = pair.indexOf('=');
-    if (separator <= 0)
-        return undefined;
-    const name = pair.slice(0, separator).trim();
-    const value = pair.slice(separator + 1).trim();
-    let domain = requestUrl.hostname.toLowerCase();
-    let hostOnly = true;
-    let path = defaultCookiePath(requestUrl.pathname);
-    let secure = false;
-    let expiresAt;
-    for (const attribute of parts) {
-        const [rawName, ...rawValue] = attribute.split('=');
-        const attributeName = rawName.trim().toLowerCase();
-        const attributeValue = rawValue.join('=').trim();
-        if (attributeName === 'domain' && attributeValue) {
-            domain = attributeValue.replace(/^\./, '').toLowerCase();
-            hostOnly = false;
-        }
-        else if (attributeName === 'path' && attributeValue.startsWith('/'))
-            path = attributeValue;
-        else if (attributeName === 'secure')
-            secure = true;
-        else if (attributeName === 'max-age') {
-            const seconds = Number(attributeValue);
-            if (Number.isFinite(seconds))
-                expiresAt = Date.now() + seconds * 1000;
-        }
-        else if (attributeName === 'expires') {
-            const timestamp = Date.parse(attributeValue);
-            if (Number.isFinite(timestamp))
-                expiresAt = timestamp;
-        }
-    }
-    return { name, value, domain, path, hostOnly, secure, ...(expiresAt !== undefined ? { expiresAt } : {}) };
-}
-function defaultCookiePath(pathname) {
-    if (!pathname || !pathname.startsWith('/'))
-        return '/';
-    const lastSlash = pathname.lastIndexOf('/');
-    return lastSlash <= 0 ? '/' : pathname.slice(0, lastSlash);
-}
-function cookieMatches(cookie, url) {
-    if (cookie.secure && url.protocol !== 'https:')
-        return false;
-    const host = url.hostname.toLowerCase();
-    if (cookie.hostOnly ? host !== cookie.domain : !(host === cookie.domain || host.endsWith(`.${cookie.domain}`)))
-        return false;
-    return url.pathname === cookie.path || url.pathname.startsWith(cookie.path.endsWith('/') ? cookie.path : `${cookie.path}/`);
-}
-function cookieKey(cookie) { return `${cookie.name};${cookie.domain};${cookie.path}`; }
 export class FetchHttpTransport {
     async request(url, init) {
         const headers = { ...init.headers };
@@ -179,7 +25,7 @@ export class FetchHttpTransport {
         const timeout = init.timeoutMs === undefined ? undefined : setTimeout(() => controller.abort(), init.timeoutMs);
         let response;
         try {
-            response = await fetch(url, { method: init.method, headers, body, signal: controller.signal, credentials: 'include' });
+            response = await fetch(url, { method: init.method, headers, body, signal: controller.signal });
         }
         catch (error) {
             if (init.signal.aborted)
@@ -208,7 +54,6 @@ export class FetchHttpTransport {
 }
 export class HttpActionExecutor {
     transport;
-    sessions = new Map();
     constructor(transport) {
         this.transport = transport;
     }
@@ -223,7 +68,7 @@ export class HttpActionExecutor {
                 url: appendQuery(url, substituteTemplateValue(context.inputs.query, context.inputs)),
                 method: substituteTemplate(String(context.inputs.method ?? 'GET'), context.inputs),
                 ...(context.inputs.body !== undefined ? { body: substituteTemplateValue(context.inputs.body, context.inputs) } : {}),
-                ...(isRecord(context.inputs.headers) ? { headers: Object.fromEntries(Object.entries(substituteTemplateValue(context.inputs.headers, context.inputs)).map(([name, value]) => [name, String(value)])) } : {}),
+                ...(isRecord(context.inputs.headers) || isRecord(context.inputs.cookies) ? { headers: renderHeaders(context.inputs.headers, context.inputs.cookies, context.inputs) } : {}),
             };
         }
         catch (error) {
@@ -231,14 +76,14 @@ 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 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 } : {}) });
+        const response = await this.transport.request(request.url, { ...request, signal: context.signal, ...(timeoutMs !== undefined ? { timeoutMs } : {}) });
+        const outputs = { status: response.status, body: response.body, ...(response.headers ? { headers: response.headers } : {}), cookies: responseCookies(response.headers) };
+        const responseHeadersName = context.step.adapterConfig?.responseHeadersName;
+        if (typeof responseHeadersName === 'string')
+            outputs[responseHeadersName] = response.headers ?? {};
         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 });
+            throw new HttpActionError('HTTP_STATUS_ERROR', `HTTP Action returned status ${response.status}. ${requestDiagnostics(request, response)}`, { status: response.status });
         }
-        const outputs = { status: response.status, body: response.body, ...(response.headers ? { headers: response.headers } : {}) };
         const responseFields = isRecord(context.step.adapterConfig?.responseFields) ? context.step.adapterConfig.responseFields : undefined;
         if (responseFields)
             for (const [name, path] of Object.entries(responseFields))
@@ -249,15 +94,65 @@ 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 requestDiagnostics(request, response) {
+    const parsed = tryParseUrl(request.url);
+    const body = request.body === undefined ? undefined : typeof request.body === 'string' ? request.body : JSON.stringify(request.body) ?? '';
+    const responseBody = typeof response.body === 'string' ? response.body : JSON.stringify(response.body) ?? '';
+    return `Request diagnostics: method=${request.method} path=${parsed?.pathname ?? '(invalid)'} bodyBytes=${byteLength(body)} requestHeaderNames=${headerNames(request.headers).join(',') || '(none)'} responseHeaderNames=${headerNames(response.headers).join(',') || '(none)'} responseBodyBytes=${byteLength(responseBody)}.`;
+}
+function tryParseUrl(value) {
+    try {
+        return new URL(value);
+    }
+    catch {
+        return undefined;
     }
 }
+function headerNames(headers) {
+    return Object.keys(headers ?? {}).map(name => name.toLowerCase()).sort();
+}
+function byteLength(value) {
+    return value === undefined ? 0 : new TextEncoder().encode(value).byteLength;
+}
+function responseCookies(headers) {
+    const raw = headers && Object.entries(headers).find(([name]) => name.toLowerCase() === 'set-cookie')?.[1];
+    const values = Array.isArray(raw) ? raw : raw ? raw.split(/\r?\n|,(?=\s*[^;,=\s]+=[^;,]*)/).map(item => item.trim()).filter(Boolean) : [];
+    return Object.fromEntries(values.flatMap(header => {
+        const [pair, ...parts] = header.split(';').map(item => item.trim());
+        const separator = pair?.indexOf('=') ?? -1;
+        if (!pair || separator <= 0)
+            return [];
+        const name = pair.slice(0, separator).trim();
+        const value = pair.slice(separator + 1).trim();
+        const attributes = {};
+        for (const part of parts) {
+            const equals = part.indexOf('=');
+            if (equals > 0)
+                attributes[part.slice(0, equals).trim().toLowerCase()] = part.slice(equals + 1).trim();
+            else if (part)
+                attributes[part.toLowerCase()] = true;
+        }
+        return [[name, { value, attributes }]];
+    }));
+}
+function renderHeaders(headersInput, cookiesInput, templateInputs) {
+    const headers = isRecord(headersInput)
+        ? Object.fromEntries(Object.entries(substituteTemplateValue(headersInput, templateInputs)).map(([name, value]) => [name, String(value)]))
+        : {};
+    if (!isRecord(cookiesInput) || Object.keys(headers).some(name => name.toLowerCase() === 'cookie'))
+        return headers;
+    const cookies = Object.entries(cookiesInput).flatMap(([name, value]) => {
+        if (isRecord(value) && typeof value.value === 'string')
+            return [`${name}=${value.value}`];
+        if (typeof value === 'string')
+            return [`${name}=${value}`];
+        return [];
+    });
+    if (cookies.length)
+        headers.Cookie = cookies.join('; ');
+    return headers;
+}
 function appendQuery(url, query) {
     if (query === undefined || query === null)
         return url;

package/dist/node-http-transport.js

@@ -8,7 +8,7 @@ export class NodeHttpTransport {
         if (init.signal.aborted)
             return Promise.reject(new HttpActionError('HTTP_ABORTED', 'HTTP Action was cancelled before a response was received.'));
         const parsed = new URL(url);
-        const headers = { ...init.headers };
+        const headers = { accept: '*/*', 'user-agent': 'QAICK-Desktop', ...init.headers };
         let body;
         if (init.body !== undefined && init.body !== null) {
             body = typeof init.body === 'string' ? init.body : JSON.stringify(init.body);
@@ -76,7 +76,7 @@ export class NodeHttpTransport {
     }
 }
 function normalizeHeaders(headers) {
-    return Object.fromEntries(Object.entries(headers).map(([name, value]) => [name, Array.isArray(value) ? value.join(', ') : value ?? '']));
+    return Object.fromEntries(Object.entries(headers).map(([name, value]) => [name, Array.isArray(value) ? value : value ?? '']));
 }
 function headerValue(headers, name) {
     const value = headers[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qaick/http-executor",
-  "version": "0.1.0-alpha.5",
+  "version": "0.1.0-alpha.7",
   "description": "Reusable QAick HTTP Action execution with browser and native Node transports.",
   "keywords": [
     "qaick",
@@ -42,7 +42,7 @@
     "@qaick/executor": ">=0.1.0-alpha.1 <0.2.0"
   },
   "devDependencies": {
-    "@qaick/executor": "0.1.0-alpha.1",
+    "@qaick/executor": "0.1.0-alpha.2",
     "@types/node": "^24.13.3",
     "typescript": "~6.0.2",
     "vitest": "^5.0.1"