migrate to ibm-watson dependancy

Author: chughts

README.md

@@ -8,7 +8,12 @@ Node-RED Watson Nodes for IBM Cloud
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
 ### New in version 0.8.1
-- Node-RED & IBM-Watson & Use of promises on API invokation & IAM URL construct migration & Removal of default endpoint of
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
+    - Document Translator node
+
+
+### New in version 0.8.1
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
     - Speech to Text node
     - Speech to Text Corpus Builder node
     - Natural Language Understanding node
@@ -33,7 +38,7 @@ During the migration there will be a dependancy on both modules.
 - Bump dependancy on node to >=10.0.0
 - Bump dependancy on cfenv, request, file-type
 - Bump dependancy on ibm-cloud-sdk-core to 0.3.7 (need to stay on 0.x, for STT Streaming to work)
-- Node-RED & IBM-Watson & Use of promises on API invokation & IAM URL construct migration & Removal of default endpoint of
+- Node-RED & IBM-Watson & Use of promises on API invocation & IAM URL construct migration & Removal of default endpoint of
     - Tone Analyzer node.
     - Personality Insights node.
     - Visual Recognition V3 node

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",

services/language_translator/v3-doc.html

@@ -47,11 +47,6 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/language-translator/api">
     </div>
@@ -335,15 +330,6 @@
         doctor.checkActionSelected();
       });
 
