mavenagi 0.0.0-alpha.11 → 0.0.0-alpha.12

package/core/fetcher/Fetcher.js

@@ -7,13 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import qs from "qs";
-import { RUNTIME } from "../runtime";
-const INITIAL_RETRY_DELAY = 1;
-const MAX_RETRY_DELAY = 60;
-const DEFAULT_MAX_RETRIES = 2;
-function fetcherImpl(args) {
-    var _a, _b;
+import { createRequestUrl } from "./createRequestUrl";
+import { getFetchFn } from "./getFetchFn";
+import { getRequestBody } from "./getRequestBody";
+import { getResponseBody } from "./getResponseBody";
+import { makeRequest } from "./makeRequest";
+import { requestWithRetries } from "./requestWithRetries";
+export function fetcherImpl(args) {
     return __awaiter(this, void 0, void 0, function* () {
         const headers = {};
         if (args.body !== undefined && args.contentType != null) {
@@ -26,112 +26,21 @@ function fetcherImpl(args) {
                 }
             }
         }
-        const url = Object.keys((_a = args.queryParameters) !== null && _a !== void 0 ? _a : {}).length > 0
-            ? `${args.url}?${qs.stringify(args.queryParameters, { arrayFormat: "repeat" })}`
-            : args.url;
-        let body = undefined;
-        const maybeStringifyBody = (body) => {
-            if (body instanceof Uint8Array) {
-                return body;
-            }
-            else if (args.contentType === "application/x-www-form-urlencoded" && typeof args.body === "string") {
-                return args.body;
-            }
-            else {
-                return JSON.stringify(body);
-            }
-        };
-        if (RUNTIME.type === "node") {
-            if (args.body instanceof (yield import("formdata-node")).FormData) {
-                // @ts-expect-error
-                body = args.body;
-            }
-            else {
-                body = maybeStringifyBody(args.body);
-            }
-        }
-        else {
-            if (args.body instanceof (yield import("form-data")).default) {
-                // @ts-expect-error
-                body = args.body;
-            }
-            else {
-                body = maybeStringifyBody(args.body);
-            }
-        }
-        const fetchFn = yield getFetchFn();
-        const makeRequest = () => __awaiter(this, void 0, void 0, function* () {
-            const signals = [];
-            // Add timeout signal
-            let timeoutAbortId = undefined;
-            if (args.timeoutMs != null) {
-                const { signal, abortId } = getTimeoutSignal(args.timeoutMs);
-                timeoutAbortId = abortId;
-                signals.push(signal);
-            }
-            // Add arbitrary signal
-            if (args.abortSignal != null) {
-                signals.push(args.abortSignal);
-            }
-            const response = yield fetchFn(url, {
-                method: args.method,
-                headers,
-                body,
-                signal: anySignal(signals),
-                credentials: args.withCredentials ? "include" : undefined,
-            });
-            if (timeoutAbortId != null) {
-                clearTimeout(timeoutAbortId);
-            }
-            return response;
+        const url = createRequestUrl(args.url, args.queryParameters);
+        let requestBody = yield getRequestBody({
+            body: args.body,
+            type: args.requestType === "json" ? "json" : "other",
         });
+        const fetchFn = yield getFetchFn();
         try {
-            let response = yield makeRequest();
-            for (let i = 0; i < ((_b = args.maxRetries) !== null && _b !== void 0 ? _b : DEFAULT_MAX_RETRIES); ++i) {
-                if (response.status === 408 ||
-                    response.status === 409 ||
-                    response.status === 429 ||
-                    response.status >= 500) {
-                    const delay = Math.min(INITIAL_RETRY_DELAY * Math.pow(i, 2), MAX_RETRY_DELAY);
-                    yield new Promise((resolve) => setTimeout(resolve, delay));
-                    response = yield makeRequest();
-                }
-                else {
-                    break;
-                }
-            }
-            let body;
-            if (response.body != null && args.responseType === "blob") {
-                body = yield response.blob();
-            }
-            else if (response.body != null && args.responseType === "streaming") {
-                body = response.body;
-            }
-            else if (response.body != null && args.responseType === "text") {
-                body = yield response.text();
-            }
-            else {
-                const text = yield response.text();
-                if (text.length > 0) {
-                    try {
-                        body = JSON.parse(text);
-                    }
-                    catch (err) {
-                        return {
-                            ok: false,
-                            error: {
-                                reason: "non-json",
-                                statusCode: response.status,
-                                rawBody: text,
-                            },
-                        };
-                    }
-                }
-            }
+            const response = yield requestWithRetries(() => __awaiter(this, void 0, void 0, function* () {
+                return makeRequest(fetchFn, url, args.method, headers, requestBody, args.timeoutMs, args.abortSignal, args.withCredentials, args.duplex);
+            }), args.maxRetries);
+            let responseBody = yield getResponseBody(response, args.responseType);
             if (response.status >= 200 && response.status < 400) {
                 return {
                     ok: true,
-                    body: body,
+                    body: responseBody,
                     headers: response.headers,
                 };
             }
@@ -141,7 +50,7 @@ function fetcherImpl(args) {
                     error: {
                         reason: "status-code",
                         statusCode: response.status,
-                        body,
+                        body: responseBody,
                     },
                 };
             }
@@ -183,54 +92,4 @@ function fetcherImpl(args) {
         }
     });
 }
-const TIMEOUT = "timeout";
-function getTimeoutSignal(timeoutMs) {
-    const controller = new AbortController();
-    const abortId = setTimeout(() => controller.abort(TIMEOUT), timeoutMs);
-    return { signal: controller.signal, abortId };
-}
-/**
- * Returns an abort signal that is getting aborted when
- * at least one of the specified abort signals is aborted.
- *
- * Requires at least node.js 18.
- */
-function anySignal(...args) {
-    // Allowing signals to be passed either as array
-    // of signals or as multiple arguments.
-    const signals = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args);
-    const controller = new AbortController();
-    for (const signal of signals) {
-        if (signal.aborted) {
-            // Exiting early if one of the signals
-            // is already aborted.
-            controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason);
-            break;
-        }
-        // Listening for signals and removing the listeners
-        // when at least one symbol is aborted.
-        signal.addEventListener("abort", () => controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason), {
-            signal: controller.signal,
-        });
-    }
-    return controller.signal;
-}
-/**
- * Returns a fetch function based on the runtime
- */
-function getFetchFn() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // In Node.js environments, the SDK always uses`node-fetch`.
-        if (RUNTIME.type === "node") {
-            return (yield import("node-fetch")).default;
-        }
-        // Otherwise the SDK uses global fetch if available,
-        // and falls back to node-fetch.
-        if (typeof fetch == "function") {
-            return fetch;
-        }
-        // Defaults to node `node-fetch` if global fetch isn't available
-        return (yield import("node-fetch")).default;
-    });
-}
 export const fetcher = fetcherImpl;

