Fix skip to work properly and updated dialouge

Author: Anish Sarangi

functions/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "audio-interface-of-internet-archive",
   "description": "Audio Interface of Internet Archive",
-  "version": "2.5.21",
+  "version": "2.5.30",
   "private": true,
   "author": "Internet Archive",
   "license": "AGPL-3.0",
@@ -52,4 +52,4 @@
     "sinon-chai": "^3.7.0",
     "virtual-alexa": "^0.7.3"
   }
-}
+}

functions/package.json

@@ -2,6 +2,11 @@ const { debug, error } = require('../../utils/logger/index')('ia:actions:hoh:ask
 const dialog = require('../../dialog/index');
 const strings = require('../../strings');
 
+const stripSSML = (text) => text
+  .replace(/<[^>]+>/g, ' ')
+  .replace(/\s+/g, ' ')
+  .trim();
+
 /**
  * Middleware
  *
@@ -22,14 +27,20 @@ module.exports = () => (ctx) => {
   const { app, reprompt, speech, suggestions } = ctx;
 
   if (speech && speech.length > 0) {
+    const spoken = speech.join(' ');
     dialog.ask(app, {
-      speech: speech.join(' '),
+      speech: spoken,
+      text: stripSSML(spoken),
       suggestions: suggestions && suggestions.filter(s => s).slice(0, 3),
       reprompt,
     });
   } else {
     error('hm... we don\'t have anything to say.');
-    dialog.ask(app, strings.events.nothingToSay);
+    const fallback = strings.events.nothingToSay;
+    dialog.ask(app, {
+      ...fallback,
+      text: stripSSML(fallback.speech),
+    });
   }
 
   return Promise.resolve(ctx);

functions/src/actions/_middlewares/ask.js

@@ -48,7 +48,16 @@ module.exports = () => (ctx) => {
 
   if (!repairScheme) {
     warning('we don\'t have any repair phrase in this slot scheme', slotScheme);
-    return Promise.resolve(ctx);
+    // Provide a default repair scheme so findRepairPhrase doesn't crash
+    return Promise.resolve({
+      ...ctx,
+      repairScheme: {
+        speech: [
+          'I couldn\'t find a match for that. Could you try something else?',
+        ],
+      },
+      suggestionsScheme: repairSlotScheme,
+    });
   }
 
   return Promise.resolve({

functions/src/actions/_middlewares/find-repair-scheme.js

@@ -0,0 +1,8 @@
+/**
+ * Handle Alexa PlaybackController.NextCommandIssued
+ */
+const playbackNext = require('./playback/next');
+
+module.exports = {
+  handler: playbackNext.handler,
+};

functions/src/actions/next-command-issued.js

@@ -1,8 +1,14 @@
 const strings = require('../strings');
+const playlist = require('../state/playlist');
 
 const helpers = require('./_helpers');
+const playbackNext = require('./playback/next');
 
 function handler (app) {
+  if (playlist.getCurrentSong(app)) {
+    return playbackNext.handler(app);
+  }
+
   return helpers.simpleResponseAndResume(app, strings.intents.next.default);
 }
 

functions/src/actions/next.js

@@ -0,0 +1,23 @@
+const dialog = require('../../dialog');
+const query = require('../../state/query');
+const strings = require('../../strings').intents.exit;
+const selectors = require('../../configurator/selectors');
+
+/**
+ * Handle exit intent during playback state.
+ * Stops audio playback AND says goodbye, clearing the AudioPlayer screen.
+ *
+ * Without this, exit during playback falls back to the top-level exit handler
+ * which only closes the session with speech but doesn't send AudioPlayer.Stop,
+ * leaving the display card on screen.
+ */
+function handler (app) {
+  // Stop the AudioPlayer (sends AudioPlayer.Stop directive + shouldEndSession:true)
+  app.stopPlayback();
+  // Say goodbye speech
+  dialog.close(app, selectors.find(strings, query.getSlots(app)));
+}
+
+module.exports = {
+  handler,
+};

functions/src/actions/playback/exit.js

@@ -11,12 +11,31 @@ const helpers = require('./_helpers');
  *
  * @param app
  */
-function handler (app) {
-  return helpers.playSong({ app, skip: 'forward' })
-    .then(({ currentSongData }) => {
-      if (!currentSongData) {
+function handler(app) {
+  const requestType = app.params.getByName('type');
+  const playerActivity = app.handlerInput &&
+    app.handlerInput.requestEnvelope &&
+    app.handlerInput.requestEnvelope.context &&
+    app.handlerInput.requestEnvelope.context.AudioPlayer &&
+    app.handlerInput.requestEnvelope.context.AudioPlayer.playerActivity;
+  const isPlaybackController = typeof requestType === 'string' &&
+    requestType.startsWith('PlaybackController.');
+  // Only suppress speech for PlaybackController events (where speech is forbidden).
+  // For voice intents (AMAZON.NextIntent), include speech to keep the session alive
+  // so subsequent "Alexa next/skip" commands continue routing to the skill.
+  const mediaResponseOnly = isPlaybackController;
+
+  debug('Request type:', requestType);
+  debug('Is PlaybackController:', isPlaybackController);
+  debug('mediaResponseOnly:', mediaResponseOnly);
+  debug('Player activity:', playerActivity);
+
+  return helpers.playSong({ app, skip: 'forward', mediaResponseOnly })
+    .then((res) => {
+      const { currentSongData } = res || {};
+      if (res && !currentSongData) {
         error('We do not have any data for previous song');
-      } else {
+      } else if (res) {
         return skippedSong(app, {
           albumId: currentSongData.album.id,
           filename: currentSongData.filename
@@ -25,6 +44,10 @@ function handler (app) {
     })
     .catch(e => {
       debug('It could be an error:', e);
+      if (mediaResponseOnly) {
+        app.stopPlayback();
+        return null;
+      }
       return dialog.ask(app, strings.events.playlistIsEnded);
     });
 }

functions/src/actions/playback/next.js

@@ -10,9 +10,21 @@ const helpers = require('./_helpers');
  * @param app
  */
 function handler (app) {
-  return helpers.playSong({ app, skip: 'back' })
+  const requestType = app.params.getByName('type');
+  const isPlaybackController = typeof requestType === 'string' &&
+    requestType.startsWith('PlaybackController.');
+  // Only suppress speech for PlaybackController events (where speech is forbidden).
+  // For voice intents (AMAZON.PreviousIntent), include speech to keep the session alive
+  // so subsequent voice commands continue routing to the skill.
+  const mediaResponseOnly = isPlaybackController;
+
+  return helpers.playSong({ app, skip: 'back', mediaResponseOnly })
     .catch(e => {
       debug('It could be an error:', e);
+      if (mediaResponseOnly) {
+        app.stopPlayback();
+        return null;
+      }
       return dialog.ask(app, strings.events.playlistIsEnded);
     });
 }

functions/src/actions/playback/previous.js

@@ -0,0 +1,7 @@
+/**
+ * Handle stop intent during playback state.
+ * Stop and exit are synonymous intents.
+ *
+ * @type {{handler: handler}}
+ */
+module.exports = Object.assign({}, require('./exit'));