@devrev/ts-adaas 1.19.10 → 1.19.11-beta.1

package/dist/uploader/uploader.js

@@ -78,12 +78,9 @@ class Uploader {
                 };
             }
         }
+        const artifactDateRanges = (0, uploader_helpers_1.computeArtifactDateRanges)(fetchedObjects);
         // Return the artifact information to the platform
-        const artifact = {
-            id: preparedArtifact.artifact_id,
-            item_type: itemType,
-            item_count: Array.isArray(fetchedObjects) ? fetchedObjects.length : 1,
-        };
+        const artifact = Object.assign({ id: preparedArtifact.artifact_id, item_type: itemType, item_count: Array.isArray(fetchedObjects) ? fetchedObjects.length : 1 }, artifactDateRanges);
         return { artifact };
     }
     /**
@@ -150,18 +147,17 @@ class Uploader {
             formData.append(field, artifact.form_data[field]);
         }
         formData.append('file', fileStream.data);
+        const hasContentLength = !!fileStream.headers['content-length'];
         try {
-            const response = await axios_client_internal_1.axiosClient.post(artifact.upload_url, formData, {
-                headers: Object.assign(Object.assign({}, formData.getHeaders()), (!fileStream.headers['content-length']
+            const response = await axios_client_internal_1.axiosClient.post(artifact.upload_url, formData, Object.assign({ headers: Object.assign(Object.assign({}, formData.getHeaders()), (!hasContentLength
                     ? {
                         'Content-Length': constants_1.MAX_DEVREV_ARTIFACT_SIZE,
                     }
-                    : {})),
+                    : {})), 
                 // Prevents buffering of the response in the memory
-                maxRedirects: 0,
+                maxRedirects: 0, 
                 // Allow 2xx and 3xx (redirects) to be considered successful, 4xx and 5xx will throw errors and be caught in the catch block
-                validateStatus: (status) => status >= 200 && status < 400,
-            });
+                validateStatus: (status) => status >= 200 && status < 400 }, (!hasContentLength ? { 'axios-retry': { retries: 0 } } : {})));
             this.destroyStream(fileStream);
             return { response };
         }

package/dist/uploader/uploader.test.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const form_data_1 = __importDefault(require("form-data"));
 const js_jsonl_1 = require("js-jsonl");
 const zlib_1 = __importDefault(require("zlib"));
+const test_utils_1 = require("../common/test-utils");
 const axios_client_internal_1 = require("../http/axios-client-internal");
-const test_helpers_1 = require("../tests/test-helpers");
 const jest_setup_1 = require("../tests/jest.setup");
-const test_utils_1 = require("../common/test-utils");
-const uploader_helpers_1 = require("./uploader.helpers");
+const test_helpers_1 = require("../tests/test-helpers");
 const uploader_1 = require("./uploader");
+const uploader_helpers_1 = require("./uploader.helpers");
 jest.mock('../http/axios-client-internal');
 jest.mock('./uploader.helpers', () => (Object.assign(Object.assign({}, jest.requireActual('./uploader.helpers')), { downloadToLocal: jest.fn(), compressGzip: jest.fn(jest.requireActual('./uploader.helpers').compressGzip) })));
 const mockedAxiosClient = jest.mocked(axios_client_internal_1.axiosClient);
@@ -51,6 +51,57 @@ describe(uploader_1.Uploader.name, () => {
             });
             expect(result.error).toBeUndefined();
         });
+        it('should compute oldest/newest created and modified dates from normalized items', async () => {
+            var _a, _b, _c, _d;
+            // Arrange
+            const itemType = 'tasks';
+            const fetchedObjects = [
+                {
+                    id: '1',
+                    created_date: '2020-06-15T10:00:00.000Z',
+                    modified_date: '2021-01-20T10:00:00.000Z',
+                    data: { name: 'Task 1' },
+                },
+                {
+                    id: '2',
+                    created_date: '2019-03-01T08:00:00.000Z',
+                    modified_date: '2022-11-30T18:00:00.000Z',
+                    data: { name: 'Task 2' },
+                },
+            ];
+            mockedAxiosClient.get.mockResolvedValueOnce(mockArtifactUploadUrlResponse);
+            mockedAxiosClient.post.mockResolvedValue((0, test_helpers_1.createAxiosResponse)());
+            // Act
+            const result = await uploader.upload(itemType, fetchedObjects);
+            // Assert
+            expect((_a = result.artifact) === null || _a === void 0 ? void 0 : _a.oldest_created_date).toBe('2019-03-01T08:00:00.000Z');
+            expect((_b = result.artifact) === null || _b === void 0 ? void 0 : _b.newest_created_date).toBe('2020-06-15T10:00:00.000Z');
+            expect((_c = result.artifact) === null || _c === void 0 ? void 0 : _c.oldest_modified_date).toBe('2021-01-20T10:00:00.000Z');
+            expect((_d = result.artifact) === null || _d === void 0 ? void 0 : _d.newest_modified_date).toBe('2022-11-30T18:00:00.000Z');
+            expect(result.error).toBeUndefined();
+        });
+        it('should compute date ranges for single object upload', async () => {
+            var _a, _b, _c, _d;
+            // Arrange
+            const itemType = 'metadata';
+            const fetchedObject = {
+                id: '1',
+                created_date: '2018-12-25T00:00:00.000Z',
+                modified_date: '2018-12-26T00:00:00.000Z',
+                data: { key: 'value' },
+            };
+            mockedAxiosClient.get.mockResolvedValueOnce(mockArtifactUploadUrlResponse);
+            mockedAxiosClient.post.mockResolvedValue((0, test_helpers_1.createAxiosResponse)());
+            // Act
+            const result = await uploader.upload(itemType, fetchedObject);
+            // Assert
+            const createdTs = '2018-12-25T00:00:00.000Z';
+            const modifiedTs = '2018-12-26T00:00:00.000Z';
+            expect((_a = result.artifact) === null || _a === void 0 ? void 0 : _a.oldest_created_date).toBe(createdTs);
+            expect((_b = result.artifact) === null || _b === void 0 ? void 0 : _b.newest_created_date).toBe(createdTs);
+            expect((_c = result.artifact) === null || _c === void 0 ? void 0 : _c.oldest_modified_date).toBe(modifiedTs);
+            expect((_d = result.artifact) === null || _d === void 0 ? void 0 : _d.newest_modified_date).toBe(modifiedTs);
+        });
         it('should report item_count as 1 when uploading single object', async () => {
             var _a;
             // Arrange
@@ -321,6 +372,30 @@ describe(uploader_1.Uploader.name, () => {
                 }),
             }));
         });
+        it('should disable axios-retry when falling back to a guessed Content-Length', async () => {
+            // Arrange
+            const artifact = (0, test_helpers_1.createArtifact)();
+            const fileStream = (0, test_helpers_1.createFileStream)({ includeContentLength: false });
+            mockedAxiosClient.post.mockResolvedValueOnce((0, test_helpers_1.createAxiosResponse)());
+            // Act
+            await uploader.streamArtifact(artifact, fileStream);
+            // Assert
+            expect(mockedAxiosClient.post).toHaveBeenCalledWith(artifact.upload_url, expect.any(form_data_1.default), expect.objectContaining({
+                'axios-retry': { retries: 0 },
+            }));
+        });
+        it('should not override axios-retry when the real Content-Length is known', async () => {
+            // Arrange
+            const artifact = (0, test_helpers_1.createArtifact)();
+            const fileStream = (0, test_helpers_1.createFileStream)({ contentLength: 1024 });
+            mockedAxiosClient.post.mockResolvedValueOnce((0, test_helpers_1.createAxiosResponse)());
+            // Act
+            await uploader.streamArtifact(artifact, fileStream);
+            // Assert
+            const callArgs = mockedAxiosClient.post.mock.calls[0];
+            const config = callArgs[2];
+            expect(config).not.toHaveProperty('axios-retry');
+        });
         it('should destroy stream and return undefined when streaming fails', async () => {
             // Arrange
             const artifact = (0, test_helpers_1.createArtifact)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/ts-adaas",
-  "version": "1.19.10",
+  "version": "1.19.11-beta.1",
   "description": "Typescript library containing the ADaaS(AirDrop as a Service) control protocol.",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -46,13 +46,13 @@
     "typescript-eslint": "^8.46.1"
   },
   "dependencies": {
-    "@devrev/typescript-sdk": "^1.1.76",
+    "@devrev/typescript-sdk": "^1.1.78",
     "axios": "^1.17.0",
     "axios-retry": "^4.5.0",
     "form-data": "^4.0.4",
     "js-jsonl": "^1.1.1",
     "ts-node": "^10.9.2",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.3"
   },
   "files": [
     "dist/**/*",