Add abortSignal to query execution

j3lte · Dec 6, 2023 · bf44a22 · bf44a22
1 parent 77bfe45
commit bf44a22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Query.ts b/src/Query.ts
@@ -374,26 +374,30 @@ export class SodaQuery<T> {
 
   execute(
     queryID?: string,
+    signal?: AbortSignal,
   ): DataResponse<Array<T & ExtraDataFields>> {
-    return this.requestData<Array<T & ExtraDataFields>>(this.getURL(queryID)).then((res) => ({
+    return this.requestData<Array<T & ExtraDataFields>>(this.getURL(queryID), { signal }).then((
+      res,
+    ) => ({
       ...res,
       data: res.data ?? [],
     }));
   }
 
   executeGeoJSON(
     queryID?: string,
+    signal?: AbortSignal,
   ): DataResponse<unknown> {
     const url = this.getURL(queryID).replace(/\.json/, ".geojson");
-    return this.requestData<unknown>(url).then((res) => ({
+    return this.requestData<unknown>(url, { signal }).then((res) => ({
       ...res,
       data: res.data ?? { type: "FeatureCollection", features: [] },
     }));
   }
 
-  getMetaData(): DataResponse<unknown> {
+  getMetaData(signal?: AbortSignal): DataResponse<unknown> {
     const url = `https://${this.#domain}/api/views/${this.#datasetId}`;
-    return this.requestData(url);
+    return this.requestData(url, { signal });
   }
 }
 

diff --git a/src/types.ts b/src/types.ts
@@ -44,6 +44,7 @@ export interface Options {
 
 export interface RequesOpts {
   method?: string;
+  signal?: AbortSignal;
 }
 
 export interface ExtraDataFields {