mysendingbox 1.0.6 → 1.0.7

package/lib/resources/resourceBase.js

@@ -1,107 +1,117 @@
 'use strict'
 
-var stream = require('stream')
-var request = require('request')
-var bluebird = require('bluebird')
+const axios = require('axios')
+const stream = require('stream')
 
 var ResourceBase = function (endpoint, config) {
   this.uri = config.options.host + endpoint
   this.config = config.options
   this.useBody = config.useBody || false
-};
+}
 
 (function () {
-
   this._transmit = function (method, uri, qs, form, headers, callback) {
-
     if (typeof headers === 'function') {
       callback = headers
       headers = {}
-    }
-    else {
+    } else {
       headers = headers || {}
     }
 
-    for (var headerKey in headers) {
-      this.config.headers[headerKey] = headers[headerKey]
-    }
-
-    var opts = {
-      url: this.uri + (uri ? '/' + uri : ''),
-      method: method,
-      auth: {user: this.config.apiKey, password: ''},
-      headers: this.config.headers,
-      json: true
-    }
-
-    var isMultiPartForm = false
-
-    for (var key in form) {
-      if (form[key] === true || form[key] === false) {
-        form[key] = form[key].toString()
-      }
+    // Ajoutez ou mettez à jour les headers
+    for (let headerKey in this.config.headers) {
+      headers[headerKey] = this.config.headers[headerKey]
     }
 
-    for (var param in form) {
-      var val = form[param]
-
-      if (val instanceof stream.Stream) {
-        isMultiPartForm = true
-        break
-      }
+    const url = this.uri + (uri ? '/' + uri : '')
 
-      if (val !== undefined && val !== null && val.hasOwnProperty('value')) {
-        isMultiPartForm = true
-        break
-      }
+    // Préparer la configuration axios
+    const axiosConfig = {
+      url: url,
+      method: method,
+      headers: headers,
+      auth: {
+        username: this.config.apiKey,
+        password: ''
+      },
+      // Par défaut, axios sérialise en JSON
+      // Ajoutez des options spécifiques selon votre besoin
     }
 
+    // Gestion des paramètres de requête
     if (qs) {
-      opts.qs = qs
+      axiosConfig.params = qs
     }
 
+    // Gestion du corps de la requête
     if (form) {
+      // Vérifier si le corps doit être envoyé en tant que formData
+      let isMultiPartForm = false
+      for (const key in form) {
+        const val = form[key]
+        if (val instanceof stream.Stream) || (val && val.hasOwnProperty('value')) {
+          isMultiPartForm = true
+          break
+        }
+      }
+
       if (this.useBody) {
-        opts.body = form
+        axiosConfig.data = form
       } else if (isMultiPartForm) {
-        opts.formData = form
+        // Si vous utilisez des fichiers stream ou formData, utilisez form-data
+        const FormData = require('form-data')
+        const formData = new FormData()
+        for (const key in form) {
+          formData.append(key, form[key])
+        }
+        axiosConfig.data = formData
+        axiosConfig.headers = {
+          ...headers,
+          ...formData.getHeaders()
+        }
       } else {
-        opts.form = form
+        axiosConfig.data = form
       }
     }
 
-    return new bluebird(function (resolve, reject) {
-      request(opts, function (err, resp, body) {
-
-        if (err) {
-          return reject(err)
-        }
-
-        if (body && body.error) {
-          var error = new Error(body.error.message)
-          error.status_code = body.error.status_code || resp.statusCode
-          error._response = resp
-          return reject(error)
-        }
-
-        if (resp && resp.statusCode >= 500) {
-          var error = new Error(resp.statusMessage)
-          error.status_code = resp.statusCode
-          error._response = resp
-          return reject(error)
-        }
-
+    // Appel axios avec gestion Promises
+    const promise = axios(axiosConfig)
+      .then(response => {
+        const body = response.data
+        // Ajout de la propriété _response
         Object.defineProperty(body, '_response', {
           enumerable: false,
           writable: false,
-          value: resp
+          value: response
         })
-
-        return resolve(body)
+        return body
+      })
+      .catch(err => {
+        if (err.response) {
+          const resp = err.response
+          const body = resp.data
+          if (body && body.error) {
+            const error = new Error(body.error.message)
+            error.status_code = body.error.status_code || resp.status
+            error._response = resp
+            throw error
+          }
+          if (resp.status >= 500) {
+            const error = new Error(resp.statusText)
+            error.status_code = resp.status
+            error._response = resp
+            throw error
+          }
+        }
+        throw err
       })
-    }).nodeify(callback)
-  }
 
+    if (callback && typeof callback === 'function') {
+      promise.then(result => callback(null, result)).catch(err => callback(err))
+    } else {
+      return promise
+    }
+  }
 }).call(ResourceBase.prototype)
 
-module.exports = ResourceBase
+module.exports = ResourceBase

package/package.json

@@ -11,16 +11,16 @@
     "Mysendingbox.com",
     "printing"
   ],
-  "version": "1.0.6",
+  "version": "1.0.7",
   "homepage": "https://github.com/exaland/mysendingbox-node",
   "author": "Exaland Concept For -> Mysendingbox <hello@mysendingbox.fr> (https://www.mysendingbox.fr/)",
   "dependencies": {
-    "bluebird": "^3.5.5",
-    "flat": "^4.1.0",
-    "request": "^2.88.0"
+    "bluebird": "^3.7.2",
+    "flat": "^6.0.1",
+    "axios": "^1.16.1"
   },
   "devDependencies": {
-    "moment": "^2.24.0"
+    "moment": "^2.30.1"
   },
   "repository": {
     "type": "git",