basic V2 support for reqest query and event

Author: spoeck

example/App.android.js

@@ -7,7 +7,7 @@ import {
   Button
 } from 'react-native';
 
-import Dialogflow from "react-native-dialogflow"
+import Dialogflow, { Dialogflow_V2 } from "react-native-dialogflow"
 
 export default class App extends Component {
   constructor(props) {
@@ -24,6 +24,12 @@ export default class App extends Component {
       "57b6ce865e6e4b138a74a88cfd8bc526", Dialogflow.LANG_GERMAN
     );
 
+    Dialogflow_V2.setConfiguration(
+      "ya29.c.El92BV4aRCnGyaJ0VWKF0ewGNprivoW68g9lm0IrbsIi7T9m3QEL-JoPnfq3tWU07WhAjmIhD14z6X-1d8N_jzLz7o_8sB-c5OgAJE4cswJPoOzixZDTmCBvMbD901_0RA",
+      Dialogflow_V2.LANG_GERMAN,
+      'testv2-3b5ca'
+    );
+
 
 
     const contexts = [{
@@ -34,7 +40,17 @@ export default class App extends Component {
       }
     }];
 
+
+    const contexts_V2 = [{
+      "name": "deals",
+      "lifespanCount": 1,
+      "parameters": {
+        "name": "Sam"
+      }
+    }];
+
     Dialogflow.setContexts(contexts);
+    //Dialogflow_V2.setContexts(contexts_V2);
 
 
     const permanentContexts = [{
@@ -44,7 +60,15 @@ export default class App extends Component {
       }
     }];
 
+    const permanentContexts_V2 = [{
+      "name": "config",
+      "parameters": {
+        "access_token": "42 yo 42 tiny rick"
+      }
+    }];
+
     Dialogflow.setPermanentContexts(permanentContexts);
+    //Dialogflow_V2.setPermanentContexts(permanentContexts_V2);
 
 
     const entities = [{
@@ -62,11 +86,13 @@ export default class App extends Component {
 
 
     Dialogflow.setEntities(entities);
+    Dialogflow_V2.setEntities(entities);
   }
 
 
   render() {
     Dialogflow.requestEvent("WELCOME", null, r => console.log(r), e => console.log(e));
+    Dialogflow_V2.requestEvent("WELCOME", null, r => console.log(r), e => console.log(e));
 
 
     return (
@@ -81,6 +107,7 @@ export default class App extends Component {
           <Button title="Start Listening" onPress={() => {
 
 
+            // V1
             Dialogflow.onListeningStarted(() => {
               this.setState({ listeningState: "started" });
             });
@@ -103,7 +130,32 @@ export default class App extends Component {
             }, error => {
               this.setState({ result: JSON.stringify(error) });
             });
+          }} />
 
+          <Button color="orange" title="Start Listening V2" onPress={() => {
+            // V2 
+            Dialogflow_V2.onListeningStarted(() => {
+              this.setState({ listeningState: "started" });
+            });
+
+            Dialogflow_V2.onListeningCanceled(() => {
+              this.setState({ listeningState: "canceled" });
+            });
+
+            Dialogflow_V2.onListeningFinished(() => {
+              this.setState({ listeningState: "finished" });
+            });
+
+            Dialogflow_V2.onAudioLevel(level => {
+              this.setState({ audioLevel: level });
+            });
+
+            Dialogflow_V2.startListening(result => {
+              console.log(result);
+              this.setState({ result: JSON.stringify(result) });
+            }, error => {
+              this.setState({ result: JSON.stringify(error) });
+            });
           }} />
         </View>
       </View>

index.android.js

@@ -3,8 +3,11 @@
 import { NativeAppEventEmitter } from 'react-native';
 import Voice from './js/RCTVoice';
 import { Dialogflow } from './js/Dialogflow';
+import { Dialogflow_V2 } from './js/Dialogflow_V2';
 
-
+/**
+ *  DIALOGFLOW V1
+ */
 var dialogflow = new Dialogflow();
 
 dialogflow.setConfiguration = function (accessToken, languageTag) {
@@ -36,3 +39,40 @@ dialogflow.finishListening = function () {
 }
 
 export default dialogflow;
+
+
+/**
+ * DIALOGFLOW V2
+ */
+var dialogflow2 = new Dialogflow_V2();
+
+dialogflow2.setConfiguration = function (accessToken, languageTag, projectId) {
+    dialogflow2.accessToken = accessToken;
+    dialogflow2.languageTag = languageTag;
+    dialogflow2.projectId = projectId;
+    dialogflow2.sessionId = dialogflow2.sessionId ? dialogflow2.sessionId : dialogflow2.guid();
+
+    Voice.onSpeechStart = () => (c) => dialogflow2.onListeningStarted(c);
+    Voice.onSpeechEnd = () => (c) => dialogflow2.onListeningFinished(c);
+}
+
+dialogflow2.startListening = function (onResult, onError) {
+
+    dialogflow2.subscription = NativeAppEventEmitter.addListener(
+        'onSpeechResults',
+        (result) => {
+            if (result.value) {
+                dialogflow2.requestQuery(result.value[0], onResult, onError);
+            }
+
+        }
+    );
+
+    Voice.start(dialogflow2.languageTag);
+}
+
+dialogflow2.finishListening = function () {
+    Voice.stop();
+}
+
+export { dialogflow2 as Dialogflow_V2 }

index.ios.js

@@ -1,16 +1,20 @@
 
 import { NativeModules, NativeAppEventEmitter } from 'react-native';
 import ResetContextsRequest from './js/ResetContextsRequest';
-
 import { Dialogflow } from './js/Dialogflow';
+import { Dialogflow_V2 } from './js/Dialogflow_V2';
+
 var SpeechToText = NativeModules.RNSpeechToTextIos;
 
+/**
+ *  DIALOGFLOW V1
+ */
 var dialogflow = new Dialogflow();
 
 dialogflow.setConfiguration = function (accessToken, languageTag) {
-    dialogflow.language = languageTag;
     dialogflow.accessToken = accessToken;
     dialogflow.languageTag = languageTag;
+    dialogflow.sessionId = dialogflow.sessionId ? dialogflow.sessionId : dialogflow.guid();
 }
 
 
@@ -40,3 +44,44 @@ dialogflow.finishListening = function () {
 }
 
 export default dialogflow;
+
+
+
+/**
+ * DIALOGFLOW V2
+ */
+var dialogflow2 = new Dialogflow_V2();
+
+dialogflow2.setConfiguration = function (accessToken, languageTag, projectId) {
+    dialogflow2.accessToken = accessToken;
+    dialogflow2.languageTag = languageTag;
+    dialogflow2.projectId = projectId;
+    dialogflow2.sessionId = dialogflow2.sessionId ? dialogflow2.sessionId : dialogflow2.guid();
+}
+
+dialogflow2.startListening = function (onResult, onError) {
+
+    dialogflow2.subscription = NativeAppEventEmitter.addListener(
+        'SpeechToText',
+        (result) => {
+
+            if (result.error) {
+                onError(result.error);
+            } else {
+                if (result.isFinal) {
+                    dialogflow2.requestQuery(result.bestTranscription.formattedString, onResult, onError);
+                }
+
+            }
+
+        }
+    );
+
+    SpeechToText.startRecognition(dialogflow2.language);
+}
+
+dialogflow2.finishListening = function () {
+    SpeechToText.finishRecognition();
+}
+
+export { dialogflow2 as Dialogflow_V2 }