@blitzbrowser/blitzbrowser 1.0.1 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzbrowser/blitzbrowser",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "Deploying, scaling and managing browsers at scale.",
   "license": "Apache-2.0",
   "main": "./dist/index.js",

package/src/app.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { S3Client } from '@aws-sdk/client-s3';
 import { StatusController } from './controllers/status.controller';
-import { UserDataS3Service, UserDataService } from './services/user-data.service';
+import { UserDataService } from './services/user-data.service';
 import { BrowserPoolService } from './services/browser-pool.service';
 import { TimezoneService } from './services/timezone.service';
 import { CDPController } from './controllers/cdp.controller';
@@ -27,11 +27,8 @@ import { CDPController } from './controllers/cdp.controller';
         });
       }
     },
-    {
-      provide: UserDataService,
-      useClass: UserDataS3Service,
-    },
-
+    
+    UserDataService,
     BrowserPoolService,
     TimezoneService
   ],

package/src/components/browser-instance.component.ts

@@ -48,7 +48,7 @@ interface BrowserInstanceEvents {
   terminated: [];
 }
 
-interface ConnectionOptions {
+export interface ConnectionOptions {
   timezone?: string;
   proxy_url?: string;
   user_data_id?: string;

package/src/index.ts

@@ -1,12 +1,13 @@
-import { BrowserInstance, BrowserInstanceEvent, BrowserInstanceRequestEvent, BrowserInstanceStatus, BrowserInstanceStatusEvent, CDPCloseEvent, CDPTerminatedEvent, ConnectionOptionsEvent } from "./components/browser-instance.component";
+import { BrowserInstance, BrowserInstanceEvent, BrowserInstanceRequestEvent, BrowserInstanceStatus, BrowserInstanceStatusEvent, CDPCloseEvent, CDPTerminatedEvent, ConnectionOptions, ConnectionOptionsEvent } from "./components/browser-instance.component";
 import { StatusController } from './controllers/status.controller';
-import { UserDataS3Service, UserDataService } from './services/user-data.service';
+import { UserDataService } from './services/user-data.service';
 import { BrowserPoolService, BrowserPoolStatus } from './services/browser-pool.service';
 import { TimezoneService } from './services/timezone.service';
 import { CDPController } from './controllers/cdp.controller';
 import LimitStream from "./transforms/limit-stream";
 
 export {
+    ConnectionOptions,
     ConnectionOptionsEvent,
     CDPCloseEvent,
     CDPTerminatedEvent,
@@ -17,7 +18,6 @@ export {
     BrowserInstance,
     StatusController,
     UserDataService,
-    UserDataS3Service,
     BrowserPoolStatus,
     BrowserPoolService,
     TimezoneService,

package/src/services/user-data.service.ts

@@ -6,10 +6,50 @@ import * as zlib from 'zlib';
 import * as tar from 'tar';
 import LimitStream from "src/transforms/limit-stream";
 
-export abstract class UserDataService {
+@Injectable()
+export class UserDataService {
+
+    private readonly logger = new Logger(UserDataService.name);
+
+    constructor(
+        private readonly s3_client: S3Client,
+    ) { }
+
+    async downloadUserData(id: string, user_data_folder: string) {
+        try {
+            const tar_file = `/tmp/${crypto.randomUUID()}`;
+            const response = await this.s3_client.send(new GetObjectCommand({
+                Bucket: process.env.S3_USER_DATA_BUCKET,
+                Key: id,
+            }));
+
+            await fsPromise.writeFile(tar_file, await response.Body.transformToByteArray());
+            await this.untarUserDataFolder(tar_file, user_data_folder);
+            await fsPromise.rm(tar_file);
+
+            this.logger.log(`Downloaded user data ${id} folder:${user_data_folder}`);
+        } catch (e) {
+            if (e.Code === 'NoSuchKey') {
+                return;
+            }
 
-    abstract downloadUserData(id: string, user_data_folder: string): Promise<void>;
-    abstract uploadUserData(id: string, user_data_folder: string): Promise<void>;
+            throw e;
+        }
+    }
+
+    async uploadUserData(id: string, user_data_folder: string) {
+        const tar_file = await this.tarUserDataFolder(user_data_folder);
+
+        await this.s3_client.send(new PutObjectCommand({
+            Bucket: process.env.S3_USER_DATA_BUCKET,
+            Key: id,
+            Body: await fsPromise.readFile(tar_file)
+        }));
+
+        await fsPromise.rm(tar_file);
+
+        this.logger.log(`Uploaded user data ${id} folder:${user_data_folder}`);
+    }
 
     /**
      * 
@@ -59,53 +99,4 @@ export abstract class UserDataService {
         ]);
     }
 
-}
-
-@Injectable()
-export class UserDataS3Service extends UserDataService {
-
-    private readonly logger = new Logger(UserDataS3Service.name);
-
-    constructor(
-        private readonly s3_client: S3Client,
-    ) {
-        super();
-    }
-
-    async downloadUserData(id: string, user_data_folder: string) {
-        try {
-            const tar_file = `/tmp/${crypto.randomUUID()}`;
-            const response = await this.s3_client.send(new GetObjectCommand({
-                Bucket: process.env.S3_USER_DATA_BUCKET,
-                Key: id,
-            }));
-
-            await fsPromise.writeFile(tar_file, await response.Body.transformToByteArray());
-            await this.untarUserDataFolder(tar_file, user_data_folder);
-            await fsPromise.rm(tar_file);
-
-            this.logger.log(`Downloaded user data ${id} folder:${user_data_folder}`);
-        } catch (e) {
-            if (e.Code === 'NoSuchKey') {
-                return;
-            }
-
-            throw e;
-        }
-    }
-
-    async uploadUserData(id: string, user_data_folder: string) {
-        const tar_file = await this.tarUserDataFolder(user_data_folder);
-
-        await this.s3_client.send(new PutObjectCommand({
-            Bucket: process.env.S3_USER_DATA_BUCKET,
-            Key: id,
-            Body: await fsPromise.readFile(tar_file)
-        }));
-
-        await fsPromise.rm(tar_file);
-
-        this.logger.log(`Uploaded user data ${id} folder:${user_data_folder}`);
-    }
-
 }