@brownandroot/api 1.2.0 → 2.0.0

package/dist/index.js

@@ -1,12 +1,67 @@
+export class ApiHubError extends Error {
+    status;
+    path;
+    url;
+    responseBody;
+    retriable;
+    service;
+    constructor(options) {
+        super(options.message);
+        this.name = 'ApiHubError';
+        this.status = options.status;
+        this.path = options.path;
+        this.url = options.url;
+        this.responseBody = options.responseBody;
+        this.retriable = options.retriable;
+        this.service = options.service ?? 'apihub';
+    }
+}
 export class ApiHubClient {
     baseUrl;
     apiKey;
     cacheTtl;
+    timeoutMs;
+    retryCount;
+    onError;
     cache = new Map();
     constructor(options) {
         this.baseUrl = options.baseUrl.replace(/\/+$/, '');
         this.apiKey = options.apiKey;
         this.cacheTtl = options.cacheTtl ?? 5 * 60 * 1000;
+        this.timeoutMs = options.timeoutMs ?? 10_000;
+        this.retryCount = options.retryCount ?? 2;
+        this.onError = options.onError;
+    }
+    isRetriableStatus(status) {
+        return status === 429 || status === 502 || status === 503 || status === 504;
+    }
+    createApiHubError(options) {
+        const error = new ApiHubError({ ...options, service: 'apihub' });
+        this.onError?.(error);
+        if (typeof window === 'undefined') {
+            console.error('[APIHubError]', {
+                status: error.status,
+                path: error.path,
+                url: error.url,
+                retriable: error.retriable,
+                responseBody: error.responseBody,
+                message: error.message,
+            });
+        }
+        return error;
+    }
+    async fetchWithTimeout(url, init) {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), this.timeoutMs);
+        try {
+            return await fetch(url, { ...init, signal: controller.signal });
+        }
+        finally {
+            clearTimeout(timeout);
+        }
+    }
+    async delay(ms) {
+        await new Promise((resolve) => setTimeout(resolve, ms));
     }
     /** Clear all cached responses, or a specific path */
     clearCache(path) {
@@ -32,22 +87,62 @@ export class ApiHubClient {
         return data;
     }
     async request(path) {
-        let res;
-        try {
-            res = await fetch(`${this.baseUrl}${path}`, {
-                headers: { 'x-api-key': this.apiKey },
-            });
-        }
-        catch {
-            throw new Error(`APIHub unavailable: ${this.baseUrl}${path}`);
-        }
-        if (!res.ok) {
+        const url = `${this.baseUrl}${path}`;
+        for (let attempt = 0; attempt <= this.retryCount; attempt++) {
+            let res;
+            try {
+                res = await this.fetchWithTimeout(url, {
+                    headers: { 'x-api-key': this.apiKey },
+                });
+            }
+            catch (error) {
+                const retriable = attempt < this.retryCount;
+                if (retriable) {
+                    const jitter = Math.floor(Math.random() * 100);
+                    await this.delay(150 * Math.pow(2, attempt) + jitter);
+                    continue;
+                }
+                const message = error instanceof Error && error.name === 'AbortError'
+                    ? `APIHub request timed out after ${this.timeoutMs}ms`
+                    : 'APIHub unavailable';
+                throw this.createApiHubError({
+                    message,
+                    status: null,
+                    path,
+                    url,
+                    responseBody: null,
+                    retriable: false,
+                });
+            }
+            if (res.ok) {
+                return res.json();
+            }
             const body = await res.json().catch(() => null);
+            const retriable = this.isRetriableStatus(res.status);
+            if (retriable && attempt < this.retryCount) {
+                const jitter = Math.floor(Math.random() * 100);
+                await this.delay(150 * Math.pow(2, attempt) + jitter);
+                continue;
+            }
             const message = (body && typeof body === 'object' && 'error' in body && typeof body.error === 'string' ? body.error : null) ??
                 `Request failed: ${res.status} ${res.statusText}`;
-            throw new Error(message);
+            throw this.createApiHubError({
+                message,
+                status: res.status,
+                path,
+                url,
+                responseBody: body,
+                retriable,
+            });
         }
-        return res.json();
+        throw this.createApiHubError({
+            message: 'APIHub request failed after retries',
+            status: null,
+            path,
+            url,
+            responseBody: null,
+            retriable: false,
+        });
     }
     /** Get all employees */
     async getEmployees() {
@@ -333,3 +428,6 @@ export class ApiHubClient {
         return this.request(`/jobtypejobsteps/${encodeURIComponent(id)}`);
     }
 }
+export { employees, workorders, costcodes, paytypes, businessUnits, jobtypejobsteps, clearCache } from './cache.js';
+export { llm } from './llm.remote.js';
+export { rag } from './rag.remote.js';

package/dist/jobtypejobsteps.remote.d.ts

@@ -1,3 +1,5 @@
-export declare const getJobtypejobsteps: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Jobtypejobstep[]>;
-export declare const getJobtypejobstepsDropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DropdownOption[]>;
-export declare const getJobtypejobstep: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Jobtypejobstep>;
+export declare const jobtypejobsteps: {
+    getAll: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Jobtypejobstep[]>;
+    dropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DropdownOption[]>;
+    get: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Jobtypejobstep | null>;
+};

package/dist/jobtypejobsteps.remote.js

@@ -1,6 +1,26 @@
 import { query } from '$app/server';
 import { z } from 'zod';
 import { getClient } from './client.js';
-export const getJobtypejobsteps = query(async () => getClient().getJobtypejobsteps());
-export const getJobtypejobstepsDropdown = query(async () => getClient().getJobtypejobstepsDropdown());
-export const getJobtypejobstep = query(z.string(), async (id) => getClient().getJobtypejobstep(id));
+function isNotFoundError(error) {
+    if (!(error instanceof Error))
+        return false;
+    return /not found/i.test(error.message);
+}
+async function asNullable(fetcher) {
+    try {
+        return await fetcher();
+    }
+    catch (error) {
+        if (isNotFoundError(error))
+            return null;
+        throw error;
+    }
+}
+const getAll = query(async () => getClient().getJobtypejobsteps());
+const dropdown = query(async () => getClient().getJobtypejobstepsDropdown());
+const get = query(z.string(), async (id) => asNullable(() => getClient().getJobtypejobstep(id)));
+export const jobtypejobsteps = {
+    getAll,
+    dropdown,
+    get,
+};

package/dist/llm.remote.d.ts

@@ -1,12 +1,14 @@
-export declare const getLlmLogs: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").LlmLog[]>;
-export declare const chat: import("@sveltejs/kit").RemoteCommand<{
-    user: string;
-    messages: {
-        role: "system" | "user" | "assistant";
-        content: string;
-    }[];
-    source: string;
-    function?: string | undefined;
-    temperature?: number | undefined;
-    maxTokens?: number | undefined;
-}, Promise<import("./index.js").ChatResponse>>;
+export declare const llm: {
+    getLogs: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").LlmLog[]>;
+    chat: import("@sveltejs/kit").RemoteCommand<{
+        user: string;
+        messages: {
+            role: "system" | "user" | "assistant";
+            content: string;
+        }[];
+        source: string;
+        function?: string | undefined;
+        temperature?: number | undefined;
+        maxTokens?: number | undefined;
+    }, Promise<import("./index.js").ChatResponse>>;
+};

package/dist/llm.remote.js

@@ -13,5 +13,9 @@ const chatRequestSchema = z.object({
     temperature: z.number().min(0).max(2).optional(),
     maxTokens: z.number().int().positive().optional(),
 });
-export const getLlmLogs = query(async () => getClient().getLlmLogs());
-export const chat = command(chatRequestSchema, async (request) => getClient().chat(request));
+const getLogs = query(async () => getClient().getLlmLogs());
+const chat = command(chatRequestSchema, async (request) => getClient().chat(request));
+export const llm = {
+    getLogs,
+    chat,
+};

package/dist/paytypes.remote.d.ts

@@ -1,3 +1,5 @@
-export declare const getPaytypes: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Paytype[]>;
-export declare const getPaytypesDropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").PaytypeDropdownOption[]>;
-export declare const getPaytype: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Paytype>;
+export declare const paytypes: {
+    getAll: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Paytype[]>;
+    dropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").PaytypeDropdownOption[]>;
+    get: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Paytype | null>;
+};

package/dist/paytypes.remote.js

@@ -1,6 +1,26 @@
 import { query } from '$app/server';
 import { z } from 'zod';
 import { getClient } from './client.js';
-export const getPaytypes = query(async () => getClient().getPaytypes());
-export const getPaytypesDropdown = query(async () => getClient().getPaytypesDropdown());
-export const getPaytype = query(z.string(), async (id) => getClient().getPaytype(id));
+function isNotFoundError(error) {
+    if (!(error instanceof Error))
+        return false;
+    return /not found/i.test(error.message);
+}
+async function asNullable(fetcher) {
+    try {
+        return await fetcher();
+    }
+    catch (error) {
+        if (isNotFoundError(error))
+            return null;
+        throw error;
+    }
+}
+const getAll = query(async () => getClient().getPaytypes());
+const dropdown = query(async () => getClient().getPaytypesDropdown());
+const get = query(z.string(), async (id) => asNullable(() => getClient().getPaytype(id)));
+export const paytypes = {
+    getAll,
+    dropdown,
+    get,
+};

package/dist/rag.remote.d.ts

@@ -1,11 +1,13 @@
-export declare const listDocuments: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DocumentRecord[]>;
-export declare const uploadDocument: import("@sveltejs/kit").RemoteCommand<{
-    fileName: string;
-    base64Content: string;
-    uploadedBy: string;
-}, Promise<import("./index.js").DocumentRecord>>;
-export declare const deleteDocument: import("@sveltejs/kit").RemoteCommand<number, Promise<void>>;
-export declare const searchDocuments: import("@sveltejs/kit").RemoteCommand<{
-    query: string;
-    topK?: number | undefined;
-}, Promise<import("./index.js").SearchResult[]>>;
+export declare const rag: {
+    list: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DocumentRecord[]>;
+    upload: import("@sveltejs/kit").RemoteCommand<{
+        fileName: string;
+        base64Content: string;
+        uploadedBy: string;
+    }, Promise<import("./index.js").DocumentRecord>>;
+    delete: import("@sveltejs/kit").RemoteCommand<number, Promise<void>>;
+    search: import("@sveltejs/kit").RemoteCommand<{
+        query: string;
+        topK?: number | undefined;
+    }, Promise<import("./index.js").SearchResult[]>>;
+};

package/dist/rag.remote.js

@@ -10,7 +10,13 @@ const searchDocumentsSchema = z.object({
     query: z.string().min(1),
     topK: z.number().int().positive().optional(),
 });
-export const listDocuments = query(async () => getClient().listDocuments());
-export const uploadDocument = command(uploadDocumentSchema, async ({ fileName, base64Content, uploadedBy }) => getClient().uploadDocument(fileName, base64Content, uploadedBy));
-export const deleteDocument = command(z.number().int().positive(), async (id) => getClient().deleteDocument(id));
-export const searchDocuments = command(searchDocumentsSchema, async ({ query: q, topK }) => getClient().searchDocuments(q, topK));
+const list = query(async () => getClient().listDocuments());
+const upload = command(uploadDocumentSchema, async ({ fileName, base64Content, uploadedBy }) => getClient().uploadDocument(fileName, base64Content, uploadedBy));
+const remove = command(z.number().int().positive(), async (id) => getClient().deleteDocument(id));
+const search = command(searchDocumentsSchema, async ({ query: q, topK }) => getClient().searchDocuments(q, topK));
+export const rag = {
+    list,
+    upload,
+    delete: remove,
+    search,
+};

package/dist/workorders.remote.d.ts

@@ -1,3 +1,5 @@
-export declare const getWorkorders: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Workorder[]>;
-export declare const getWorkordersDropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DropdownOption[]>;
-export declare const getWorkorder: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Workorder>;
+export declare const workorders: {
+    getAll: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").Workorder[]>;
+    dropdown: import("@sveltejs/kit").RemoteQueryFunction<void, import("./index.js").DropdownOption[]>;
+    get: import("@sveltejs/kit").RemoteQueryFunction<string, import("./index.js").Workorder | null>;
+};

package/dist/workorders.remote.js

@@ -1,6 +1,26 @@
 import { query } from '$app/server';
 import { z } from 'zod';
 import { getClient } from './client.js';
-export const getWorkorders = query(async () => getClient().getWorkorders());
-export const getWorkordersDropdown = query(async () => getClient().getWorkordersDropdown());
-export const getWorkorder = query(z.string(), async (id) => getClient().getWorkorder(id));
+function isNotFoundError(error) {
+    if (!(error instanceof Error))
+        return false;
+    return /not found/i.test(error.message);
+}
+async function asNullable(fetcher) {
+    try {
+        return await fetcher();
+    }
+    catch (error) {
+        if (isNotFoundError(error))
+            return null;
+        throw error;
+    }
+}
+const getAll = query(async () => getClient().getWorkorders());
+const dropdown = query(async () => getClient().getWorkordersDropdown());
+const get = query(z.string(), async (id) => asNullable(() => getClient().getWorkorder(id)));
+export const workorders = {
+    getAll,
+    dropdown,
+    get,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@brownandroot/api",
-	"version": "1.2.0",
+	"version": "2.0.0",
 	"type": "module",
 	"repository": {
 		"type": "git",
@@ -13,42 +13,6 @@
 		".": {
 			"types": "./dist/index.d.ts",
 			"default": "./dist/index.js"
-		},
-		"./cache": {
-			"types": "./dist/cache.d.ts",
-			"default": "./dist/cache.js"
-		},
-		"./employees": {
-			"types": "./dist/employees.remote.d.ts",
-			"default": "./dist/employees.remote.js"
-		},
-		"./businessUnits": {
-			"types": "./dist/businessUnits.remote.d.ts",
-			"default": "./dist/businessUnits.remote.js"
-		},
-		"./costcodes": {
-			"types": "./dist/costcodes.remote.d.ts",
-			"default": "./dist/costcodes.remote.js"
-		},
-		"./paytypes": {
-			"types": "./dist/paytypes.remote.d.ts",
-			"default": "./dist/paytypes.remote.js"
-		},
-		"./workorders": {
-			"types": "./dist/workorders.remote.d.ts",
-			"default": "./dist/workorders.remote.js"
-		},
-		"./jobtypejobsteps": {
-			"types": "./dist/jobtypejobsteps.remote.d.ts",
-			"default": "./dist/jobtypejobsteps.remote.js"
-		},
-		"./llm": {
-			"types": "./dist/llm.remote.d.ts",
-			"default": "./dist/llm.remote.js"
-		},
-		"./rag": {
-			"types": "./dist/rag.remote.d.ts",
-			"default": "./dist/rag.remote.js"
 		}
 	},
 	"files": [