@blinkdotnew/sdk 0.6.0 → 0.6.1

package/dist/index.d.mts

@@ -681,6 +681,7 @@ declare class BlinkRealtimeChannel implements RealtimeChannel {
     private isSubscribed;
     private reconnectTimer;
     private heartbeatTimer;
+    private reconnectAttempts;
     constructor(channelName: string, httpClient: HttpClient, projectId: string);
     subscribe(options?: {
         userId?: string;
@@ -709,6 +710,7 @@ declare class BlinkRealtimeImpl implements BlinkRealtime {
     private httpClient;
     private projectId;
     private channels;
+    private handlers;
     constructor(httpClient: HttpClient, projectId: string);
     channel(name: string): RealtimeChannel;
     subscribe(channelName: string, callback: (message: RealtimeMessage) => void, options?: RealtimeSubscribeOptions): Promise<() => void>;

package/dist/index.d.ts

@@ -681,6 +681,7 @@ declare class BlinkRealtimeChannel implements RealtimeChannel {
     private isSubscribed;
     private reconnectTimer;
     private heartbeatTimer;
+    private reconnectAttempts;
     constructor(channelName: string, httpClient: HttpClient, projectId: string);
     subscribe(options?: {
         userId?: string;
@@ -709,6 +710,7 @@ declare class BlinkRealtimeImpl implements BlinkRealtime {
     private httpClient;
     private projectId;
     private channels;
+    private handlers;
     constructor(httpClient: HttpClient, projectId: string);
     channel(name: string): RealtimeChannel;
     subscribe(channelName: string, callback: (message: RealtimeMessage) => void, options?: RealtimeSubscribeOptions): Promise<() => void>;

package/dist/index.js

@@ -1,5 +1,12 @@
 'use strict';
 
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // ../core/src/types.ts
 var BlinkError = class extends Error {
   constructor(message, code, status, details) {
@@ -2474,6 +2481,17 @@ var BlinkDataImpl = class {
 };
 
 // src/realtime.ts
+var getWebSocketClass = () => {
+  if (typeof WebSocket !== "undefined") {
+    return WebSocket;
+  }
+  try {
+    const WS = __require("ws");
+    return WS;
+  } catch (error) {
+    throw new BlinkRealtimeError('WebSocket is not available. Install "ws" package for Node.js environments.');
+  }
+};
 var BlinkRealtimeChannel = class {
   constructor(channelName, httpClient, projectId) {
     this.channelName = channelName;
@@ -2486,6 +2504,7 @@ var BlinkRealtimeChannel = class {
   isSubscribed = false;
   reconnectTimer = null;
   heartbeatTimer = null;
+  reconnectAttempts = 0;
   async subscribe(options = {}) {
     if (this.isSubscribed) {
       return;
@@ -2576,7 +2595,9 @@ var BlinkRealtimeChannel = class {
         channel: this.channelName,
         limit: options.limit,
         start: options.after,
+        // after = start from this ID onwards
         end: options.before
+        // before = end at this ID
       });
       return response.data.messages;
     } catch (error) {
@@ -2586,16 +2607,22 @@ var BlinkRealtimeChannel = class {
     }
   }
   async connectWebSocket() {
-    if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+    if (this.websocket && this.websocket.readyState === 1) {
       return;
     }
     return new Promise((resolve, reject) => {
       try {
         const baseUrl = this.httpClient.projectId.includes("localhost") ? "ws://localhost:3000" : "wss://core.blink.new";
         const wsUrl = `${baseUrl}?project_id=${this.projectId}`;
-        this.websocket = new WebSocket(wsUrl);
+        const WSClass = getWebSocketClass();
+        this.websocket = new WSClass(wsUrl);
+        if (!this.websocket) {
+          reject(new BlinkRealtimeError("Failed to create WebSocket instance"));
+          return;
+        }
         this.websocket.onopen = () => {
           console.log(`\u{1F517} Connected to realtime for project ${this.projectId}`);
+          this.reconnectAttempts = 0;
           resolve();
         };
         this.websocket.onmessage = (event) => {
@@ -2616,7 +2643,7 @@ var BlinkRealtimeChannel = class {
           reject(new BlinkRealtimeError("WebSocket connection failed"));
         };
         setTimeout(() => {
-          if (this.websocket?.readyState !== WebSocket.OPEN) {
+          if (this.websocket?.readyState !== 1) {
             reject(new BlinkRealtimeError("WebSocket connection timeout"));
           }
         }, 5e3);
@@ -2664,8 +2691,8 @@ var BlinkRealtimeChannel = class {
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
     }
-    this.heartbeatTimer = window.setInterval(() => {
-      if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+    this.heartbeatTimer = globalThis.setInterval(() => {
+      if (this.websocket && this.websocket.readyState === 1) {
         this.websocket.send(JSON.stringify({ type: "ping", payload: {} }));
       }
     }, 25e3);
@@ -2674,7 +2701,12 @@ var BlinkRealtimeChannel = class {
     if (this.reconnectTimer) {
       clearTimeout(this.reconnectTimer);
     }
-    this.reconnectTimer = window.setTimeout(async () => {
+    this.reconnectAttempts++;
+    const baseDelay = Math.min(3e4, Math.pow(2, this.reconnectAttempts) * 1e3);
+    const jitter = Math.random() * 1e3;
+    const delay = baseDelay + jitter;
+    console.log(`\u{1F504} Scheduling reconnect attempt ${this.reconnectAttempts} in ${Math.round(delay)}ms`);
+    this.reconnectTimer = globalThis.setTimeout(async () => {
       if (this.isSubscribed) {
         try {
           await this.connectWebSocket();
@@ -2693,7 +2725,7 @@ var BlinkRealtimeChannel = class {
           this.scheduleReconnect();
         }
       }
-    }, 2e3);
+    }, delay);
   }
   cleanup() {
     this.isSubscribed = false;
@@ -2719,6 +2751,7 @@ var BlinkRealtimeImpl = class {
     this.projectId = projectId;
   }
   channels = /* @__PURE__ */ new Map();
+  handlers = {};
   channel(name) {
     if (!this.channels.has(name)) {
       this.channels.set(name, new BlinkRealtimeChannel(name, this.httpClient, this.projectId));
@@ -2728,7 +2761,21 @@ var BlinkRealtimeImpl = class {
   async subscribe(channelName, callback, options = {}) {
     const channel = this.channel(channelName);
     await channel.subscribe(options);
-    return channel.onMessage(callback);
+    const state = this.handlers[channelName] ??= {
+      msgHandlers: /* @__PURE__ */ new Set(),
+      presHandlers: /* @__PURE__ */ new Set(),
+      subscribed: true
+    };
+    state.msgHandlers.add(callback);
+    const messageUnsub = channel.onMessage(callback);
+    return () => {
+      messageUnsub();
+      state.msgHandlers.delete(callback);
+      if (state.msgHandlers.size === 0 && state.presHandlers.size === 0) {
+        channel.unsubscribe();
+        delete this.handlers[channelName];
+      }
+    };
   }
   async publish(channelName, type, data, options = {}) {
     const channel = this.channel(channelName);
@@ -2740,7 +2787,21 @@ var BlinkRealtimeImpl = class {
   }
   onPresence(channelName, callback) {
     const channel = this.channel(channelName);
-    return channel.onPresence(callback);
+    const state = this.handlers[channelName] ??= {
+      msgHandlers: /* @__PURE__ */ new Set(),
+      presHandlers: /* @__PURE__ */ new Set(),
+      subscribed: false
+    };
+    state.presHandlers.add(callback);
+    const presenceUnsub = channel.onPresence(callback);
+    return () => {
+      presenceUnsub();
+      state.presHandlers.delete(callback);
+      if (state.msgHandlers.size === 0 && state.presHandlers.size === 0) {
+        channel.unsubscribe();
+        delete this.handlers[channelName];
+      }
+    };
   }
 };
 

package/dist/index.mjs

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // ../core/src/types.ts
 var BlinkError = class extends Error {
   constructor(message, code, status, details) {
@@ -2472,6 +2479,17 @@ var BlinkDataImpl = class {
 };
 
 // src/realtime.ts
+var getWebSocketClass = () => {
+  if (typeof WebSocket !== "undefined") {
+    return WebSocket;
+  }
+  try {
+    const WS = __require("ws");
+    return WS;
+  } catch (error) {
+    throw new BlinkRealtimeError('WebSocket is not available. Install "ws" package for Node.js environments.');
+  }
+};
 var BlinkRealtimeChannel = class {
   constructor(channelName, httpClient, projectId) {
     this.channelName = channelName;
@@ -2484,6 +2502,7 @@ var BlinkRealtimeChannel = class {
   isSubscribed = false;
   reconnectTimer = null;
   heartbeatTimer = null;
+  reconnectAttempts = 0;
   async subscribe(options = {}) {
     if (this.isSubscribed) {
       return;
@@ -2574,7 +2593,9 @@ var BlinkRealtimeChannel = class {
         channel: this.channelName,
         limit: options.limit,
         start: options.after,
+        // after = start from this ID onwards
         end: options.before
+        // before = end at this ID
       });
       return response.data.messages;
     } catch (error) {
@@ -2584,16 +2605,22 @@ var BlinkRealtimeChannel = class {
     }
   }
   async connectWebSocket() {
-    if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+    if (this.websocket && this.websocket.readyState === 1) {
       return;
     }
     return new Promise((resolve, reject) => {
       try {
         const baseUrl = this.httpClient.projectId.includes("localhost") ? "ws://localhost:3000" : "wss://core.blink.new";
         const wsUrl = `${baseUrl}?project_id=${this.projectId}`;
-        this.websocket = new WebSocket(wsUrl);
+        const WSClass = getWebSocketClass();
+        this.websocket = new WSClass(wsUrl);
+        if (!this.websocket) {
+          reject(new BlinkRealtimeError("Failed to create WebSocket instance"));
+          return;
+        }
         this.websocket.onopen = () => {
           console.log(`\u{1F517} Connected to realtime for project ${this.projectId}`);
+          this.reconnectAttempts = 0;
           resolve();
         };
         this.websocket.onmessage = (event) => {
@@ -2614,7 +2641,7 @@ var BlinkRealtimeChannel = class {
           reject(new BlinkRealtimeError("WebSocket connection failed"));
         };
         setTimeout(() => {
-          if (this.websocket?.readyState !== WebSocket.OPEN) {
+          if (this.websocket?.readyState !== 1) {
             reject(new BlinkRealtimeError("WebSocket connection timeout"));
           }
         }, 5e3);
@@ -2662,8 +2689,8 @@ var BlinkRealtimeChannel = class {
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
     }
-    this.heartbeatTimer = window.setInterval(() => {
-      if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+    this.heartbeatTimer = globalThis.setInterval(() => {
+      if (this.websocket && this.websocket.readyState === 1) {
         this.websocket.send(JSON.stringify({ type: "ping", payload: {} }));
       }
     }, 25e3);
@@ -2672,7 +2699,12 @@ var BlinkRealtimeChannel = class {
     if (this.reconnectTimer) {
       clearTimeout(this.reconnectTimer);
     }
-    this.reconnectTimer = window.setTimeout(async () => {
+    this.reconnectAttempts++;
+    const baseDelay = Math.min(3e4, Math.pow(2, this.reconnectAttempts) * 1e3);
+    const jitter = Math.random() * 1e3;
+    const delay = baseDelay + jitter;
+    console.log(`\u{1F504} Scheduling reconnect attempt ${this.reconnectAttempts} in ${Math.round(delay)}ms`);
+    this.reconnectTimer = globalThis.setTimeout(async () => {
       if (this.isSubscribed) {
         try {
           await this.connectWebSocket();
@@ -2691,7 +2723,7 @@ var BlinkRealtimeChannel = class {
           this.scheduleReconnect();
         }
       }
-    }, 2e3);
+    }, delay);
   }
   cleanup() {
     this.isSubscribed = false;
@@ -2717,6 +2749,7 @@ var BlinkRealtimeImpl = class {
     this.projectId = projectId;
   }
   channels = /* @__PURE__ */ new Map();
+  handlers = {};
   channel(name) {
     if (!this.channels.has(name)) {
       this.channels.set(name, new BlinkRealtimeChannel(name, this.httpClient, this.projectId));
@@ -2726,7 +2759,21 @@ var BlinkRealtimeImpl = class {
   async subscribe(channelName, callback, options = {}) {
     const channel = this.channel(channelName);
     await channel.subscribe(options);
-    return channel.onMessage(callback);
+    const state = this.handlers[channelName] ??= {
+      msgHandlers: /* @__PURE__ */ new Set(),
+      presHandlers: /* @__PURE__ */ new Set(),
+      subscribed: true
+    };
+    state.msgHandlers.add(callback);
+    const messageUnsub = channel.onMessage(callback);
+    return () => {
+      messageUnsub();
+      state.msgHandlers.delete(callback);
+      if (state.msgHandlers.size === 0 && state.presHandlers.size === 0) {
+        channel.unsubscribe();
+        delete this.handlers[channelName];
+      }
+    };
   }
   async publish(channelName, type, data, options = {}) {
     const channel = this.channel(channelName);
@@ -2738,7 +2785,21 @@ var BlinkRealtimeImpl = class {
   }
   onPresence(channelName, callback) {
     const channel = this.channel(channelName);
-    return channel.onPresence(callback);
+    const state = this.handlers[channelName] ??= {
+      msgHandlers: /* @__PURE__ */ new Set(),
+      presHandlers: /* @__PURE__ */ new Set(),
+      subscribed: false
+    };
+    state.presHandlers.add(callback);
+    const presenceUnsub = channel.onPresence(callback);
+    return () => {
+      presenceUnsub();
+      state.presHandlers.delete(callback);
+      if (state.msgHandlers.size === 0 && state.presHandlers.size === 0) {
+        channel.unsubscribe();
+        delete this.handlers[channelName];
+      }
+    };
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blinkdotnew/sdk",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Blink TypeScript SDK for client-side applications - Zero-boilerplate CRUD + auth for modern SaaS/AI apps",
   "keywords": [
     "blink",