gologin 2.1.23 → 2.1.25

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Combined changelog for GoLogin node.js SDK
 
+## [2.1.24] 2025-06-16
+
+
+### Fixes
+
+* Error running profile with proxies
+* Proxy passing in orbita 135 
+
 ## [2.1.23] 2025-06-09
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "types": "./index.d.ts",
   "main": "./src/gologin.js",

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

@@ -2,7 +2,8 @@ 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 { CHROME_EXTENSIONS_PATH, composeExtractionPromises, FALLBACK_API_URL, USER_EXTENSIONS_PATH } from '../utils/common.js';
+import { makeRequest } from '../utils/http.js';
 
 const { readdir, readFile, stat, mkdir, copyFile } = _promises;
 

package/src/gologin-api.js

@@ -240,11 +240,11 @@ export const GologinApi = ({ token }) => {
     },
 
     async exit() {
-      Promise.allSettled(browsers.map((browser) => browser.close()));
-      Promise.allSettled(
+      await Promise.allSettled(browsers.map((browser) => browser.close()));
+      await Promise.allSettled(
         legacyGls.map((gl) => gl.stopLocal({ posting: true })),
       );
-      Promise.allSettled(
+      await Promise.allSettled(
         legacyGls.map((gl) => gl.stopRemote({ posting: true })),
       );
     },

package/src/gologin.js

@@ -78,11 +78,15 @@ export class GoLogin {
     this.restoreLastSession = options.restoreLastSession || true;
     this.processSpawned = null;
     this.processKillTimeout = 1 * 1000;
+    this.browserMajorVersion = 0;
+    this.newProxyOrbbitaMajorVersion = 135;
 
     if (process.env.DISABLE_TELEMETRY !== 'true') {
       Sentry.init({
         dsn: 'https://a13d5939a60ae4f6583e228597f1f2a0@sentry-new.amzn.pro/24',
         tracesSampleRate: 1.0,
+        defaultIntegrations: false,
+        release: process.env.npm_package_version || '2.1.24',
       });
     }
 
@@ -220,6 +224,8 @@ export class GoLogin {
     const [screenWidth, screenHeight] = resolution.split('x').map(Number);
     const langHeader = (profileData.navigator && profileData.navigator.language) || '';
     const splittedLangs = langHeader ? langHeader.split(',')[0] : 'en-US';
+    const [browserMajorVersion] = profileData.navigator.userAgent.split('Chrome/')[1].split('.');
+    this.browserMajorVersion = browserMajorVersion;
 
     const startupUrl = (profileData.startUrl || '').trim().split(',')[0];
     const startupUrls = (profileData.startUrl || '').split(',')
@@ -311,6 +317,26 @@ export class GoLogin {
       },
     };
 
+    if (browserMajorVersion >= this.newProxyOrbbitaMajorVersion && profileData.proxy?.mode !== 'none') {
+      let proxyServer = `${profileData.proxy.mode}://`;
+      if (profileData.proxy.username) {
+        const encodedUsername = encodeURIComponent(profileData.proxy.username || '');
+        const encodedPassword = encodeURIComponent(profileData.proxy.password || '');
+
+        proxyServer += encodedPassword
+          ? `${encodedUsername}:${encodedPassword}@`
+          : `${encodedUsername}@`;
+      }
+
+      proxyServer += `${profileData.proxy.host}:${profileData.proxy.port}`;
+      preferences.proxy = {
+        ...preferences.proxy,
+        mode: 'fixed_servers',
+        schema: profileData.proxy.mode,
+        server: proxyServer,
+      };
+    }
+
     return preferences;
   }
 
@@ -599,9 +625,15 @@ export class GoLogin {
     const checkAutoLangResult = checkAutoLang(gologin, this._tz);
     this.browserLang = isMAC ? 'en-US' : checkAutoLangResult;
 
-    await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(Object.assign(preferences, {
-      gologin,
-    })));
+    const prefsToWrite = Object.assign(preferences, { gologin });
+    if (this.browserMajorVersion >= this.newProxyOrbbitaMajorVersion && this.proxy?.mode !== 'none') {
+      prefsToWrite.proxy = {
+        mode: 'fixed_servers',
+        server: gologin.proxy.server,
+      };
+    }
+
+    await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(prefsToWrite));
 
     const bookmarksParsedData = await getCurrentProfileBookmarks(this.bookmarksFilePath);
     const bookmarksFromDb = profile.bookmarks?.bookmark_bar;
@@ -614,8 +646,9 @@ export class GoLogin {
   }
 
   async commitProfile() {
-    const dataBuff = await this.getProfileDataToUpdate();
-
+    // wait for orbita to finish working with files
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+    const dataBuff = await this.getProfileDataToUpdate().catch(console.log);
     debug('begin updating', dataBuff.length);
     if (!dataBuff.length) {
       debug('WARN: profile zip data empty - SKIPPING PROFILE COMMIT');

package/src/utils/http.js

@@ -4,14 +4,14 @@ import requests from 'requestretry';
 const TIMEZONE_URL = 'https://geo.myip.link';
 
 const attemptRequest = async (requestUrl, options) => {
-  const { body } = await requests(requestUrl, options);
-  if (body.statusCode >= 400) {
-    const error = new Error(body);
-    error.statusCode = body.statusCode;
+  const req = await requests(requestUrl, options);
+  if (req.statusCode >= 400) {
+    const error = new Error(req.body);
+    error.statusCode = req.statusCode;
     throw error;
   }
 
-  return body;
+  return req.body;
 };
 
 export const makeRequest = async (url, options, internalOptions) => {