@fishjam-cloud/js-server-sdk 0.25.3 → 0.25.5

package/dist/{chunk-4UDMIEMT.mjs → chunk-NUDP3SRJ.mjs}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@fishjam-cloud/js-server-sdk",
-  version: "0.25.3",
+  version: "0.25.5",
   description: "Fishjam server SDK for JavaScript",
   homepage: "https://github.com/fishjam-cloud/js-server-sdk",
   author: "Fishjam Team",

package/dist/index.d.mts

@@ -759,7 +759,7 @@ declare class FishjamWSNotifier extends FishjamWSNotifier_base {
     private isExpectedEvent;
 }
 
-declare const expectedEventsList: readonly ["trackData", "trackImage"];
+declare const expectedEventsList: readonly ["trackData"];
 /**
  * @useDeclaredType
  */
@@ -793,6 +793,7 @@ declare class FishjamAgent extends FishjamAgent_base {
     private readonly client;
     private resolveConnectionPromise;
     private readonly connectionPromise;
+    private readonly pendingImageCaptures;
     constructor(config: FishjamConfig, agentToken: string, callbacks?: AgentCallbacks);
     /**
      * Await Agent connection to Fishjam.
@@ -822,9 +823,14 @@ declare class FishjamAgent extends FishjamAgent_base {
     sendData(trackId: TrackId, data: Uint8Array): void;
     /**
      * Request a captured image from the given track
+     * @param trackId - the track to capture an image from
+     * @param timeoutMs - timeout in milliseconds (default: 5000)
+     * @returns a promise that resolves with the captured image data
      */
-    captureImage(trackId: TrackId): void;
+    captureImage(trackId: string, timeoutMs?: number): Promise<IncomingTrackImage>;
     disconnect(): void;
+    private handleTrackImageMessage;
+    private rejectPendingCaptures;
     private dispatchNotification;
     private setupConnection;
     private isExpectedEvent;

package/dist/index.d.ts

@@ -759,7 +759,7 @@ declare class FishjamWSNotifier extends FishjamWSNotifier_base {
     private isExpectedEvent;
 }
 
-declare const expectedEventsList: readonly ["trackData", "trackImage"];
+declare const expectedEventsList: readonly ["trackData"];
 /**
  * @useDeclaredType
  */
@@ -793,6 +793,7 @@ declare class FishjamAgent extends FishjamAgent_base {
     private readonly client;
     private resolveConnectionPromise;
     private readonly connectionPromise;
+    private readonly pendingImageCaptures;
     constructor(config: FishjamConfig, agentToken: string, callbacks?: AgentCallbacks);
     /**
      * Await Agent connection to Fishjam.
@@ -822,9 +823,14 @@ declare class FishjamAgent extends FishjamAgent_base {
     sendData(trackId: TrackId, data: Uint8Array): void;
     /**
      * Request a captured image from the given track
+     * @param trackId - the track to capture an image from
+     * @param timeoutMs - timeout in milliseconds (default: 5000)
+     * @returns a promise that resolves with the captured image data
      */
-    captureImage(trackId: TrackId): void;
+    captureImage(trackId: string, timeoutMs?: number): Promise<IncomingTrackImage>;
     disconnect(): void;
+    private handleTrackImageMessage;
+    private rejectPendingCaptures;
     private dispatchNotification;
     private setupConnection;
     private isExpectedEvent;

package/dist/index.js

@@ -5349,18 +5349,22 @@ var FishjamWSNotifier = class extends import_events.EventEmitter {
 // src/agent.ts
 var import_events2 = require("events");
 var import_uuid = require("uuid");
-var expectedEventsList2 = ["trackData", "trackImage"];
+var expectedEventsList2 = ["trackData"];
 var FishjamAgent = class extends import_events2.EventEmitter {
   client;
   resolveConnectionPromise = null;
   connectionPromise;
+  pendingImageCaptures = /* @__PURE__ */ new Map();
   constructor(config, agentToken, callbacks) {
     super();
     const fishjamUrl = getFishjamUrl(config);
     const websocketUrl = `${httpToWebsocket(fishjamUrl)}/socket/agent/websocket`;
     this.client = new WebSocket(websocketUrl);
     this.client.binaryType = "arraybuffer";
-    this.client.onclose = (message) => callbacks?.onClose?.(message.code, message.reason);
+    this.client.onclose = (message) => {
+      this.rejectPendingCaptures("WebSocket closed");
+      callbacks?.onClose?.(message.code, message.reason);
+    };
     this.client.onerror = (message) => callbacks?.onError?.(message);
     this.client.onmessage = (message) => this.dispatchNotification(message);
     this.client.onopen = () => this.setupConnection(agentToken);
@@ -5417,18 +5421,55 @@ var FishjamAgent = class extends import_events2.EventEmitter {
   }
   /**
    * Request a captured image from the given track
+   * @param trackId - the track to capture an image from
+   * @param timeoutMs - timeout in milliseconds (default: 5000)
+   * @returns a promise that resolves with the captured image data
    */
-  captureImage(trackId) {
-    const msg = AgentRequest.encode({ captureImage: { trackId } }).finish();
-    this.client.send(msg);
+  captureImage(trackId, timeoutMs = 5e3) {
+    if (this.pendingImageCaptures.has(trackId)) {
+      return Promise.reject(new Error(`captureImage already pending for track ${trackId}`));
+    }
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pendingImageCaptures.delete(trackId);
+        reject(new Error(`captureImage timed out after ${timeoutMs}ms for track ${trackId}`));
+      }, timeoutMs);
+      this.pendingImageCaptures.set(trackId, { resolve, reject, timer });
+      const msg = AgentRequest.encode({ captureImage: { trackId } }).finish();
+      try {
+        this.client.send(msg);
+      } catch (error) {
+        clearTimeout(timer);
+        this.pendingImageCaptures.delete(trackId);
+        reject(error);
+      }
+    });
   }
   disconnect() {
+    this.rejectPendingCaptures("Agent disconnected");
     this.client.close();
   }
+  handleTrackImageMessage({ trackImage }) {
+    if (!trackImage) return;
+    const pending = this.pendingImageCaptures.get(trackImage.trackId);
+    if (pending) {
+      clearTimeout(pending.timer);
+      this.pendingImageCaptures.delete(trackImage.trackId);
+      pending.resolve(trackImage);
+    }
+  }
+  rejectPendingCaptures(reason) {
+    for (const [trackId, { reject, timer }] of this.pendingImageCaptures) {
+      clearTimeout(timer);
+      reject(new Error(`${reason}: captureImage rejected for track ${trackId}`));
+    }
+    this.pendingImageCaptures.clear();
+  }
   dispatchNotification(message) {
     try {
       const data = new Uint8Array(message.data);
       const decodedMessage = AgentResponse.decode(data);
+      this.handleTrackImageMessage(decodedMessage);
       const [notification, msg] = Object.entries(decodedMessage).find(([_k, v]) => v);
       if (!this.isExpectedEvent(notification)) return;
       this.emit(notification, msg);
@@ -5489,7 +5530,7 @@ var mapException = (error, entity) => {
 // package.json
 var package_default = {
   name: "@fishjam-cloud/js-server-sdk",
-  version: "0.25.3",
+  version: "0.25.5",
   description: "Fishjam server SDK for JavaScript",
   homepage: "https://github.com/fishjam-cloud/js-server-sdk",
   author: "Fishjam Team",

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./chunk-4UDMIEMT.mjs";
+} from "./chunk-NUDP3SRJ.mjs";
 
 // ../fishjam-openapi/dist/index.js
 import globalAxios2 from "axios";
@@ -5301,18 +5301,22 @@ var FishjamWSNotifier = class extends EventEmitter {
 // src/agent.ts
 import { EventEmitter as EventEmitter2 } from "events";
 import { v4 as uuid4 } from "uuid";
-var expectedEventsList2 = ["trackData", "trackImage"];
+var expectedEventsList2 = ["trackData"];
 var FishjamAgent = class extends EventEmitter2 {
   client;
   resolveConnectionPromise = null;
   connectionPromise;
+  pendingImageCaptures = /* @__PURE__ */ new Map();
   constructor(config, agentToken, callbacks) {
     super();
     const fishjamUrl = getFishjamUrl(config);
     const websocketUrl = `${httpToWebsocket(fishjamUrl)}/socket/agent/websocket`;
     this.client = new WebSocket(websocketUrl);
     this.client.binaryType = "arraybuffer";
-    this.client.onclose = (message) => callbacks?.onClose?.(message.code, message.reason);
+    this.client.onclose = (message) => {
+      this.rejectPendingCaptures("WebSocket closed");
+      callbacks?.onClose?.(message.code, message.reason);
+    };
     this.client.onerror = (message) => callbacks?.onError?.(message);
     this.client.onmessage = (message) => this.dispatchNotification(message);
     this.client.onopen = () => this.setupConnection(agentToken);
@@ -5369,18 +5373,55 @@ var FishjamAgent = class extends EventEmitter2 {
   }
   /**
    * Request a captured image from the given track
+   * @param trackId - the track to capture an image from
+   * @param timeoutMs - timeout in milliseconds (default: 5000)
+   * @returns a promise that resolves with the captured image data
    */
-  captureImage(trackId) {
-    const msg = AgentRequest.encode({ captureImage: { trackId } }).finish();
-    this.client.send(msg);
+  captureImage(trackId, timeoutMs = 5e3) {
+    if (this.pendingImageCaptures.has(trackId)) {
+      return Promise.reject(new Error(`captureImage already pending for track ${trackId}`));
+    }
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pendingImageCaptures.delete(trackId);
+        reject(new Error(`captureImage timed out after ${timeoutMs}ms for track ${trackId}`));
+      }, timeoutMs);
+      this.pendingImageCaptures.set(trackId, { resolve, reject, timer });
+      const msg = AgentRequest.encode({ captureImage: { trackId } }).finish();
+      try {
+        this.client.send(msg);
+      } catch (error) {
+        clearTimeout(timer);
+        this.pendingImageCaptures.delete(trackId);
+        reject(error);
+      }
+    });
   }
   disconnect() {
+    this.rejectPendingCaptures("Agent disconnected");
     this.client.close();
   }
+  handleTrackImageMessage({ trackImage }) {
+    if (!trackImage) return;
+    const pending = this.pendingImageCaptures.get(trackImage.trackId);
+    if (pending) {
+      clearTimeout(pending.timer);
+      this.pendingImageCaptures.delete(trackImage.trackId);
+      pending.resolve(trackImage);
+    }
+  }
+  rejectPendingCaptures(reason) {
+    for (const [trackId, { reject, timer }] of this.pendingImageCaptures) {
+      clearTimeout(timer);
+      reject(new Error(`${reason}: captureImage rejected for track ${trackId}`));
+    }
+    this.pendingImageCaptures.clear();
+  }
   dispatchNotification(message) {
     try {
       const data = new Uint8Array(message.data);
       const decodedMessage = AgentResponse.decode(data);
+      this.handleTrackImageMessage(decodedMessage);
       const [notification, msg] = Object.entries(decodedMessage).find(([_k, v]) => v);
       if (!this.isExpectedEvent(notification)) return;
       this.emit(notification, msg);

package/dist/integrations/gemini.js

@@ -31,7 +31,7 @@ var import_genai = require("@google/genai");
 // package.json
 var package_default = {
   name: "@fishjam-cloud/js-server-sdk",
-  version: "0.25.3",
+  version: "0.25.5",
   description: "Fishjam server SDK for JavaScript",
   homepage: "https://github.com/fishjam-cloud/js-server-sdk",
   author: "Fishjam Team",

package/dist/integrations/gemini.mjs

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunk-4UDMIEMT.mjs";
+} from "../chunk-NUDP3SRJ.mjs";
 
 // src/integrations/gemini.ts
 import { GoogleGenAI } from "@google/genai";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/js-server-sdk",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "description": "Fishjam server SDK for JavaScript",
   "homepage": "https://github.com/fishjam-cloud/js-server-sdk",
   "author": "Fishjam Team",