Merge pull request #17 from proppy/bump

shiritori: update dependencies

Author: proppy

functions/.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "parserOptions": {
-    "ecmaVersion": 7,
+    "ecmaVersion": 8,
     "sourceType": "module"
   },
   "extends": ["semistandard"],

functions/index.js

@@ -23,16 +23,14 @@ const { actionssdk, SimpleResponse } = require('actions-on-google');
 const functions = require('firebase-functions');
 const shiritori = require('./shiritori');
 const admin = require('firebase-admin');
-admin.initializeApp(functions.config().firebase);
+admin.initializeApp();
 
 const corpus = 'noun';
 
-const dict = k => {
-  return admin.database()
-      .ref(corpus).child(k)
-      .once('value')
-      .then(snap => snap.val());
-};
+const dict = k => admin.database()
+  .ref(corpus).child(k)
+  .once('value')
+  .then(snap => snap.val());
 
 const app = actionssdk({
   // リクエストとレスポンスをロギングする。
@@ -45,35 +43,31 @@ const app = actionssdk({
   })
 });
 
-app.intent('actions.intent.MAIN', (conv) => {
+app.intent('actions.intent.MAIN', conv => {
   conv.ask('どうぞ、始めて下さい');
 });
 
-app.intent('actions.intent.TEXT', (conv, input) => {
-  return shiritori.loaded.then(() => {
-    return 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;
-          }
-        });
-  });
+app.intent('actions.intent.TEXT', async (conv, input) => {
+  const result = await shiritori.interact(dict, input, conv.data.used);
+  switch (result.state) {
+    case shiritori.state.CONTINUE:
+      conv.data.used.unshift(input);
+      conv.data.used.unshift(result.word);
+      conv.ask(new SimpleResponse({
+        speech: result.word,
+        text: `${result.word} [${result.kana}]`
+      }));
+      break;
+    case shiritori.state.LOSE_N:
+    case shiritori.state.LOSE_USED:
+    case shiritori.state.LOSE_CHAIN:
+      conv.close('ざんねん。あなたの負けです。');
+      break;
+    case shiritori.state.WIN_N:
+    case shiritori.state.WIN_USED:
+      conv.close('すごい！あなたの勝ちです。');
+      break;
+  }
 });
 
 exports.shiritoriV3 = functions.https.onRequest(app);