gologin 2.0.9 → 2.0.11

package/package.json

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

package/src/bookmarks/utils.js

@@ -0,0 +1,16 @@
+import { promises as _promises } from 'fs';
+
+const { readFile } = _promises;
+
+export const getCurrentProfileBookmarks = async (pathToBookmarks) => {
+  const currentBookmarksFileData = await readFile(pathToBookmarks, { encoding: 'utf-8' });
+
+  let bookmarks = {};
+  try {
+    bookmarks = JSON.parse(currentBookmarksFileData);
+  } catch (error) {
+    console.log(error);
+  }
+
+  return bookmarks;
+};

package/src/browser/browser-api.js

@@ -69,3 +69,27 @@ export const updateProfileProxy = (profileId, ACCESS_TOKEN, browserProxyData) =>
 
     return { body: [] };
   });
+
+/**
+  * @param {string} profileId
+  * @param {string} ACCESS_TOKEN
+  * @param {Object} bookmarks
+*/
+export const updateProfileBookmarks = async (profileIds, ACCESS_TOKEN, bookmarks) => {
+  const params = {
+    profileIds,
+    bookmarks,
+  };
+
+  return requestretry.patch(`${API_URL}/browser/bookmarks/many`, {
+    headers: {
+      Authorization: `Bearer ${ACCESS_TOKEN}`,
+      'user-agent': 'gologin-api',
+    },
+    json: params,
+    maxAttempts: 3,
+    retryDelay: 2000,
+    timeout: 10 * 1000,
+  }).catch((error) => console.log(error));
+};
+

package/src/browser/browser-checker.js

@@ -9,6 +9,8 @@ import ProgressBar from 'progress';
 import { createInterface } from 'readline';
 import util from 'util';
 
+import { findLatestBrowserVersionDirectory } from '../utils/utils.js';
+
 const exec = util.promisify(execNonPromise);
 const { access, mkdir, readdir, rmdir, unlink, copyFile, readlink, symlink, lstat } = _promises;
 
