@trayio/commons 1.8.0 → 1.9.1

package/dist/file/NodeFsFileStorage.d.ts

@@ -2,7 +2,7 @@ import * as TE from 'fp-ts/lib/TaskEither';
 import { File, FileStorage } from './File';
 export declare class NodeFsFileStorage implements FileStorage {
     private basePath;
-    constructor(basePath: string);
+    constructor(basePath?: string);
     write(file: File): TE.TaskEither<Error, undefined>;
     read(key: string): TE.TaskEither<Error, File>;
     delete(key: string): TE.TaskEither<Error, undefined>;

package/dist/file/NodeFsFileStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeFsFileStorage.d.ts","sourceRoot":"","sources":["../../src/file/NodeFsFileStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAG3C,qBAAa,iBAAkB,YAAW,WAAW;IACxC,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAEpC,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAalD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC;IAkB7C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;CAWpD"}
+{"version":3,"file":"NodeFsFileStorage.d.ts","sourceRoot":"","sources":["../../src/file/NodeFsFileStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAG3C,qBAAa,iBAAkB,YAAW,WAAW;IACxC,OAAO,CAAC,QAAQ;gBAAR,QAAQ,GAAE,MAAe;IAE7C,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAalD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC;IAkB7C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;CAWpD"}

package/dist/file/NodeFsFileStorage.integration.test.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const FileStorage_abstract_test_1 = require("@trayio/commons/src/file/FileStorage.abstract.test");
 const NodeFsFileStorage_1 = require("./NodeFsFileStorage");
-(0, FileStorage_abstract_test_1.fileStorageTest)(new NodeFsFileStorage_1.NodeFsFileStorage('/tmp'));
+(0, FileStorage_abstract_test_1.fileStorageTest)(new NodeFsFileStorage_1.NodeFsFileStorage());

package/dist/file/NodeFsFileStorage.js

@@ -29,7 +29,7 @@ const fs = __importStar(require("fs/promises"));
 const function_1 = require("fp-ts/lib/function");
 const Task_1 = require("../task/Task");
 class NodeFsFileStorage {
-    constructor(basePath) {
+    constructor(basePath = '/tmp') {
         this.basePath = basePath;
     }
     write(file) {

package/dist/http/HttpClient.abstract.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpClient.abstract.test.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.abstract.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,QA0QpD"}
+{"version":3,"file":"HttpClient.abstract.test.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.abstract.test.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,QAgdpD"}

package/dist/http/HttpClient.abstract.test.js

@@ -31,6 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpClientTest = void 0;
 const E = __importStar(require("fp-ts/Either"));
@@ -39,12 +42,15 @@ const t = __importStar(require("io-ts"));
 const http_1 = require("http");
 const util_1 = require("util");
 const TE = __importStar(require("fp-ts/TaskEither"));
+const formidable_1 = __importDefault(require("formidable"));
 const Task_1 = require("../task/Task");
 const JsonSerialization_1 = require("../serialization/JsonSerialization");
 const TypeCodec_1 = require("../codec/TypeCodec");
 const Http_1 = require("./Http");
+const NodeFsFileStorage_1 = require("../file/NodeFsFileStorage");
 function httpClientTest(httpClient) {
     const serialization = new JsonSerialization_1.JsonSerialization();
+    const fileStorage = new NodeFsFileStorage_1.NodeFsFileStorage();
     const testErrorResponseCodec = TypeCodec_1.TypeCodec.fromDescriptor(t.type({
         message: t.string,
     }));
@@ -52,6 +58,13 @@ function httpClientTest(httpClient) {
         strField: t.string,
         intField: t.number,
     }));
+    const testMultiPartBodyTypeCodec = TypeCodec_1.TypeCodec.fromDescriptor(t.type({
+        fields: t.record(t.string, t.string),
+        files: t.record(t.string, t.type({
+            key: t.string,
+            size: t.number,
+        })),
+    }));
     const testInputCodec = TypeCodec_1.TypeCodec.fromDescriptor(t.type({
         inputField: t.number,
     }));
@@ -59,18 +72,76 @@ function httpClientTest(httpClient) {
         const serializedResponse = (0, function_1.pipe)(E.right(responseCodec.encode(response)), E.map((encodedResponse) => serialization.serialize(encodedResponse)), E.getOrElse(() => (new util_1.TextEncoder().encode('Error serializing value').buffer)));
         httpResponse.end(Buffer.from(serializedResponse));
     }
-    function processHttpRequest(requestCodec, responseCodec, httpRequest, httpResponse, process) {
-        const body = [];
-        httpRequest.on('data', (chunk) => {
-            body.push(chunk);
-        });
-        httpRequest.on('end', () => {
-            const buffer = Buffer.concat(body);
-            const response = (0, function_1.pipe)(serialization.deserialize(buffer), E.chain((encodedRequest) => requestCodec.decode(encodedRequest)), E.map(process), E.map((result) => responseCodec.encode(result)), E.map((encodedResult) => serialization.serialize(encodedResult)), E.getOrElse(() => (new util_1.TextEncoder().encode('Error serializing value').buffer)));
-            httpResponse.end(Buffer.from(response));
+    function processHttpRequest(requestCodec, responseCodec, httpRequest, httpResponse, process, isMultiPartBody = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (isMultiPartBody) {
+                const form = (0, formidable_1.default)({});
+                let fields;
+                let files;
+                try {
+                    [fields, files] = yield form.parse(httpRequest);
+                }
+                catch (err) {
+                    console.error(err);
+                    return;
+                }
+                const input = {
+                    fields: flattenFields(fields),
+                    files: flattenFiles(files),
+                };
+                const response = (0, function_1.pipe)(requestCodec.decode(input), E.map(process), E.map((result) => new util_1.TextEncoder().encode(JSON.stringify(responseCodec.encode(result))).buffer), E.getOrElse(() => new util_1.TextEncoder().encode('Error serializing value').buffer));
+                httpResponse.end(Buffer.from(response));
+            }
+            const body = [];
+            httpRequest.on('data', (chunk) => {
+                body.push(chunk);
+            });
+            httpRequest.on('end', () => {
+                const buffer = Buffer.concat(body);
+                const response = (0, function_1.pipe)(serialization.deserialize(buffer), E.chain((encodedRequest) => requestCodec.decode(encodedRequest)), E.map(process), E.map((result) => responseCodec.encode(result)), E.map((encodedResult) => serialization.serialize(encodedResult)), E.getOrElse(() => (new util_1.TextEncoder().encode('Error serializing value').buffer)));
+                httpResponse.end(Buffer.from(response));
+            });
         });
     }
-    const requestListener = (req, res) => {
+    const flattenFields = (fields) => {
+        const flattenedFields = {};
+        Object.entries(fields).forEach(([key, value]) => {
+            if (Array.isArray(value) && value.length > 1) {
+                throw new Error(`Field ${key} has more than one value and is current not supported`);
+            }
+            if (Array.isArray(value)) {
+                flattenedFields[key] = value.join(',');
+            }
+            else {
+                flattenedFields[key] = value !== null && value !== void 0 ? value : '';
+            }
+        });
+        return flattenedFields;
+    };
+    const flattenFiles = (files) => {
+        const flattenedFiles = {};
+        Object.entries(files)
+            .filter(([key, file]) => file !== null)
+            .forEach(([key, file]) => {
+            if (Array.isArray(file) && file.length > 1) {
+                throw new Error(`Field ${key} has more than one file and is currently not supported`);
+            }
+            if (Array.isArray(file)) {
+                const fileContent = convertFormidableFileToTrayFile(file[0]);
+                flattenedFiles[key] = fileContent;
+            }
+        });
+        return flattenedFiles;
+    };
+    const convertFormidableFileToTrayFile = (file) => {
+        var _a;
+        return ({
+            key: (_a = file.originalFilename) !== null && _a !== void 0 ? _a : '',
+            size: file.size,
+        });
+    };
+    const requestListener = (req, res) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (req.method === 'GET' && typeof req.headers['error'] === 'string') {
             const errorCode = +req.headers['error'];
             res.writeHead(errorCode, {
@@ -90,15 +161,20 @@ function httpClientTest(httpClient) {
             };
             sendHttpResponse(res, response, testResponseCodec);
         }
+        else if (req.method === 'POST' &&
+            ((_a = req.headers['content-type']) === null || _a === void 0 ? void 0 : _a.includes(Http_1.HttpContentType.MultipartRequestBody))) {
+            res.writeHead(200, { [Http_1.HttpHeader.ContentType]: Http_1.HttpContentType.Json });
+            yield processHttpRequest(testMultiPartBodyTypeCodec, testMultiPartBodyTypeCodec, req, res, (input) => input, true);
+        }
         else {
             const customHeader = req.headers['x-custom-header'];
             res.writeHead(200, { [Http_1.HttpHeader.ContentType]: Http_1.HttpContentType.Json });
-            processHttpRequest(testInputCodec, testResponseCodec, req, res, (input) => ({
+            yield processHttpRequest(testInputCodec, testResponseCodec, req, res, (input) => ({
                 strField: customHeader,
                 intField: input.inputField,
             }));
         }
-    };
+    });
     const host = 'localhost';
     const port = 8000; // TODO: Get random port
     const baseUrl = `http://${host}:${port}`;
@@ -140,7 +216,9 @@ function httpClientTest(httpClient) {
                 inputField: 321,
             };
             const response = yield (0, function_1.pipe)((0, Task_1.createTaskEitherFromEither)(E.right(testInputCodec.encode(testInput))), TE.map((encoded) => serialization.serialize(encoded)), TE.chain((serializedInput) => httpClient.execute(Http_1.HttpMethod.Post, baseUrl, {
-                headers: { 'x-custom-header': 'customVal' },
+                headers: {
+                    'x-custom-header': 'customVal',
+                },
                 pathParams: {},
                 queryString: {},
                 body: serializedInput,
@@ -152,6 +230,69 @@ function httpClientTest(httpClient) {
             const result = (0, function_1.pipe)(response, E.chain((httpResponse) => serialization.deserialize(httpResponse.body)), E.chain((encoded) => testResponseCodec.decode(encoded)));
             expect(result).toStrictEqual(E.right(testValue));
         }));
+        test('should send a POST request with multipart body', () => __awaiter(this, void 0, void 0, function* () {
+            yield fileStorage.delete('file1')();
+            yield fileStorage.delete('file2')();
+            const file1 = yield fileStorage.write({
+                metadata: {
+                    key: 'file1',
+                    size: 123,
+                },
+                content: Buffer.from('file 1 content'),
+            })();
+            const file2 = yield fileStorage.write({
+                metadata: {
+                    key: 'file2',
+                    size: 456,
+                },
+                content: Buffer.from('file 2 content'),
+            })();
+            if (file1._tag === 'Left') {
+                throw file1.left;
+            }
+            if (file2._tag === 'Left') {
+                throw file2.left;
+            }
+            const testInput = {
+                fields: {
+                    field1: 'field1',
+                    field2: 'field2',
+                },
+                files: {
+                    file1: {
+                        key: 'file1',
+                        size: 123,
+                    },
+                    file2: {
+                        key: 'file2',
+                        size: 456,
+                    },
+                },
+            };
+            const response = yield httpClient.execute(Http_1.HttpMethod.Post, baseUrl, {
+                headers: {
+                    'x-custom-header': 'customVal',
+                    'content-type': Http_1.HttpContentType.MultipartRequestBody,
+                },
+                pathParams: {},
+                queryString: {},
+                body: testInput,
+            })();
+            const result = (0, function_1.pipe)(response, E.chain((httpResponse) => serialization.deserialize(httpResponse.body)), E.chain((res) => testMultiPartBodyTypeCodec.decode(res)));
+            expect(result).toEqual(E.right(expect.objectContaining({
+                fields: testInput.fields,
+                files: expect.objectContaining({
+                    file1: expect.objectContaining({
+                        key: 'file1',
+                        size: expect.any(Number),
+                    }),
+                    file2: expect.objectContaining({
+                        key: 'file2',
+                        size: expect.any(Number),
+                    }),
+                }),
+            })));
+        }));
         test('should parse an internal error response', () => __awaiter(this, void 0, void 0, function* () {
             const response = yield httpClient.execute(Http_1.HttpMethod.Get, baseUrl, {
                 headers: { error: '500' },

package/dist/string/StringConversions.d.ts

@@ -0,0 +1,6 @@
+export interface StringConversionsInterface {
+    toBoolean: (str: string) => boolean;
+    toNumber: (str: string) => number;
+}
+export declare const StringConversions: StringConversionsInterface;
+//# sourceMappingURL=StringConversions.d.ts.map

package/dist/string/StringConversions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StringConversions.d.ts","sourceRoot":"","sources":["../../src/string/StringConversions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA0B;IAC1C,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACpC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,iBAAiB,EAAE,0BAY/B,CAAC"}

package/dist/string/StringConversions.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StringConversions = void 0;
+exports.StringConversions = {
+    toBoolean: (string) => {
+        switch (string.toLowerCase().trim()) {
+            case 'true':
+                return true;
+            case 'false':
+                return false;
+            default:
+                return Boolean(string);
+        }
+    },
+    toNumber: (string) => parseInt(string, 10),
+};

package/dist/string/StringConversions.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=StringConversions.unit.test.d.ts.map

package/dist/string/StringConversions.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StringConversions.unit.test.d.ts","sourceRoot":"","sources":["../../src/string/StringConversions.unit.test.ts"],"names":[],"mappings":""}

package/dist/string/StringConversions.unit.test.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const StringConversions_1 = require("./StringConversions");
+describe('StringConversions', () => {
+    describe('toBoolean', () => {
+        it('should convert "true" string to boolean true', () => {
+            expect(StringConversions_1.StringConversions.toBoolean('true')).toBe(true);
+        });
+        it('should convert "false" string to boolean false', () => {
+            expect(StringConversions_1.StringConversions.toBoolean('false')).toBe(false);
+        });
+        it('should convert non-boolean string to boolean', () => {
+            expect(StringConversions_1.StringConversions.toBoolean('hello')).toBe(true);
+            expect(StringConversions_1.StringConversions.toBoolean('')).toBe(false);
+        });
+        it('should handle case insensitivity', () => {
+            expect(StringConversions_1.StringConversions.toBoolean('TrUe')).toBe(true);
+            expect(StringConversions_1.StringConversions.toBoolean('FaLsE')).toBe(false);
+        });
+        it('should handle leading/trailing spaces', () => {
+            expect(StringConversions_1.StringConversions.toBoolean(' true ')).toBe(true);
+            expect(StringConversions_1.StringConversions.toBoolean(' false ')).toBe(false);
+        });
+    });
+    describe('toNumber', () => {
+        it('should convert string to number', () => {
+            expect(StringConversions_1.StringConversions.toNumber('123')).toBe(123);
+        });
+        it('should handle non-numeric string', () => {
+            expect(StringConversions_1.StringConversions.toNumber('hello')).toBeNaN();
+        });
+        it('should handle empty string', () => {
+            expect(StringConversions_1.StringConversions.toNumber('')).toBeNaN();
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/commons",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "Extensions to the standard/core libraries and basic features",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,8 +14,10 @@
     "access": "public"
   },
   "dependencies": {
+    "@types/formidable": "3.4.4",
     "@types/node": "18.11.9",
     "@types/uuid": "9.0.2",
+    "formidable": "^3.5.1",
     "fp-ts": "2.12.3",
     "io-ts": "2.2.19",
     "io-ts-types": "0.5.19",