replace bent by native node fetch (#401)

* replace bent by native node fetch

* wip

* wip

* wip

test/accounts.js

@@ -1,11 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const SP_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734ds';
-const authSP = {bearer: ADMIN_TOKEN};
-const ACC_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734da';
-const authAcc = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {

test/applications.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createVoipCarrier, createServiceProvider, 

test/auth.js

@@ -1,11 +1,13 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createVoipCarrier, createServiceProvider, createPhoneNumber, createAccount, deleteObjectBySid} = require('./utils');
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/call-test.js

@@ -1,6 +1,7 @@
 const test = require('tape');
 const jwt = require('jsonwebtoken');
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const consoleLogger = { debug: console.log, info: console.log, error: console.error }
@@ -47,8 +48,7 @@ test('Create Call Success With Synthesizer in Payload', async (t) => {
   });
   // THEN
   t.ok(result.statusCode === 201, 'successfully created Call without Synthesizer && application_sid');
-  const fs_request = await getLastRequestFromFeatureServer('15083778299_createCall');
-  const obj = JSON.parse(fs_request);
+  const obj = await getLastRequestFromFeatureServer('15083778299_createCall');
   t.ok(obj.body.speech_synthesis_vendor == 'google', 'speech synthesizer successfully added')
   t.ok(obj.body.speech_recognizer_vendor == 'google', 'speech recognizer successfully added')
 });
@@ -82,7 +82,7 @@ test('Create Call Success Without Synthesizer in Payload', async (t) => {
       }
     }
   }).then(data => { t.ok(false, 'Create Call should not be success') })
-    .catch(error => { t.ok(error.response.statusCode === 400, 'Call failed for no synthesizer') });
+    .catch(error => { t.ok(error.statusCode === 400, 'Call failed for no synthesizer') });
 });
 
 test("Create call with application sid and app_json", async(t) => {
@@ -150,7 +150,6 @@ result = await request.post(`/Accounts/${account_sid}/Calls`, {
 });
 // THEN
 t.ok(result.statusCode === 201, 'successfully created Call without Synthesizer && application_sid');
-const fs_request = await getLastRequestFromFeatureServer('15083778299_createCall');
-const obj = JSON.parse(fs_request);
+const obj = await getLastRequestFromFeatureServer('15083778299_createCall');
 t.ok(obj.body.app_json == app_json, 'app_json successfully added')
 });

test/clients.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
+const { createClient } = require('./http-client');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/email_utils.js

@@ -1,7 +1,5 @@
 const test = require('tape');
 const {emailSimpleText} = require('../lib/utils/email-utils');
