@observertc/observer-js 1.3.0-rc.3 → 1.3.0-rc.4

package/dist/index.mjs

@@ -178,11 +178,11 @@ var SinkRegistry = class {
   }
   /** End every sink of this registry and of its descendants. */
   clear() {
-    for (const sink of [...this._sinks.values()]) {
+    for (const [id, sink] of [...this._sinks.entries()]) {
       try {
         sink.end();
       } catch (err) {
-        logger.warn("Sink %s failed to end: %o", sink.id, err);
+        logger.warn("Sink %s failed to end: %o", id, err);
       }
     }
   }
@@ -3124,7 +3124,7 @@ var ObservedClient = class extends EventEmitter3 {
   /** The distinct `publicAddress`es currently known by this client's open peer connections. */
   /**
    * The sink this client's samples are written to: whatever is registered under its client id in
-   * `call.sinks` (the one `createClientSink` returned, or a sink the application added), if any.
+   * `call.sinks` (the one created through `saveClientSamples`, or a sink the application added), if any.
    */
   get sink() {
     return this.call.sinks.get(this.clientId);
@@ -5277,17 +5277,26 @@ var ObservedCall = class extends EventEmitter4 {
     if (!client.leftAt) return;
     this.endedAt = Math.max(this.endedAt ?? client.leftAt, client.leftAt);
   }
-  /** Emit an Observer-bus event scoped to this call. */
   _createClientSink(clientId) {
-    const createClientSink = this.observer.config.createClientSink;
-    if (!createClientSink) return void 0;
+    const config = this.observer.config.saveClientSamples;
+    if (!config || !config.jsonlPath && !config.sink) return void 0;
+    if (config.jsonlPath && config.sink) {
+      logger6.warn("saveClientSamples: give either jsonlPath or sink, not both; no client samples are saved");
+      return void 0;
+    }
     if (this.observer.sinks.get(clientId)) {
       logger6.warn("No sample sink for client %s in call %s: sink id %s is already in use", clientId, this.callId, clientId);
       return void 0;
     }
-    const destination = createClientSink({ id: clientId, observedCall: this, clientId });
-    return destination ? this.sinks.createFromDestination(clientId, destination) : void 0;
+    const params = { id: clientId, observedCall: this, clientId };
+    if (config.jsonlPath) {
+      const jsonlPath = config.jsonlPath(params);
+      return jsonlPath === void 0 ? void 0 : this.sinks.createFromDestination(clientId, { jsonlPath });
+    }
+    const sink = config.sink?.(params);
+    return sink ? this.sinks.createFromDestination(clientId, { sink }) : void 0;
   }
+  /** Emit an Observer-bus event scoped to this call. */
   _notify(type, ...args) {
     this.observer.emit(type, ...args);
   }