@observertc/observer-js 1.0.0-beta.17 → 1.0.0-beta.18

package/dist/index.mjs

@@ -4355,7 +4355,7 @@ var ObservedCall = class extends EventEmitter3 {
     if (this.closed || !this.observedClients.has(clientId)) return;
     return this.observedClients.get(clientId);
   }
-  createObservedClient(settings) {
+  createObservedClient(settings, acceptCtx) {
     if (this.closed) {
       logger4.warn("Attempted to create a client (clientId: %s) on a closed call %s", settings.clientId, this.callId);
       return void 0;
@@ -4364,15 +4364,18 @@ var ObservedCall = class extends EventEmitter3 {
       logger4.warn("Client with id %s already exists in call %s; returning the existing instance", settings.clientId, this.callId);
       return this.observedClients.get(settings.clientId);
     }
-    if (!settings.closeClientIfIdleForMs) {
-      settings.closeClientIfIdleForMs = this.observer.config.closeClientIfIdleForMs;
-    }
-    if (settings.appData === void 0) {
-      settings.appData = this.observer.config.createClientAppData?.({ clientId: settings.clientId, observedCall: this });
-    }
+    const clientSettings = {
+      ...settings,
+      closeClientIfIdleForMs: settings.closeClientIfIdleForMs || this.observer.config.closeClientIfIdleForMs,
+      appData: settings.appData ?? this.observer.config.createClientAppData?.({
+        clientId: settings.clientId,
+        observedCall: this,
+        acceptCtx
+      })
+    };
     const observedClientIssueRegistry = new ObservedClientIssueRegistry(this.activeIssuesRegistry);
     const result = new ObservedClient(
-      settings,
+      clientSettings,
       this,
       observedClientIssueRegistry
     );
@@ -4419,8 +4422,8 @@ var ObservedCall = class extends EventEmitter3 {
     }
     return result;
   }
-  getOrCreateObservedClient(settings) {
-    return this.getObservedClient(settings.clientId) ?? this.createObservedClient(settings);
+  getOrCreateObservedClient(settings, acceptCtx) {
+    return this.getObservedClient(settings.clientId) ?? this.createObservedClient(settings, acceptCtx);
   }
   update(context) {
     if (this.closed) return;
@@ -6668,7 +6671,12 @@ var Observer = class extends EventEmitter6 {
     if (this.closed || !this.observedCalls.has(callId)) return;
     return this.observedCalls.get(callId);
   }
-  createObservedCall(settings) {
+  /**
+   * @param acceptCtx the `accept()` context, when this call is being created to receive a sample.
+   * Passed on to `ObserverConfig.createCallAppData`, so the factory can read whatever the caller (or
+   * an accept middleware) put there — a tenant, a region, a trace id.
+   */
+  createObservedCall(settings, acceptCtx) {
     if (this.closed) {
       logger9.warn("Attempted to create a call (callId: %s) on a closed observer", settings.callId);
       return void 0;
@@ -6680,7 +6688,7 @@ var Observer = class extends EventEmitter6 {
     const callSettings = {
       ...settings,
       closeCallIfEmptyForMs: settings.closeCallIfEmptyForMs ?? this.config.closeCallIfEmptyForMs,
-      appData: settings.appData ?? this.config.createCallAppData?.({ callId: settings.callId, observer: this })
+      appData: settings.appData ?? this.config.createCallAppData?.({ callId: settings.callId, observer: this, acceptCtx })
     };
     const callActiveIssuesRegistry = new ActiveIssuesRegistry(this.activeIssuesRegistry);
     const observedCall = new ObservedCall(
@@ -6707,8 +6715,8 @@ var Observer = class extends EventEmitter6 {
     this._notify("call-added", { ...this.eventScope, observedCall });
     return observedCall;
   }
-  getOrCreateObservedCall(settings) {
-    return this.getObservedCall(settings.callId) ?? this.createObservedCall(settings);
+  getOrCreateObservedCall(settings, acceptCtx) {
+    return this.getObservedCall(settings.callId) ?? this.createObservedCall(settings, acceptCtx);
   }
   createObservedMediasoupRouter(settings) {
     if (this.closed) {
@@ -6775,21 +6783,9 @@ var Observer = class extends EventEmitter6 {
       this._notify("sample-rejected", { ...this.eventScope, reason: "missing-clientId", sample });
       return;
     }
-    let call = this.getObservedCall(sample.callId);
-    if (!call) {
-      call = this.createObservedCall({
-        callId: sample.callId,
-        appData: this.config.createCallAppData?.({ callId: sample.callId, observer: this })
-      });
-    }
+    const call = this.getOrCreateObservedCall({ callId: sample.callId }, context);
     if (!call) return;
-    let client = call.getObservedClient(sample.clientId);
-    if (!client) {
-      client = call.createObservedClient({
-        clientId: sample.clientId,
-        appData: this.config.createClientAppData?.({ clientId: sample.clientId, observedCall: call })
-      });
-    }
+    const client = call.getOrCreateObservedClient({ clientId: sample.clientId }, context);
     if (!client) return;
     client.accept(sample, context);
   }