package/core/fetcher/createRequestUrl.d.ts

@@ -0,0 +1 @@
+export declare function createRequestUrl(baseUrl: string, queryParameters?: Record<string, string | string[] | object | object[]>): string;

package/core/fetcher/createRequestUrl.js

@@ -0,0 +1,6 @@
+import qs from "qs";
+export function createRequestUrl(baseUrl, queryParameters) {
+    return Object.keys(queryParameters !== null && queryParameters !== void 0 ? queryParameters : {}).length > 0
+        ? `${baseUrl}?${qs.stringify(queryParameters, { arrayFormat: "repeat" })}`
+        : baseUrl;
+}

package/core/fetcher/getFetchFn.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Returns a fetch function based on the runtime
+ */
+export declare function getFetchFn(): Promise<any>;

package/core/fetcher/getFetchFn.js

@@ -0,0 +1,32 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { RUNTIME } from "../runtime";
+/**
+ * Returns a fetch function based on the runtime
+ */
+export function getFetchFn() {
+    return __awaiter(this, void 0, void 0, function* () {
+        // In Node.js 18+ environments, use native fetch
+        if (RUNTIME.type === "node" && RUNTIME.parsedVersion != null && RUNTIME.parsedVersion >= 18) {
+            return fetch;
+        }
+        // In Node.js 18 or lower environments, the SDK always uses`node-fetch`.
+        if (RUNTIME.type === "node") {
+            return (yield import("node-fetch")).default;
+        }
+        // Otherwise the SDK uses global fetch if available,
+        // and falls back to node-fetch.
+        if (typeof fetch == "function") {
+            return fetch;
+        }
+        // Defaults to node `node-fetch` if global fetch isn't available
+        return (yield import("node-fetch")).default;
+    });
+}