-const bent = require('bent');
-const getJSON = bent('json')
 const logger = {
   debug: () =>{},
   info: () => {}
@@ -15,7 +13,7 @@ test('email-test', async(t) => {
 
   await emailSimpleText(logger, 'test@gmail.com', 'subject', 'body text');
 
-  const obj = await getJSON(`http://127.0.0.1:3101/lastRequest/custom_email_vendor`);
+  const obj = await (await fetch(`http://127.0.0.1:3101/lastRequest/custom_email_vendor`)).json();
   t.ok(obj.headers['Content-Type'] == 'application/json');
   t.ok(obj.headers.Authorization == 'Basic VVNFUk5BTUU6UEFTU1dPUkQ=');
   t.ok(obj.body.from == 'jambonz Support <support@jambonz.org>');

test/forgot-password.js

@@ -1,5 +1,6 @@
 const test = require('tape');
-const request = require("request-promise-native").defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: "http://127.0.0.1:3000/v1",
 });
 

test/http-client.js

@@ -0,0 +1,172 @@
+/**
+ * Fetch-based HTTP client that mimics the request-promise-native API
+ */
+
+class HttpClient {
+  constructor(defaults = {}) {
+    this.defaults = defaults;
+    this.baseUrl = defaults.baseUrl || '';
+  }
+
+  /**
+   * Make an HTTP GET request
+   */
+  async get(url, options = {}) {
+    return this._makeRequest(url, 'GET', options);
+  }
+
+  /**
+   * Make an HTTP POST request
+   */
+  async post(url, options = {}) {
+    return this._makeRequest(url, 'POST', options);
+  }
+
+  /**
+   * Make an HTTP PUT request
+   */
+  async put(url, options = {}) {
+    return this._makeRequest(url, 'PUT', options);
+  }
+
+  /**
+   * Make an HTTP DELETE request
+   */
+  async delete(url, options = {}) {
+    return this._makeRequest(url, 'DELETE', options);
+  }
+
+  /**
+   * Private method to handle all HTTP requests
+   */
+  async _makeRequest(url, method, options = {}) {
+    const { 
+      auth, 
+      body, 
+      json = true, // Changed default to true since most API calls expect JSON
+      qs = {}, 
+      simple = true, 
+      resolveWithFullResponse = false 
+    } = options;
+
+    // Build full URL with query parameters
+    const fullUrl = this._buildUrl(url, qs);
+
+    // Set up headers
+    const headers = {};
+    if (auth?.bearer) {
+      headers['Authorization'] = `Bearer ${auth.bearer}`;
+    }
+    
+    // Set JSON headers for all requests when json is true
+    if (json) {
+      headers['Accept'] = 'application/json';
+      
+      // Only set Content-Type when sending data
+      if (['POST', 'PUT', 'PATCH'].includes(method) && body) {
+        headers['Content-Type'] = 'application/json';
+      }
+    }
+    
+    // Build request options
+    const fetchOptions = {
+      method,
+      headers
+    };
+
+    // Add request body if needed
+    if (body && ['POST', 'PUT', 'PATCH'].includes(method)) {
+      fetchOptions.body = json ? JSON.stringify(body) : body;
+    }
+
+    try {
+      // Make the request
+      const response = await fetch(fullUrl, fetchOptions);
+      
+      // Clone the response before consuming it
+      // This allows us to use the body in error handling if needed
+      const clonedResponse = response.clone();
+      
+      // Parse response body based on content type - only once
+      let responseBody = null;
+      if (response.status !== 204) { // No content
+        if (json) {
+          try {
+            responseBody = await response.json();
+          } catch (e) {
+            // If can't parse JSON, get text
+            responseBody = await clonedResponse.text();
+          }
+        } else {
+          responseBody = await response.text();
+        }
+      }
+
+      // Handle errors if simple mode is enabled
+      if (simple && !response.ok) {
+        const error = new Error(`Request failed with status code ${response.status}`);
+        error.statusCode = response.status;
+        error.body = responseBody; // Include the already parsed body
+        throw error;
+      }
+
+      // Return full response object or just body based on options
+      if (resolveWithFullResponse) {
+        return {
+          statusCode: response.status,
+          body: responseBody,
+          headers: Object.fromEntries(response.headers.entries())
+        };
+      }
+      
+      return responseBody;
+    } catch (error) {
+      if (!simple) {
+        // If simple=false, return error response instead of throwing
+        return {
+          statusCode: error.statusCode || 500,
+          body: error.body || { message: error.message }
+        };
+      }
+      throw error;
+    }
+  }
+  /**
+   * Build URL with query parameters
+   */
+  _buildUrl(url, qs) {
+    // Start with base URL
+    let fullUrl = this.baseUrl + url;
+    
+    // Add query parameters
+    if (Object.keys(qs).length > 0) {
+      const params = new URLSearchParams();
+      Object.entries(qs).forEach(([key, value]) => {
+        params.append(key, value);
+      });
+      fullUrl += `?${params.toString()}`;
+    }
+    
+    return fullUrl;
+  }
+}
+
+/**
+ * Create a client with default options
+ */
+function createClient(defaults = {}) {
+  const client = new HttpClient(defaults);
+  
+  // Return the methods directly for API compatibility
+  return {
+    get: (url, options) => client.get(url, options),
+    post: (url, options) => client.post(url, options),
+    put: (url, options) => client.put(url, options),
+    delete: (url, options) => client.delete(url, options),
+    defaults: client.defaults
+  };
+}
+
+module.exports = {
+  createClient
+};

test/lcr-carriers-set-entries.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/lcr-routes.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/lcrs.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
+const { createClient } = require('./http-client');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/login.js

@@ -1,12 +1,14 @@
 const test = require('tape') ;
 const jwt = require('jsonwebtoken');
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const exec = require('child_process').exec ;
 const {generateHashedPassword} = require('../lib/utils/password-utils');
 
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
@@ -52,7 +54,7 @@ test('login tests', async(t) => {
                 password: 'adm',  
               }
             }).catch(error => {
-              t.ok(error.response.statusCode === 403, `Maximum login attempts reached. Please try again in ${attempTime} seconds.`)
+              t.ok(error.statusCode === 403, `Maximum login attempts reached. Please try again in ${attempTime} seconds.`)
           });
         } else if (index < maxAttempts) {
           attemptResult = await request.post('/login', {
@@ -62,7 +64,10 @@ test('login tests', async(t) => {
               username: 'admin',
               password: 'adm',  
             }
-          }).catch(error => t.ok(error.response.statusCode === 403));
+          }).catch(error => {
+            console.log(JSON.stringify(error));
+            t.ok(error.statusCode === 403);
+          });
         } else {
             attemptResult = await request.post('/login', {
                 resolveWithFullResponse: true,
@@ -71,7 +76,7 @@ test('login tests', async(t) => {
                   username: 'admin',
                   password: 'adm',  
                 }
-              }).catch(error => t.ok(error.response.statusCode === 403, 'Maximum login attempts reached. Please try again later or reset your password.'));
+              }).catch(error => t.ok(error.statusCode === 403, 'Maximum login attempts reached. Please try again later or reset your password.'));
         }
     }
 

