Replacing node-fetch with axios to get proxy detection (#1036)

munozemilio · web-flow · commit e06ad472e760 · 2020-10-26T03:41:09.000-07:00
* Replacing node-fetch with axios to get proxy detection

* Fixing linting errors

* Fixing tests to be cross OS compatible
diff --git a/packages/luis/package.json b/packages/luis/package.json
@@ -48,6 +48,7 @@
     "@oclif/errors": "~1.2.2",
     "@types/node-fetch": "~2.5.5",
     "@types/sinon": "^7.5.0",
+    "axios": "~0.21.0",
     "cli-ux": "~5.3.3",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.19",
diff --git a/packages/luis/src/api/http-request.ts b/packages/luis/src/api/http-request.ts
@@ -1,4 +1,4 @@
-import fetch from 'node-fetch'
+import axios from 'axios'
 
 let headers = {
   'Content-Type': 'application/json',
@@ -9,39 +9,82 @@ export default {
   async get(
     url: string,
     subscriptionKey: string) {
-    setSubscriptionKey(subscriptionKey)
-    const response = await fetch(url, {method: 'GET', headers})
-    return response.json()
+    const resp = await httpRequest(
+      subscriptionKey,
+      {
+        method: 'GET',
+        url,
+        headers
+      })
+
+    return resp.data
+
   },
 
   async post(
     url: string,
     subscriptionKey: string,
     body: any,
     extraHeaders = {}) {
-    setSubscriptionKey(subscriptionKey)
     headers = {...headers, ...extraHeaders}
-    const response = await fetch(url, {method: 'POST', headers, body: JSON.stringify(body)})
-    return response.json()
+
+    const resp = await httpRequest(
+      subscriptionKey,
+      {
+        method: 'POST',
+        url,
+        data: body,
+        headers
+      })
+
+    return resp.data
   },
 
   async put(
     url: string,
     subscriptionKey: string,
     body: any) {
-    setSubscriptionKey(subscriptionKey)
-    const response = await fetch(url, {method: 'PUT', headers, body: JSON.stringify(body)})
+    const resp = await httpRequest(
+      subscriptionKey,
+      {
+        method: 'PUT',
+        url,
+        data: body,
+        headers
+      })
 
-    return isJSON(response) ? response.json() : {code: 'Success'}
+    return isJSON(resp.data) ? resp.data : {code: 'Success'}
   },
 
   async delete(
     url: string,
     subscriptionKey: string) {
-    setSubscriptionKey(subscriptionKey)
-    const response = await fetch(url, {method: 'DELETE', headers})
-    return isJSON(response) ? response.json() : {code: 'Success'}
+    const resp = await httpRequest(
+      subscriptionKey,
+      {
+        method: 'DELETE',
+        url,
+        headers
+      })
+    return isJSON(resp.data) ? resp.data : {code: 'Success'}
+  }
+}
+
+const httpRequest = async function (subscriptionKey: string, config: any) {
+  setSubscriptionKey(subscriptionKey)
+  try {
+    return await axios(config)
+  } catch (error) {
+    if (error.response) {
+      // The request was made and the server responded with a status code
+      // that falls out of the range of 2xx
+      throw Error(error.response.statusText)
+    } else {
+      // Something happened in setting up the request that triggered an Error
+      throw Error(error.message)
+    }
   }
+
 }
 
 const setSubscriptionKey = function (subscriptionKey: string) {
diff --git a/packages/luis/test/commands/luis/application/create.test.ts b/packages/luis/test/commands/luis/application/create.test.ts
@@ -59,7 +59,7 @@ describe('luis:application:create', () => {
   .command(['luis:application:create', '--endpoint', 'undefined', '--name', 'orange_app', '--subscriptionKey', uuidv1(), '--culture', 'en-us', '--description', 'test description', '--versionId', '0.04'])
   .exit(1)
   .it('fails to create an app and displays an error message if the endpoint is undefined', ctx => {
-    expect(ctx.stderr).to.contain('Failed to create app: TypeError: Only absolute URLs are supported\n')
+    expect(ctx.stderr).to.contain('Failed to create app: Error:')
   })
 
 })
diff --git a/packages/luis/test/commands/luis/application/rename.test.ts b/packages/luis/test/commands/luis/application/rename.test.ts
@@ -62,7 +62,7 @@ describe('luis:application:rename', () => {
   .command(['luis:application:rename', '--endpoint', 'undefined', '--subscriptionKey', uuidv1(), '--appId', uuidv1(), '--name', 'sample-app', '--description', 'test description'])
   .exit(1)
   .it('fails to create an app and displays an error message if the endpoint is undefined', ctx => {
-    expect(ctx.stderr).to.contain('Failed to rename app: TypeError: Only absolute URLs are supported\n')
+    expect(ctx.stderr).to.contain('Failed to rename app: Error:')
   })
 
 })
diff --git a/packages/luis/test/commands/luis/version/rename.test.ts b/packages/luis/test/commands/luis/version/rename.test.ts
@@ -56,7 +56,7 @@ describe('luis:version:rename', () => {
   .command(['luis:version:rename', '--endpoint', 'undefined', '--subscriptionKey', uuidv1(), '--appId', uuidv1(), '--versionId', '0.1', '--newVersionId', '0.2'])
   .exit(1)
   .it('fails to rename application version and displays an error message if the endpoint is undefined', ctx => {
-    expect(ctx.stderr).to.contain('Failed to rename app version: TypeError: Only absolute URLs are supported\n')
+    expect(ctx.stderr).to.contain('Failed to rename app version: Error')
   })
 
 })
diff --git a/packages/qnamaker/package.json b/packages/qnamaker/package.json
@@ -45,6 +45,7 @@
     "@oclif/errors": "~1.2.2",
     "@oclif/parser": "~3.8.4",
     "await-delay": "^1.0.0",
+    "axios": "~0.21.0",
     "camelcase": "^4.1.0",
     "chalk": "2.4.1",
     "cli-table3": "^0.5.1",
diff --git a/packages/qnamaker/src/commands/qnamaker/init.ts b/packages/qnamaker/src/commands/qnamaker/init.ts
@@ -69,10 +69,10 @@ export default class QnamakerInit extends Command {
 
   async updateKbId(config: any) {
     let response = await new Endpointkeys().getEndpointKeys(config)
-    config.endpointKey = JSON.parse(await response.text()).primaryEndpointKey
+    config.endpointKey = response.data.primaryEndpointKey
 
     response = await new Knowledgebase().getKnowledgebaseDetails(config)
-    let kb = await JSON.parse(await response.text())
+    let kb = await response.data
     config.hostname = kb.hostName
   }
 }
diff --git a/packages/qnamaker/src/commands/qnamaker/kb/create.ts b/packages/qnamaker/src/commands/qnamaker/kb/create.ts
@@ -72,10 +72,10 @@ export default class QnamakerKbCreate extends Command {
 
   async updateKbId(config: any) {
     let response = await new Endpointkeys().getEndpointKeys(config)
-    config.endpointKey = JSON.parse(await response.text()).primaryEndpointKey
+    config.endpointKey = response.data.primaryEndpointKey
 
     response = await new Knowledgebase().getKnowledgebaseDetails(config)
-    const kb = JSON.parse(await response.text())
+    const kb = response.data
     config.hostname = kb.hostName
 
     return kb
diff --git a/packages/qnamaker/src/commands/qnamaker/kb/delete.ts b/packages/qnamaker/src/commands/qnamaker/kb/delete.ts
@@ -29,7 +29,7 @@ export default class QnamakerKbDelete extends Command {
 
     if (!flags.force) {
       let kbResult = await new Knowledgebase().getKnowledgebaseDetails(input.config)
-      let kb = await JSON.parse(await kbResult.text())
+      let kb = kbResult.data
       let answer = await cli.confirm(`Are you sure you would like to delete ${kb.name} [${kb.id}]? (y/n)`)
       if (!answer) {
         this.log('operation canceled')
diff --git a/packages/qnamaker/src/utils/qnamakerbase.ts b/packages/qnamaker/src/utils/qnamakerbase.ts
@@ -29,7 +29,7 @@ export async function processInputs(flags: any, payload: any, configfile: string
       result.requestBody = input ? await file.getContentFromFile(input) : stdin
       try {
         result.requestBody = JSON.parse(result.requestBody)
-      } catch(ex) {
+      } catch (ex) {
         flags.qnaFormat = true
       }
     }
@@ -81,37 +81,37 @@ export async function processFlags(flags: any, flagLabels: string[], configDir:
 
       input[flag] = flags[flag] || (config ? config[configPrefix + flag] : null)
     })
-  
+
   return input
 }
 
-async function getUserConfig (configPath: string) {
+async function getUserConfig(configPath: string) {
   if (fs.existsSync(path.join(configPath, 'config.json'))) {
     return fs.readJSON(path.join(configPath, 'config.json'), {throws: false})
   }
 
   return {}
 }
 
-function filterByAllowedConfigValues (configObj: any, prefix: string) {
+function filterByAllowedConfigValues(configObj: any, prefix: string) {
   const allowedConfigValues = [`${prefix}kbId`, `${prefix}endpoint`, `${prefix}region`, `${prefix}subscriptionKey`]
   const filtered = Object.keys(configObj)
   .filter(key => allowedConfigValues.includes(key))
   .reduce((filteredConfigObj: any, key) => {
     filteredConfigObj[key] = configObj[key]
-    
+
     return filteredConfigObj
   }, {})
 
   return filtered
 }
 
-function filterConfig (config: any, prefix: string) {
+function filterConfig(config: any, prefix: string) {
   return Object.keys(config)
     .filter((key: string) => key.startsWith(prefix))
     .reduce((filteredConfig: any, key: string) => {
       filteredConfig[key] = config[key]
 
       return filteredConfig
     }, {})
-}
+}
diff --git a/packages/qnamaker/src/utils/qnamakerinstanceutils.ts b/packages/qnamaker/src/utils/qnamakerinstanceutils.ts
@@ -12,9 +12,9 @@ export function sortQnA(qnaInstance: any) {
 
 export function sortAlterations(alterationsInstance: any) {
   alterationsInstance.wordAlterations.forEach((word: any) => {
-    word.alterations.sort(sortComparers.compareFn);
+    word.alterations.sort(sortComparers.compareFn)
   })
-  alterationsInstance.wordAlterations.sort(sortComparers.compareAltName);
+  alterationsInstance.wordAlterations.sort(sortComparers.compareAltName)
 }
 
 const sortComparers = {
diff --git a/packages/qnamaker/utils/api/serviceBase.js b/packages/qnamaker/utils/api/serviceBase.js
@@ -6,7 +6,7 @@ const os = require('os');
 const { insertParametersFromObject } = require('../insertParametersFromObject');
 const deriveParamsFromPath = require('../deriveParamsFromPath');
 const packageJSON = require('./../../package');
-
+const axios = require('axios');
 const nodeFetch = require('node-fetch');
 
 global.fetch = function (...args) {
@@ -103,7 +103,17 @@ class ServiceBase {
             if (body)
                 console.log(body);
         }
-        return fetch(URL, { headers, method, body });
+        // return fetch(URL, { headers, method, body });
+ 
+        return axios({     
+            method,
+            url: URL,
+            headers,
+            data: body
+        });        
+  
+
+
     }
 
     /**
diff --git a/packages/qnamaker/utils/index.js b/packages/qnamaker/utils/index.js
@@ -41,13 +41,25 @@ module.exports = async function qnamaker(config, serviceManifest, args, requestB
     }
     // Create the target service and kick off the request.
     const service = new api[identifier]();
-    const response = await service[operation.name](args, (requestBodyDataModel || requestBody));
-    //console.log(' requestBodyDataModel '+requestBodyDataModel +' entityType '+operation.entityType+' requestBody '+ requestBody)
-    const text = await response.text();
+
     try {
-        return JSON.parse(text);
+      const response = await service[operation.name](args, (requestBodyDataModel || requestBody));
+      return response.data;
     }
-    catch (e) {
-        return text;
+    catch (error) {
+        if (error.response) {
+            // The request was made and the server responded with a status code
+            // that falls out of the range of 2xx
+            return error.response.data;
+
+          } else if (error.request) {
+            // The request was made but no response was received
+            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+            // http.ClientRequest in node.js
+            return error.request;
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            return error.message;
+          }
     }
 };
diff --git a/packages/qnamaker/utils/qnaconfig.js b/packages/qnamaker/utils/qnaconfig.js
@@ -56,9 +56,9 @@ const config = {
             });
             
             if (opResult.error)
-                throw new Error(JSON.stringify(opResult.error, null, 4));
+                throw new Error(JSON.stringify(opResult.data.error, null, 4));
 
-            result = await opResult.json();
+            result = opResult.data;
             cli.action.start(result.operationState)
 
             if (result.operationState === 'Failed'){

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ export default class QnamakerInit extends Command {`
`69`	`69`
`70`	`70`	`async updateKbId(config: any) {`
`71`	`71`	`let response = await new Endpointkeys().getEndpointKeys(config)`
`72`		`- config.endpointKey = JSON.parse(await response.text()).primaryEndpointKey`
	`72`	`+ config.endpointKey = response.data.primaryEndpointKey`
`73`	`73`
`74`	`74`	`response = await new Knowledgebase().getKnowledgebaseDetails(config)`
`75`		`- let kb = await JSON.parse(await response.text())`
	`75`	`+ let kb = await response.data`
`76`	`76`	`config.hostname = kb.hostName`
`77`	`77`	`}`
`78`	`78`	`}`