@aurabase/realtime 0.5.0 → 0.5.1

package/dist/index.cjs

@@ -272,10 +272,12 @@ var AuraChannel = class {
   constructor(name, projectPrefix, options) {
     this.name = name;
     this._projectPrefix = projectPrefix;
-    this._isPrivate = options?.private ?? false;
-    this._broadcastAck = options?.broadcast?.ack ?? false;
-    this._broadcastSelf = options?.broadcast?.self ?? false;
-    this._presenceKey = options?.config?.presence?.key ?? "";
+    const bcast = options?.broadcast ?? options?.config?.broadcast;
+    const pres = options?.presence ?? options?.config?.presence;
+    this._isPrivate = Boolean(options?.private ?? options?.config?.private ?? false);
+    this._broadcastAck = Boolean(bcast?.ack ?? false);
+    this._broadcastSelf = Boolean(bcast?.self ?? false);
+    this._presenceKey = typeof pres?.key === "string" ? pres.key : "";
   }
   /** Génère un ref_id unique pour la corrélation request/response. */
   _nextRef() {
@@ -308,6 +310,7 @@ var AuraChannel = class {
   subscribe(callback, timeoutMs) {
     this._subscribeCallback = callback ?? null;
     this._subscribed = true;
+    this._serverState = "pending";
     this._closedEmitted = false;
     if (typeof timeoutMs === "number" && timeoutMs > 0) {
       this._subscribeTimeoutMs = timeoutMs;
@@ -694,14 +697,32 @@ var AuraChannel = class {
                 }
               }
             }
-            listener.callback(event);
+            const cdcPayload = payload && typeof payload === "object" ? payload : {};
+            if (cdcPayload.new === void 0 && cdcPayload.record !== void 0) {
+              cdcPayload.new = cdcPayload.record;
+            }
+            if (cdcPayload.old === void 0 && cdcPayload.old_record !== void 0) {
+              cdcPayload.old = cdcPayload.old_record;
+            }
+            if (cdcPayload.eventType === void 0 && cdcPayload.type !== void 0) {
+              cdcPayload.eventType = cdcPayload.type;
+            }
+            const enrichedEvent = Object.assign(Object.create(event), {
+              new: cdcPayload.record,
+              old: cdcPayload.old_record,
+              eventType: cdcPayload.type,
+              schema: cdcPayload.schema,
+              table: cdcPayload.table
+            });
+            listener.callback(enrichedEvent);
           }
         }
       } else if (listener.type === "broadcast") {
         if (eventType === "broadcast") {
           const filter = listener.filter;
-          const payload = event.payload;
-          if (!filter.event || payload.event === filter.event) {
+          const broadcastPayload = event.payload && typeof event.payload === "object" ? event.payload : void 0;
+          const broadcastEvent = broadcastPayload?.event;
+          if (!filter.event || filter.event === "*" || broadcastEvent === filter.event) {
             listener.callback(event);
           }
         }
@@ -926,6 +947,8 @@ var RealtimeService = class _RealtimeService {
   _tokenRefreshTimer = null;
   /** Dernier access_token propagé au serveur — évite les pushs redondants (propagation différentielle). */
   _lastSentToken = null;
+  /** Token d'authentification explicite passé à setAuth(), prioritaire sur authStore. */
+  _customAuthToken = null;
   /** Listeners d'erreurs de transport (handshake refusé, coupure, connexion morte). */
   _errorListeners = /* @__PURE__ */ new Set();
   /**
@@ -955,6 +978,10 @@ var RealtimeService = class _RealtimeService {
   get connectionState() {
     return this._state;
   }
+  /** Whether the WebSocket is currently connected. */
+  get isConnected() {
+    return this._state === "connected";
+  }
   /** Listen for connection state changes. */
   onStateChange(callback) {
     this._stateListeners.add(callback);
@@ -1019,17 +1046,15 @@ var RealtimeService = class _RealtimeService {
   }
   // ─── Préfixe de projet des canaux ───────────────────────────────────────
   /**
-   * Préfixe `"<project_id>:"` des noms de canaux sur le fil, `""` s'il est inconnu.
+   * Préfixe de projet déduit du token courant (`<project_id>:`), vide si aucun token.
    *
-   * `aura-realtime` exige que tout canal commence par le `project_id` du TOKEN
-   * (`handlers/websocket.rs`, `expected_prefix` ; idem pour le broadcast HTTP,
-   * `handlers/broadcast.rs`). Le SDK ne porte plus d'identifiant de projet — le projet est
-   * celui de l'URL — mais le token de session, lui, porte ce claim : on le lit là, dans le
-   * même jeton que celui envoyé au serveur. Sans token (pas encore connecté), il n'y a rien
+   * Utilisé pour normaliser les noms de canaux : le serveur (`aura-realtime`) attend
+   * systématiquement `<project_id>:<canal>` sur le protocole WebSocket et REST, alors que
+   * l'utilisateur passe généralement un nom court (`room-1`). Sans session, aucun préfixe
    * à préfixer ; la connexion WS échouerait de toute façon, le serveur exigeant un JWT.
    */
   _projectPrefix() {
-    const token = this.client.authStore.token;
+    const token = this._customAuthToken ?? this.client.authStore.token;
     if (!token) return "";
     const pid = getTokenProjectId(token);
     return pid ? `${pid}:` : "";
@@ -1047,7 +1072,7 @@ var RealtimeService = class _RealtimeService {
     }
     this._intentionalClose = false;
     this._setState("connecting");
-    const token = this.client.authStore.token;
+    const token = this._customAuthToken ?? this.client.authStore.token;
     const params = new URLSearchParams();
     if (token) params.set("token", token);
     if (this.client.apiKey) params.set("apikey", this.client.apiKey);
@@ -1066,6 +1091,9 @@ var RealtimeService = class _RealtimeService {
       opened = true;
       this._reconnectAttempts = 0;
       this._setState("connected");
+      if (this._customAuthToken && this._customAuthToken !== this._lastSentToken) {
+        this.refreshToken(this._customAuthToken);
+      }
       this._awaitingPong = false;
       this._lastServerMessageAt = Date.now();
       this._heartbeat.start(() => this._heartbeatTick(ws), HEARTBEAT_INTERVAL_MS);
@@ -1291,7 +1319,11 @@ var RealtimeService = class _RealtimeService {
    */
   setAuth(token) {
     const resolved = token ?? this.client.authStore.token;
-    if (resolved == null) return;
+    this._customAuthToken = resolved ?? null;
+    if (resolved == null) {
+      this._lastSentToken = null;
+      return;
+    }
     this.refreshToken(resolved);
   }
   /**
@@ -1469,8 +1501,9 @@ var RealtimeService = class _RealtimeService {
     }
     return ch;
   }
-  /** Remove a channel. */
-  removeChannel(name) {
+  /** Remove a channel by name or by AuraChannel instance. */
+  removeChannel(channel) {
+    const name = typeof channel === "string" ? channel : channel.name;
     const ch = this._channels.get(name);
     if (ch) {
       ch.unsubscribe();
@@ -1500,8 +1533,17 @@ var RealtimeService = class _RealtimeService {
         ch._onMessage(msg);
         return;
       }
+      if (channelFull.includes(":")) {
+        const colonIdx = channelFull.indexOf(":");
+        const relativeName = channelFull.slice(colonIdx + 1);
+        const relCh = this._channels.get(relativeName);
+        if (relCh) {
+          relCh._onMessage(msg);
+          return;
+        }
+      }
       for (const [, channel] of this._channels) {
-        if (channel.fullName === channelFull || channelFull.startsWith(channel.fullName + ":")) {
+        if (channel.fullName === channelFull || channel.name === channelFull || channelFull.startsWith(channel.fullName + ":") || channelFull.endsWith(`:${channel.name}`)) {
           channel._onMessage(msg);
           return;
         }

package/dist/index.d.cts

@@ -1,10 +1,17 @@
-import { ChannelConfig, PostgresChangesFilter, RealtimeEvent, BroadcastFilter, PresenceFilter, PresenceState, SubscribeCallback, BroadcastPayload, BroadcastSendStatus, ServerMessage, RealtimeListenType, AuraClientLike, AuraResponse } from '@aurabase/core';
+import { ChannelConfig, PostgresChangesFilter, RealtimeEvent, BroadcastFilter, PresenceFilter, PresenceState, SubscribeCallback, BroadcastPayload, BroadcastSendStatus, ServerMessage, AuraClientLike, AuraResponse } from '@aurabase/core';
 
-type ListenerCallback = (payload: RealtimeEvent | Record<string, unknown>) => void;
 type ListenerEntry = {
-    type: RealtimeListenType;
-    filter: PostgresChangesFilter | BroadcastFilter | PresenceFilter;
-    callback: ListenerCallback;
+    type: 'postgres_changes';
+    filter: PostgresChangesFilter;
+    callback: (payload: RealtimeEvent) => void;
+} | {
+    type: 'broadcast';
+    filter: BroadcastFilter;
+    callback: (payload: RealtimeEvent) => void;
+} | {
+    type: 'presence';
+    filter: PresenceFilter;
+    callback: (payload: PresenceState | RealtimeEvent | Record<string, unknown>) => void;
 };
 /**
  * Fonction d'émission fournie par `RealtimeService`.
@@ -379,6 +386,8 @@ declare class RealtimeService {
     private _tokenRefreshTimer;
     /** Dernier access_token propagé au serveur — évite les pushs redondants (propagation différentielle). */
     private _lastSentToken;
+    /** Token d'authentification explicite passé à setAuth(), prioritaire sur authStore. */
+    private _customAuthToken;
     /** Listeners d'erreurs de transport (handshake refusé, coupure, connexion morte). */
     private _errorListeners;
     /**
@@ -404,6 +413,8 @@ declare class RealtimeService {
     constructor(client: AuraClientLike);
     /** Current connection state. */
     get connectionState(): ConnectionState;
+    /** Whether the WebSocket is currently connected. */
+    get isConnected(): boolean;
     /** Listen for connection state changes. */
     onStateChange(callback: (state: ConnectionState) => void): () => void;
     private _setState;
@@ -438,13 +449,11 @@ declare class RealtimeService {
      */
     private _emitError;
     /**
-     * Préfixe `"<project_id>:"` des noms de canaux sur le fil, `""` s'il est inconnu.
+     * Préfixe de projet déduit du token courant (`<project_id>:`), vide si aucun token.
      *
-     * `aura-realtime` exige que tout canal commence par le `project_id` du TOKEN
-     * (`handlers/websocket.rs`, `expected_prefix` ; idem pour le broadcast HTTP,
-     * `handlers/broadcast.rs`). Le SDK ne porte plus d'identifiant de projet — le projet est
-     * celui de l'URL — mais le token de session, lui, porte ce claim : on le lit là, dans le
-     * même jeton que celui envoyé au serveur. Sans token (pas encore connecté), il n'y a rien
+     * Utilisé pour normaliser les noms de canaux : le serveur (`aura-realtime`) attend
+     * systématiquement `<project_id>:<canal>` sur le protocole WebSocket et REST, alors que
+     * l'utilisateur passe généralement un nom court (`room-1`). Sans session, aucun préfixe
      * à préfixer ; la connexion WS échouerait de toute façon, le serveur exigeant un JWT.
      */
     private _projectPrefix;
@@ -609,8 +618,8 @@ declare class RealtimeService {
      * ```
      */
     channel(name: string, options?: ChannelConfig): AuraChannel;
-    /** Remove a channel. */
-    removeChannel(name: string): void;
+    /** Remove a channel by name or by AuraChannel instance. */
+    removeChannel(channel: string | AuraChannel): void;
     /** List active channels. */
     getChannels(): AuraChannel[];
     /** Remove all channels and subscriptions. */

package/dist/index.d.ts

@@ -1,10 +1,17 @@
-import { ChannelConfig, PostgresChangesFilter, RealtimeEvent, BroadcastFilter, PresenceFilter, PresenceState, SubscribeCallback, BroadcastPayload, BroadcastSendStatus, ServerMessage, RealtimeListenType, AuraClientLike, AuraResponse } from '@aurabase/core';
+import { ChannelConfig, PostgresChangesFilter, RealtimeEvent, BroadcastFilter, PresenceFilter, PresenceState, SubscribeCallback, BroadcastPayload, BroadcastSendStatus, ServerMessage, AuraClientLike, AuraResponse } from '@aurabase/core';
 
-type ListenerCallback = (payload: RealtimeEvent | Record<string, unknown>) => void;
 type ListenerEntry = {
-    type: RealtimeListenType;
-    filter: PostgresChangesFilter | BroadcastFilter | PresenceFilter;
-    callback: ListenerCallback;
+    type: 'postgres_changes';
+    filter: PostgresChangesFilter;
+    callback: (payload: RealtimeEvent) => void;
+} | {
+    type: 'broadcast';
+    filter: BroadcastFilter;
+    callback: (payload: RealtimeEvent) => void;
+} | {
+    type: 'presence';
+    filter: PresenceFilter;
+    callback: (payload: PresenceState | RealtimeEvent | Record<string, unknown>) => void;
 };
 /**
  * Fonction d'émission fournie par `RealtimeService`.
@@ -379,6 +386,8 @@ declare class RealtimeService {
     private _tokenRefreshTimer;
     /** Dernier access_token propagé au serveur — évite les pushs redondants (propagation différentielle). */
     private _lastSentToken;
+    /** Token d'authentification explicite passé à setAuth(), prioritaire sur authStore. */
+    private _customAuthToken;
     /** Listeners d'erreurs de transport (handshake refusé, coupure, connexion morte). */
     private _errorListeners;
     /**
@@ -404,6 +413,8 @@ declare class RealtimeService {
     constructor(client: AuraClientLike);
     /** Current connection state. */
     get connectionState(): ConnectionState;
+    /** Whether the WebSocket is currently connected. */
+    get isConnected(): boolean;
     /** Listen for connection state changes. */
     onStateChange(callback: (state: ConnectionState) => void): () => void;
     private _setState;
@@ -438,13 +449,11 @@ declare class RealtimeService {
      */
     private _emitError;
     /**
-     * Préfixe `"<project_id>:"` des noms de canaux sur le fil, `""` s'il est inconnu.
+     * Préfixe de projet déduit du token courant (`<project_id>:`), vide si aucun token.
      *
-     * `aura-realtime` exige que tout canal commence par le `project_id` du TOKEN
-     * (`handlers/websocket.rs`, `expected_prefix` ; idem pour le broadcast HTTP,
-     * `handlers/broadcast.rs`). Le SDK ne porte plus d'identifiant de projet — le projet est
-     * celui de l'URL — mais le token de session, lui, porte ce claim : on le lit là, dans le
-     * même jeton que celui envoyé au serveur. Sans token (pas encore connecté), il n'y a rien
+     * Utilisé pour normaliser les noms de canaux : le serveur (`aura-realtime`) attend
+     * systématiquement `<project_id>:<canal>` sur le protocole WebSocket et REST, alors que
+     * l'utilisateur passe généralement un nom court (`room-1`). Sans session, aucun préfixe
      * à préfixer ; la connexion WS échouerait de toute façon, le serveur exigeant un JWT.
      */
     private _projectPrefix;
@@ -609,8 +618,8 @@ declare class RealtimeService {
      * ```
      */
     channel(name: string, options?: ChannelConfig): AuraChannel;
-    /** Remove a channel. */
-    removeChannel(name: string): void;
+    /** Remove a channel by name or by AuraChannel instance. */
+    removeChannel(channel: string | AuraChannel): void;
     /** List active channels. */
     getChannels(): AuraChannel[];
     /** Remove all channels and subscriptions. */

package/dist/index.js

@@ -270,10 +270,12 @@ var AuraChannel = class {
   constructor(name, projectPrefix, options) {
     this.name = name;
     this._projectPrefix = projectPrefix;
-    this._isPrivate = options?.private ?? false;
-    this._broadcastAck = options?.broadcast?.ack ?? false;
-    this._broadcastSelf = options?.broadcast?.self ?? false;
-    this._presenceKey = options?.config?.presence?.key ?? "";
+    const bcast = options?.broadcast ?? options?.config?.broadcast;
+    const pres = options?.presence ?? options?.config?.presence;
+    this._isPrivate = Boolean(options?.private ?? options?.config?.private ?? false);
+    this._broadcastAck = Boolean(bcast?.ack ?? false);
+    this._broadcastSelf = Boolean(bcast?.self ?? false);
+    this._presenceKey = typeof pres?.key === "string" ? pres.key : "";
   }
   /** Génère un ref_id unique pour la corrélation request/response. */
   _nextRef() {
@@ -306,6 +308,7 @@ var AuraChannel = class {
   subscribe(callback, timeoutMs) {
     this._subscribeCallback = callback ?? null;
     this._subscribed = true;
+    this._serverState = "pending";
     this._closedEmitted = false;
     if (typeof timeoutMs === "number" && timeoutMs > 0) {
       this._subscribeTimeoutMs = timeoutMs;
@@ -692,14 +695,32 @@ var AuraChannel = class {
                 }
               }
             }
-            listener.callback(event);
+            const cdcPayload = payload && typeof payload === "object" ? payload : {};
+            if (cdcPayload.new === void 0 && cdcPayload.record !== void 0) {
+              cdcPayload.new = cdcPayload.record;
+            }
+            if (cdcPayload.old === void 0 && cdcPayload.old_record !== void 0) {
+              cdcPayload.old = cdcPayload.old_record;
+            }
+            if (cdcPayload.eventType === void 0 && cdcPayload.type !== void 0) {
+              cdcPayload.eventType = cdcPayload.type;
+            }
+            const enrichedEvent = Object.assign(Object.create(event), {
+              new: cdcPayload.record,
+              old: cdcPayload.old_record,
+              eventType: cdcPayload.type,
+              schema: cdcPayload.schema,
+              table: cdcPayload.table
+            });
+            listener.callback(enrichedEvent);
           }
         }
       } else if (listener.type === "broadcast") {
         if (eventType === "broadcast") {
           const filter = listener.filter;
-          const payload = event.payload;
-          if (!filter.event || payload.event === filter.event) {
+          const broadcastPayload = event.payload && typeof event.payload === "object" ? event.payload : void 0;
+          const broadcastEvent = broadcastPayload?.event;
+          if (!filter.event || filter.event === "*" || broadcastEvent === filter.event) {
             listener.callback(event);
           }
         }
@@ -924,6 +945,8 @@ var RealtimeService = class _RealtimeService {
   _tokenRefreshTimer = null;
   /** Dernier access_token propagé au serveur — évite les pushs redondants (propagation différentielle). */
   _lastSentToken = null;
+  /** Token d'authentification explicite passé à setAuth(), prioritaire sur authStore. */
+  _customAuthToken = null;
   /** Listeners d'erreurs de transport (handshake refusé, coupure, connexion morte). */
   _errorListeners = /* @__PURE__ */ new Set();
   /**
@@ -953,6 +976,10 @@ var RealtimeService = class _RealtimeService {
   get connectionState() {
     return this._state;
   }
+  /** Whether the WebSocket is currently connected. */
+  get isConnected() {
+    return this._state === "connected";
+  }
   /** Listen for connection state changes. */
   onStateChange(callback) {
     this._stateListeners.add(callback);
@@ -1017,17 +1044,15 @@ var RealtimeService = class _RealtimeService {
   }
   // ─── Préfixe de projet des canaux ───────────────────────────────────────
   /**
-   * Préfixe `"<project_id>:"` des noms de canaux sur le fil, `""` s'il est inconnu.
+   * Préfixe de projet déduit du token courant (`<project_id>:`), vide si aucun token.
    *
-   * `aura-realtime` exige que tout canal commence par le `project_id` du TOKEN
-   * (`handlers/websocket.rs`, `expected_prefix` ; idem pour le broadcast HTTP,
-   * `handlers/broadcast.rs`). Le SDK ne porte plus d'identifiant de projet — le projet est
-   * celui de l'URL — mais le token de session, lui, porte ce claim : on le lit là, dans le
-   * même jeton que celui envoyé au serveur. Sans token (pas encore connecté), il n'y a rien
+   * Utilisé pour normaliser les noms de canaux : le serveur (`aura-realtime`) attend
+   * systématiquement `<project_id>:<canal>` sur le protocole WebSocket et REST, alors que
+   * l'utilisateur passe généralement un nom court (`room-1`). Sans session, aucun préfixe
    * à préfixer ; la connexion WS échouerait de toute façon, le serveur exigeant un JWT.
    */
   _projectPrefix() {
-    const token = this.client.authStore.token;
+    const token = this._customAuthToken ?? this.client.authStore.token;
     if (!token) return "";
     const pid = getTokenProjectId(token);
     return pid ? `${pid}:` : "";
@@ -1045,7 +1070,7 @@ var RealtimeService = class _RealtimeService {
     }
     this._intentionalClose = false;
     this._setState("connecting");
-    const token = this.client.authStore.token;
+    const token = this._customAuthToken ?? this.client.authStore.token;
     const params = new URLSearchParams();
     if (token) params.set("token", token);
     if (this.client.apiKey) params.set("apikey", this.client.apiKey);
@@ -1064,6 +1089,9 @@ var RealtimeService = class _RealtimeService {
       opened = true;
       this._reconnectAttempts = 0;
       this._setState("connected");
+      if (this._customAuthToken && this._customAuthToken !== this._lastSentToken) {
+        this.refreshToken(this._customAuthToken);
+      }
       this._awaitingPong = false;
       this._lastServerMessageAt = Date.now();
       this._heartbeat.start(() => this._heartbeatTick(ws), HEARTBEAT_INTERVAL_MS);
@@ -1289,7 +1317,11 @@ var RealtimeService = class _RealtimeService {
    */
   setAuth(token) {
     const resolved = token ?? this.client.authStore.token;
-    if (resolved == null) return;
+    this._customAuthToken = resolved ?? null;
+    if (resolved == null) {
+      this._lastSentToken = null;
+      return;
+    }
     this.refreshToken(resolved);
   }
   /**
@@ -1467,8 +1499,9 @@ var RealtimeService = class _RealtimeService {
     }
     return ch;
   }
-  /** Remove a channel. */
-  removeChannel(name) {
+  /** Remove a channel by name or by AuraChannel instance. */
+  removeChannel(channel) {
+    const name = typeof channel === "string" ? channel : channel.name;
     const ch = this._channels.get(name);
     if (ch) {
       ch.unsubscribe();
@@ -1498,8 +1531,17 @@ var RealtimeService = class _RealtimeService {
         ch._onMessage(msg);
         return;
       }
+      if (channelFull.includes(":")) {
+        const colonIdx = channelFull.indexOf(":");
+        const relativeName = channelFull.slice(colonIdx + 1);
+        const relCh = this._channels.get(relativeName);
+        if (relCh) {
+          relCh._onMessage(msg);
+          return;
+        }
+      }
       for (const [, channel] of this._channels) {
-        if (channel.fullName === channelFull || channelFull.startsWith(channel.fullName + ":")) {
+        if (channel.fullName === channelFull || channel.name === channelFull || channelFull.startsWith(channel.fullName + ":") || channelFull.endsWith(`:${channel.name}`)) {
           channel._onMessage(msg);
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aurabase/realtime",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Service temps réel du SDK Aurabase (postgres_changes, broadcast, presence)",
   "type": "module",
   "main": "dist/index.cjs",
@@ -34,7 +34,7 @@
     "url": "git+https://github.com/daylami555/aurabase.git",
     "directory": "aurabase-js/packages/realtime"
   },
-  "homepage": "https://github.com/daylami555/aurabase/tree/main/aurabase-js/packages/realtime#readme",
+  "homepage": "https://aurabase.cloud",
   "bugs": {
     "url": "https://github.com/daylami555/aurabase/issues"
   },
@@ -44,19 +44,20 @@
     "sdk",
     "realtime"
   ],
-  "dependencies": {
-    "@aurabase/core": "0.5.0"
-  },
-  "devDependencies": {
-    "@types/node": "20.14.15",
-    "tsup": "^8.0.0",
-    "typescript": "^5.5.0",
-    "vitest": "^4.1.6"
-  },
   "scripts": {
     "build": "tsup",
     "test": "vitest run --passWithNoTests",
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
+    "prepack": "pnpm build",
     "typecheck:tests": "tsc --noEmit -p tsconfig.test.json"
+  },
+  "dependencies": {
+    "@aurabase/core": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "tsup": "catalog:",
+    "typescript": "catalog:",
+    "vitest": "catalog:"
   }
-}
+}