gologin 2.0.8 → 2.0.10

package/package.json

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

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

@@ -584,15 +584,15 @@ export class GoLogin {
       }
     }
 
-    const [languages] = this.language.split(';');
+    const languages = this.language.replace(/;|q=[\d\.]+/img, '')
 
     if (preferences.gologin==null) {
       preferences.gologin = {};
     }
 
     preferences.gologin.langHeader = gologin.language;
-    preferences.gologin.languages = languages;
-    // debug("convertedPreferences=", preferences.gologin)
+    preferences.gologin.language = languages;
+
     await writeFile(join(profilePath, 'Default', 'Preferences'), JSON.stringify(Object.assign(preferences, {
       gologin,
     })));

package/src/profile/profile-directories-to-remove.js

@@ -11,7 +11,7 @@ const DEFAULT_FOLDER_USELESS_FILE = [
   },
   {
     name: 'Service Worker',
-    subs: ['CacheStorage'],
+    subs: ['CacheStorage', 'ScriptCache'],
     isDirectory: true,
   },
   {

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;
+};
+