@trayio/axios 1.8.0 → 1.9.1

package/dist/http/AxiosHttpClient.d.ts

@@ -1,9 +1,14 @@
 import * as TE from 'fp-ts/TaskEither';
 import { HttpClient } from '@trayio/commons/http/HttpClient';
 import { HttpMethod, HttpRequest, HttpResponse } from '@trayio/commons/http/Http';
+import FormData = require('form-data');
+import { FileStorage } from '@trayio/commons/file/File';
 export declare class AxiosHttpClient implements HttpClient {
+    private readonly fileStorage;
+    constructor(fileStorage?: FileStorage);
     execute(method: HttpMethod, url: string, request: HttpRequest): TE.TaskEither<Error, HttpResponse>;
     private axiosErrorToHttpResponse;
     private axiosResponseToHttpResponse;
+    appendFields: (formData: FormData) => (fields: Record<string, string>) => FormData;
 }
 //# sourceMappingURL=AxiosHttpClient.d.ts.map

package/dist/http/AxiosHttpClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AxiosHttpClient.d.ts","sourceRoot":"","sources":["../../src/http/AxiosHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACN,UAAU,EACV,WAAW,EAEX,YAAY,EACZ,MAAM,2BAA2B,CAAC;AAInC,qBAAa,eAAgB,YAAW,UAAU;IACjD,OAAO,CACN,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC;IA2CrC,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,2BAA2B;CASnC"}
+{"version":3,"file":"AxiosHttpClient.d.ts","sourceRoot":"","sources":["../../src/http/AxiosHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAEN,UAAU,EACV,WAAW,EAEX,YAAY,EAEZ,MAAM,2BAA2B,CAAC;AAGnC,OAAO,QAAQ,GAAG,QAAQ,WAAW,CAAC,CAAC;AACvC,OAAO,EAAQ,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAG9D,qBAAa,eAAgB,YAAW,UAAU;IAEhD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,GAAE,WAAqC;IAGpE,OAAO,CACN,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC;IA+FrC,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,2BAA2B;IAUnC,YAAY,aAAc,QAAQ,cAAc,OAAO,MAAM,EAAE,MAAM,CAAC,cAKpE;CACF"}

package/dist/http/AxiosHttpClient.js

@@ -1,19 +1,91 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AxiosHttpClient = void 0;
+const TE = __importStar(require("fp-ts/TaskEither"));
+const function_1 = require("fp-ts/function");
+const Http_1 = require("@trayio/commons/http/Http");
 const Task_1 = require("@trayio/commons/task/Task");
 const axios_1 = __importDefault(require("axios"));
+const FormData = require("form-data");
+const NodeFsFileStorage_1 = require("@trayio/commons/file/NodeFsFileStorage");
 class AxiosHttpClient {
+    constructor(fileStorage = new NodeFsFileStorage_1.NodeFsFileStorage()) {
+        this.fileStorage = fileStorage;
+        this.appendFields = (formData) => (fields) => {
+            Object.entries(fields).forEach(([key, value]) => {
+                formData.append(key, value);
+            });
+            return formData;
+        };
+    }
     execute(method, url, request) {
+        /*
+          Removes default headers so that we control what we send to the server, without this, it sends default content-type and accept headers,
+          the caller of this HttpClient interface is responsible of deciding the values of these headers, axios shouldn't try to be smart
+          and derive these from the body or even set defaults.
+        */
+        axios_1.default.defaults.headers.common = {};
+        axios_1.default.defaults.headers.get = {};
+        axios_1.default.defaults.headers.post = {};
+        axios_1.default.defaults.headers.put = {};
+        axios_1.default.defaults.headers.patch = {};
+        axios_1.default.defaults.headers.delete = {};
         const finalUrl = Object.entries(request.pathParams).reduce((acc, [key, value]) => acc.replace(`:${key}`, encodeURIComponent(value)), url);
         const headers = Object.entries(request.headers).reduce((acc, [key, value]) => {
             const newValue = typeof value === 'string' ? value : value.join(', ');
             return Object.assign(Object.assign({}, acc), { [key]: newValue });
         }, {});
-        const axiosConfig = {
+        let axiosConfig;
+        if (headers['content-type'] &&
+            headers['content-type'].includes(Http_1.HttpContentType.MultipartRequestBody)) {
+            const formData = new FormData();
+            this.appendFields(formData)(request.body.fields);
+            const fileEntries = Object.entries(request.body.files);
+            const taskEithers = fileEntries.map(([key, value]) => (0, function_1.pipe)(this.fileStorage.read(value.key), TE.map((file) => (Object.assign(Object.assign({}, file), { formFileName: key })))));
+            return (0, function_1.pipe)(TE.sequenceArray(taskEithers), TE.map((files) => files), TE.chain((files) => {
+                files.forEach((file) => {
+                    formData.append(file.formFileName, file.content, file.metadata.key);
+                });
+                axiosConfig = {
+                    url: finalUrl,
+                    method: method.toString(),
+                    data: formData,
+                    responseType: 'arraybuffer',
+                    headers,
+                    params: request.queryString,
+                };
+                return (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => (0, axios_1.default)(axiosConfig)
+                    .then(this.axiosResponseToHttpResponse)
+                    .catch(this.axiosErrorToHttpResponse.bind(this)));
+            }));
+        }
+        axiosConfig = {
             url: finalUrl,
             method: method.toString(),
             data: request.body,
@@ -21,17 +93,6 @@ class AxiosHttpClient {
             headers,
             params: request.queryString,
         };
-        /*
-          Removes default headers so that we control what we send to the server, without this, it sends default content-type and accept headers,
-          the caller of this HttpClient interface is responsible of deciding the values of these headers, axios shouldn't try to be smart
-          and derive these from the body or even set defaults.
-        */
-        axios_1.default.defaults.headers.common = {};
-        axios_1.default.defaults.headers.get = {};
-        axios_1.default.defaults.headers.post = {};
-        axios_1.default.defaults.headers.put = {};
-        axios_1.default.defaults.headers.patch = {};
-        axios_1.default.defaults.headers.delete = {};
         return (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => (0, axios_1.default)(axiosConfig)
             .then(this.axiosResponseToHttpResponse)
             .catch(this.axiosErrorToHttpResponse.bind(this)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/axios",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "Axios extensions and implementations",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,8 +14,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "1.8.0",
-    "axios": "0.27.2"
+    "@trayio/commons": "1.9.1",
+    "axios": "0.27.2",
+    "form-data": "4.0.0"
   },
   "typesVersions": {
     "*": {