shiritori: add error handling

Change-Id: I1bab0fd196f2aedd5036dfea3b58738b33c39bd8

Author: proppy

functions/index.js

@@ -49,33 +49,31 @@ app.intent('actions.intent.MAIN', (conv) => {
   conv.ask('どうぞ、始めて下さい');
 });
 
-app.intent('actions.intent.TEXT', (conv, input) => new Promise((resolve, reject) => {
+app.intent('actions.intent.TEXT', (conv, input) => {
   shiritori.loaded.then(() => {
-    shiritori.interact(dict, input, conv.data.used, {
-      lose () {
-        conv.close('ざんねん。あなたの負けです。');
-        resolve();
-      },
-      win (word, kana) {
-        if (word) {
-          conv.close(`${word} [${kana}]`);
-          resolve();
-        } else {
-          conv.close('すごい！あなたの勝ちです。');
-          resolve();
-        }
-      },
-      next (word, kana) {
-        conv.data.used.unshift(input);
-        conv.data.used.unshift(word);
-        conv.ask(new SimpleResponse({
-          speech: word,
-          text: `${word} [${kana}]`
-        }));
-        resolve();
-      }
-    });
+    shiritori.interact(dict, input, conv.data.used)
+        .then(result => {
+          conv.data.used.unshift(input);
+          conv.data.used.unshift(result.word);
+          conv.ask(new SimpleResponse({
+            speech: result.word,
+            text: `${result.word} [${result.kana}]`
+          }));
+        })
+        .catch(result => {
+          if (result.win) {
+            if (result.word) {
+              conv.close(`${result.word} [${result.kana}]`);
+            } else {
+              conv.close('すごい！あなたの勝ちです。');
+            }
+          } else if (result.loose) {
+            conv.close('ざんねん。あなたの負けです。');
+          } else {
+            throw result;
+          }
+        });
   });
-}));
+});
 
-exports.shiritoriV2 = functions.https.onRequest(app);
+exports.shiritoriV3 = functions.https.onRequest(app);

functions/shiritori/index.js

@@ -99,7 +99,7 @@ exports.kanas = (word) => new Set((() => {
 
 // しりとりのゲームループ。
 exports.interact = (dict, word, chain) => new Promise((resolve, reject) => {
-  const next = exports.kanas(word);
+  const next = exports.kanas(word)
   if ((next.size === 0) || !exports.check(word, chain)) {
     return reject({loose: true})
   }
@@ -118,9 +118,12 @@ exports.interact = (dict, word, chain) => new Promise((resolve, reject) => {
     }
     const w = unused[Math.floor(Math.random() * unused.length)]
     const wk = words[w]
+    if (wk.length === 0) {
+      return reject({error: 'empty dictionary entry for key: ' + w})
+    }
     if (wk[wk.length - 1] === 'ん') {
-      return reject({win: true, 'word': w, 'kana': wk})
+      return reject({win: true, word: w, kana: wk})
     }
-    return resolve({'word': w, 'kana': wk})
+    resolve({word: w, kana: wk})
   })
 })

functions/shiritori/main.js

@@ -36,7 +36,7 @@ shiritori.loaded.then(() => {
         .interact(
             kana => Promise.resolve(corpus[kana]),
             input,
-            chain,
+            chain
         )
         .then(result => {
           console.log(`${result.word} [${result.kana}]`)
@@ -48,9 +48,11 @@ shiritori.loaded.then(() => {
           if (reason.win) {
             console.log('すごい！')
             process.exit(0)
-          } else {
+          } else if (reason.loose) {
             console.log('ざんねん。')
             process.exit(-1)
+          } else {
+            throw reason
           }
         })
   })

functions/shiritori/test.js

@@ -80,7 +80,7 @@ const dict = k => Promise.resolve({
 }[k])
 
 test('internal.next', async t => {
-  const result = await shiritori.interact(dict, 'べんと', [],)
+  const result = await shiritori.interact(dict, 'べんと', [])
   t.is('とんかつ', result.kana)
   t.is('とんかつ', result.word)
 })
@@ -109,3 +109,9 @@ test('interact.win kanji', async t => {
   t.is('ざぶとん', result.kana)
   t.is('座布団', result.word)
 })
+
+test('interact.error ', async t => {
+  const result = await t.throws(shiritori.interact(k => Promise.resolve({'つけまん': ''}),
+                                                  'とんかつ', ['べんと']))
+  t.true(result.error.length > 0)
+})