speech/recognize.js: upgrade googleapis

jmdobry · jmdobry · commit d2436ac98bdb · 2016-07-21T12:04:06.000-07:00
diff --git a/speech/package.json b/speech/package.json
@@ -12,7 +12,7 @@
     "async": "^1.5.2",
     "google-auto-auth": "^0.2.4",
     "google-proto-files": "^0.3.0",
-    "googleapis": "^7.1.0",
+    "googleapis": "^12.0.0",
     "grpc": "^0.15.0"
   }
 }
diff --git a/speech/recognize.js b/speech/recognize.js
@@ -18,10 +18,13 @@
 var google = require('googleapis');
 var async = require('async');
 var fs = require('fs');
+
+// Get a reference to the speech service
+var speech = google.speech('v1beta1').speech;
 // [END import_libraries]
 
 // [START authenticating]
-function getSpeechService (host, callback) {
+function getAuthClient (callback) {
   // Acquire credentials
   google.auth.getApplicationDefault(function (err, authClient) {
     if (err) {
@@ -42,25 +45,7 @@ function getSpeechService (host, callback) {
       ]);
     }
 
-    // Load the speach service using acquired credentials
-    console.log('Loading speech service...');
-
-    // Url to discovery doc file
-    // [START discovery_doc]
-    host = host || 'speech.googleapis.com';
-    var url = 'https://' + host + '/$discovery/rest';
-    // [END discovery_doc]
-
-    google.discoverAPI({
-      url: url,
-      version: 'v1beta1',
-      auth: authClient
-    }, function (err, speechService) {
-      if (err) {
-        return callback(err);
-      }
-      callback(null, speechService, authClient);
-    });
+    return callback(null, authClient);
   });
 }
 // [END authenticating]
@@ -87,7 +72,7 @@ function prepareRequest (inputFile, callback) {
 }
 // [END construct_request]
 
-function main (inputFile, host, callback) {
+function main (inputFile, callback) {
   var requestPayload;
 
   async.waterfall([
@@ -96,12 +81,12 @@ function main (inputFile, host, callback) {
     },
     function (payload, cb) {
       requestPayload = payload;
-      getSpeechService(host, cb);
+      getAuthClient(cb);
     },
     // [START send_request]
-    function sendRequest (speechService, authClient, cb) {
+    function sendRequest (authClient, cb) {
       console.log('Analyzing speech...');
-      speechService.speech.syncrecognize({
+      speech.syncrecognize({
         auth: authClient,
         resource: requestPayload
       }, function (err, result) {
@@ -119,12 +104,11 @@ function main (inputFile, host, callback) {
 // [START run_application]
 if (module === require.main) {
   if (process.argv.length < 3) {
-    console.log('Usage: node recognize <inputFile> [speech_api_host]');
+    console.log('Usage: node recognize <inputFile>');
     process.exit();
   }
   var inputFile = process.argv[2];
-  var host = process.argv[3];
-  main(inputFile, host || 'speech.googleapis.com', console.log);
+  main(inputFile, console.log);
 }
 // [END run_application]
 // [END app]
diff --git a/test/speech/recognize.test.js b/test/speech/recognize.test.js
@@ -20,15 +20,13 @@ describe('speech:recognize', function () {
   it('should recognize speech in audio', function (done) {
     recognizeExample.main(
       path.join(__dirname, '../../speech/resources/audio.raw'),
-      process.env.SPEECH_API_HOST || 'speech.googleapis.com',
       function (err, result) {
         assert(!err);
         assert(result);
         assert(Array.isArray(result.results));
         assert(result.results.length === 1);
         assert(result.results[0].alternatives);
         assert(console.log.calledWith('Got audio file!'));
-        assert(console.log.calledWith('Loading speech service...'));
         assert(console.log.calledWith('Analyzing speech...'));
         done();
       }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"async": "^1.5.2",`
`13`	`13`	`"google-auto-auth": "^0.2.4",`
`14`	`14`	`"google-proto-files": "^0.3.0",`
`15`		`- "googleapis": "^7.1.0",`
	`15`	`+ "googleapis": "^12.0.0",`
`16`	`16`	`"grpc": "^0.15.0"`
`17`	`17`	`}`
`18`	`18`	`}`