package/core/fetcher/getRequestBody.d.ts

@@ -0,0 +1,7 @@
+export declare namespace GetRequestBody {
+    interface Args {
+        body: unknown;
+        type: "json" | "file" | "bytes" | "other";
+    }
+}
+export declare function getRequestBody({ body, type }: GetRequestBody.Args): Promise<BodyInit | undefined>;

package/core/fetcher/getRequestBody.js

@@ -0,0 +1,19 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+export function getRequestBody({ body, type }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (type.includes("json")) {
+            return JSON.stringify(body);
+        }
+        else {
+            return body;
+        }
+    });
+}

package/core/fetcher/getResponseBody.d.ts

@@ -0,0 +1 @@
+export declare function getResponseBody(response: Response, responseType?: string): Promise<unknown>;

package/core/fetcher/getResponseBody.js

@@ -0,0 +1,48 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { chooseStreamWrapper } from "./stream-wrappers/chooseStreamWrapper";
+export function getResponseBody(response, responseType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (response.body != null && responseType === "blob") {
+            return yield response.blob();
+        }
+        else if (response.body != null && responseType === "sse") {
+            return response.body;
+        }
+        else if (response.body != null && responseType === "streaming") {
+            return chooseStreamWrapper(response.body);
+        }
+        else if (response.body != null && responseType === "text") {
+            return yield response.text();
+        }
+        else {
+            const text = yield response.text();
+            if (text.length > 0) {
+                try {
+                    let responseBody = JSON.parse(text);
+                    return responseBody;
+                }
+                catch (err) {
+                    return {
+                        ok: false,
+                        error: {
+                            reason: "non-json",
+                            statusCode: response.status,
+                            rawBody: text,
+                        },
+                    };
+                }
+            }
+            else {
+                return undefined;
+            }
+        }
+    });
+}

package/core/fetcher/makeRequest.d.ts

@@ -0,0 +1 @@
+export declare const makeRequest: (fetchFn: (url: string, init: RequestInit) => Promise<Response>, url: string, method: string, headers: Record<string, string>, requestBody: BodyInit | undefined, timeoutMs?: number | undefined, abortSignal?: AbortSignal | undefined, withCredentials?: boolean | undefined, duplex?: "half" | undefined) => Promise<Response>;

package/core/fetcher/makeRequest.js

@@ -0,0 +1,38 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { anySignal, getTimeoutSignal } from "./signals";
+export const makeRequest = (fetchFn, url, method, headers, requestBody, timeoutMs, abortSignal, withCredentials, duplex) => __awaiter(void 0, void 0, void 0, function* () {
+    const signals = [];
+    // Add timeout signal
+    let timeoutAbortId = undefined;
+    if (timeoutMs != null) {
+        const { signal, abortId } = getTimeoutSignal(timeoutMs);
+        timeoutAbortId = abortId;
+        signals.push(signal);
+    }
+    // Add arbitrary signal
+    if (abortSignal != null) {
+        signals.push(abortSignal);
+    }
+    let newSignals = anySignal(signals);
+    const response = yield fetchFn(url, {
+        method: method,
+        headers,
+        body: requestBody,
+        signal: newSignals,
+        credentials: withCredentials ? "include" : undefined,
+        // @ts-ignore
+        duplex,
+    });
+    if (timeoutAbortId != null) {
+        clearTimeout(timeoutAbortId);
+    }
+    return response;
+});