test/ms-teams.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createServiceProvider, createAccount, deleteObjectBySid} = require('./utils');

test/oauth/gh-get-user.js

@@ -1,9 +1,6 @@
-const bent = require('bent');
-const getJSON = bent('GET', 200);
-const request = require('request');
-
 const test = async() => {
-  request.get('https://api.github.com/user', {
+  fetch('https://api.github.com/user', {
+    method: 'GET',
     headers: {
       Authorization: `Bearer ${process.env.GH_CODE}`,
       Accept: 'application/json',

test/password-settings.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
+const { createClient } = require('./http-client');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/phone-numbers.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createVoipCarrier, deleteObjectBySid} = require('./utils');

test/recent-calls.js

@@ -3,7 +3,8 @@ const fs = require('fs');
 const jwt = require('jsonwebtoken');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const consoleLogger = {debug: console.log, info: console.log, error: console.error}

test/sbcs.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createServiceProvider, deleteObjectBySid} = require('./utils');

test/service-providers.js

@@ -1,11 +1,13 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {deleteObjectBySid} = require('./utils');
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/sip-gateways.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createVoipCarrier, deleteObjectBySid} = require('./utils');

test/smpp-gateways.js

@@ -1,11 +1,13 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createVoipCarrier, deleteObjectBySid} = require('./utils');
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/speech-credentials.js

@@ -3,12 +3,14 @@ const fs = require('fs');
 const jwt = require('jsonwebtoken');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createServiceProvider, createAccount, deleteObjectBySid} = require('./utils');
 const { noopLogger } = require('@jambonz/realtimedb-helpers/lib/utils');
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/system-information.js

@@ -1,8 +1,9 @@
 const test = require('tape') ;
 const jwt = require('jsonwebtoken');
+const { createClient } = require('./http-client');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 

test/tts-cache.js

@@ -2,7 +2,8 @@ const test = require('tape') ;
 const jwt = require('jsonwebtoken');
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const crypto = require('crypto');

test/users-view-only.js

@@ -1,10 +1,12 @@
 const test = require('tape') ;
 const jwt = require('jsonwebtoken');
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const exec = require('child_process').exec ;
 const {generateHashedPassword} = require('../lib/utils/password-utils');
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/users.js

@@ -1,10 +1,11 @@
 const test = require('tape') ;
 const jwt = require('jsonwebtoken');
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const exec = require('child_process').exec ;
-const {generateHashedPassword} = require('../lib/utils/password-utils');
+
 
 
 process.on('unhandledRejection', (reason, p) => {

test/utils.js

@@ -1,6 +1,7 @@
 const { v4: uuid } = require('uuid');
 const fs = require('fs');
-const request_fs_mock = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request_fs_mock = createClient({
   baseUrl: 'http://127.0.0.1:3100'
 });
 

test/voip-carriers.js

@@ -1,11 +1,13 @@
 const test = require('tape') ;
 const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
 const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const {createServiceProvider, createAccount, createApplication, deleteObjectBySid} = require('./utils');
 
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/webapp_tests.js

@@ -1,7 +1,8 @@
 const test = require('tape') ;
 const exec = require('child_process').exec ;
 const Account = require('../lib/models/account');
-const request = require('request-promise-native').defaults({
+const { createClient } = require('./http-client');
+const request = createClient({
   baseUrl: 'http://127.0.0.1:3000/v1'
 });
 const theOneAndOnlyServiceProviderSid = '2708b1b3-2736-40ea-b502-c53d8396247f';