@rebasepro/client 0.10.0 → 0.10.1-canary.14e53ae

package/src/storage.ts

@@ -12,6 +12,14 @@ import { Transport } from "./transport";
 export function createStorage(transport: Transport, storageId?: string): StorageSource {
     const urlsCache = new Map<string, { config: DownloadConfig; expiresAt?: number }>();
 
+    /**
+     * Base for URLs the *browser* will fetch on its own (file downloads,
+     * previews). API requests keep going to `baseUrl`; see
+     * {@link RebaseClientConfig.storageUrlOrigin} for why these can differ.
+     */
+    const fileUrlBase = (): string =>
+        `${transport.storageUrlOrigin ?? transport.baseUrl}${transport.apiPath}`;
+
     /** Append ?storageId=... to a path when multi-backend routing is active. */
     const withStorageId = (path: string): string => {
         if (!storageId) return path;
@@ -95,7 +103,7 @@ export function createStorage(transport: Transport, storageId?: string): Storage
         // token are needed — build the URL directly and cache it forever.
         if (isPublicStoragePath(filePath)) {
             const publicConfig: DownloadConfig = {
-                url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`)
+                url: withStorageId(`${fileUrlBase()}/storage/file/${filePath}`)
             };
             urlsCache.set(cacheKey, { config: publicConfig }); // no expiry
             return publicConfig;
@@ -107,7 +115,7 @@ export function createStorage(transport: Transport, storageId?: string): Storage
             // Public object (server-confirmed): token-less permanent URL.
             if (result.data.public) {
                 const publicConfig: DownloadConfig = {
-                    url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}`),
+                    url: withStorageId(`${fileUrlBase()}/storage/file/${filePath}`),
                     metadata: result.data
                 };
                 urlsCache.set(cacheKey, { config: publicConfig }); // no expiry
@@ -125,7 +133,7 @@ export function createStorage(transport: Transport, storageId?: string): Storage
                 // `withStorageId` picks `?` or `&` based on whether the token
                 // query is already present, so the URL stays valid even when
                 // there is no token.
-                url: withStorageId(`${transport.baseUrl}${transport.apiPath}/storage/file/${filePath}${tokenQuery}`),
+                url: withStorageId(`${fileUrlBase()}/storage/file/${filePath}${tokenQuery}`),
                 metadata: result.data
             };
 

package/src/transport.ts

@@ -33,6 +33,20 @@ export interface RebaseClientConfig {
      * Defaults to `"/api"`; override only if the server mounts it elsewhere.
      */
     apiPath?: string;
+    /**
+     * Origin to use instead of {@link baseUrl} for URLs that are handed to the
+     * browser to fetch on its own — storage file downloads and previews.
+     *
+     * API *requests* always go to `baseUrl`; this only changes URLs the SDK
+     * *returns* (e.g. `storage.getSignedUrl`). It exists for proxied setups:
+     * when `baseUrl` routes through an authenticated middleman (the Rebase
+     * console's Studio proxy), a plain `<img src>` or a copied link cannot
+     * satisfy the middleman's auth — but the file route itself is reachable
+     * directly at the origin server and secured by its own scoped `?token=`.
+     * Set this to that server's public origin (no path; {@link apiPath} is
+     * appended) and returned file URLs point straight at it.
+     */
+    storageUrlOrigin?: string;
     fetch?: typeof globalThis.fetch;
     onUnauthorized?: () => Promise<boolean>;
     websocketUrl?: string; // Optional real-time WebSocket connection
@@ -107,6 +121,8 @@ export interface Transport {
     setOnUnauthorized: (handler: () => Promise<boolean>) => void;
     readonly baseUrl: string;
     readonly apiPath: string;
+    /** See {@link RebaseClientConfig.storageUrlOrigin}. Undefined = use `baseUrl`. */
+    readonly storageUrlOrigin?: string;
     readonly fetchFn: typeof globalThis.fetch;
     getHeaders: (init?: RequestInit) => Record<string, string>;
     resolveToken: () => Promise<string | null>;
@@ -266,6 +282,7 @@ headers: retryHeaders });
         setOnUnauthorized(handler: () => Promise<boolean>) { onUnauthorizedHandler = handler; },
         get baseUrl() { return resolveBaseUrl(config.baseUrl); },
         get apiPath() { return apiPath; },
+        get storageUrlOrigin() { return config.storageUrlOrigin?.replace(/\/$/, "") || undefined; },
         get fetchFn() { return fetchFn; },
         getHeaders: (init?: RequestInit) => getHeaders(token, init) as Record<string, string>,
         resolveToken: async () => {