@drawcall/market 0.1.86 → 0.1.87

package/dist/client.d.ts

@@ -1,10 +1,19 @@
 import type { ContractRouterClient } from '@orpc/contract';
 import type { AppContract } from './contract.js';
 export type MarketClient = ContractRouterClient<AppContract>;
+type RequestFetch = (request: Request, init?: {
+    redirect?: Request['redirect'];
+}) => Promise<Response>;
 export interface MarketClientOptions {
     baseUrl?: string;
-    fetch?: typeof globalThis.fetch;
+    fetch?: RequestFetch;
     authToken?: string;
 }
+interface RetryOptions {
+    attempts?: number;
+    delayMs?: number;
+}
 export declare function createMarketClient(opts?: MarketClientOptions): MarketClient;
+export declare function createRetryingFetch(fetchImpl: RequestFetch, options?: RetryOptions): RequestFetch;
+export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEhD,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAI5D,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,GAAE,mBAAwB,GAAG,YAAY,CAQ/E"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAEhD,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAC5D,KAAK,YAAY,GAAG,CAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;CAAE,KACtC,OAAO,CAAC,QAAQ,CAAC,CAAA;AAgBtB,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,GAAE,mBAAwB,GAAG,YAAY,CAY/E;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,YAAY,EACvB,OAAO,GAAE,YAAiB,GACzB,YAAY,CA2Bd"}

package/dist/client.js

@@ -1,16 +1,65 @@
 import { createORPCClient } from '@orpc/client';
 import { RPCLink } from '@orpc/client/fetch';
 const DEFAULT_BASE_URL = 'https://market.drawcall.ai';
+const RETRYABLE_RPC_PATHS = new Set([
+    '/api/rpc/asset/search',
+    '/api/rpc/asset/exact',
+    '/api/rpc/asset/downloadZip',
+    '/api/rpc/asset/files',
+    '/api/rpc/asset/fileManifest',
+    '/api/rpc/asset/generateStatus',
+    '/api/rpc/asset/installMetadata',
+    '/api/rpc/asset/agent/status',
+    '/api/rpc/user/getProfile',
+    '/api/rpc/user/getAuthToken',
+]);
 function buildHeaders(authToken) {
     return authToken ? { authorization: `Bearer ${authToken}` } : undefined;
 }
 export function createMarketClient(opts = {}) {
     const baseUrl = opts.baseUrl ?? DEFAULT_BASE_URL;
+    const fetch = opts.fetch ??
+        ((request, init) => globalThis.fetch(new Request(request), init));
     const link = new RPCLink({
         url: new URL('/api/rpc', baseUrl).href,
-        fetch: opts.fetch,
+        fetch: createRetryingFetch(fetch),
         headers: buildHeaders(opts.authToken),
     });
     return createORPCClient(link);
 }
