@fabriktor/client 0.0.80 → 0.0.82

package/dist/src/core/crud.d.ts

@@ -1,7 +1,7 @@
 import { OperationResultValueKey, SearchResultResultsKey, type OperationResult, type SearchResult, type UpsertResult } from "@fabriktor/schema";
 import type { TokenProvider } from "./auth.js";
 import { type QueryOptions } from "./col.js";
-import type { HTTPDoer } from "./http.js";
+import type { HTTPDoer, RequestOptions } from "./http.js";
 import type { CompletePayload, ReplaceOptionalField } from "./type.js";
 export type OperationResultOf<T> = ReplaceOptionalField<OperationResult, typeof OperationResultValueKey, T>;
 export type SearchResultOf<T> = ReplaceOptionalField<SearchResult, typeof SearchResultResultsKey, T[]>;
@@ -15,17 +15,17 @@ export type CRUDClientOptions = {
 export type QueryOptionsCRUD = {
     query?: QueryOptions;
 };
-export type InsertOneOptionsCRUD<In> = {
+export type InsertOneOptionsCRUD<In> = RequestOptions & {
     in: CompletePayload<In>;
 };
 export type UpsertOneOptionsCRUD<In> = {
     in: CompletePayload<In>;
     query?: QueryOptions;
 };
-export type FindOneOptionsCRUD = {
+export type FindOneOptionsCRUD = Pick<RequestOptions, "signal"> & {
     id: string;
 };
-export type ReplaceOneOptionsCRUD<In> = {
+export type ReplaceOneOptionsCRUD<In> = Pick<RequestOptions, "signal"> & {
     id: string;
     in: Partial<In>;
 };

package/dist/src/core/crud.js

@@ -45,6 +45,8 @@ export class CRUDClient {
             method: HTTPMethodPost,
             token,
             body: opts.in,
+            signal: opts.signal,
+            idempotency_key: opts.idempotency_key,
         });
     }
     async upsertOne(opts) {
@@ -72,6 +74,7 @@ export class CRUDClient {
                 id: opts.id,
             }),
             method: HTTPMethodGet,
+            signal: opts.signal,
             token,
         });
     }
@@ -86,6 +89,7 @@ export class CRUDClient {
             }),
             method: HTTPMethodPatch,
             token,
+            signal: opts.signal,
             body: opts.in,
         });
     }

package/dist/src/core/http.d.ts

@@ -5,7 +5,11 @@ export declare const headerContentType = "content-type";
 export declare const headerContentDisposition = "content-disposition";
 export declare const prefixBearer = "Bearer";
 export type Method = typeof HTTPMethodGet | typeof HTTPMethodPost | typeof HTTPMethodPatch | typeof HTTPMethodDelete;
-export type HTTPOptions<T> = {
+export type RequestOptions = {
+    signal?: AbortSignal;
+    idempotency_key?: string;
+};
+export type HTTPOptions<T> = RequestOptions & {
     base_url: string;
     path: string;
     method: Method;

package/dist/src/core/http.js

@@ -51,6 +51,9 @@ export class HTTPClient {
         }
     }
     async response(opts) {
+        if (opts.signal?.aborted) {
+            throw errHTTPRequestFailed(opts.signal.reason);
+        }
         const h = headers(opts);
         const requestBody = body(opts.body);
         const idempotencyPath = idempotencyRequestPath(opts.path, requestBody);
@@ -59,6 +62,7 @@ export class HTTPClient {
             store: this.idempotency,
             method: opts.method,
             path: idempotencyPath,
+            key: opts.idempotency_key,
         });
         let res;
         try {
@@ -66,12 +70,13 @@ export class HTTPClient {
                 method: opts.method,
                 headers: h,
                 body: requestBody,
+                signal: opts.signal,
             });
         }
         catch (err) {
             throw errHTTPRequestFailed(err);
         }
