@jambonz/mrf 0.1.6 → 0.1.8

package/lib/endpoint.js

@@ -432,11 +432,45 @@ class Endpoint extends EventEmitter {
     });
     return this;
   }
-  dub() {
-    return Promise.reject(new Error('mediajam: dub pending Phase 2 (dub.*)'));
+  /* dub (mod_dub): fsmrf passes {action, track, play, loop, gain, say}.
+   * Map each action onto the mediajam dub.* command family. gain is in
+   * dB (the dub verb's gain), carried as gainDb. */
+  async dub(opts = {}) {
+    const {action, track} = opts;
+    switch (action) {
+      case 'addTrack':
+        await this._request('dub.addTrack', {track});
+        break;
+      case 'removeTrack':
+        await this._request('dub.removeTrack', {track});
+        break;
+      case 'silenceTrack':
+        await this._request('dub.silenceTrack', {track});
+        break;
+      case 'playOnTrack':
+        await this._request('dub.playOnTrack', {
+          track,
+          url: opts.play,
+          ...(opts.loop && {loop: true}),
+          ...(typeof opts.gain === 'number' && opts.gain !== 0 && {gainDb: opts.gain})
+        });
+        break;
+      case 'sayOnTrack':
+        await this._request('dub.sayOnTrack', {
+          track,
+          say: opts.say,
+          ...(typeof opts.gain === 'number' && opts.gain !== 0 && {gainDb: opts.gain})
+        });
+        break;
+      default:
+        throw new Error(`mediajam: unknown dub action '${action}'`);
+    }
+    return this;
   }
-  setGain() {
-    return Promise.reject(new Error('mediajam: setGain pending Phase 2 (dub.*)'));
+  /* mod_dub setGain — scales the channel audio; maps to endpoint.set gainDb */
+  async setGain(gain) {
+    await this._request('endpoint.set', {gainDb: typeof gain === 'number' ? gain : parseInt(gain, 10) || 0});
+    return this;
   }
   join() {
     return Promise.reject(new Error('mediajam: conference join pending Phase 3 (room.*)'));

package/lib/mediaserver.js

@@ -136,9 +136,7 @@ class MediaServer extends EventEmitter {
     const data = {};
     if (opts.remoteSdp) data.remoteSdp = opts.remoteSdp;
     if (opts.codecs) data.codecs = Array.isArray(opts.codecs) ? opts.codecs : [opts.codecs];
-    /* direction tag for session accounting (mediajam-cli subtotals):
-     * connectCaller marks inbound; everything else defaults outbound */
-    data.tags = { direction: 'outbound', ...(opts.tags || {}) };
+    if (opts.tags) data.tags = opts.tags;
     const options = {};
     if (opts.media_timeout) options.mediaTimeoutMs = parseInt(opts.media_timeout, 10);
     if (opts.media_hold_timeout) options.holdTimeoutMs = parseInt(opts.media_hold_timeout, 10);
@@ -156,11 +154,7 @@ class MediaServer extends EventEmitter {
    * it. Works with drachtio req/res objects (duck-typed).
    */
   async connectCaller(req, res, opts = {}) {
-    const endpoint = await this.createEndpoint({
-      ...opts,
-      remoteSdp: req.body,
-      tags: { direction: 'inbound', ...(opts.tags || {}) }
-    });
+    const endpoint = await this.createEndpoint({ ...opts, remoteSdp: req.body });
     const dialog = await res.send(200, { body: endpoint.local.sdp });
     return { endpoint, dialog };
   }

package/package.json

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

package/test/client.test.js

@@ -92,6 +92,36 @@ test('execute send_dtmf maps digits and duration', async(t) => {
   assert.equal(req.data.durationMs, 150);
 });
 
+test('dub actions map to dub.* commands', async(t) => {
+  const { ms, mock } = await setup(t);
+  const ep = await ms.createEndpoint({});
+  await ep.dub({ action: 'addTrack', track: 'music' });
+  await ep.dub({ action: 'playOnTrack', track: 'music', play: 'http://x/a.mp3', loop: true, gain: 5 });
+  await ep.dub({ action: 'sayOnTrack', track: 'music', say: 'say:{vendor=google}hello', gain: -3 });
+  await ep.dub({ action: 'silenceTrack', track: 'music' });
+  await ep.dub({ action: 'removeTrack', track: 'music' });
+
+  const add = mock.requests.find((r) => r.cmd === 'dub.addTrack');
+  assert.equal(add.data.track, 'music');
+  const play = mock.requests.find((r) => r.cmd === 'dub.playOnTrack');
+  assert.equal(play.data.url, 'http://x/a.mp3');
+  assert.equal(play.data.loop, true);
+  assert.equal(play.data.gainDb, 5);
+  const say = mock.requests.find((r) => r.cmd === 'dub.sayOnTrack');
+  assert.equal(say.data.say, 'say:{vendor=google}hello');
+  assert.equal(say.data.gainDb, -3);
+  assert.ok(mock.requests.find((r) => r.cmd === 'dub.silenceTrack'));
+  assert.ok(mock.requests.find((r) => r.cmd === 'dub.removeTrack'));
+});
+
+test('setGain maps to endpoint.set gainDb', async(t) => {
+  const { ms, mock } = await setup(t);
+  const ep = await ms.createEndpoint({});
+  await ep.setGain(7);
+  const req = mock.requests.filter((r) => r.cmd === 'endpoint.set').pop();
+  assert.equal(req.data.gainDb, 7);
+});
+
 test('bridge and unbridge', async(t) => {
   const { ms, mock } = await setup(t);
   const a = await ms.createEndpoint({});

package/test/support/mock-server.js

@@ -119,6 +119,11 @@ class MockMediajam {
       case 'endpoint.unmute':
       case 'bridge.create':
       case 'bridge.destroy':
+      case 'dub.addTrack':
+      case 'dub.removeTrack':
+      case 'dub.silenceTrack':
+      case 'dub.playOnTrack':
+      case 'dub.sayOnTrack':
         res({});
         break;
       case 'endpoint.info':