@supabase/storage-js 2.91.1 → 2.91.2

package/src/lib/version.ts

@@ -4,4 +4,4 @@
 // - Debugging and support (identifying which version is running)
 // - Telemetry and logging (version reporting in errors/analytics)
 // - Ensuring build artifacts match the published package version
-export const version = '2.91.1'
+export const version = '2.91.2'

package/src/packages/BlobDownloadBuilder.ts

@@ -1,4 +1,4 @@
-import { isStorageError } from '../lib/errors'
+import { isStorageError } from '../lib/common/errors'
 import { DownloadResult } from '../lib/types'
 import StreamDownloadBuilder from './StreamDownloadBuilder'
 

package/src/packages/StorageAnalyticsClient.ts

@@ -1,8 +1,9 @@
 import { IcebergRestCatalog, IcebergError } from 'iceberg-js'
 import { DEFAULT_HEADERS } from '../lib/constants'
-import { isStorageError, StorageError } from '../lib/errors'
-import { Fetch, get, post, remove } from '../lib/fetch'
-import { isValidBucketName, resolveFetch } from '../lib/helpers'
+import { StorageError } from '../lib/common/errors'
+import { Fetch, get, post, remove } from '../lib/common/fetch'
+import { isValidBucketName } from '../lib/common/helpers'
+import BaseApiClient from '../lib/common/BaseApiClient'
 import { AnalyticBucket } from '../lib/types'
 
 type WrapAsyncMethod<T> = T extends (...args: infer A) => Promise<infer R>