-        if (idempotencyToken !== undefined) {
+        if (idempotencyToken !== undefined && opts.idempotency_key === undefined) {
             this.idempotency.reset(opts.method, idempotencyPath);
         }
         if (!res.ok) {

package/dist/src/core/idempotency.d.ts

@@ -14,4 +14,5 @@ export declare function applyIdempotencyHeader(opts: {
     store: IdempotencyStore;
     method: string;
     path: string;
+    key?: string;
 }): string | undefined;

package/dist/src/core/idempotency.js

@@ -34,7 +34,7 @@ export function applyIdempotencyHeader(opts) {
     if (!shouldUseIdempotency(opts.method)) {
         return undefined;
     }
-    const token = opts.store.get(opts.method, opts.path);
+    const token = opts.key ?? opts.store.get(opts.method, opts.path);
     opts.headers.set(HeaderIdempotency, token);
     return token;
 }

package/dist/src/core/multipart.d.ts

@@ -1,8 +1,8 @@
 import { HTTPMethodPost } from "@fabriktor/schema";
-import type { Fetcher } from "./http.js";
+import type { Fetcher, RequestOptions } from "./http.js";
 import type { IdempotencyStore } from "./idempotency.js";
 export type MultipartMethod = typeof HTTPMethodPost;
-export type MultipartOptions = {
+export type MultipartOptions = RequestOptions & {
     base_url: string;
     path: string;
     method: MultipartMethod;

package/dist/src/core/multipart.js

@@ -14,12 +14,16 @@ export class MultipartClient {
         this.idempotency = opts.idempotency;
     }
     async do(opts) {
+        if (opts.signal?.aborted) {
+            throw errHTTPRequestFailed(opts.signal.reason);
+        }
         const h = headers(opts);
         const idempotencyToken = applyIdempotencyHeader({
             headers: h,
             store: this.idempotency,
             method: opts.method,
             path: opts.path,
+            key: opts.idempotency_key,
         });
         let res;
         try {
@@ -27,12 +31,13 @@ export class MultipartClient {
                 method: opts.method,
                 headers: h,
                 body: opts.form,
+                signal: opts.signal,
             });
         }
         catch (err) {
             throw errHTTPRequestFailed(err);
         }
-        if (idempotencyToken !== undefined) {
+        if (idempotencyToken !== undefined && opts.idempotency_key === undefined) {
             this.idempotency.reset(opts.method, opts.path);
         }
         if (!res.ok) {

package/dist/src/storage/storage.d.ts

@@ -1,7 +1,7 @@
 import { type Object as StorageObject, type OperationResult, type PLStorageDownload, type RPStorageUpload } from "@fabriktor/schema";
 import type { TokenProvider } from "../core/auth.js";
 import type { DeleteOneOptionsCRUD, OperationResultOf } from "../core/crud.js";
-import type { HTTPDoer } from "../core/http.js";
+import type { HTTPDoer, RequestOptions } from "../core/http.js";
 import { type MultipartDoer } from "../core/multipart.js";
 import type { CompletePayload } from "../core/type.js";
 export declare const storageCollections: readonly ["calls", "chat", "contacts", "jobs", "locations", "memos", "qr", "reports", "tickets", "users", "feed"];
@@ -10,7 +10,7 @@ export type StorageUploadFile = File | {
     blob: Blob;
     filename: string;
 };
-export type UploadStorageOptions = {
+export type UploadStorageOptions = RequestOptions & {
     owner_id: string;
     uploader_id?: string;
     full_quality?: boolean;

package/dist/src/storage/storage.js

@@ -56,6 +56,8 @@ export class StorageClient {
             method: HTTPMethodPost,
             token,
             form,
+            signal: opts.signal,
+            idempotency_key: opts.idempotency_key,
         });
     }
     async download(col, opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/client",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,6 +17,6 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/schema": "0.0.62"
+    "@fabriktor/schema": "0.0.63"
   }
 }