gologin 2.1.29 → 2.1.30

package/package.json

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

package/src/gologin.js

@@ -27,7 +27,7 @@ import {
 } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
-import { checkAutoLang } from './utils/browser.js';
+import { checkAutoLang, getIntlProfileConfig } from './utils/browser.js';
 import { API_URL, ensureDirectoryExists, FALLBACK_API_URL, getOsAdvanced } from './utils/common.js';
 import { STORAGE_GATEWAY_BASE_URL } from './utils/constants.js';
 import { get, isPortReachable } from './utils/utils.js';
@@ -82,6 +82,7 @@ export class GoLogin {
     this.newProxyOrbbitaMajorVersion = 135;
     this.proxyCheckTimeout = options.proxyCheckTimeout || 13 * 1000;
     this.proxyCheckAttempts = options.proxyCheckAttempts || 3;
+    this.browserLatestMajorVersion = 137;
 
     if (process.env.DISABLE_TELEMETRY !== 'true') {
       Sentry.init({
@@ -120,9 +121,7 @@ export class GoLogin {
     if (!(Array.isArray(versionsToDownload) && versionsToDownload.length)) {
       versionsToDownload = [];
 
-      const { latestVersion: browserLatestVersion } = await this.browserChecker.getLatestBrowserVersion();
-      const [latestBrowserMajorVersion] = browserLatestVersion.split('.');
-      const latestVersionNumber = Number(latestBrowserMajorVersion);
+      const latestVersionNumber = await this.getLatestBrowserVersion();
 
       for (let i = latestVersionNumber; i > latestVersionNumber - lastActualCount; i--) {
         versionsToDownload.push(i.toString());
@@ -138,6 +137,15 @@ export class GoLogin {
     }
   }
 
+  async getLatestBrowserVersion() {
+    const { latestVersion: browserLatestVersion } = await this.browserChecker.getLatestBrowserVersion();
+    const [latestBrowserMajorVersion] = browserLatestVersion.split('.');
+    const latestVersionNumber = Number(latestBrowserMajorVersion);
+    this.latestBrowserMajorVersion = latestVersionNumber;
+
+    return latestVersionNumber;
+  }
+
   async setProfileId(profile_id) {
     this.profile_id = profile_id;
     this.cookiesFilePath = await getCookiesFilePath(profile_id, this.tmpdir);
@@ -222,8 +230,6 @@ 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(',')
@@ -315,7 +321,7 @@ export class GoLogin {
       },
     };
 
-    if (browserMajorVersion >= this.newProxyOrbbitaMajorVersion && profileData.proxy?.mode !== 'none') {
+    if (this.browserMajorVersion >= this.newProxyOrbbitaMajorVersion && profileData.proxy?.mode !== 'none') {
       let proxyServer = `${profileData.proxy.mode}://`;
       if (profileData.proxy.username) {
         const encodedUsername = encodeURIComponent(profileData.proxy.username || '');
@@ -455,8 +461,15 @@ export class GoLogin {
 
     if (!this.executablePath) {
       const { userAgent } = profile.navigator;
-      const [browserMajorVersion] = userAgent.split('Chrome/')[1].split('.');
-      await this.checkBrowser(browserMajorVersion);
+      try {
+        const [browserMajorVersion] = userAgent.split('Chrome/')[1].split('.');
+        this.browserMajorVersion = Number(browserMajorVersion);
+        await this.checkBrowser(browserMajorVersion);
+      } catch (e) {
+        const latestVersionNumber = await this.getLatestBrowserVersion();
+        this.browserMajorVersion = latestVersionNumber;
+        await this.checkBrowser(latestVersionNumber);
+      }
     }
 
     const { navigator = {}, fonts, os: profileOs } = profile;
@@ -626,9 +639,12 @@ export class GoLogin {
     }
 
     const isMAC = OS_PLATFORM === 'darwin';
-    const checkAutoLangResult = checkAutoLang(gologin, this._tz);
-    this.browserLang = isMAC ? 'en-US' : checkAutoLangResult;
+    const checkAutoLangResult = checkAutoLang(gologin, this._tz, profile.autoLang);
+    const intlConfig = getIntlProfileConfig(profile, this._tz, profile.autoLang);
 
+    await writeFile(join(profilePath, 'orbita.config'), JSON.stringify({ intl: intlConfig }, null, '\t'), { encoding: 'utf-8' }).catch(console.log);
+
+    this.browserLang = isMAC ? 'en-US' : checkAutoLangResult;
     const prefsToWrite = Object.assign(preferences, { gologin });
     if (this.browserMajorVersion >= this.newProxyOrbbitaMajorVersion && this.proxy?.mode !== 'none') {
       prefsToWrite.proxy = {

package/src/utils/browser.js

@@ -1,5 +1,5 @@
-export const checkAutoLang = (profileData, timezoneCheckResult) => {
-  if (!profileData.autoLang) {
+export const checkAutoLang = (profileData, timezoneCheckResult, autoLang) => {
+  if (!autoLang) {
     return checkBrowserLang(profileData);
   }
 
@@ -27,7 +27,7 @@ export const checkAutoLang = (profileData, timezoneCheckResult) => {
         return acc;
       }
 
-      const qualityParam = 10-index;
+      const qualityParam = 10 - index;
       if (qualityParam > 0) {
         const separator = (resultLangsArr.length - index) < 2 ? '' : ',';
         gologinLangsArr.push(cur);
@@ -60,3 +60,61 @@ const checkBrowserLang = (profileData, defaultLocale = 'en-US') => {
 
   return defaultLocale;
 };
+
+export const getIntlProfileConfig = (profileData, timezoneCheckResult, autoLang) => {
+  if (!autoLang) {
+    return checkBrowserLang(profileData);
+  }
+
+  let timezoneLang = '';
+  const { country: timezoneCountry = '', languages } = timezoneCheckResult;
+  if (!languages) {
+    return checkBrowserLang(profileData);
+  }
+
+  const [firstDetectedLangLocale] = languages.split(',');
+  // если есть languages, значит есть и timezoneCountry, иначе в languages пришла бы пустая строка
+  timezoneLang = `${firstDetectedLangLocale}-${timezoneCountry}` || '';
+
+  let resultLangsArr = [];
+  const [lang = '', country = ''] = timezoneLang.split('-');
+  if (country) {
+    resultLangsArr.push([lang, country].join('-'));
+  }
+
+  resultLangsArr.push(lang, 'en-US', 'en');
+  resultLangsArr = [...new Set(resultLangsArr)];
+
+  const mainLanguage = getMainLanguage(resultLangsArr);
+
+  return {
+    accept_languages: resultLangsArr.join(','),
+    selected_languages: resultLangsArr.join(','),
+    app_locale: mainLanguage,
+    forced_languages: [
+      mainLanguage,
+    ],
+  };
+};
+
+const mainLocaleList = ['af', 'am', 'ar', 'as', 'az', 'be', 'bg', 'bn', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en-GB',
+  'es-419', 'fr', 'fr-CA', 'gl', 'gu', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'kn', 'ko', 'ky', 'lo', 'lt', 'lv',
+  'ml', 'mn', 'mr', 'ms', 'my', 'nb', 'ne', 'nl', 'or', 'pa', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'si', 'sk', 'sl', 'sq', 'sr', 'sr-Latn', 'sv', 'sw',
+  'ta', 'te', 'th', 'tr', 'uk', 'ur', 'uz', 'vi', 'zh-CN', 'zh-HK', 'zh-TW', 'zu', 'es', 'en-US', 'mk',
+];
+
+const getMainLanguage = (langArr) => {
+  for (const lang of langArr) {
+    if (mainLocaleList.includes(lang)) {
+      return lang;
+    }
+
+    const [locale] = lang.split('-');
+    if (mainLocaleList.includes(locale)) {
+      return locale;
+    }
+  }
+
+  return '';
+};
+

package/src/utils/common.js

@@ -1,7 +1,7 @@
 import { exec } from 'child_process';
 import { promises as fsPromises } from 'fs';
 import { homedir } from 'os';
-import { join, sep } from 'path';
+import { dirname, join, sep } from 'path';
 import { promisify } from 'util';
 
 import { deleteExtensionArchive, extractExtension } from '../extensions/extensions-extractor.js';
@@ -38,8 +38,10 @@ const getMacArmSpec = async () => {
 
 export const ensureDirectoryExists = async (filePath) => {
   try {
-    const directory = filePath.substring(0, filePath.lastIndexOf('/'));
-    await fsPromises.mkdir(directory, { recursive: true });
+    const directory = dirname(filePath);
+    if (directory && directory !== '.') {
+      await fsPromises.mkdir(directory, { recursive: true, force: true });
+    }
   } catch (error) {
     if (error.code !== 'EEXIST') {
       console.error('Error creating directory:', error.message);