gologin 2.1.21 → 2.1.23

package/src/extensions/extensions-manager.js

@@ -4,11 +4,13 @@ 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 { FALLBACK_API_URL } from '../utils/common.js';
 
 const { mkdir, readdir, rmdir, unlink } = _promises;
 
 const EXTENSION_URL =
-  'https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D{ext_id}%26uc&prodversion=97.0.4692.71';
+  'https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D{ext_id}%26uc&prodversion=135.0.7049.41';
 
 export class ExtensionsManager extends UserExtensionsManager {
   #existedChromeExtensions = [];
@@ -134,6 +136,7 @@ export class ExtensionsManager extends UserExtensionsManager {
 
       const buffer = await new Promise((res) => {
         const chunks = [];
+        console.log('extUrl', extUrl);
         request.get(extUrl, {
           maxAttempts: 3,
           retryDelay: 1000,
@@ -143,7 +146,7 @@ export class ExtensionsManager extends UserExtensionsManager {
           .on('data', (data) => chunks.push(data))
           .on('end', () => res(Buffer.concat(chunks)));
       });
-
+      console.log('buffer', buffer);
       let zipExt;
       try {
         zipExt = crxToZip(buffer);
@@ -166,17 +169,15 @@ export class ExtensionsManager extends UserExtensionsManager {
   }
 
   async getExtensionsPolicies() {
-    const globalExtConfig = await request.get(`${this.apiBaseUrl}/gologin-settings/chrome_ext_policies`, {
-      headers: {
-        Authorization: `Bearer ${this.accessToken}`,
-        'user-agent': this.userAgent,
-        'x-two-factor-token': this.twoFaKey || '',
-      },
+    const globalExtConfig = await makeRequest(`${this.apiBaseUrl}/gologin-settings/chrome_ext_policies`, {
       json: true,
       maxAttempts: 2,
       retryDelay: 1000,
       timeout: 10 * 1000,
-      fullResponse: false,
+      method: 'GET',
+    }, {
+      token: this.accessToken,
+      fallbackUrl: `${FALLBACK_API_URL}/gologin-settings/chrome_ext_policies`,
     });
 
     const chromeExtPolicies = globalExtConfig?.chromeExtPolicies || {};
@@ -260,20 +261,17 @@ export class ExtensionsManager extends UserExtensionsManager {
       return;
     }
 
-    const checkResponse = await request(`${this.apiBaseUrl}/extensions/check`, {
+    const checkResponse = await makeRequest(`${this.apiBaseUrl}/extensions/check`, {
       method: 'POST',
-      headers: {
-        Authorization: `Bearer ${this.accessToken}`,
-        'user-agent': this.userAgent,
-        'x-two-factor-token': this.twoFaKey || '',
-      },
-      body: {
+      json: {
         extensionsIds,
       },
-      json: true,
+    }, {
+      token: this.accessToken,
+      fallbackUrl: `${FALLBACK_API_URL}/extensions/check`,
     });
 
-    const { extensionsToAdd = [] } = checkResponse.body;
+    const { extensionsToAdd = [] } = checkResponse;
 
     if (!extensionsToAdd.length) {
       return;
@@ -281,17 +279,14 @@ export class ExtensionsManager extends UserExtensionsManager {
 
     const extensionsToUpdate = await this.getExtensionsNameAndImage(extensionsToAdd, pathToExtensions);
 
-    request(`${this.apiBaseUrl}/extensions/create`, {
+    makeRequest(`${this.apiBaseUrl}/extensions/create`, {
       method: 'POST',
-      headers: {
-        Authorization: `Bearer ${this.accessToken}`,
-        'user-agent': this.userAgent,
-        'x-two-factor-token': this.twoFaKey || '',
-      },
-      body: {
+      json: {
         extensionsInfo: extensionsToUpdate,
       },
-      json: true,
+    }, {
+      token: this.accessToken,
+      fallbackUrl: `${FALLBACK_API_URL}/extensions/create`,
     });
   }
 

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

@@ -78,19 +78,17 @@ export class UserExtensionsManager {
       return;
     }
 
-    const extensionsToDownloadPaths = await request.post(`${this.#API_BASE_URL}/extensions/user_chrome_extensions_paths`, {
-      json: true,
+    const extensionsToDownloadPaths = await makeRequest(`${this.#API_BASE_URL}/extensions/user_chrome_extensions_paths`, {
       fullResponse: false,
-      headers: {
-        Authorization: `Bearer ${this.#ACCESS_TOKEN}`,
-        'user-agent': this.#USER_AGENT,
-        'x-two-factor-token': this.#TWO_FA_KEY || '',
-      },
-      body: {
+      json: {
         existedUserChromeExtensions: this.#existedUserExtensions,
         profileId,
         userChromeExtensions,
       },
+      method: 'POST',
+    }, {
+      token: this.#ACCESS_TOKEN,
+      fallbackUrl: `${FALLBACK_API_URL}/extensions/user_chrome_extensions_paths`,
     }) || [];
 
     const extensionsToDownloadPathsFiltered =

package/src/gologin-api.js

@@ -1,7 +1,8 @@
 import puppeteer from 'puppeteer-core';
 
 import GoLogin from './gologin.js';
-import { API_URL, getOsAdvanced } from './utils/common.js';
+import { API_URL, FALLBACK_API_URL, getOsAdvanced } from './utils/common.js';
+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';
@@ -10,11 +11,9 @@ export const getDefaultParams = () => ({
   token: process.env.GOLOGIN_API_TOKEN,
   profile_id: process.env.GOLOGIN_PROFILE_ID,
   executablePath: process.env.GOLOGIN_EXECUTABLE_PATH,
-  autoUpdateBrowser: true,
 });
 
 const createGologinProfileManager = ({ profileId, ...params }) => {
-  console.log({ params });
   const defaults = getDefaultParams();
   const mergedParams = {
     ...defaults,
@@ -23,8 +22,6 @@ const createGologinProfileManager = ({ profileId, ...params }) => {
 
   mergedParams.profile_id = profileId ?? mergedParams.profile_id;
 
-  console.log({ mergedParams });
-
   return new GoLogin(mergedParams);
 };
 
@@ -50,9 +47,11 @@ export const GologinApi = ({ token }) => {
     }
 
     const startedProfile = await legacyGologin.start();
+
     const browser = await puppeteer.connect({
       browserWSEndpoint: startedProfile.wsUrl,
       ignoreHTTPSErrors: true,
+      defaultViewport: null,
     });
 
     browsers.push(browser);
@@ -88,7 +87,6 @@ export const GologinApi = ({ token }) => {
 
   const api = {
     async launch(params = {}) {
-      console.log();
       if (params.cloud) {
         return launchCloudProfile(params);
       }
@@ -97,26 +95,12 @@ export const GologinApi = ({ token }) => {
     },
 
     async createProfileWithCustomParams(options) {
-      const response = await fetch(`${API_URL}/browser/custom`, {
+      const response = await makeRequest(`${API_URL}/browser/custom`, {
         method: 'POST',
-        headers: {
-          'Authorization': `Bearer ${token}`,
-          'User-Agent': 'gologin-api',
-        },
-        body: JSON.stringify(options),
-      });
-
-      if (response.status === 400) {
-        throw new Error(`gologin failed account creation with status code, ${response.status} DATA  ${JSON.stringify(await response.json())}`);
-      }
+        json: options,
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/custom` });
 
-      if (response.status === 500) {
-        throw new Error(`gologin failed account creation with status code, ${response.status}`);
-      }
-
-      const profile = await response.json();
-
-      return profile.id;
+      return response.id;
     },
 
     async refreshProfilesFingerprint(profileIds) {
@@ -124,17 +108,12 @@ export const GologinApi = ({ token }) => {
         throw new Error('Profile ID is required');
       }
 
-      const response = await fetch(`${API_URL}/browser/fingerprints`, {
-        headers: {
-          'Authorization': `Bearer ${token}`,
-          'User-Agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
+      const response = await makeRequest(`${API_URL}/browser/fingerprints`, {
         method: 'PATCH',
-        body: JSON.stringify({ browsersIds: profileIds }),
-      });
+        json: { browsersIds: profileIds },
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/fingerprints` });
 
-      return response.json();
+      return response;
     },
 
     async createProfileRandomFingerprint(name = '') {
@@ -142,21 +121,16 @@ export const GologinApi = ({ token }) => {
       const { os, osSpec } = osInfo;
       const resultName = name || 'api-generated';
 
-      const response = await fetch(`${API_URL}/browser/quick`, {
+      const response = await makeRequest(`${API_URL}/browser/quick`, {
         method: 'POST',
-        headers: {
-          'Authorization': `Bearer ${token}`,
-          'User-Agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
+        json: {
           os,
           osSpec,
           name: resultName,
-        }),
-      });
+        },
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/quick` });
 
-      return response.json();
+      return response;
     },
 
     async updateUserAgentToLatestBrowser(profileIds, workspaceId = '') {
@@ -165,32 +139,21 @@ export const GologinApi = ({ token }) => {
         url += `?currentWorkspace=${workspaceId}`;
       }
 
-      const response = await fetch(url, {
+      const response = await makeRequest(url, {
         method: 'PATCH',
-        headers: {
-          'Authorization': `Bearer ${token}`,
-          'User-Agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ browserIds: profileIds, updateUaToNewBrowserV: true, updateAllProfiles: false, testOrbita: false }),
-      });
+        json: { browserIds: profileIds, updateUaToNewBrowserV: true, updateAllProfiles: false, testOrbita: false },
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/update_ua_to_new_browser_v` });
 
-      return response.json();
+      return response;
     },
 
     async changeProfileProxy(profileId, proxyData) {
-      console.log(proxyData);
-      const response = await fetch(`${API_URL}/browser/${profileId}/proxy`, {
+      const response = await makeRequest(`${API_URL}/browser/${profileId}/proxy`, {
         method: 'PATCH',
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'user-agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(proxyData),
-      });
+        json: proxyData,
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/${profileId}/proxy` });
 
-      return response.status;
+      return response;
     },
 
     getAvailableType(availableTrafficData) {
@@ -208,22 +171,16 @@ export const GologinApi = ({ token }) => {
 
     async addGologinProxyToProfile(profileId, countryCode, proxyType = '') {
       if (!proxyType) {
-        const availableTraffic = await fetch(`${API_URL}/users-proxies/geolocation/traffic`, {
-          headers: {
-            Authorization: `Bearer ${token}`,
-            'user-agent': 'gologin-api',
-            'Content-Type': 'application/json',
-          },
-        });
-
-        const availableTrafficData = await availableTraffic.json();
-        console.log(availableTrafficData);
+        const availableTraffic = await makeRequest(`${API_URL}/users-proxies/geolocation/traffic`, {
+          method: 'GET',
+        }, { token, fallbackUrl: `${FALLBACK_API_URL}/users-proxies/geolocation/traffic` });
+
+        const availableTrafficData = availableTraffic;
         const availableType = this.getAvailableType(availableTrafficData);
         if (availableType === 'none') {
           throw new Error(trafficLimitMessage);
         }
 
-        console.log(availableType);
         proxyType = availableType;
       }
 
@@ -247,22 +204,17 @@ export const GologinApi = ({ token }) => {
           throw new Error('Invalid proxy type');
       }
 
-      const proxyResponse = await fetch(`${API_URL}/users-proxies/mobile-proxy`, {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'user-agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
+      const proxyResponse = await makeRequest(`${API_URL}/users-proxies/mobile-proxy`, {
         method: 'POST',
-        body: JSON.stringify({
+        json: {
           countryCode,
           isDc,
           isMobile,
           profileIdToLink: profileId,
-        }),
-      });
+        },
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/users-proxies/mobile-proxy` });
 
-      const proxy = await proxyResponse.json();
+      const proxy = proxyResponse;
       if (proxy.trafficLimitBytes < proxy.trafficUsedBytes) {
         throw new Error(trafficLimitMessage);
       }
@@ -271,27 +223,18 @@ export const GologinApi = ({ token }) => {
     },
 
     async addCookiesToProfile(profileId, cookies) {
-      const response = await fetch(`${API_URL}/browser/${profileId}/cookies?fromUser=true`, {
+      const response = await makeRequest(`${API_URL}/browser/${profileId}/cookies?fromUser=true`, {
         method: 'POST',
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'user-agent': 'gologin-api',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(cookies),
-      });
+        json: cookies,
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/${profileId}/cookies?fromUser=true` });
 
       return response.status;
     },
 
     async deleteProfile(profileId) {
-      const response = await fetch(`${API_URL}/browser/${profileId}`, {
+      const response = await makeRequest(`${API_URL}/browser/${profileId}`, {
         method: 'DELETE',
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'user-agent': 'gologin-api',
-        },
-      });
+      }, { token, fallbackUrl: `${FALLBACK_API_URL}/browser/${profileId}` });
 
       return response.status;
     },
@@ -299,7 +242,7 @@ export const GologinApi = ({ token }) => {
     async exit() {
       Promise.allSettled(browsers.map((browser) => browser.close()));
       Promise.allSettled(
-        legacyGls.map((gl) => gl.stopLocal({ posting: false })),
+        legacyGls.map((gl) => gl.stopLocal({ posting: true })),
       );
       Promise.allSettled(
         legacyGls.map((gl) => gl.stopRemote({ posting: true })),