-      $('#node-input-default-endpoint').change(() => {
-        var checked = $('#node-input-default-endpoint').prop('checked')
-        if (checked) {
-          $('#node-input-service-endpoint').parent().hide();
-        } else {
-          $('#node-input-service-endpoint').parent().show();
-        }
-      });
-
       $('#node-input-srclang').change(function () {
         doctor.srclang_selected = $('#node-input-srclang').val();
         if (doctor.models) {
@@ -400,9 +386,7 @@
           var e = $('#node-input-service-endpoint').val();
           var creds = {un: u, pwd: p, key: k};
 
-          if (! $('#node-input-default-endpoint').prop('checked')) {
-            creds.e = e;
-          }
+          creds.e = e;
 
           $.getJSON('watson-doc-translator/models/', creds)
           .done(function (data) {
@@ -541,8 +525,7 @@
                 destlanghidden: {value: ''},
                 filename: {value: ''},
                 'document-id': {value: ''},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/language-translator/api'}
+                'service-endpoint' :{value: ''}
             },
             credentials: {
                 username: {type: 'text'}

services/language_translator/v3-doc.js

@@ -17,10 +17,11 @@
 module.exports = function (RED) {
   const request = require('request'),
     SERVICE_IDENTIFIER = 'language-translator',
-    SERVICE_VERSION = '2018-05-01';
+    SERVICE_VERSION = '2018-05-01',
+    LanguageTranslatorV3 = require('ibm-watson/language-translator/v3'),
+    { IamAuthenticator } = require('ibm-watson/auth');
 
   var pkg = require('../../package.json'),
-    LanguageTranslatorV3 = require('watson-developer-cloud/language-translator/v3'),
     fs = require('fs'),
     fileType = require('file-type'),
     temp = require('temp'),
@@ -54,6 +55,7 @@ module.exports = function (RED) {
   RED.httpAdmin.get('/watson-doc-translator/models', function (req, res) {
     endpoint = req.query.e ? req.query.e : sEndpoint;
     var lt = null,
+      authSettings = {},
       serviceSettings = {
         version: SERVICE_VERSION,
         url: endpoint,
@@ -63,24 +65,28 @@ module.exports = function (RED) {
       };
 
     if (sApikey || req.query.key) {
-      serviceSettings.iam_apikey = sApikey ? sApikey : req.query.key;
+      authSettings.apikey = sApikey ? sApikey : req.query.key;
     } else {
-      serviceSettings.username = sUsername ? sUsername : req.query.un;
-      serviceSettings.password = sPassword ? sPassword : req.query.pwd;
+      authSettings.username = sUsername ? sUsername : req.query.un;
+      authSettings.password = sPassword ? sPassword : req.query.pwd;
     }
+    serviceSettings.authenticator = new IamAuthenticator(authSettings);
 
     lt = new LanguageTranslatorV3(serviceSettings);
 
-    lt.listModels({}, function (err, models) {
-      if (err) {
-        res.json(err);
-      } else {
+    lt.listModels({})
+      .then((response) => {
+        let models = [];
+        if (response && response.result && response.result.models) {
+          models = response.result;
+        }
         res.json(models);
-      }
-    });
+      })
+      .catch((err) => {
+        res.json(err);
+      })
   });
 
-
   function Node (config) {
     var node = this;
     RED.nodes.createNode(this, config);
@@ -144,6 +150,30 @@ module.exports = function (RED) {
       return Promise.resolve();
     }
 
+    function getService() {
+      let authSettings = {},
+        serviceSettings = {
+          version: '2018-05-01',
+          headers: {
+            'User-Agent': pkg.name + '-' + pkg.version
+          }
+        };
+
+      if (apikey) {
+        authSettings.apikey = apikey;
+      } else {
+        authSettings.username = username;
+        authSettings.password = password;
+      }
+      serviceSettings.authenticator = new IamAuthenticator(authSettings);
+
+      if (endpoint) {
+        serviceSettings.url = endpoint;
+      }
+
+      return new LanguageTranslatorV3(serviceSettings);
+    }
+
 
     function buildAuthSettings () {
       var authSettings = {};
@@ -186,7 +216,6 @@ module.exports = function (RED) {
               reject('Document not found ' + response.statusCode);
               break;
             default:
-              console.log(body);
               reject('Error Invoking API ' + response.statusCode);
               break;
             }
@@ -324,10 +353,46 @@ module.exports = function (RED) {
     }
 
     function executeGetDocument(msg) {
-      var docid = docID(msg);
-      let uriAddress = `${endpoint}/v3/documents/${docid}/translated_document?version=${SERVICE_VERSION}`;
+      return new Promise(function resolver(resolve, reject){
+        let lt = getService(),
+          docid = docID(msg);
+
+        lt.getTranslatedDocument({documentId : docid})
+          .then((response) => {
+            msg.payload = response;
+            if (response && response.result) {
+              msg.payload = response.result;
+            }
+            return payloadutils.checkForStream(msg);
+          })
+          .then(() => {
+            resolve(msg.payload);
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      });
+    }
 
-      return executeGetRequest(uriAddress);
+    function executeGetDocumentXX(msg) {
+      return new Promise(function resolver(resolve, reject){
+        var docid = docID(msg);
+        let uriAddress = `${endpoint}/v3/documents/${docid}/translated_document?version=${SERVICE_VERSION}`;
+
+        executeGetRequest(uriAddress)
+          .then((response) => {
+            msg.payload = response;
+            return payloadutils.checkForStream(msg);
+          })
+          .then(() => {
+            resolve(msg.payload);
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      });
+
+      // return executeGetRequest(uriAddress);
     }
 
     function executeDeleteDocument(msg) {
@@ -416,7 +481,7 @@ module.exports = function (RED) {
       return Promise.resolve();
     }
 
-    function doit(msg) {
+    function doit(msg, send) {
       let action = msg.action || config.action;
 
       translatorutils.credentialCheck(username, password, apikey)
@@ -440,16 +505,16 @@ module.exports = function (RED) {
         .then(function(){
           temp.cleanup();
           node.status({});
-          node.send(msg);
+          send(msg);
         })
         .catch(function(err){
           temp.cleanup();
           payloadutils.reportError(node, msg, err);
-          node.send(msg);
+          send(msg);
         });
     }
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       // The dynamic nature of this node has caused problems with the password field. it is
       // hidden but not a credential. If it is treated as a credential, it gets lost when there
       // is a request to refresh the model list.
@@ -459,7 +524,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey || config.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -476,12 +541,13 @@ module.exports = function (RED) {
             pos = i+1;
           node.status({ fill: 'blue', shape: 'dot', text: `Processing document ${pos} of ${len}` });
           msgClone.payload = e;
-          doit(msgClone);
+          doit(msgClone, send);
         });
 
       } else {
-        doit(msg);
+        doit(msg, send);
       }
+      done();
     });
   }