package/core/fetcher/requestWithRetries.d.ts

@@ -0,0 +1 @@
+export declare function requestWithRetries(requestFn: () => Promise<Response>, maxRetries?: number): Promise<Response>;

package/core/fetcher/requestWithRetries.js

@@ -0,0 +1,28 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const INITIAL_RETRY_DELAY = 1;
+const MAX_RETRY_DELAY = 60;
+const DEFAULT_MAX_RETRIES = 2;
+export function requestWithRetries(requestFn, maxRetries = DEFAULT_MAX_RETRIES) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let response = yield requestFn();
+        for (let i = 0; i < maxRetries; ++i) {
+            if ([408, 409, 429].includes(response.status) || response.status >= 500) {
+                const delay = Math.min(INITIAL_RETRY_DELAY * Math.pow(2, i), MAX_RETRY_DELAY);
+                yield new Promise((resolve) => setTimeout(resolve, delay));
+                response = yield requestFn();
+            }
+            else {
+                break;
+            }
+        }
+        return response;
+    });
+}

package/core/fetcher/signals.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+export declare function getTimeoutSignal(timeoutMs: number): {
+    signal: AbortSignal;
+    abortId: NodeJS.Timeout;
+};
+/**
+ * Returns an abort signal that is getting aborted when
+ * at least one of the specified abort signals is aborted.
+ *
+ * Requires at least node.js 18.
+ */
+export declare function anySignal(...args: AbortSignal[] | [AbortSignal[]]): AbortSignal;

package/core/fetcher/signals.js

@@ -0,0 +1,32 @@
+const TIMEOUT = "timeout";
+export function getTimeoutSignal(timeoutMs) {
+    const controller = new AbortController();
+    const abortId = setTimeout(() => controller.abort(TIMEOUT), timeoutMs);
+    return { signal: controller.signal, abortId };
+}
+/**
+ * Returns an abort signal that is getting aborted when
+ * at least one of the specified abort signals is aborted.
+ *
+ * Requires at least node.js 18.
+ */
+export function anySignal(...args) {
+    // Allowing signals to be passed either as array
+    // of signals or as multiple arguments.
+    const signals = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args);
+    const controller = new AbortController();
+    for (const signal of signals) {
+        if (signal.aborted) {
+            // Exiting early if one of the signals
+            // is already aborted.
+            controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason);
+            break;
+        }
+        // Listening for signals and removing the listeners
+        // when at least one symbol is aborted.
+        signal.addEventListener("abort", () => controller.abort(signal === null || signal === void 0 ? void 0 : signal.reason), {
+            signal: controller.signal,
+        });
+    }
+    return controller.signal;
+}

package/core/fetcher/stream-wrappers/Node18UniversalStreamWrapper.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="node" />
+import type { Writable } from "stream";
+import { EventCallback, StreamWrapper } from "./chooseStreamWrapper";
+export declare class Node18UniversalStreamWrapper implements StreamWrapper<Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>, Uint8Array> {
+    private readableStream;
+    private reader;
+    private events;
+    private paused;
+    private resumeCallback;
+    private encoding;
+    constructor(readableStream: ReadableStream<Uint8Array>);
+    on(event: string, callback: EventCallback): void;
+    off(event: string, callback: EventCallback): void;
+    pipe(dest: Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>): Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>;
+    pipeTo(dest: Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>): Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>;
+    unpipe(dest: Node18UniversalStreamWrapper | Writable | WritableStream<Uint8Array>): void;
+    destroy(error?: Error): void;
+    pause(): void;
+    resume(): void;
+    get isPaused(): boolean;
+    read(): Promise<Uint8Array | undefined>;
+    setEncoding(encoding: string): void;
+    text(): Promise<string>;
+    json<T>(): Promise<T>;
+    private _write;
+    private _end;
+    private _error;
+    private _emit;
+    private _startReading;
+}