@apicity/xai 0.6.6 → 0.7.0

package/dist/src/xai.js

@@ -1,18 +1,54 @@
 import { XaiError, } from "./types.js";
-import { XaiChatRequestSchema, XaiImageGenerateRequestSchema, XaiImageEditRequestSchema, XaiVideoGenerateRequestSchema, XaiGrokImagineVideo15ImageToVideoRequestSchema, XaiVideoEditRequestSchema, XaiVideoExtendRequestSchema, XaiBatchCreateRequestSchema, XaiCollectionCreateRequestSchema, XaiCollectionUpdateRequestSchema, XaiDocumentSearchRequestSchema, XaiResponseRequestSchema, XaiResponseCompactRequestSchema, XaiTokenizeTextRequestSchema, XaiRealtimeClientSecretRequestSchema, XaiTtsRequestSchema, XaiSttRequestSchema, XaiCustomVoiceCreateRequestSchema, XaiBillingUsageRequestSchema, XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW, } from "./zod.js";
+import { XaiChatRequestSchema, XaiImageGenerateRequestSchema, XaiImageEditRequestSchema, XaiFilePublicUrlRequestSchema, XaiVideoGenerateRequestSchema, XaiGrokImagineVideo15ImageToVideoRequestSchema, XaiVideoEditRequestSchema, XaiVideoExtendRequestSchema, XaiBatchCreateRequestSchema, XaiCollectionCreateRequestSchema, XaiCollectionUpdateRequestSchema, XaiDocumentSearchRequestSchema, XaiResponseRequestSchema, XaiResponseCompactRequestSchema, XaiTokenizeTextRequestSchema, XaiRealtimeClientSecretRequestSchema, XaiTtsRequestSchema, XaiSttRequestSchema, XaiCustomVoiceCreateRequestSchema, XaiCustomVoiceUpdateRequestSchema, XaiBillingUsageRequestSchema, XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW, } from "./zod.js";
 import { attachExamples } from "./example.js";
+import { createTransport } from "./transport.js";
 import { withPaidGate } from "./with-paid-gate.js";
