gologin 1.0.45 → 1.0.48

package/browser-checker.js

@@ -53,7 +53,7 @@ class BrowserChecker {
       executableFilePath = path.join(this.#browserPath, 'orbita-browser', 'chrome.exe');
     }
     this.#executableFilePath = executableFilePath;
-    console.log('executableFilePath:', executableFilePath);
+    // console.log('executableFilePath:', executableFilePath);
   }
   
   async checkBrowser(autoUpdateBrowser = false) {

package/browser-user-data-manager.js

@@ -3,6 +3,7 @@ const os = require('os');
 const request = require('requestretry');
 const { rmdirSync, createWriteStream } = require('fs');
 const { access, readFile, writeFile, mkdir, readdir, copyFile } = require('fs').promises;
+const crypto = require('crypto');
 
 const fontsCollection = require('./fonts');
 
@@ -12,6 +13,7 @@ const FONTS_DIR_NAME = 'fonts';
 const HOMEDIR = os.homedir();
 const BROWSER_PATH = path.join(HOMEDIR, '.gologin', 'browser');
 const OS_PLATFORM = process.platform;
+const DEFAULT_ORBITA_EXTENSIONS_NAMES = ['Google Hangouts', 'Chromium PDF Viewer', 'CryptoTokenExtension', 'Web Store'];
 
 class BrowserUserDataManager {
   static downloadCookies({ profileId, ACCESS_TOKEN, API_BASE_URL }) {
@@ -114,7 +116,7 @@ class BrowserUserDataManager {
     await writeFile(path.join(profilePath, 'Default', 'fonts_config'), result);
   }
 
-  static setExtPaths(settings = {}, profileExtensionsCheckRes = []) {
+  static setExtPathsAndRemoveDeleted(settings = {}, profileExtensionsCheckRes = []) {
     const formattedLocalExtArray = profileExtensionsCheckRes.map((el) => {
       const [extFolderName = ''] = el.split(path.sep).reverse();
       const [originalId] = extFolderName.split('@');
@@ -128,21 +130,60 @@ class BrowserUserDataManager {
       }
     }).filter(Boolean);
 
-    if (!formattedLocalExtArray.length) {
-      return;
-    }
-
     const extensionsSettings = settings.extensions?.settings || {};
     const extensionsEntries = Object.entries(extensionsSettings);
 
     extensionsEntries.forEach((extensionObj) => {
-      const [extensionsId] = extensionObj;
-      const localExtObj = formattedLocalExtArray.find(el => el.originalId === extensionsId);
+      let [extensionId, currentExtSettings = {}] = extensionObj;
+      const extName = currentExtSettings.manifest?.name || '';
+      let extPath = currentExtSettings.path || '';
+      let originalId = '';
+
+      const isExtensionToBeDeleted = ['resources', 'passwords-ext', 'cookies-ext'].some(substring => extPath.includes(substring))
+        || DEFAULT_ORBITA_EXTENSIONS_NAMES.includes(extName);
+      if (isExtensionToBeDeleted) {
+        delete extensionsSettings[extensionId];
+        return;
+      }
+
+      if (os.platform() === 'win32') {
+        extPath = extPath.replace(/\//g, '\\');
+      } else {
+        extPath = extPath.replace(/\\/g, '/');
+      }
+      extensionsSettings[extensionId].path = extPath;
+
+      const isExtensionManageable = ['chrome-extensions', 'user-extensions'].some(substring => extPath.includes(substring));
+      if (isExtensionManageable) {
+        const [extFolderName] = extPath.split(path.sep).reverse();
+        [originalId] = extFolderName.split('@');
+        const isExtensionInProfileSettings = formattedLocalExtArray.find(el => el.path.includes(originalId));
+        if (!isExtensionInProfileSettings) {
+          delete extensionsSettings[extensionId];
+          return;
+        }
+
+        if (!currentExtSettings.manifest?.key) {
+          const hexEncodedPath = crypto.createHash('sha256').update(extPath).digest('hex');
+          const newId = hexEncodedPath.split('').slice(0, 32).map(symbol => extIdEncoding[symbol]).join('');
+          delete extensionsSettings[extensionId];
+
+          extensionsSettings[newId] = currentExtSettings;
+          extensionId = newId;
+        }
+      } else {
+        const splittedPath = extPath.split(path.sep);
+        if (splittedPath.length === 2) {
+          [originalId] = splittedPath
+        }
+      }
+
+      const localExtObj = originalId && formattedLocalExtArray.find(el => el.path.includes(originalId));
       if (!localExtObj) {
         return;
       }
 
-      extensionsSettings[extensionsId].path = localExtObj?.path || '';
+      extensionsSettings[extensionId].path = localExtObj?.path || '';
     });
 
     return extensionsSettings;
@@ -202,6 +243,25 @@ class BrowserUserDataManager {
   }
 }
 
+const extIdEncoding = {
+  0: 'a',
+  1: 'b',
+  2: 'c',
+  3: 'd',
+  4: 'e',
+  5: 'f',
+  6: 'g',
+  7: 'h',
+  8: 'i',
+  9: 'j',
+  a: 'k',
+  b: 'l',
+  c: 'm',
+  d: 'n',
+  e: 'o',
+  f: 'p',
+};
+
 module.exports = {
   BrowserUserDataManager,
 }

package/extensions-manager.js

@@ -249,6 +249,28 @@ class ExtensionsManager {
 
     return Promise.all(removeFoldersPromises);
   }
+
+  getExtensionsToInstall(extensionsFromPref, extensionsFromDB) {
+    if (!extensionsFromPref) {
+      return [];
+    }
+
+    const objectEntries = Object.entries(extensionsFromPref);
+    const extensionsInPref = objectEntries?.map(([_, settings]) => {
+      const [extFolderName] = settings.path.split(path.sep).reverse();
+      const [originalId] = extFolderName.split('@');
+      return originalId;
+    }) || [];
+
+    return extensionsFromDB.reduce((acc, extension) => {
+      const [extFolderName] = extension.split(path.sep).reverse();
+      const [originalId] = extFolderName.split('@');
+      if (!extensionsInPref.includes(originalId)) {
+        acc.push(extension);
+      }
+      return acc;
+    }, []);
+  }
 }
 
 const crxToZip = (buf) => {

package/gologin.js

@@ -47,9 +47,10 @@ class GoLogin {
     this.autoUpdateBrowser = !!options.autoUpdateBrowser;
     this.browserChecker = new BrowserChecker(options.skipOrbitaHashChecking);
     this.uploadCookiesToServer = options.uploadCookiesToServer || false;
-    this.writeCookesFromServer = options.writeCookesFromServer || true;
+    this.writeCookesFromServer = options.writeCookesFromServer;
     this.remote_debugging_port = options.remote_debugging_port || 0;
     this.timezone = options.timezone;
+    this.extensionPathsToInstall = [];
 
     if (options.tmpdir) {
       this.tmpdir = options.tmpdir;
@@ -247,9 +248,35 @@ class GoLogin {
     if (_.get(preferences, 'navigator.language')) {
       preferences.language = _.get(preferences, 'navigator.language');
     }
+    if (_.get(preferences, 'navigator.maxTouchPoints')) {
+      preferences.navigator.max_touch_points = _.get(preferences, 'navigator.maxTouchPoints');
+    }
 
     if (_.get(preferences, 'isM1')) {
-      preferences.is_m1 = _.get(preferences, 'navigator.language');
+      preferences.is_m1 = _.get(preferences, 'isM1');
+    }
+
+    if (_.get(preferences, 'os') == 'android'){
+      const devicePixelRatio = _.get(preferences, "devicePixelRatio");
+      const deviceScaleFactorCeil = Math.ceil(devicePixelRatio || 3.5);
+      let deviceScaleFactor = devicePixelRatio;
+      if (deviceScaleFactorCeil === devicePixelRatio) {
+        deviceScaleFactor += 0.00000001;
+      }
+
+      preferences.mobile = {
+        enable: true,
+        width: parseInt(this.resolution.width, 10),
+        height: parseInt(this.resolution.height, 10),
+        device_scale_factor: deviceScaleFactor,        
+      }
+    }
+
+    preferences.mediaDevices = {
+      enable: preferences.mediaDevices.enableMasking,
+      videoInputs: preferences.mediaDevices.videoInputs,
+      audioInputs: preferences.mediaDevices.audioInputs,
+      audioOutputs: preferences.mediaDevices.audioOutputs,
     }
     
     return preferences;
@@ -396,13 +423,16 @@ class GoLogin {
       }
 
       let extSettings;
-      if (ExtensionsManagerInst.useLocalExtStorage && profileExtensionsCheckRes.length) {
-        extSettings = BrowserUserDataManager.setExtPaths(preferences, profileExtensionsCheckRes);
-      } else if (!ExtensionsManagerInst.useLocalExtStorage) {
+      if (ExtensionsManagerInst.useLocalExtStorage) {
+        extSettings = BrowserUserDataManager.setExtPathsAndRemoveDeleted(preferences, profileExtensionsCheckRes);
+      } else {
         const originalExtensionsFolder = path.join(profilePath, 'Default', 'Extensions');
         extSettings = await BrowserUserDataManager.setOriginalExtPaths(preferences, originalExtensionsFolder);
       }
 
+      this.extensionPathsToInstall =
+        ExtensionsManagerInst.getExtensionsToInstall(extSettings, profileExtensionsCheckRes);
+
       if (extSettings) {
         const currentExtSettings = preferences.extensions || {};
         currentExtSettings.settings = extSettings
@@ -462,10 +492,16 @@ class GoLogin {
     };
     
     debug('profile.webRtc=', profile.webRtc);
+    debug('profile.timezone=', profile.timezone);
+    debug('profile.mediaDevices=', profile.mediaDevices);
 
     const audioContext = profile.audioContext || {};
     const { mode: audioCtxMode = 'off', noise: audioCtxNoise } = audioContext;
-    profile.timezone = { id: this._tz.timezone };
+    if(profile.timezone.fillBasedOnIp==false){
+      profile.timezone = { id: profile.timezone.timezone };
+    } else {
+      profile.timezone = { id: this._tz.timezone };
+    }
     profile.webgl_noise_value = profile.webGL.noise;
     profile.get_client_rects_noise = profile.webGL.getClientRectsNoise;
     profile.canvasMode = profile.canvas.mode;
@@ -488,10 +524,10 @@ class GoLogin {
 
     const gologin = this.convertPreferences(profile);
 
-    debug(`Writing profile for screenWidth ${profilePath}`, JSON.stringify(profile));
+    debug(`Writing profile for screenWidth ${profilePath}`, JSON.stringify(gologin));
     gologin.screenWidth = this.resolution.width;
     gologin.screenHeight = this.resolution.height;
-
+    debug("writeCookesFromServer", this.writeCookesFromServer)
     if (this.writeCookesFromServer) {
       await this.writeCookiesToFile();
     }
@@ -517,7 +553,7 @@ class GoLogin {
     
     preferences.gologin.langHeader = gologin.language;
     preferences.gologin.languages = languages;
-
+    // debug("convertedPreferences=", preferences.gologin)
     await writeFile(path.join(profilePath, 'Default', 'Preferences'), JSON.stringify(_.merge(preferences, {
       gologin
     })));
@@ -713,7 +749,7 @@ class GoLogin {
     this.port = remote_debugging_port;
     
     const ORBITA_BROWSER = this.executablePath || this.browserChecker.getOrbitaPath;
-
+    console.log("ORBITA_BROWSER=", ORBITA_BROWSER)
     const env = {};
     Object.keys(process.env).forEach((key) => {
       env[key] = process.env[key];
@@ -747,6 +783,22 @@ class GoLogin {
         `--lang=${browserLang}`,
       ];
 
+      if (this.extensionPathsToInstall.length) {
+        if (Array.isArray(this.extra_params) && this.extra_params.length) {
+          this.extra_params.forEach((param, index) => {
+            if (!param.includes('--load-extension=')) {
+              return;
+            }
+
+            const [_, extPathsString] = param.split('=');
+            const extPathsArray = extPathsString.split(',');
+            this.extensionPathsToInstall = [...this.extensionPathsToInstall, ...extPathsArray];
+            this.extra_params.splice(index, 1);
+          });
+        }
+        params.push(`--load-extension=${this.extensionPathsToInstall.join(',')}`);
+      }
+
       if (this.fontsMasking) {
         let arg = '--font-masking-mode=2';
         if (this.differentOs) {
@@ -929,7 +981,7 @@ class GoLogin {
       os = options.os;
     } 
 
-    let fingerprint = await requests.get(`https://api.gologin.com/browser/fingerprint?os=${os}`,{
+    let fingerprint = await requests.get(`${API_URL}/browser/fingerprint?os=${os}`,{
       headers: {
         'Authorization': `Bearer ${this.access_token}`,
         'User-Agent': 'gologin-api',
@@ -958,7 +1010,7 @@ class GoLogin {
     if (deviceMemory < 1) {
       deviceMemory = 1;
     }
-    navigator.deviceMemory = deviceMemory;
+    navigator.deviceMemory = deviceMemory*1024;
     webGLMetadata.mode = webGLMetadata.mode === 'noise' ? 'mask' : 'off';
 
     const json = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "1.0.45",
+  "version": "1.0.48",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "main": "./gologin.js",
   "repository": {