@jambonz/mrf 0.1.2 → 0.1.4

package/lib/endpoint.js

@@ -1,4 +1,5 @@
 const { EventEmitter } = require('events');
+const { randomUUID } = require('crypto');
 const { parseSdp, translatePlayUrl } = require('./utils');
 
 // mediajam normalized wire events -> legacy ESL event names the
@@ -46,13 +47,29 @@ class Endpoint extends EventEmitter {
       seekOffset = file.seekOffset;
       file = file.file;
     }
-    const urls = (Array.isArray(file) ? file : [file]).map(translatePlayUrl);
-    const data = { urls };
+    const files = Array.isArray(file) ? file : [file];
+    const urls = files.map(translatePlayUrl);
+    /* the client supplies the playId so _pendingPlays is populated BEFORE
+     * anything hits the wire — the server's play.start event can arrive in
+     * the same tcp chunk as the command response, which processes ahead of
+     * the awaiter's microtask; a lookup keyed on the response's playId
+     * misses that window (seen live: playback-start without file). */
+    const playId = randomUUID();
+    const data = { urls, playId };
     if (seekOffset > 0) data.seekOffset = parseInt(seekOffset, 10);
-    const { playId } = await this._request('play.start', data);
-    return new Promise((resolve, reject) => {
-      this._pendingPlays.set(playId, { resolve, reject });
+    const result = new Promise((resolve, reject) => {
+      // file (the caller's original, untranslated path) rides on the
+      // playback-start/stop events: FS parity — the say/play tasks match
+      // events to plays by evt.file when there is no tts playback id
+      this._pendingPlays.set(playId, { resolve, reject, file: files[0] });
     });
+    try {
+      await this._request('play.start', data);
+    } catch (err) {
+      this._pendingPlays.delete(playId);
+      throw err;
+    }
+    return result;
   }
 
   /** fsmrf api() passthrough: translate the FS api commands in use. */
@@ -457,9 +474,12 @@ class Endpoint extends EventEmitter {
       case 'dtmf':
         this.emit('dtmf', { dtmf: data.digit, duration: data.durationMs, source: data.source });
         break;
-      case 'play.start':
-        this.emit('playback-start', { playId: data.playId, ...ttsVars(data.tts) });
+      case 'play.start': {
+        const file = this._pendingPlays.get(data.playId)?.file;
+        this.emit('playback-start',
+          { playId: data.playId, ...(file && {file}), ...ttsVars(data.tts) });
         break;
+      }
       case 'play.done': {
         const p = this._pendingPlays.get(data.playId);
         if (p) {
@@ -475,7 +495,9 @@ class Endpoint extends EventEmitter {
             playbackLastOffsetPos: data.lastOffsetPos ?? 0
           });
         }
-        this.emit('playback-stop', { playId: data.playId, reason: data.reason, ...ttsVars(data.tts) });
+        this.emit('playback-stop',
+          { playId: data.playId, reason: data.reason, ...(p?.file && {file: p.file}),
+            ...ttsVars(data.tts) });
         break;
       }
       default: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/mrf",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "index.js",
   "scripts": {
     "test": "node --test",

package/test/support/mock-server.js

@@ -97,7 +97,7 @@ class MockMediajam {
       case 'play.start': {
         const ep = this.endpoints.get(frame.ep);
         if (!ep) return fail('unknown_endpoint', frame.ep);
-        const playId = randomUUID().slice(0, 8);
+        const playId = frame.data?.playId || randomUUID().slice(0, 8);
         res({ playId });
         this.send(socket, { t: 'evt', ep: frame.ep, evt: 'play.start', data: { playId } });
         const t = setTimeout(() => {