@@ -17,12 +18,7 @@ export type WrappedIcebergRestCatalog = {
  * Client class for managing Analytics Buckets using Iceberg tables
  * Provides methods for creating, listing, and deleting analytics buckets
  */
-export default class StorageAnalyticsClient {
-  protected url: string
-  protected headers: { [key: string]: string }
-  protected fetch: Fetch
-  protected shouldThrowOnError = false
-
+export default class StorageAnalyticsClient extends BaseApiClient<StorageError> {
   /**
    * @alpha
    *
@@ -41,25 +37,9 @@ export default class StorageAnalyticsClient {
    * ```
    */
   constructor(url: string, headers: { [key: string]: string } = {}, fetch?: Fetch) {
-    this.url = url.replace(/\/$/, '')
-    this.headers = { ...DEFAULT_HEADERS, ...headers }
-    this.fetch = resolveFetch(fetch)
-  }
-
-  /**
-   * @alpha
-   *
-   * Enable throwing errors instead of returning them in the response
-   * When enabled, failed operations will throw instead of returning { data: null, error }
-   *
-   * **Public alpha:** This API is part of a public alpha release and may not be available to your account type.
-   *
-   * @category Analytics Buckets
-   * @returns This instance for method chaining
-   */
-  public throwOnError(): this {
-    this.shouldThrowOnError = true
-    return this
+    const finalUrl = url.replace(/\/$/, '')
+    const finalHeaders = { ...DEFAULT_HEADERS, ...headers }
+    super(finalUrl, finalHeaders, fetch, 'storage')
   }
 
   /**
@@ -106,19 +86,9 @@ export default class StorageAnalyticsClient {
         error: StorageError
       }
   > {
-    try {
-      const data = await post(this.fetch, `${this.url}/bucket`, { name }, { headers: this.headers })
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    return this.handleOperation(async () => {
+      return await post(this.fetch, `${this.url}/bucket`, { name }, { headers: this.headers })
+    })
   }
 
   /**
@@ -183,7 +153,7 @@ export default class StorageAnalyticsClient {
         error: StorageError
       }
   > {
-    try {
+    return this.handleOperation(async () => {
       // Build query string from options
       const queryParams = new URLSearchParams()
       if (options?.limit !== undefined) queryParams.set('limit', options.limit.toString())
@@ -195,19 +165,8 @@ export default class StorageAnalyticsClient {
       const queryString = queryParams.toString()
       const url = queryString ? `${this.url}/bucket?${queryString}` : `${this.url}/bucket`
 
-      const data = await get(this.fetch, url, { headers: this.headers })
-
-      return { data: data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+      return await get(this.fetch, url, { headers: this.headers })
+    })
   }
 
   /**
@@ -251,24 +210,14 @@ export default class StorageAnalyticsClient {
         error: StorageError
       }
   > {
-    try {
-      const data = await remove(
+    return this.handleOperation(async () => {
+      return await remove(
         this.fetch,
         `${this.url}/bucket/${bucketName}`,
         {},
         { headers: this.headers }
       )
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    })
   }
 
   /**

package/src/packages/StorageBucketApi.ts

@@ -1,16 +1,11 @@
 import { DEFAULT_HEADERS } from '../lib/constants'
-import { isStorageError, StorageError } from '../lib/errors'
-import { Fetch, get, post, put, remove } from '../lib/fetch'
-import { resolveFetch } from '../lib/helpers'
+import { StorageError } from '../lib/common/errors'
+import { Fetch, get, post, put, remove } from '../lib/common/fetch'
+import BaseApiClient from '../lib/common/BaseApiClient'
 import { Bucket, BucketType, ListBucketOptions } from '../lib/types'
 import { StorageClientOptions } from '../StorageClient'
 
-export default class StorageBucketApi {
-  protected url: string
-  protected headers: { [key: string]: string }
-  protected fetch: Fetch
-  protected shouldThrowOnError = false
-
+export default class StorageBucketApi extends BaseApiClient<StorageError> {
   constructor(
     url: string,
     headers: { [key: string]: string } = {},
@@ -28,19 +23,10 @@ export default class StorageBucketApi {
       }
     }
 
-    this.url = baseUrl.href.replace(/\/$/, '')
-    this.headers = { ...DEFAULT_HEADERS, ...headers }
-    this.fetch = resolveFetch(fetch)
-  }
+    const finalUrl = baseUrl.href.replace(/\/$/, '')
+    const finalHeaders = { ...DEFAULT_HEADERS, ...headers }
 
-  /**
-   * Enable throwing errors instead of returning them.
-   *
-   * @category File Buckets
-   */
-  public throwOnError(): this {
-    this.shouldThrowOnError = true
-    return this
+    super(finalUrl, finalHeaders, fetch, 'storage')
   }
 
   /**
@@ -85,22 +71,12 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
+    return this.handleOperation(async () => {
       const queryString = this.listBucketOptionsToQueryString(options)
-      const data = await get(this.fetch, `${this.url}/bucket${queryString}`, {
+      return await get(this.fetch, `${this.url}/bucket${queryString}`, {
         headers: this.headers,
       })
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    })
   }
 
   /**
@@ -146,19 +122,9 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
-      const data = await get(this.fetch, `${this.url}/bucket/${id}`, { headers: this.headers })
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    return this.handleOperation(async () => {
+      return await get(this.fetch, `${this.url}/bucket/${id}`, { headers: this.headers })
+    })
   }
 
   /**
@@ -218,8 +184,8 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
-      const data = await post(
+    return this.handleOperation(async () => {
+      return await post(
         this.fetch,
         `${this.url}/bucket`,
         {
@@ -232,17 +198,7 @@ export default class StorageBucketApi {
         },
         { headers: this.headers }
       )
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    })
   }
 
   /**
@@ -297,8 +253,8 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
-      const data = await put(
+    return this.handleOperation(async () => {
+      return await put(
         this.fetch,
         `${this.url}/bucket/${id}`,
         {
@@ -310,17 +266,7 @@ export default class StorageBucketApi {
         },
         { headers: this.headers }
       )
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    })
   }
 
   /**
@@ -357,24 +303,9 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
-      const data = await post(
-        this.fetch,
-        `${this.url}/bucket/${id}/empty`,
-        {},
-        { headers: this.headers }
-      )
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    return this.handleOperation(async () => {
+      return await post(this.fetch, `${this.url}/bucket/${id}/empty`, {}, { headers: this.headers })
+    })
   }
 
   /**
@@ -412,24 +343,9 @@ export default class StorageBucketApi {
         error: StorageError
       }
   > {
-    try {
-      const data = await remove(
-        this.fetch,
-        `${this.url}/bucket/${id}`,
-        {},
-        { headers: this.headers }
-      )
-      return { data, error: null }
-    } catch (error) {
-      if (this.shouldThrowOnError) {
-        throw error
-      }
-      if (isStorageError(error)) {
-        return { data: null, error }
-      }
-
-      throw error
-    }
+    return this.handleOperation(async () => {
+      return await remove(this.fetch, `${this.url}/bucket/${id}`, {}, { headers: this.headers })
+    })
   }
 
   private listBucketOptionsToQueryString(options?: ListBucketOptions): string {