@@ -50,7 +52,12 @@ export class BrowserChecker {
 
     let executableFilePath = join(this.#browserPath, 'orbita-browser', 'chrome');
     if (PLATFORM === 'darwin') {
-      executableFilePath = join(this.#browserPath, 'Orbita-Browser.app', 'Contents', 'MacOS', 'Orbita');
+      const orbitaFolderName = findLatestBrowserVersionDirectory(this.#browserPath);
+      if (orbitaFolderName === 'error') {
+        throw Error('Orbita folder not found in this directory: ' + this.#browserPath);
+      }
+
+      executableFilePath = join(this.#browserPath, orbitaFolderName, 'Orbita-Browser.app', 'Contents', 'MacOS', 'Orbita');
     } else if (PLATFORM === 'win32') {
       executableFilePath = join(this.#browserPath, 'orbita-browser', 'chrome.exe');
     }

package/src/gologin.js

@@ -11,15 +11,16 @@ import rimraf from 'rimraf';
 import ProxyAgent from 'simple-proxy-agent';
 
 import { fontsCollection } from '../fonts.js';
-import { updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from './browser/browser-api.js';
+import { getCurrentProfileBookmarks } from './bookmarks/utils.js';
+import { updateProfileBookmarks, updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from './browser/browser-api.js';
 import BrowserChecker from './browser/browser-checker.js';
 import { composeFonts, downloadCookies, setExtPathsAndRemoveDeleted, 
   setOriginalExtPaths, uploadCookies } from './browser/browser-user-data-manager.js';
 import { getChunckedInsertValues, getDB, loadCookiesFromFile } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
-import { get, isPortReachable } from './utils/utils.js';
 import { API_URL } from './utils/common.js';
+import { get, isPortReachable } from './utils/utils.js';
 
 const { access, unlink, writeFile, readFile } = _promises;
 
@@ -69,6 +70,7 @@ export class GoLogin {
 
     this.cookiesFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Network', 'Cookies');
     this.profile_zip_path = join(this.tmpdir, `gologin_${this.profile_id}.zip`);
+    this.bookmarksFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Bookmarks');
     debug('INIT GOLOGIN', this.profile_id);
   }
 
@@ -255,8 +257,13 @@ export class GoLogin {
       preferences.hardwareConcurrency = get(preferences, 'navigator.hardwareConcurrency');
     }
 
+    if (get(preferences, 'navigator.deviceMemory')) {
+      preferences.deviceMemory = get(preferences, 'navigator.deviceMemory')*1024;
+    }
+
     if (get(preferences, 'navigator.language')) {
-      preferences.language = get(preferences, 'navigator.language');
+      preferences.langHeader = get(preferences, 'navigator.language');
+      preferences.languages = get(preferences, 'navigator.language').replace(/;|q=[\d\.]+/img, '');
     }
 
     if (get(preferences, 'navigator.maxTouchPoints')) {
@@ -290,6 +297,12 @@ export class GoLogin {
       audioOutputs: preferences.mediaDevices.audioOutputs,
     };
 
+    preferences.webRtc = {
+      ...preferences.webRtc,
+      fill_based_on_ip: !!get(preferences, 'webRTC.fillBasedOnIp'),
+      local_ip_masking: !!get(preferences, 'webRTC.local_ip_masking'),
+    };
+
     return preferences;
   }
 
@@ -597,6 +610,11 @@ export class GoLogin {
       gologin,
     })));
 
+    const bookmarksParsedData = await getCurrentProfileBookmarks(this.bookmarksFilePath);
+    const bookmarksFromDb = profile.bookmarks?.bookmark_bar;
+    bookmarksParsedData.roots = bookmarksFromDb ? profile.bookmarks : bookmarksParsedData.roots;
+    await writeFile(this.bookmarksFilePath, JSON.stringify(bookmarksParsedData));
+
     debug('Profile ready. Path: ', profilePath, 'PROXY', JSON.stringify(get(preferences, 'gologin.proxy')));
 
     return profilePath;
@@ -922,6 +940,8 @@ export class GoLogin {
       await this.uploadProfileCookiesToServer();
     }
 
+    await this.saveBookmarksToDb();
+
     this.is_stopping = true;
     await this.sanitizeProfile();
 
@@ -1250,6 +1270,12 @@ export class GoLogin {
     return this.postCookies(this.profile_id, cookies);
   }
 
+  async saveBookmarksToDb() {
+    const bookmarksData = await getCurrentProfileBookmarks(this.bookmarksFilePath);
+    const bookmarks = bookmarksData.roots || {};
+    await updateProfileBookmarks([this.profile_id], this.access_token, bookmarks);
+  }
+
   async start() {
     if (this.is_remote) {
       return this.startRemote();

package/src/utils/utils.js

@@ -1,4 +1,6 @@
+import { readdirSync, statSync } from 'node:fs';
 import net from 'node:net';
+import { join } from 'node:path';
 
 export const get = (value, path, defaultValue) =>
   String(path).split('.').reduce((acc, v) => {
@@ -20,3 +22,28 @@ export const isPortReachable = (port) => new Promise(resolve => {
     .listen(port);
 });
 
+export const findLatestBrowserVersionDirectory = (browserPath) => {
+  const folderContents = readdirSync(browserPath);
+  const directories = folderContents.filter(file => statSync(join(browserPath, file)).isDirectory());
+
+  const { folderName, version } = directories.reduce((newest, currentFolderName) => {
+    const match = currentFolderName.match(/\d+/);
+
+    if (match) {
+      const findedVersion = parseInt(match[0], 10);
+
+      if (findedVersion > newest.version) {
+        return { folderName: currentFolderName, version: findedVersion };
+      }
+    }
+
+    return newest;
+  }, { folderName: '', version: 0 });
+
+  if (!version) {
+    return 'error';
+  }
+
+  return folderName;
+};
+