gologin 2.2.8 → 3.0.0

package/src/extensions/extensions-manager.js

@@ -1,10 +1,9 @@
 import { createWriteStream, promises as _promises } from 'fs';
 import { join, sep } from 'path';
-import request from 'requestretry';
 
 import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, USER_EXTENSIONS_PATH } from '../utils/common.js';
 import UserExtensionsManager from './user-extensions-manager.js';
-import { makeRequest } from '../utils/http.js';
+import { fetchBufferWithRetry, fetchHeadWithRetry, makeRequest } from '../utils/http.js';
 import { FALLBACK_API_URL } from '../utils/common.js';
 
 const { mkdir, readdir, rmdir, unlink } = _promises;
@@ -134,19 +133,11 @@ export class ExtensionsManager extends UserExtensionsManager {
       const reqPath = uploadedProfileMetadata.req.path;
       const extVer = getExtVersion(reqPath);
 
-      const buffer = await new Promise((res) => {
-        const chunks = [];
-        console.log('extUrl', extUrl);
-        request.get(extUrl, {
-          maxAttempts: 3,
-          retryDelay: 1000,
-          timeout: 8 * 1000,
-          fullResponse: false,
-        })
-          .on('data', (data) => chunks.push(data))
-          .on('end', () => res(Buffer.concat(chunks)));
+      const buffer = await fetchBufferWithRetry(extUrl, {
+        maxAttempts: 3,
+        retryDelay: 1000,
+        timeout: 8 * 1000,
       });
-      console.log('buffer', buffer);
       let zipExt;
       try {
         zipExt = crxToZip(buffer);
@@ -357,14 +348,11 @@ const calcLength = (a, b, c, d) => {
   return length;
 };
 
-const getExtMetadata = (extUrl) => (
-  request.head(extUrl, {
-    maxAttempts: 3,
-    retryDelay: 2000,
-    timeout: 2 * 1000,
-    fullResponse: true,
-  })
-);
+const getExtMetadata = (extUrl) => fetchHeadWithRetry(extUrl, {
+  maxAttempts: 3,
+  retryDelay: 2000,
+  timeout: 2 * 1000,
+});
 
 const getExtVersion = (metadata) => {
   const [extFullName = ''] = metadata.split('/').reverse();

package/src/extensions/user-extensions-manager.js

@@ -1,9 +1,8 @@
 import { createWriteStream, promises as _promises } from 'fs';
 import { join, sep } from 'path';
-import request from 'requestretry';
 
 import { CHROME_EXTENSIONS_PATH, composeExtractionPromises, FALLBACK_API_URL, USER_EXTENSIONS_PATH } from '../utils/common.js';
-import { makeRequest } from '../utils/http.js';
+import { fetchToWriteStream, makeRequest } from '../utils/http.js';
 
 const { readdir, readFile, stat, mkdir, copyFile } = _promises;
 
@@ -105,12 +104,10 @@ export class UserExtensionsManager {
       const zipPath = `${join(USER_EXTENSIONS_PATH, extId)}.zip`;
       const archiveZip = createWriteStream(zipPath);
 
-      await request(awsPath, {
+      await fetchToWriteStream(awsPath, archiveZip, {
         retryDelay: 2 * 1000,
         maxAttempts: 3,
-      }).pipe(archiveZip);
-
-      await new Promise(r => archiveZip.on('close', () => r()));
+      });
 
       return zipPath;
     });

package/src/gologin-api.js

@@ -1,5 +1,3 @@
-import puppeteer from 'puppeteer-core';
-
 import GoLogin from './gologin.js';
 import { API_URL, FALLBACK_API_URL, getOsAdvanced } from './utils/common.js';
 import { makeRequest } from './utils/http.js';
@@ -7,6 +5,20 @@ import { makeRequest } from './utils/http.js';
 const trafficLimitMessage =
   'You dont have free traffic to use the proxy. Please go to app https://app.gologin.com/ and buy some traffic if you want to use the proxy';
 
+let puppeteerModulePromise = null;
+
+const loadPuppeteer = () => {
+  puppeteerModulePromise ||= import('puppeteer-core').then((module) => module.default ?? module);
+
+  return puppeteerModulePromise;
+};
+
+const connectToBrowser = async (options) => {
+  const puppeteer = await loadPuppeteer();
+
+  return puppeteer.connect(options);
+};
+
 export const getDefaultParams = () => ({
   token: process.env.GOLOGIN_API_TOKEN,
   profile_id: process.env.GOLOGIN_PROFILE_ID,
@@ -48,7 +60,7 @@ export const GologinApi = ({ token }) => {
 
     const startedProfile = await legacyGologin.start();
 
-    const browser = await puppeteer.connect({
+    const browser = await connectToBrowser({
       browserWSEndpoint: startedProfile.wsUrl,
       ignoreHTTPSErrors: true,
       defaultViewport: null,
@@ -75,7 +87,7 @@ export const GologinApi = ({ token }) => {
     legacyGls.push(legacyGologin);
 
     const browserWSEndpoint = `https://cloudbrowser.gologin.com/connect?token=${token}&profile=${params.profileId}`;
-    const browser = await puppeteer.connect({
+    const browser = await connectToBrowser({
       browserWSEndpoint,
       ignoreHTTPSErrors: true,
     });