cloreai 4.0.0 → 4.0.1

package/README.md

@@ -31,8 +31,8 @@ import Cloreai from 'cloreai'
 
 const cloreai = new Cloreai('API_KEY', {
   baseURL: 'https://api.clore.ai/v1', // (optional) Override the default base URL for the API
-  fetch: globalThis.fetch, // (optional) Specify a custom `fetch` function implementation
   fetchOptions: {}, // (optional) Additional `RequestInit` options to be passed to `fetch` calls
+  fetch: globalThis.fetch, // (optional) Specify a custom `fetch` function implementation
   queueOptions: {}, // (optional) Queue instance options https://github.com/sindresorhus/p-queue
   queueCreateOrderOptions: {}, // (optional) Create order queue instance options https://github.com/sindresorhus/p-queue
 })
@@ -296,26 +296,25 @@ const marketplace = await pRetry(
 
 ## Timeouts
 
-Use `AbortSignal.timeout`.
-
-Options signal from fetchOptions and request options are combined. In the
-following example, the request will be aborted after 5 seconds, but it can also
-be aborted earlier by calling `controller.abort()`.
+Use `AbortSignal.timeout`:
 
 ```typescript
-const cloreai = new Cloreai('API_KEY', {
-  fetchOptions: {
-    signal: AbortSignal.timeout(5000),
-  },
+const marketplace = await cloreai.marketplace({
+  signal: AbortSignal.timeout(5000),
 })
+```
 
+Combine signals using `AbortSignal.any`. In the following example, the request
+will be aborted after 5 seconds, but can also be aborted earlier by calling
+`controller.abort()`:
+
+```typescript
 const controller = new AbortController()
 
-setTimeout(() => {
-  controller.abort()
-}, 10000)
+// You can abort by event
+// controller.abort()
 
 const marketplace = await cloreai.marketplace({
-  signal: controller.signal, // Combined with `AbortSignal.timeout(5000)`
+  signal: AbortSignal.any([AbortSignal.timeout(5000), controller.signal]),
 })
 ```

package/dist/Cloreai.d.ts

@@ -14,14 +14,17 @@ import type { WalletsResponseData } from './resources/wallets.ts';
 import Gigaspot from './Gigaspot.ts';
 export interface Options {
     baseURL?: string;
-    fetch?: typeof fetch;
     fetchOptions?: RequestInit;
+    fetch?: typeof fetch;
     queueOptions?: QueueOptions;
     queueCreateOrderOptions?: QueueOptions;
 }
 export type QueueOptions = PQueueOptions<Queue<() => Promise<unknown>, QueueAddOptions>, QueueAddOptions>;
 declare class Cloreai {
     #private;
+    baseURL: string;
+    fetchOptions: RequestInit;
+    fetch: typeof fetch;
     queue: PQueue;
     queueCreateOrder: PQueue;
     gigaspot: Gigaspot;

package/dist/Cloreai.js

@@ -3,85 +3,17 @@ import { CloreaiError } from "./CloreaiError.js";
 import { priorityLevels, RATE_LIMIT, RATE_LIMIT_CREATE_ORDER, statusCodes } from "./constants.js";
 import Gigaspot from "./Gigaspot.js";
 class Cloreai {
+    baseURL;
+    fetchOptions;
+    fetch;
     queue;
     queueCreateOrder;
     gigaspot;
-    #baseURL;
-    #fetch;
+    #apiKey;
     constructor(apiKey, options = {}) {
-        this.#baseURL = options.baseURL ?? 'https://api.clore.ai/v1';
-        const fetchFunction = options.fetch ?? fetch;
-        const fetchOptions = options.fetchOptions ?? {};
-        this.#fetch = async (input, init = {}) => {
-            if (input instanceof Request) {
-                throw new TypeError('Input must be a string or URL');
-            }
-            const headers = new Headers({
-                'Content-Type': 'application/json',
-                'auth': apiKey,
-            });
-            for (const [key, value] of new Headers(fetchOptions.headers)) {
-                headers.set(key, value);
-            }
-            for (const [key, value] of new Headers(init.headers)) {
-                headers.set(key, value);
-            }
-            const signal = AbortSignal.any([
-                ...(fetchOptions.signal ? [fetchOptions.signal] : []),
-                ...(init.signal ? [init.signal] : []),
-            ]);
-            const mergedInit = {
-                ...fetchOptions,
-                ...init,
-                headers,
-                signal,
-            };
-            const url = new URL(input);
-            const request = new Request(url, mergedInit);
-            let response;
-            try {
-                response = await fetchFunction(request);
-            }
-            catch (error) {
-                throw new CloreaiError(error instanceof Error ? error.message : String(error), {
-                    cause: error,
-                    init: mergedInit,
-                    request,
-                });
-            }
-            const originalJson = response.json;
-            // @ts-expect-error: json is readonly
-            response.json = async () => {
-                let data;
-                try {
-                    data = await originalJson.call(response);
-                }
-                catch (error) {
-                    throw new CloreaiError(error instanceof Error ? error.message : String(error), {
-                        cause: error,
-                        init: mergedInit,
-                        request,
-                        response,
-                    });
-                }
-                if (data.code === statusCodes.NORMAL) {
-                    return data;
-                }
-                const hasError = Boolean(data.error);
-                const errorMessage = hasError
-                    ? `Code "${data.code}, error "${data.error}"`
-                    : `Code "${data.code}"`;
-                throw new CloreaiError(errorMessage, {
-                    init: mergedInit,
-                    request,
-                    response,
-                    statusCode: data.code,
-                    description: data.error ?? '',
-                    data,
-                });
-            };
-            return response;
-        };
+        this.baseURL = options.baseURL ?? 'https://api.clore.ai/v1';
+        this.fetchOptions = options.fetchOptions ?? {};
+        this.fetch = options.fetch ?? fetch;
         this.queue = new PQueue({
             interval: RATE_LIMIT,
             intervalCap: 1,
@@ -94,10 +26,78 @@ class Cloreai {
             concurrency: 1,
             ...options.queueCreateOrderOptions,
         });
-        this.gigaspot = new Gigaspot(this.queue, this.#baseURL, this.#fetch);
+        this.gigaspot = new Gigaspot(this, this.#fetch.bind(this));
+        this.#apiKey = apiKey;
+    }
+    async #fetch(input, init = {}) {
+        const headers = new Headers({
+            'Content-Type': 'application/json',
+            'auth': this.#apiKey,
+        });
+        for (const [key, value] of new Headers(this.fetchOptions.headers)) {
+            headers.set(key, value);
+        }
+        for (const [key, value] of new Headers(init.headers)) {
+            headers.set(key, value);
+        }
+        const signal = AbortSignal.any([
+            ...(this.fetchOptions.signal ? [this.fetchOptions.signal] : []),
+            ...(init.signal ? [init.signal] : []),
+        ]);
+        const mergedInit = {
+            ...this.fetchOptions,
+            ...init,
+            headers,
+            signal,
+        };
+        const url = new URL(input);
+        const request = new Request(url, mergedInit);
+        let response;
+        try {
+            response = await this.fetch(request);
+        }
+        catch (error) {
+            throw new CloreaiError(error instanceof Error ? error.message : String(error), {
+                cause: error,
+                init: mergedInit,
+                request,
+            });
+        }
+        const originalJson = response.json;
+        // @ts-expect-error: json is readonly
+        response.json = async () => {
+            let data;
+            try {
+                data = await originalJson.call(response);
+            }
+            catch (error) {
+                throw new CloreaiError(error instanceof Error ? error.message : String(error), {
+                    cause: error,
+                    init: mergedInit,
+                    request,
+                    response,
+                });
+            }
+            if (data.code === statusCodes.NORMAL) {
+                return data;
+            }
+            const hasError = Boolean(data.error);
+            const errorMessage = hasError
+                ? `Code "${data.code}, error "${data.error}"`
+                : `Code "${data.code}"`;
+            throw new CloreaiError(errorMessage, {
+                init: mergedInit,
+                request,
+                response,
+                statusCode: data.code,
+                description: data.error ?? '',
+                data,
+            });
+        };
+        return response;
     }
     async wallets(init = {}) {
-        const url = new URL(this.#baseURL + '/wallets');
+        const url = new URL(this.baseURL + '/wallets');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -110,7 +110,7 @@ class Cloreai {
         return await response.json();
     }
     async myServers(init = {}) {
-        const url = new URL(this.#baseURL + '/my_servers');
+        const url = new URL(this.baseURL + '/my_servers');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -123,7 +123,7 @@ class Cloreai {
         return await response.json();
     }
     async serverConfig(data, init = {}) {
-        const url = new URL(this.#baseURL + '/server_config');
+        const url = new URL(this.baseURL + '/server_config');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -137,7 +137,7 @@ class Cloreai {
         return await response.json();
     }
     async marketplace(init = {}) {
-        const url = new URL(this.#baseURL + '/marketplace');
+        const url = new URL(this.baseURL + '/marketplace');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -150,7 +150,7 @@ class Cloreai {
         return await response.json();
     }
     async myOrders(params = {}, init = {}) {
-        const url = new URL(this.#baseURL + '/my_orders');
+        const url = new URL(this.baseURL + '/my_orders');
         for (const [key, value] of Object.entries(params)) {
             url.searchParams.set(key, String(value));
         }
@@ -166,7 +166,7 @@ class Cloreai {
         return await response.json();
     }
     async spotMarketplace(params, init = {}) {
-        const url = new URL(this.#baseURL + '/spot_marketplace');
+        const url = new URL(this.baseURL + '/spot_marketplace');
         for (const [key, value] of Object.entries(params)) {
             url.searchParams.set(key, String(value));
         }
@@ -182,7 +182,7 @@ class Cloreai {
         return await response.json();
     }
     async setServerSettings(data, init = {}) {
-        const url = new URL(this.#baseURL + '/set_server_settings');
+        const url = new URL(this.baseURL + '/set_server_settings');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -196,7 +196,7 @@ class Cloreai {
         return await response.json();
     }
     async setSpotPrice(data, init = {}) {
-        const url = new URL(this.#baseURL + '/set_spot_price');
+        const url = new URL(this.baseURL + '/set_spot_price');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -210,7 +210,7 @@ class Cloreai {
         return await response.json();
     }
     async cancelOrder(data, init = {}) {
-        const url = new URL(this.#baseURL + '/cancel_order');
+        const url = new URL(this.baseURL + '/cancel_order');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -224,7 +224,7 @@ class Cloreai {
         return await response.json();
     }
     async createOrder(data, init = {}) {
-        const url = new URL(this.#baseURL + '/create_order');
+        const url = new URL(this.baseURL + '/create_order');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -238,7 +238,7 @@ class Cloreai {
         return await response.json();
     }
     async pohBalance(init = {}) {
-        const url = new URL(this.#baseURL + '/poh_balance');
+        const url = new URL(this.baseURL + '/poh_balance');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
@@ -251,7 +251,7 @@ class Cloreai {
         return await response.json();
     }
     async renterFees(init = {}) {
-        const url = new URL(this.#baseURL + '/renter_fees');
+        const url = new URL(this.baseURL + '/renter_fees');
         const response = await this.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,

package/dist/Gigaspot.d.ts

@@ -1,11 +1,12 @@
-import type PQueue from 'p-queue';
+import type Cloreai from './Cloreai.ts';
 import type { CancelOrdersRequestData, CancelOrdersResponseData } from './resources/cancelOrders.ts';
 import type { CreateGigaspotOrdersRequestData, CreateGigaspotOrdersResponseData } from './resources/createGigaspotOrders.ts';
 import type { EditGigaspotOrdersRequestData, EditGigaspotOrdersResponseData } from './resources/editGigaspotOrders.ts';
 import type { GetGigaspotResponseData } from './resources/getGigaspot.ts';
+type Fetch = (input: string | URL, init?: RequestInit) => Promise<Response>;
 declare class Gigaspot {
     #private;
-    constructor(queue: PQueue, baseURL: string, fetchFunction: typeof fetch);
+    constructor(cloreai: Cloreai, fetch: Fetch);
     getGigaspot(init?: RequestInit): Promise<GetGigaspotResponseData>;
     createGigaspotOrders(data: CreateGigaspotOrdersRequestData, init?: RequestInit): Promise<CreateGigaspotOrdersResponseData>;
     editGigaspotOrders(data: EditGigaspotOrdersRequestData, init?: RequestInit): Promise<EditGigaspotOrdersResponseData>;

package/dist/Gigaspot.js

@@ -1,17 +1,14 @@
 import { priorityLevels } from "./constants.js";
-/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
 class Gigaspot {
-    #queue;
-    #baseURL;
+    #cloreai;
     #fetch;
-    constructor(queue, baseURL, fetchFunction) {
-        this.#queue = queue;
-        this.#baseURL = baseURL;
-        this.#fetch = fetchFunction;
+    constructor(cloreai, fetch) {
+        this.#cloreai = cloreai;
+        this.#fetch = fetch;
     }
     async getGigaspot(init = {}) {
-        const url = new URL(this.#baseURL + '/get_gigaspot');
-        const response = await this.#queue.add(async () => {
+        const url = new URL(this.#cloreai.baseURL + '/get_gigaspot');
+        const response = await this.#cloreai.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
                 method: 'GET',
@@ -29,8 +26,8 @@ class Gigaspot {
         };
     }
     async createGigaspotOrders(data, init = {}) {
-        const url = new URL(this.#baseURL + '/create_gigaspot_orders');
-        const response = await this.#queue.add(async () => {
+        const url = new URL(this.#cloreai.baseURL + '/create_gigaspot_orders');
+        const response = await this.#cloreai.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
                 method: 'POST',
@@ -43,8 +40,8 @@ class Gigaspot {
         return await response.json();
     }
     async editGigaspotOrders(data, init = {}) {
-        const url = new URL(this.#baseURL + '/edit_gigaspot_orders');
-        const response = await this.#queue.add(async () => {
+        const url = new URL(this.#cloreai.baseURL + '/edit_gigaspot_orders');
+        const response = await this.#cloreai.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
                 method: 'POST',
@@ -57,8 +54,8 @@ class Gigaspot {
         return await response.json();
     }
     async cancelOrders(data, init = {}) {
-        const url = new URL(this.#baseURL + '/cancel_orders');
-        const response = await this.#queue.add(async () => {
+        const url = new URL(this.#cloreai.baseURL + '/cancel_orders');
+        const response = await this.#cloreai.queue.add(async () => {
             return await this.#fetch(url, {
                 ...init,
                 method: 'POST',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloreai",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "CLORE.AI API client",
   "keywords": [
     "cloreai",
@@ -33,12 +33,12 @@
     "@tsconfig/node-ts": "^23.6.4",
     "@tsconfig/strictest": "^2.0.8",
     "@types/node": "^25.6.0",
-    "eslint": "^10.2.0",
+    "eslint": "^10.2.1",
     "eslint-config-vladpuz": "^4.0.1",
     "husky": "^9.1.7",
-    "prettier": "^3.8.2",
+    "prettier": "^3.8.3",
     "prettier-config-vladpuz": "^3.0.0",
     "rimraf": "^6.1.3",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   }
 }