Update signal parameter to be an object instead

Author: joshen-supabase

src/lib/storage/StorageFileApi.ts

@@ -1,4 +1,4 @@
-import { get, post, remove } from './fetch'
+import { FetchParameters, get, post, remove } from './fetch'
 import { isBrowser } from './helpers'
 import { FileObject, FileOptions, SearchOptions } from './types'
 
@@ -227,15 +227,15 @@ export class StorageFileApi {
   async list(
     path?: string,
     options?: SearchOptions,
-    signal?: AbortSignal
+    parameters?: FetchParameters
   ): Promise<{ data: FileObject[] | null; error: Error | null }> {
     try {
       const body = { ...DEFAULT_SEARCH_OPTIONS, ...options, prefix: path || '' }
       const data = await post(
         `${this.url}/object/list/${this.bucketId}`,
         body,
         { headers: this.headers },
-        signal
+        parameters
       )
       return { data, error: null }
     } catch (error) {

src/lib/storage/fetch.ts

@@ -7,6 +7,10 @@ export interface FetchOptions {
   noResolveJson?: boolean
 }
 
+export interface FetchParameters {
+  signal?: AbortSignal
+}
+
 export type RequestMethodType = 'GET' | 'POST' | 'PUT' | 'DELETE'
 
 const _getErrorMessage = (err: any): string =>
@@ -27,7 +31,7 @@ const handleError = (error: any, reject: any) => {
 const _getRequestParams = (
   method: RequestMethodType,
   options?: FetchOptions,
-  signal?: AbortSignal,
+  parameters?: FetchParameters,
   body?: object
 ) => {
   const params: { [k: string]: any } = { method, headers: options?.headers || {} }
@@ -39,22 +43,18 @@ const _getRequestParams = (
   params.headers = { 'Content-Type': 'application/json', ...options?.headers }
   params.body = JSON.stringify(body)
 
-  if (signal) {
-    params.signal = signal
-  }
-
-  return params
+  return { ...params, ...parameters }
 }
 
 async function _handleRequest(
   method: RequestMethodType,
   url: string,
   options?: FetchOptions,
-  signal?: AbortSignal,
+  parameters?: FetchParameters,
   body?: object
 ): Promise<any> {
   return new Promise((resolve, reject) => {
-    fetch(url, _getRequestParams(method, options, signal, body))
+    fetch(url, _getRequestParams(method, options, parameters, body))
       .then((result) => {
         if (!result.ok) throw result
         if (options?.noResolveJson) return resolve(result)
@@ -65,33 +65,37 @@ async function _handleRequest(
   })
 }
 
-export async function get(url: string, options?: FetchOptions, signal?: AbortSignal): Promise<any> {
-  return _handleRequest('GET', url, options, signal)
+export async function get(
+  url: string,
+  options?: FetchOptions,
+  parameters?: FetchParameters
+): Promise<any> {
+  return _handleRequest('GET', url, options, parameters)
 }
 
 export async function post(
   url: string,
   body: object,
   options?: FetchOptions,
-  signal?: AbortSignal
+  parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('POST', url, options, signal, body)
+  return _handleRequest('POST', url, options, parameters, body)
 }
 
 export async function put(
   url: string,
   body: object,
   options?: FetchOptions,
-  signal?: AbortSignal
+  parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('PUT', url, options, signal, body)
+  return _handleRequest('PUT', url, options, parameters, body)
 }
 
 export async function remove(
   url: string,
   body: object,
   options?: FetchOptions,
-  signal?: AbortSignal
+  parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('DELETE', url, options, signal, body)
+  return _handleRequest('DELETE', url, options, parameters, body)
 }