@devrev/ts-adaas 1.4.0 → 1.4.2

package/dist/repo/repo.interfaces.d.ts

@@ -36,7 +36,7 @@ export interface NormalizedAttachment {
     file_name: string;
     parent_id: string;
     author_id?: string;
-    grand_parent_id?: number;
+    grand_parent_id?: number | string;
 }
 /**
  * Item is an interface that defines the structure of an item.

package/dist/workers/worker-adapter.d.ts

@@ -24,10 +24,10 @@ export declare function createWorkerAdapter<ConnectorState>({ event, adapterStat
 export declare class WorkerAdapter<ConnectorState> {
     readonly event: AirdropEvent;
     readonly options?: WorkerAdapterOptions;
+    isTimeout: boolean;
     private adapterState;
     private _artifacts;
     private hasWorkerEmitted;
-    private isTimeout;
     private repos;
     private loaderReports;
     private _processedFiles;

package/dist/workers/worker-adapter.js

@@ -123,7 +123,7 @@ class WorkerAdapter {
                 // Wait for all promises to settle and check for rate limiting
                 const results = await Promise.all(promises);
                 // Check if any of the results indicate rate limiting
-                const rateLimit = results.find(result => result === null || result === void 0 ? void 0 : result.delay);
+                const rateLimit = results.find((result) => result === null || result === void 0 ? void 0 : result.delay);
                 if (rateLimit) {
                     // Return the delay information to the caller
                     return { delay: rateLimit.delay };
@@ -688,9 +688,12 @@ class WorkerAdapter {
      }) {
         var _a, _b;
         if (batchSize <= 0) {
-            const error = new Error(`Invalid attachments batch size: ${batchSize}. Batch size must be greater than 0.`);
-            console.error(error.message);
-            return { error };
+            console.warn(`The specified batch size (${batchSize}) is invalid. Using 1 instead.`);
+            batchSize = 1;
+        }
+        if (batchSize > 50) {
+            console.warn(`The specified batch size (${batchSize}) is too large. Using 50 instead.`);
+            batchSize = 50;
         }
         const repos = [
             {

package/dist/workers/worker-adapter.test.js

@@ -142,44 +142,6 @@ describe('WorkerAdapter', () => {
             expect(result[0]).toHaveLength(1);
             expect(result[1]).toHaveLength(1);
         });
-        it('should handle invalid (0) batch size', async () => {
-            var _a;
-            // Arrange
-            const mockStream = jest.fn();
-            const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
-            // Act
-            const result = await adapter.streamAttachments({
-                stream: mockStream,
-                batchSize: 0,
-            });
-            // Assert
-            expect(consoleErrorSpy).toHaveBeenCalled();
-            expect(result).toEqual({
-                error: expect.any(Error),
-            });
-            expect((_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.message).toContain('Invalid attachments batch size');
-            // Restore console.error
-            consoleErrorSpy.mockRestore();
-        });
-        it('should handle invalid (negative) batch size', async () => {
-            var _a;
-            // Arrange
-            const mockStream = jest.fn();
-            const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
-            // Act
-            const result = await adapter.streamAttachments({
-                stream: mockStream,
-                batchSize: -1,
-            });
-            // Assert
-            expect(consoleErrorSpy).toHaveBeenCalled();
-            expect(result).toEqual({
-                error: expect.any(Error),
-            });
-            expect((_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.message).toContain('Invalid attachments batch size');
-            // Restore console.error
-            consoleErrorSpy.mockRestore();
-        });
     });
     describe('defaultAttachmentsIterator', () => {
         it('should process all batches of attachments', async () => {
@@ -400,23 +362,84 @@ describe('WorkerAdapter', () => {
             expect(result).toBeUndefined();
         });
         it('should handle invalid batch size', async () => {
-            var _a;
             // Arrange
             const mockStream = jest.fn();
-            const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+            const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+            // Set up adapter state with artifact IDs
+            adapter.state.toDevRev = {
+                attachmentsMetadata: {
+                    artifactIds: ['artifact1'],
+                    lastProcessed: 0,
+                    lastProcessedAttachmentsIdsList: [],
+                },
+            };
+            // Mock getting attachments
+            adapter['uploader'].getAttachmentsFromArtifactId = jest.fn().mockResolvedValue({
+                attachments: [
+                    { url: 'http://example.com/file1.pdf', id: 'attachment1', file_name: 'file1.pdf', parent_id: 'parent1' },
+                ],
+            });
+            // Mock the required methods
+            adapter.initializeRepos = jest.fn();
+            const mockReducedAttachments = [['batch1']];
+            adapter['defaultAttachmentsReducer'] = jest.fn().mockReturnValue(mockReducedAttachments);
+            adapter['defaultAttachmentsIterator'] = jest.fn().mockResolvedValue({});
             // Act
             const result = await adapter.streamAttachments({
                 stream: mockStream,
                 batchSize: 0,
             });
             // Assert
-            expect(consoleErrorSpy).toHaveBeenCalled();
-            expect(result).toEqual({
-                error: expect.any(Error),
+            expect(consoleWarnSpy).toHaveBeenCalledWith('The specified batch size (0) is invalid. Using 1 instead.');
+            // Verify that the reducer was called with batchSize 50 (not 100)
+            expect(adapter['defaultAttachmentsReducer']).toHaveBeenCalledWith({
+                attachments: expect.any(Array),
+                adapter: adapter,
+                batchSize: 1,
             });
-            expect((_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.message).toContain('Invalid attachments batch size');
-            // Restore console.error
-            consoleErrorSpy.mockRestore();
+            expect(result).toBeUndefined();
+            // Restore console.warn
+            consoleWarnSpy.mockRestore();
+        });
+        it('should cap batch size to 50 when batchSize is greater than 50', async () => {
+            // Arrange
+            const mockStream = jest.fn();
+            const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+            // Set up adapter state with artifact IDs
+            adapter.state.toDevRev = {
+                attachmentsMetadata: {
+                    artifactIds: ['artifact1'],
+                    lastProcessed: 0,
+                    lastProcessedAttachmentsIdsList: [],
+                },
+            };
+            // Mock getting attachments
+            adapter['uploader'].getAttachmentsFromArtifactId = jest.fn().mockResolvedValue({
+                attachments: [
+                    { url: 'http://example.com/file1.pdf', id: 'attachment1', file_name: 'file1.pdf', parent_id: 'parent1' },
+                ],
+            });
+            // Mock the required methods
+            adapter.initializeRepos = jest.fn();
+            const mockReducedAttachments = [['batch1']];
+            adapter['defaultAttachmentsReducer'] = jest.fn().mockReturnValue(mockReducedAttachments);
+            adapter['defaultAttachmentsIterator'] = jest.fn().mockResolvedValue({});
+            // Act
+            const result = await adapter.streamAttachments({
+                stream: mockStream,
+                batchSize: 100, // Set batch size greater than 50
+            });
+            // Assert
+            expect(consoleWarnSpy).toHaveBeenCalledWith('The specified batch size (100) is too large. Using 50 instead.');
+            // Verify that the reducer was called with batchSize 50 (not 100)
+            expect(adapter['defaultAttachmentsReducer']).toHaveBeenCalledWith({
+                attachments: expect.any(Array),
+                adapter: adapter,
+                batchSize: 50, // Should be capped at 50
+            });
+            expect(result).toBeUndefined();
+            // Restore console.warn
+            consoleWarnSpy.mockRestore();
         });
         it('should handle empty attachments metadata artifact IDs', async () => {
             // Arrange

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/ts-adaas",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Typescript library containing the ADaaS(AirDrop as a Service) control protocol.",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -23,7 +23,7 @@
   "author": "devrev",
   "license": "ISC",
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "@types/lambda-log": "^3.0.3",
     "@types/node": "^22.15.18",
     "@types/yargs": "^17.0.33",
@@ -33,12 +33,12 @@
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.3.3",
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@devrev/typescript-sdk": "^1.1.54",
-    "axios": "^1.7.9",
+    "@devrev/typescript-sdk": "^1.1.59",
+    "axios": "^1.9.0",
     "axios-retry": "^4.5.0",
     "form-data": "^4.0.1",
     "js-jsonl": "^1.1.1",