-// Helper function to safely handle AbortSignal across different environments
-function attachAbortHandler(signal, controller) {
-    if (!signal)
-        return;
-    // Handle both standard AbortSignal and node-fetch's AbortSignal
-    if (typeof signal.addEventListener === "function") {
-        signal.addEventListener("abort", () => controller.abort(), { once: true });
+function isXaiErrorEnvelope(body) {
+    return (typeof body === "object" &&
+        body !== null &&
+        "error" in body &&
+        typeof body.error === "object");
+}
+function parseXaiErrorBody(status, body) {
+    if (isXaiErrorEnvelope(body) && typeof body.error?.message === "string") {
+        return { message: `XAI API error ${status}: ${body.error.message}` };
+    }
+    return { message: `XAI API error: ${status}` };
+}
+async function wrapXaiTransportFailure(fn) {
+    try {
+        return await fn();
     }
-    else if (signal.aborted) {
-        // Already aborted, abort our controller too
-        controller.abort();
+    catch (error) {
+        if (error instanceof XaiError)
+            throw error;
+        throw new XaiError(`XAI request failed: ${error}`, 500);
+    }
+}
+async function readJsonResponse(res) {
+    return await wrapXaiTransportFailure(async () => (await res.json()));
+}
+async function readArrayBufferResponse(res) {
+    return await wrapXaiTransportFailure(async () => await res.arrayBuffer());
+}
+async function jsonRequest(transport, method, path, body, signal) {
+    const res = await transport.raw(path, {
+        method,
+        headers: body === undefined ? undefined : { "Content-Type": "application/json" },
+        body: body === undefined ? undefined : JSON.stringify(body),
+        signal,
+    });
+    return await readJsonResponse(res);
+}
+function isAbortSignal(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "aborted" in value &&
+        "addEventListener" in value);
+}
+function appendOptionalFormField(form, name, value) {
+    if (value !== undefined) {
+        form.append(name, value);
     }
 }
 const DEFAULT_VIDEO_POLL_INTERVAL_MS = 5000;
@@ -25,10 +61,22 @@ function normalizeImageReference(image) {
     return rest;
 }
 function normalizeImageEditRequest(req) {
+    const { image_file_id, image_file_ids, ...rest } = req;
+    const normalized = {
+        ...rest,
+    };
+    if (normalized.image === undefined && image_file_id !== undefined) {
+        normalized.image = { file_id: image_file_id };
+    }
+    if (normalized.images === undefined && image_file_ids !== undefined) {
+        normalized.images = image_file_ids.map((file_id) => ({ file_id }));
+    }
     return {
-        ...req,
-        image: req.image === undefined ? undefined : normalizeImageReference(req.image),
-        images: req.images?.map(normalizeImageReference),
+        ...normalized,
+        image: normalized.image === undefined
+            ? undefined
+            : normalizeImageReference(normalized.image),
+        images: normalized.images?.map(normalizeImageReference),
     };
 }
 function normalizeVideoReference(image) {
@@ -36,11 +84,51 @@ function normalizeVideoReference(image) {
         return { url: image };
     return image;
 }
+function normalizeVideoGenerateRequest(req) {
+    const { image_file_id, video_file_id, reference_image_file_ids, ...rest } = req;
+    const normalized = {
+        ...rest,
+    };
+    if (normalized.image === undefined && image_file_id !== undefined) {
+        normalized.image = { file_id: image_file_id };
+    }
+    if (normalized.video === undefined && video_file_id !== undefined) {
+        normalized.video = { file_id: video_file_id };
+    }
+    if (normalized.reference_images === undefined &&
+        reference_image_file_ids !== undefined) {
+        normalized.reference_images = reference_image_file_ids.map((file_id) => ({
+            file_id,
+        }));
+    }
+    return normalized;
+}
+function normalizeVideoEditRequest(req) {
+    const { video_file_id, ...rest } = req;
+    const normalized = {
+        ...rest,
+    };
+    if (normalized.video === undefined && video_file_id !== undefined) {
+        normalized.video = { file_id: video_file_id };
+    }
+    return normalized;
+}
+function normalizeVideoExtendRequest(req) {
+    const { video_file_id, ...rest } = req;
+    const normalized = {
+        ...rest,
+    };
+    if (normalized.video === undefined && video_file_id !== undefined) {
+        normalized.video = { file_id: video_file_id };
+    }
+    return normalized;
+}
 function applyVideoGenerationDefaults(req) {
-    if (req.model !== undefined)
-        return req;
+    const normalized = normalizeVideoGenerateRequest(req);
+    if (normalized.model !== undefined)
+        return normalized;
     return {
-        ...req,
+        ...normalized,
         model: XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW,
     };
 }
@@ -67,95 +155,39 @@ export function createXai(opts) {
     const managementBaseURL = opts.managementBaseURL ?? "https://management-api.x.ai/v1";
     const managementRootURL = managementBaseURL.replace(/\/v1\/?$/, "");
     const managementApiKey = opts.managementApiKey ?? opts.apiKey;
-    const doFetch = opts.fetch ?? fetch;
     const timeout = opts.timeout ?? 30000;
+    const transport = createTransport({
+        baseUrl: baseURL,
+        timeoutMs: timeout,
+        fetchImpl: opts.fetch,
+        defaultHeaders: () => ({ Authorization: `Bearer ${opts.apiKey}` }),
+        parseErrorBody: parseXaiErrorBody,
+        errorClass: XaiError,
+        requestFailedPrefix: "XAI request failed",
+    });
+    const managementTransport = createTransport({
+        baseUrl: managementBaseURL,
+        timeoutMs: timeout,
+        fetchImpl: opts.fetch,
+        defaultHeaders: () => ({ Authorization: `Bearer ${managementApiKey}` }),
+        parseErrorBody: parseXaiErrorBody,
+        errorClass: XaiError,
+        requestFailedPrefix: "XAI request failed",
+    });
+    const managementRootTransport = createTransport({
+        baseUrl: managementRootURL,
+        timeoutMs: timeout,
+        fetchImpl: opts.fetch,
+        defaultHeaders: () => ({ Authorization: `Bearer ${managementApiKey}` }),
+        parseErrorBody: parseXaiErrorBody,
+        errorClass: XaiError,
+        requestFailedPrefix: "XAI request failed",
+    });
     async function makeRequest(method, path, body, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const headers = {
-                Authorization: `Bearer ${opts.apiKey}`,
-            };
-            const init = {
-                method,
-                headers,
-                signal: controller.signal,
-            };
-            if (body !== undefined) {
-                headers["Content-Type"] = "application/json";
-                init.body = JSON.stringify(body);
-            }
-            const res = await doFetch(`${baseURL}${path}`, init);
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let body = null;
-                try {
-                    body = await res.json();
-                    if (typeof body === "object" && body !== null && "error" in body) {
-                        const err = body.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, body);
-            }
-            return (await res.json());
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        return await jsonRequest(transport, method, path, body, signal);
     }
     async function makeGetTextRequest(path, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const res = await doFetch(`${baseURL}${path}`, {
-                method: "GET",
-                headers: {
-                    Authorization: `Bearer ${opts.apiKey}`,
-                },
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let body = null;
-                try {
-                    body = await res.json();
-                    if (typeof body === "object" && body !== null && "error" in body) {
-                        const err = body.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, body);
-            }
-            return await res.text();
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        return await transport.getText(path, { signal });
     }
     function buildQuery(params) {
         const parts = [];
@@ -174,11 +206,19 @@ export function createXai(opts) {
             req.model !== XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW) {
             throw new XaiError(`Grok Imagine image-to-video uses ${XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW}`, 400, { model: req.model });
         }
-        const { pollIntervalMs = DEFAULT_VIDEO_POLL_INTERVAL_MS, maxPolls = DEFAULT_VIDEO_MAX_POLLS, image, } = req;
+        const { pollIntervalMs = DEFAULT_VIDEO_POLL_INTERVAL_MS, maxPolls = DEFAULT_VIDEO_MAX_POLLS, image, image_file_id, } = req;
+        const imageReference = image !== undefined
+            ? normalizeVideoReference(image)
+            : image_file_id !== undefined
+                ? { file_id: image_file_id }
+                : undefined;
+        if (imageReference === undefined) {
+            throw new XaiError("XAI image-to-video requires image or image_file_id", 400);
+        }
         const generationRequest = {
             prompt: req.prompt,
             model: XAI_GROK_IMAGINE_VIDEO_1_5_PREVIEW,
-            image: normalizeVideoReference(image),
+            image: imageReference,
         };
         if (req.duration !== undefined)
             generationRequest.duration = req.duration;
@@ -188,6 +228,9 @@ export function createXai(opts) {
         if (req.resolution !== undefined) {
             generationRequest.resolution = req.resolution;
         }
+        if (req.storage_options !== undefined) {
+            generationRequest.storage_options = req.storage_options;
+        }
         const start = await makeRequest("POST", "/videos/generations", generationRequest, signal);
         let lastStatus;
         for (let poll = 0; poll < maxPolls; poll++) {
@@ -218,102 +261,10 @@ export function createXai(opts) {
         throw new XaiError(`XAI video generation timed out after ${maxPolls} polls: ${start.request_id}`, 408, lastStatus ?? { request_id: start.request_id });
     }
     async function makeManagementRequest(method, path, body, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const headers = {
-                Authorization: `Bearer ${managementApiKey}`,
-            };
-            const init = {
-                method,
-                headers,
-                signal: controller.signal,
-            };
-            if (body !== undefined) {
-                headers["Content-Type"] = "application/json";
-                init.body = JSON.stringify(body);
-            }
-            const res = await doFetch(`${managementBaseURL}${path}`, init);
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let errBody = null;
-                try {
-                    errBody = await res.json();
-                    if (typeof errBody === "object" &&
-                        errBody !== null &&
-                        "error" in errBody) {
-                        const err = errBody.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, errBody);
-            }
-            return (await res.json());
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        return await jsonRequest(managementTransport, method, path, body, signal);
     }
     async function makeManagementRootRequest(method, path, body, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const headers = {
-                Authorization: `Bearer ${managementApiKey}`,
-            };
-            const init = {
-                method,
-                headers,
-                signal: controller.signal,
-            };
-            if (body !== undefined) {
-                headers["Content-Type"] = "application/json";
-                init.body = JSON.stringify(body);
-            }
-            const res = await doFetch(`${managementRootURL}${path}`, init);
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let errBody = null;
-                try {
-                    errBody = await res.json();
-                    if (typeof errBody === "object" &&
-                        errBody !== null &&
-                        "error" in errBody) {
-                        const err = errBody.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, errBody);
-            }
-            return (await res.json());
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        return await jsonRequest(managementRootTransport, method, path, body, signal);
     }
     function buildManagementQuery(params) {
         const parts = [];
@@ -332,91 +283,19 @@ export function createXai(opts) {
         return parts.length > 0 ? `?${parts.join("&")}` : "";
     }
     async function makeBinaryRequest(path, body, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const res = await doFetch(`${baseURL}${path}`, {
-                method: "POST",
-                headers: {
-                    Authorization: `Bearer ${opts.apiKey}`,
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify(body),
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let errBody = null;
-                try {
-                    errBody = await res.json();
-                    if (typeof errBody === "object" &&
-                        errBody !== null &&
-                        "error" in errBody) {
-                        const err = errBody.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, errBody);
-            }
-            return await res.arrayBuffer();
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        const res = await transport.raw(path, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(body),
+            signal,
+        });
+        return await readArrayBufferResponse(res);
+    }
+    async function makeGetBinaryRequest(path, signal) {
+        return await transport.getBinary(path, { signal });
     }
     async function makeMultipartRequest(path, form, signal) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        if (signal) {
-            attachAbortHandler(signal, controller);
-        }
-        try {
-            const res = await doFetch(`${baseURL}${path}`, {
-                method: "POST",
-                headers: { Authorization: `Bearer ${opts.apiKey}` },
-                body: form,
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!res.ok) {
-                let message = `XAI API error: ${res.status}`;
-                let errBody = null;
-                try {
-                    errBody = await res.json();
-                    if (typeof errBody === "object" &&
-                        errBody !== null &&
-                        "error" in errBody) {
-                        const err = errBody.error;
-                        if (err?.message) {
-                            message = `XAI API error ${res.status}: ${err.message}`;
-                        }
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new XaiError(message, res.status, errBody);
-            }
-            return (await res.json());
-        }
-        catch (error) {
-            clearTimeout(timeoutId);
-            if (error instanceof XaiError)
-                throw error;
-            throw new XaiError(`XAI request failed: ${error}`, 500);
-        }
+        return await transport.postForm(path, form, { signal });
     }
     // POST https://api.x.ai/v1/batches
     // Docs: https://docs.x.ai/docs/api-reference
@@ -447,13 +326,20 @@ export function createXai(opts) {
             await makeManagementRequest("POST", `/collections/${collectionId}/documents/${fileId}`, req ?? {}, signal);
         },
     });
-    // GET https://api.x.ai/v1/files/{fileIdOrSignal}
+    // GET https://api.x.ai/v1/files/{paramsOrFileIdOrSignal}
     // Docs: https://docs.x.ai/docs/api-reference
-    async function getFiles(fileIdOrSignal, signal) {
-        if (typeof fileIdOrSignal === "string") {
-            return makeRequest("GET", `/files/${fileIdOrSignal}`, undefined, signal);
-        }
-        return makeRequest("GET", "/files", undefined, fileIdOrSignal);
+    async function getFiles(paramsOrFileIdOrSignal, signal) {
+        if (typeof paramsOrFileIdOrSignal === "string") {
+            return makeRequest("GET", `/files/${encodeURIComponent(paramsOrFileIdOrSignal)}`, undefined, signal);
+        }
+        const queryParams = isAbortSignal(paramsOrFileIdOrSignal)
+            ? {}
+            : (paramsOrFileIdOrSignal ?? {});
+        const requestSignal = isAbortSignal(paramsOrFileIdOrSignal)
+            ? paramsOrFileIdOrSignal
+            : signal;
+        const query = buildQuery(queryParams);
+        return makeRequest("GET", `/files${query}`, undefined, requestSignal);
     }
     const getFilesNamespace = Object.assign(getFiles, {
         // GET https://api.x.ai/v1/files/{fileId}/content
@@ -566,6 +452,56 @@ export function createXai(opts) {
     }, {
         schema: XaiCollectionUpdateRequestSchema,
     });
+    // POST https://api.x.ai/v1/custom-voices
+    // Docs: https://docs.x.ai/developers/model-capabilities/audio/custom-voices
+    const postCustomVoices = Object.assign(async function customVoices(req, signal) {
+        const form = new FormData();
+        form.append("file", req.file, req.filename ?? "reference");
+        appendOptionalFormField(form, "name", req.name);
+        appendOptionalFormField(form, "description", req.description);
+        appendOptionalFormField(form, "gender", req.gender);
+        appendOptionalFormField(form, "accent", req.accent);
+        appendOptionalFormField(form, "age", req.age);
+        appendOptionalFormField(form, "language", req.language);
+        appendOptionalFormField(form, "use_case", req.use_case);
+        appendOptionalFormField(form, "tone", req.tone);
+        return await makeMultipartRequest("/custom-voices", form, signal);
+    }, {
+        schema: XaiCustomVoiceCreateRequestSchema,
+    });
+    // GET https://api.x.ai/v1/custom-voices/{paramsOrVoiceIdOrSignal}
+    // Docs: https://docs.x.ai/developers/model-capabilities/audio/custom-voices
+    const getCustomVoices = Object.assign(async function listCustomVoices(paramsOrVoiceIdOrSignal, signal) {
+        if (typeof paramsOrVoiceIdOrSignal === "string") {
+            return await makeRequest("GET", `/custom-voices/${encodeURIComponent(paramsOrVoiceIdOrSignal)}`, undefined, signal);
+        }
+        const queryParams = isAbortSignal(paramsOrVoiceIdOrSignal)
+            ? {}
+            : (paramsOrVoiceIdOrSignal ?? {});
+        const requestSignal = isAbortSignal(paramsOrVoiceIdOrSignal)
+            ? paramsOrVoiceIdOrSignal
+            : signal;
+        const query = buildQuery(queryParams);
+        return await makeRequest("GET", `/custom-voices${query}`, undefined, requestSignal);
+    }, {
+        // GET https://api.x.ai/v1/custom-voices/{voiceId}/audio
+        // Docs: https://docs.x.ai/developers/model-capabilities/audio/custom-voices
+        audio: async function customVoiceAudio(voiceId, signal) {
+            return await makeGetBinaryRequest(`/custom-voices/${encodeURIComponent(voiceId)}/audio`, signal);
+        },
+    });
+    // PATCH https://api.x.ai/v1/custom-voices/{voiceId}
+    // Docs: https://docs.x.ai/developers/model-capabilities/audio/custom-voices
+    const patchCustomVoices = Object.assign(async function updateCustomVoice(voiceId, req, signal) {
+        return await makeRequest("PATCH", `/custom-voices/${encodeURIComponent(voiceId)}`, req, signal);
+    }, {
+        schema: XaiCustomVoiceUpdateRequestSchema,
+    });
+    // DELETE https://api.x.ai/v1/custom-voices/{voiceId}
+    // Docs: https://docs.x.ai/developers/model-capabilities/audio/custom-voices
+    async function deleteCustomVoices(voiceId, signal) {
+        return await makeRequest("DELETE", `/custom-voices/${encodeURIComponent(voiceId)}`, undefined, signal);
+    }
     return attachExamples(withPaidGate("xai", {
         post: {
             v1: {
@@ -622,14 +558,14 @@ export function createXai(opts) {
                     // POST https://api.x.ai/v1/videos/edits
                     // Docs: https://docs.x.ai/docs/api-reference
                     edits: Object.assign(async function edits(req, signal) {
-                        return await makeRequest("POST", "/videos/edits", req, signal);
+                        return await makeRequest("POST", "/videos/edits", normalizeVideoEditRequest(req), signal);
                     }, {
                         schema: XaiVideoEditRequestSchema,
                     }),
                     // POST https://api.x.ai/v1/videos/extensions
                     // Docs: https://docs.x.ai/docs/api-reference
                     extensions: Object.assign(async function extensions(req, signal) {
-                        return await makeRequest("POST", "/videos/extensions", req, signal);
+                        return await makeRequest("POST", "/videos/extensions", normalizeVideoExtendRequest(req), signal);
                     }, {
                         schema: XaiVideoExtendRequestSchema,
                     }),
@@ -637,52 +573,31 @@ export function createXai(opts) {
                 // POST https://api.x.ai/v1/files
                 // Docs: https://docs.x.ai/docs/api-reference
                 files: Object.assign(async function postFiles(file, filename, purpose, signal) {
-                    const controller = new AbortController();
-                    const timeoutId = setTimeout(() => controller.abort(), timeout);
-                    if (signal) {
-                        attachAbortHandler(signal, controller);
-                    }
-                    try {
-                        const formData = new FormData();
-                        formData.append("file", file, filename);
-                        if (purpose !== undefined)
-                            formData.append("purpose", purpose);
-                        const res = await doFetch(`${baseURL}/files`, {
-                            method: "POST",
-                            headers: { Authorization: `Bearer ${opts.apiKey}` },
-                            body: formData,
-                            signal: controller.signal,
-                        });
-                        clearTimeout(timeoutId);
-                        if (!res.ok) {
-                            let message = `XAI API error: ${res.status}`;
-                            let body = null;
-                            try {
-                                body = await res.json();
-                                if (typeof body === "object" &&
-                                    body !== null &&
-                                    "error" in body) {
-                                    const err = body
-                                        .error;
-                                    if (err?.message) {
-                                        message = `XAI API error ${res.status}: ${err.message}`;
-                                    }
-                                }
-                            }
-                            catch {
-                                // ignore parse errors
-                            }
-                            throw new XaiError(message, res.status, body);
-                        }
-                        return (await res.json());
-                    }
-                    catch (error) {
-                        clearTimeout(timeoutId);
-                        if (error instanceof XaiError)
-                            throw error;
-                        throw new XaiError(`XAI request failed: ${error}`, 500);
-                    }
-                }, {}),
+                    const formData = new FormData();
+                    formData.append("file", file, filename);
+                    if (purpose !== undefined)
+                        formData.append("purpose", purpose);
+                    return await makeMultipartRequest("/files", formData, signal);
+                }, {
+                    // POST https://api.x.ai/v1/files/{fileId}/public-url
+                    // Docs: https://docs.x.ai/developers/files/public-urls
+                    publicUrl: Object.assign(async function createFilePublicUrl(fileId, reqOrSignal, signal) {
+                        const req = isAbortSignal(reqOrSignal)
+                            ? {}
+                            : (reqOrSignal ?? {});
+                        const requestSignal = isAbortSignal(reqOrSignal)
+                            ? reqOrSignal
+                            : signal;
+                        return await makeRequest("POST", `/files/${encodeURIComponent(fileId)}/public-url`, req, requestSignal);
+                    }, {
+                        schema: XaiFilePublicUrlRequestSchema,
+                        // POST https://api.x.ai/v1/files/{fileId}/public-url/revoke
+                        // Docs: https://docs.x.ai/developers/files/public-urls
+                        revoke: async function revokeFilePublicUrl(fileId, signal) {
+                            return await makeRequest("POST", `/files/${encodeURIComponent(fileId)}/public-url/revoke`, {}, signal);
+                        },
+                    }),
+                }),
                 batches: postBatches,
                 documents: {
                     // POST https://api.x.ai/v1/documents/search
@@ -728,17 +643,7 @@ export function createXai(opts) {
                 }, {
                     schema: XaiSttRequestSchema,
                 }),
-                // POST https://api.x.ai/v1/custom-voices
-                // Docs: https://docs.x.ai/docs/api-reference
-                customVoices: Object.assign(async function customVoices(req, signal) {
-                    const form = new FormData();
-                    form.append("file", req.file, req.filename ?? "reference");
-                    form.append("name", req.name);
-                    form.append("language", req.language);
-                    return await makeMultipartRequest("/custom-voices", form, signal);
-                }, {
-                    schema: XaiCustomVoiceCreateRequestSchema,
-                }),
+                customVoices: postCustomVoices,
             },
             managementApi: {
                 v1: {
@@ -773,50 +678,12 @@ export function createXai(opts) {
                     // GET https://api.x.ai/v1/chat/deferred-completion/{requestId}
                     // Docs: https://docs.x.ai/docs/api-reference
                     deferredCompletion: async function deferredCompletion(requestId, signal) {
-                        const controller = new AbortController();
-                        const timeoutId = setTimeout(() => controller.abort(), timeout);
-                        if (signal) {
-                            attachAbortHandler(signal, controller);
-                        }
-                        try {
-                            const res = await doFetch(`${baseURL}/chat/deferred-completion/${encodeURIComponent(requestId)}`, {
-                                method: "GET",
-                                headers: { Authorization: `Bearer ${opts.apiKey}` },
-                                signal: controller.signal,
-                            });
-                            clearTimeout(timeoutId);
-                            if (res.status === 202) {
-                                return { ready: false, data: null };
-                            }
-                            if (!res.ok) {
-                                let message = `XAI API error: ${res.status}`;
-                                let body = null;
-                                try {
-                                    body = await res.json();
-                                    if (typeof body === "object" &&
-                                        body !== null &&
-                                        "error" in body) {
-                                        const err = body
-                                            .error;
-                                        if (err?.message) {
-                                            message = `XAI API error ${res.status}: ${err.message}`;
-                                        }
-                                    }
-                                }
-                                catch {
-                                    // ignore parse errors
-                                }
-                                throw new XaiError(message, res.status, body);
-                            }
-                            const data = (await res.json());
-                            return { ready: true, data };
-                        }
-                        catch (error) {
-                            clearTimeout(timeoutId);
-                            if (error instanceof XaiError)
-                                throw error;
-                            throw new XaiError(`XAI request failed: ${error}`, 500);
+                        const res = await transport.raw(`/chat/deferred-completion/${encodeURIComponent(requestId)}`, { signal });
+                        if (res.status === 202) {
+                            return { ready: false, data: null };
                         }
+                        const data = await readJsonResponse(res);
+                        return { ready: true, data };
                     },
                 },
                 // GET https://api.x.ai/v1/videos/{requestId}
@@ -830,6 +697,7 @@ export function createXai(opts) {
                 imageGenerationModels: getImageGenerationModels,
                 videoGenerationModels: getVideoGenerationModels,
                 batches: getBatchesNamespace,
+                customVoices: getCustomVoices,
             },
             managementApi: {
                 v1: {
@@ -882,37 +750,9 @@ export function createXai(opts) {
                 // DELETE https://api.x.ai/v1/files/{fileId}
                 // Docs: https://docs.x.ai/docs/api-reference
                 files: async function deleteFiles(fileId, signal) {
-                    const controller = new AbortController();
-                    const timeoutId = setTimeout(() => controller.abort(), timeout);
-                    if (signal) {
-                        attachAbortHandler(signal, controller);
-                    }
-                    try {
-                        const res = await doFetch(`${baseURL}/files/${fileId}`, {
-                            method: "DELETE",
-                            headers: { Authorization: `Bearer ${opts.apiKey}` },
-                            signal: controller.signal,
-                        });
-                        clearTimeout(timeoutId);
-                        if (!res.ok) {
-                            let deleteBody = null;
-                            try {
-                                deleteBody = await res.json();
-                            }
-                            catch {
-                                // ignore parse errors
-                            }
-                            throw new XaiError(`XAI API error: ${res.status}`, res.status, deleteBody);
-                        }
-                        return (await res.json());
-                    }
-                    catch (error) {
-                        clearTimeout(timeoutId);
-                        if (error instanceof XaiError)
-                            throw error;
-                        throw new XaiError(`XAI request failed: ${error}`, 500);
-                    }
+                    return await makeRequest("DELETE", `/files/${fileId}`, undefined, signal);
                 },
+                customVoices: deleteCustomVoices,
             },
             managementApi: {
                 v1: {
@@ -928,6 +768,9 @@ export function createXai(opts) {
             },
         },
         patch: {
+            v1: {
+                customVoices: patchCustomVoices,
+            },
             managementApi: {
                 v1: {
                     collections: {