@rebasepro/client 0.4.0 → 0.6.0

package/dist/websocket.d.ts

@@ -2,7 +2,7 @@ import { DeleteEntityProps, Entity, EntityCollection, FetchCollectionProps, Fetc
 export interface RebaseWebSocketConfig {
     websocketUrl: string;
     /** Optional auth token getter for WebSocket authentication */
-    getAuthToken?: () => Promise<string>;
+    getAuthToken?: () => Promise<string | null>;
     /** Optional WebSocket constructor to override globalThis.WebSocket (e.g. for Node environments) */
     WebSocket?: typeof WebSocket;
     /** Callback to handle unauthorized requests or token expiration (refreshes auth session) */
@@ -16,7 +16,7 @@ export declare class ApiError extends Error {
 export declare class RebaseWebSocketClient {
     private websocketUrl;
     private ws;
-    getAuthToken?: () => Promise<string>;
+    getAuthToken?: () => Promise<string | null>;
     private subscriptions;
     private listeners;
     on(event: "connect" | "disconnect" | "reconnect" | "error", cb: (...args: unknown[]) => void): () => boolean;
@@ -30,6 +30,7 @@ export declare class RebaseWebSocketClient {
     private maxReconnectAttempts;
     private isConnected;
     private messageQueue;
+    private requestTimeoutMs;
     private reconnectTimeout;
     private isAuthenticated;
     private authPromise;
@@ -44,18 +45,20 @@ export declare class RebaseWebSocketClient {
     /**
      * Set the auth token getter function
      */
-    setAuthTokenGetter(getAuthToken: () => Promise<string>): void;
+    setAuthTokenGetter(getAuthToken: () => Promise<string | null>): void;
     disconnect(): void;
     private initWebSocket;
     private processMessageQueue;
     private attemptReconnect;
     private isAuthError;
     private handleAuthFailure;
-    private handleWebSocketMessage;
-    private ensureAuthenticated;
     /**
-     * Force re-authentication (call after token refresh)
+     * Shared logic for re-subscribing a collection or entity subscription
+     * after an auth error is resolved by refreshing credentials.
      */
+    private resubscribeAfterAuthRefresh;
+    private handleWebSocketMessage;
+    private ensureAuthenticated;
     reauthenticate(): Promise<void>;
     private sendMessage;
     private doSendMessage;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/client",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "HTTP SDK client for the Rebase custom backend",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -30,20 +30,20 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@rebasepro/common": "0.4.0",
-    "@rebasepro/types": "0.4.0",
-    "@rebasepro/utils": "0.4.0"
+    "@rebasepro/common": "0.6.0",
+    "@rebasepro/utils": "0.6.0",
+    "@rebasepro/types": "0.6.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^20.19.41",
-    "cross-env": "^7.0.3",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.4.10",
-    "tsd": "^0.31.2",
-    "typescript": "^5.9.3",
-    "vite": "^5.4.21"
+    "@jest/globals": "^30.4.1",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^25.9.3",
+    "cross-env": "^10.1.0",
+    "jest": "^30.4.2",
+    "ts-jest": "^29.4.11",
+    "tsd": "^0.33.0",
+    "typescript": "^6.0.3",
+    "vite": "^8.0.16"
   },
   "files": [
     "dist",

package/src/admin.ts

@@ -1,15 +1,8 @@
 import type { Transport } from "./transport";
+import { AdminUser } from "@rebasepro/types";
+
+export type { AdminUser };
 
-export interface AdminUser {
-    uid: string;
-    email: string;
-    displayName: string | null;
-    photoURL: string | null;
-    provider: string;
-    roles: string[];
-    createdAt: string;
-    updatedAt: string;
-}
 
 export interface CreateAdminOptions {
     adminPath?: string;

package/src/auth.ts

@@ -1,4 +1,6 @@
 import { RebaseApiError, Transport } from "./transport";
+import { AuthChangeEvent } from "@rebasepro/types";
+
 
 export interface RebaseUser {
     uid: string;
@@ -24,7 +26,8 @@ export interface RebaseSession {
     user: RebaseUser;
 }
 
-export type AuthChangeEvent = "SIGNED_IN" | "SIGNED_OUT" | "TOKEN_REFRESHED" | "USER_UPDATED";
+export type { AuthChangeEvent };
+
 
 export interface AuthConfig {
     needsSetup: boolean;
@@ -215,7 +218,9 @@ refreshToken: session.refreshToken };
         const responseBody = await res.json().catch(() => ({}));
         if (!res.ok) throwApiError(res.status, responseBody, res.statusText);
         const session = handleAuthResponse(responseBody, "SIGNED_IN");
-        return { user: session.user, accessToken: session.accessToken, refreshToken: session.refreshToken };
+        return { user: session.user,
+accessToken: session.accessToken,
+refreshToken: session.refreshToken };
     }
 
     async function signInWithLinkedin(code: string, redirectUri: string) {
@@ -553,7 +558,7 @@ export function createCookieStorage(options: CookieStorageOptions = {}): AuthSto
         setItem(key: string, value: string): void {
             if (typeof document === "undefined") return;
             let cookieStr = `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-            
+
             if (defaultOptions.path) {
                 cookieStr += `; path=${defaultOptions.path}`;
             }
@@ -571,7 +576,7 @@ export function createCookieStorage(options: CookieStorageOptions = {}): AuthSto
             if (defaultOptions.sameSite) {
                 cookieStr += `; samesite=${defaultOptions.sameSite}`;
             }
-            
+
             document.cookie = cookieStr;
         },
         removeItem(key: string): void {

package/src/collection.test.ts

@@ -1,4 +1,4 @@
-import { jest } from '@jest/globals';
+import { jest } from "@jest/globals";
 import { createCollectionClient } from "./collection";
 import type { Transport } from "./transport";
 
@@ -12,7 +12,7 @@ function createMockTransport(): Transport {
         apiPath: "/api",
         fetchFn: globalThis.fetch,
         getHeaders: () => ({}),
-        resolveToken: jest.fn<any>().mockResolvedValue(null),
+        resolveToken: jest.fn<any>().mockResolvedValue(null)
     };
 }
 
@@ -74,7 +74,8 @@ describe("createCollectionClient", () => {
 
             const client = createCollectionClient(transport, "users");
             // Even if the caller passes limit/offset in params, they should be stripped
-            await client.count({ limit: 50, offset: 10 });
+            await client.count({ limit: 50,
+offset: 10 });
 
             const calledUrl = (transport.request as ReturnType<typeof jest.fn>).mock.calls[0][0] as string;
             expect(calledUrl).not.toContain("limit=");
@@ -111,7 +112,7 @@ describe("createCollectionClient", () => {
             await client.count({
                 where: {
                     status: "eq.active",
-                    total: [">=", 100],
+                    total: [">=", 100]
                 }
             });
 
@@ -124,8 +125,12 @@ describe("createCollectionClient", () => {
     describe("find()", () => {
         it("should call the list endpoint and return entities", async () => {
             (transport.request as ReturnType<typeof jest.fn>).mockResolvedValue({
-                data: [{ id: "1", name: "Product A" }],
-                meta: { total: 1, limit: 20, offset: 0, hasMore: false }
+                data: [{ id: "1",
+name: "Product A" }],
+                meta: { total: 1,
+limit: 20,
+offset: 0,
+hasMore: false }
             });
 
             const client = createCollectionClient(transport, "products");

package/src/functions.ts

@@ -58,7 +58,7 @@ export function createFunctionsClient(transport: Transport): FunctionsClient {
         async invoke<T = unknown>(
             name: string,
             payload?: unknown,
-            options?: FunctionInvokeOptions,
+            options?: FunctionInvokeOptions
         ): Promise<T> {
             const method = options?.method ?? "POST";
             const subPath = options?.path ? `/${options.path.replace(/^\//, "")}` : "";
@@ -75,6 +75,6 @@ export function createFunctionsClient(transport: Transport): FunctionsClient {
             }
 
             return transport.request<T>(routePath, init);
-        },
+        }
     };
 }

package/src/index.ts

@@ -4,7 +4,10 @@ import { createAdmin, CreateAdminOptions } from "./admin";
 import { createCron, CreateCronOptions } from "./cron";
 import { createCollectionClient, CollectionClient } from "./collection";
 import { createFunctionsClient } from "./functions";
-import type { FunctionsClient } from "./functions";
+import { createStorage } from "./storage";
+import { RebaseWebSocketClient } from "./websocket";
+import { RebaseClient, RebaseData, StorageSource } from "@rebasepro/types";
+import { toSnakeCase } from "@rebasepro/utils";
 
 export * from "./transport";
 export * from "./auth";
@@ -16,6 +19,7 @@ export * from "./websocket";
 export * from "./storage";
 export * from "./reviver";
 export * from "./functions";
+export type { Entity, FindResponse } from "@rebasepro/types";
 
 export interface CreateRebaseClientOptions extends RebaseClientConfig {
     auth?: CreateAuthOptions;
@@ -23,17 +27,34 @@ export interface CreateRebaseClientOptions extends RebaseClientConfig {
     cron?: CreateCronOptions;
 }
 
-import { RebaseWebSocketClient } from "./websocket";
-import { RebaseClient as BaseRebaseClient, RebaseData, CollectionAccessor, StorageSource } from "@rebasepro/types";
-export type { Entity, FindResponse } from "@rebasepro/types";
-import { toSnakeCase } from "@rebasepro/utils";
+// ─── Typed Data Proxy ────────────────────────────────────────────────────────
+// Adds typed collection accessors when `DB` is provided via the SDK generator.
 
 type KebabToCamelCase<S extends string> =
   S extends `${infer T}-${infer U}`
     ? `${T}${Capitalize<KebabToCamelCase<U>>}`
     : S;
 
-export type RebaseClient<DB = Record<string, unknown>> = Omit<BaseRebaseClient<DB>, "data"> & {
+type TypedDataLayer<DB> = {
+    collection<S extends string>(slug: S): CollectionClient<
+        KebabToCamelCase<S> extends keyof DB
+            ? (DB[KebabToCamelCase<S>] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>)
+            : Record<string, unknown>
+    >;
+} & {
+    [K in keyof DB]: CollectionClient<
+        DB[K] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>
+    >;
+} & RebaseData;
+
+/**
+ * The return type of `createRebaseClient<DB>()`.
+ *
+ * This is `RebaseClient` (from `@rebasepro/types`) with all optional
+ * capabilities populated and the `data` layer narrowed to provide
+ * typed collection accessors when a `DB` schema generic is supplied.
+ */
+export type CreateRebaseClientResult<DB = Record<string, unknown>> = Omit<RebaseClient, "data"> & {
     setToken: (token: string | null) => void;
     setAuthTokenGetter: (getter: () => Promise<string | null>) => void;
     setOnUnauthorized: (handler: () => Promise<boolean>) => void;
@@ -41,24 +62,14 @@ export type RebaseClient<DB = Record<string, unknown>> = Omit<BaseRebaseClient<D
     auth: ReturnType<typeof createAuth>;
     admin: ReturnType<typeof createAdmin>;
     cron: ReturnType<typeof createCron>;
-    functions: FunctionsClient;
+    functions: ReturnType<typeof createFunctionsClient>;
     ws?: RebaseWebSocketClient;
-    storage?: StorageSource;
+    storage: StorageSource;
     call: <T = unknown>(endpoint: string, payload?: unknown) => Promise<T>;
-    data: {
-        collection<S extends string>(slug: S): CollectionClient<
-            KebabToCamelCase<S> extends keyof DB
-                ? (DB[KebabToCamelCase<S>] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>)
-                : Record<string, unknown>
-        >;
-    } & {
-        [K in keyof DB]: CollectionClient<
-            DB[K] extends { Row: infer R extends Record<string, unknown> } ? R : Record<string, unknown>
-        >;
-    } & RebaseData;
+    data: TypedDataLayer<DB>;
 };
 
-import { createStorage } from "./storage";
+// ─── Factory ─────────────────────────────────────────────────────────────────
 
 /**
  * Derive a WebSocket URL from an HTTP base URL.
@@ -94,7 +105,7 @@ function deriveWebSocketUrl(baseUrl?: string): string {
         .replace(/\/$/, "");
 }
 
-export function createRebaseClient<DB = Record<string, unknown>>(options: CreateRebaseClientOptions): RebaseClient<DB> {
+export function createRebaseClient<DB = Record<string, unknown>>(options: CreateRebaseClientOptions): CreateRebaseClientResult<DB> {
     const transport = createTransport(options);
     const auth = createAuth(transport, options.auth);
     const admin = createAdmin(transport, options.admin);
@@ -206,7 +217,8 @@ export function createRebaseClient<DB = Record<string, unknown>>(options: Create
         },
         data: dataProxy,
         email: undefined
-    } as unknown as RebaseClient<DB>;
+    } as unknown as CreateRebaseClientResult<DB>;
 
     return target;
 }
+