+export function createRetryingFetch(fetchImpl, options = {}) {
+    const attempts = options.attempts ?? 4;
+    const delayMs = options.delayMs ?? 250;
+    return async (request, init) => {
+        if (!RETRYABLE_RPC_PATHS.has(new URL(request.url).pathname)) {
+            return fetchImpl(request, init);
+        }
+        const body = request.body ? new Uint8Array(await request.clone().arrayBuffer()) : undefined;
+        const nextRequest = () => new Request(request.url, {
+            method: request.method,
+            headers: request.headers,
+            body,
+            credentials: request.credentials,
+            signal: request.signal,
+        });
+        for (let attempt = 1;; attempt += 1) {
+            try {
+                const response = await fetchImpl(nextRequest(), init);
+                if (attempt === attempts || !isTransientStatus(response.status))
+                    return response;
+            }
+            catch (error) {
+                if (attempt === attempts)
+                    throw error;
+            }
+            await delay(delayMs * 2 ** (attempt - 1));
+        }
+    };
+}
+function isTransientStatus(status) {
+    return status === 429 || status >= 500;
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAM5C,MAAM,gBAAgB,GAAG,4BAA4B,CAAA;AAQrD,SAAS,YAAY,CAAC,SAAkB;IACtC,OAAO,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACzE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAA4B,EAAE;IAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,gBAAgB,CAAA;IAChD,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC;QACvB,GAAG,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI;QACtC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;KACtC,CAAC,CAAA;IACF,OAAO,gBAAgB,CAAe,IAAI,CAAC,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawcall/market",
-  "version": "0.1.86",
+  "version": "0.1.87",
   "repository": {
     "type": "git",
     "url": "https://github.com/drawcall-ai/market",

package/src/client.ts

@@ -4,25 +4,90 @@ import type { ContractRouterClient } from '@orpc/contract'
 import type { AppContract } from './contract.js'
 
 export type MarketClient = ContractRouterClient<AppContract>
+type RequestFetch = (
+  request: Request,
+  init?: { redirect?: Request['redirect'] },
+) => Promise<Response>
 
 const DEFAULT_BASE_URL = 'https://market.drawcall.ai'
+const RETRYABLE_RPC_PATHS = new Set([
+  '/api/rpc/asset/search',
+  '/api/rpc/asset/exact',
+  '/api/rpc/asset/downloadZip',
+  '/api/rpc/asset/files',
+  '/api/rpc/asset/fileManifest',
+  '/api/rpc/asset/generateStatus',
+  '/api/rpc/asset/installMetadata',
+  '/api/rpc/asset/agent/status',
+  '/api/rpc/user/getProfile',
+  '/api/rpc/user/getAuthToken',
+])
 
 export interface MarketClientOptions {
   baseUrl?: string
-  fetch?: typeof globalThis.fetch
+  fetch?: RequestFetch
   authToken?: string
 }
 
+interface RetryOptions {
+  attempts?: number
+  delayMs?: number
+}
+
 function buildHeaders(authToken?: string): Record<string, string> | undefined {
   return authToken ? { authorization: `Bearer ${authToken}` } : undefined
 }
 
 export function createMarketClient(opts: MarketClientOptions = {}): MarketClient {
   const baseUrl = opts.baseUrl ?? DEFAULT_BASE_URL
+  const fetch =
+    opts.fetch ??
+    ((request: Request, init?: { redirect?: Request['redirect'] }) =>
+      globalThis.fetch(new Request(request), init))
   const link = new RPCLink({
     url: new URL('/api/rpc', baseUrl).href,
-    fetch: opts.fetch,
+    fetch: createRetryingFetch(fetch),
     headers: buildHeaders(opts.authToken),
   })
   return createORPCClient<MarketClient>(link)
 }
+
+export function createRetryingFetch(
+  fetchImpl: RequestFetch,
+  options: RetryOptions = {},
+): RequestFetch {
+  const attempts = options.attempts ?? 4
+  const delayMs = options.delayMs ?? 250
+
+  return async (request, init) => {
+    if (!RETRYABLE_RPC_PATHS.has(new URL(request.url).pathname)) {
+      return fetchImpl(request, init)
+    }
+    const body = request.body ? new Uint8Array(await request.clone().arrayBuffer()) : undefined
+    const nextRequest = () =>
+      new Request(request.url, {
+        method: request.method,
+        headers: request.headers,
+        body,
+        credentials: request.credentials,
+        signal: request.signal,
+      })
+    for (let attempt = 1; ; attempt += 1) {
+      try {
+        const response = await fetchImpl(nextRequest(), init)
+        if (attempt === attempts || !isTransientStatus(response.status)) return response
+      } catch (error) {
+        if (attempt === attempts) throw error
+      }
+      await delay(delayMs * 2 ** (attempt - 1))
+    }
+  }
+}
+
+function isTransientStatus(status: number): boolean {
+  return status === 429 || status >= 500
+}
+
+function delay(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}