@afterrealism/dendri-client 2.4.0 → 2.5.0

package/dist/dendri.cjs

@@ -3533,7 +3533,7 @@ var Logger = class {
 var logger_default = new Logger();
 
 // src/api.ts
-var version = "2.4.0";
+var version = "2.5.0";
 var API = class _API {
   constructor(_options) {
     this._options = _options;
@@ -3546,6 +3546,7 @@ var API = class _API {
     const url = new URL(`${protocol}://${host}:${port}${path}${key}/${method}`);
     url.searchParams.set("ts", `${Date.now()}${Math.random()}`);
     url.searchParams.set("version", version);
+    if (this._options.apiKey) url.searchParams.set("api_key", this._options.apiKey);
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), _API.FETCH_TIMEOUT);
     return fetch(url.href, {
@@ -3574,11 +3575,12 @@ var API = class _API {
   async getTurnCredentials() {
     const protocol = this._options.secure ? "https" : "http";
     const { host, port, path, key } = this._options;
-    const url = `${protocol}://${host}:${port}${path}${key}/turn-credentials`;
+    const url = new URL(`${protocol}://${host}:${port}${path}${key}/turn-credentials`);
+    if (this._options.apiKey) url.searchParams.set("api_key", this._options.apiKey);
     try {
       const controller = new AbortController();
       const timeoutId = setTimeout(() => controller.abort(), _API.FETCH_TIMEOUT);
-      const response = await fetch(url, {
+      const response = await fetch(url.href, {
         referrerPolicy: this._options.referrerPolicy,
         signal: controller.signal
       }).finally(() => clearTimeout(timeoutId));
@@ -5405,17 +5407,29 @@ var PollingTransport = class _PollingTransport extends SignalingTransport {
   _heartbeatTimer;
   _lastSeq = 0;
   _baseUrl;
+  _key;
+  _jwt;
+  _apiKey;
   _pingInterval;
   _abortController;
   /** Backoff schedule base delays in milliseconds. */
   static BACKOFF_SCHEDULE = [0, 1e3, 2e3, 4e3, 8e3, 16e3, 3e4];
   /** Random jitter range in milliseconds (applied as +/-). */
   static BACKOFF_JITTER = 500;
-  constructor(secure, host, port, path, _key, pingInterval = 5e3, _jwt) {
+  constructor(secure, host, port, path, key, pingInterval = 5e3, jwt, apiKey) {
     super();
     const protocol = secure ? "https://" : "http://";
     this._baseUrl = `${protocol + host}:${port}${path}`;
     this._pingInterval = pingInterval;
+    this._key = key;
+    this._jwt = jwt;
+    this._apiKey = apiKey;
+  }
+  /** Append the shared auth params (key, jwt, api_key) so every HTTP call authenticates like the WS transport. */
+  _applyAuthParams(params) {
+    params.set("key", this._key);
+    if (this._jwt) params.set("jwt", this._jwt);
+    if (this._apiKey) params.set("api_key", this._apiKey);
   }
   get reconnectAttempt() {
     return this._reconnectAttempt;
@@ -5443,6 +5457,7 @@ var PollingTransport = class _PollingTransport extends SignalingTransport {
           id: this._id,
           token: this._token
         });
+        this._applyAuthParams(params);
         if (this._lastSeq > 0) params.set("last_seq", String(this._lastSeq));
         const response = await fetch(`${this._baseUrl}http/poll?${params}`, {
           signal: this._abortController.signal
@@ -5481,6 +5496,7 @@ var PollingTransport = class _PollingTransport extends SignalingTransport {
       id: this._id,
       token: this._token
     });
+    this._applyAuthParams(params);
     try {
       await fetch(`${this._baseUrl}http/send?${params}`, {
         method: "POST",
@@ -5545,13 +5561,16 @@ var PollingTransport = class _PollingTransport extends SignalingTransport {
 };
 
 // src/socket.ts
-var version2 = "2.4.0";
+var version2 = "2.5.0";
 var Socket = class _Socket extends SignalingTransport {
-  constructor(secure, host, port, path, key, pingInterval = 5e3, jwt) {
+  constructor(secure, host, port, path, key, pingInterval = 5e3, jwt, apiKey) {
     super();
     this.pingInterval = pingInterval;
     const wsProtocol = secure ? "wss://" : "ws://";
     this._baseUrl = `${wsProtocol + host}:${port}${path}dendri?key=${key}`;
+    if (apiKey) {
+      this._baseUrl += `&api_key=${encodeURIComponent(apiKey)}`;
+    }
     this._jwt = jwt;
   }
   pingInterval;
@@ -5857,18 +5876,28 @@ var SSETransport = class _SSETransport extends SignalingTransport {
   _heartbeatTimer;
   _lastSeq = 0;
   _baseUrl;
+  _key;
   _jwt;
+  _apiKey;
   _pingInterval;
   /** Backoff schedule base delays in milliseconds. */
   static BACKOFF_SCHEDULE = [0, 1e3, 2e3, 4e3, 8e3, 16e3, 3e4];
   /** Random jitter range in milliseconds (applied as +/-). */
   static BACKOFF_JITTER = 500;
-  constructor(secure, host, port, path, _key, pingInterval = 5e3, jwt) {
+  constructor(secure, host, port, path, key, pingInterval = 5e3, jwt, apiKey) {
     super();
     const protocol = secure ? "https://" : "http://";
     this._baseUrl = `${protocol + host}:${port}${path}`;
     this._pingInterval = pingInterval;
+    this._key = key;
     this._jwt = jwt;
+    this._apiKey = apiKey;
+  }
+  /** Append the shared auth params (key, jwt, api_key) so every HTTP call authenticates like the WS transport. */
+  _applyAuthParams(params) {
+    params.set("key", this._key);
+    if (this._jwt) params.set("jwt", this._jwt);
+    if (this._apiKey) params.set("api_key", this._apiKey);
   }
   get reconnectAttempt() {
     return this._reconnectAttempt;
@@ -5886,10 +5915,9 @@ var SSETransport = class _SSETransport extends SignalingTransport {
     if (this._disconnected) return;
     const params = new URLSearchParams({
       id: this._id,
-      token: this._token,
-      key: "dendri"
+      token: this._token
     });
-    if (this._jwt) params.set("jwt", this._jwt);
+    this._applyAuthParams(params);
     if (this._lastSeq > 0) params.set("last_seq", String(this._lastSeq));
     const url = `${this._baseUrl}http/sse?${params}`;
     try {
@@ -5963,6 +5991,7 @@ var SSETransport = class _SSETransport extends SignalingTransport {
       id: this._id,
       token: this._token
     });
+    this._applyAuthParams(params);
     try {
       await fetch(`${this._baseUrl}http/send?${params}`, {
         method: "POST",
@@ -6035,6 +6064,28 @@ var SSETransport = class _SSETransport extends SignalingTransport {
 };
 
 // src/dendri.ts
+function parseServerUrl(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(
+      `Invalid Dendri "url" option: "${url}". Expected a full URL like "wss://signal.example.com".`
+    );
+  }
+  const secure = parsed.protocol === "wss:" || parsed.protocol === "https:";
+  if (!secure && parsed.protocol !== "ws:" && parsed.protocol !== "http:") {
+    throw new Error(
+      `Invalid Dendri "url" protocol: "${parsed.protocol}". Use wss://, ws://, https://, or http://.`
+    );
+  }
+  return {
+    host: parsed.hostname,
+    port: parsed.port ? Number(parsed.port) : secure ? 443 : 80,
+    secure,
+    path: parsed.pathname || "/"
+  };
+}
 var Dendri = class _Dendri extends EventEmitterWithError {
   static DEFAULT_KEY = "dendri";
   _serializers = {
@@ -6125,6 +6176,9 @@ var Dendri = class _Dendri extends EventEmitterWithError {
     } else if (id) {
       userId = id.toString();
     }
+    if (providedOptions?.url) {
+      providedOptions = { ...parseServerUrl(providedOptions.url), ...providedOptions };
+    }
     const normalizedOptions = {
       debug: 0,
       // 1: Errors, 2: Warnings, 3: All logs
@@ -6243,7 +6297,8 @@ var Dendri = class _Dendri extends EventEmitterWithError {
       this._options.path,
       this._options.key,
       this._options.pingInterval,
-      this._options.jwt
+      this._options.jwt,
+      this._options.apiKey
     ) : transport === "polling" ? new PollingTransport(
       this._options.secure ?? false,
       this._options.host,
@@ -6251,7 +6306,8 @@ var Dendri = class _Dendri extends EventEmitterWithError {
       this._options.path,
       this._options.key,
       this._options.pingInterval,
-      this._options.jwt
+      this._options.jwt,
+      this._options.apiKey
     ) : new Socket(
       this._options.secure ?? false,
       this._options.host,
@@ -6259,7 +6315,8 @@ var Dendri = class _Dendri extends EventEmitterWithError {
       this._options.path,
       this._options.key,
       this._options.pingInterval,
-      this._options.jwt
+      this._options.jwt,
+      this._options.apiKey
     );
     socket.on("message" /* Message */, (data) => {
       this._handleMessage(data);