gologin 2.1.16 → 2.1.18

package/package.json

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

package/src/browser/browser-checker.js

@@ -6,10 +6,8 @@ import { get } from 'https';
 import { homedir } from 'os';
 import { join } from 'path';
 import ProgressBar from 'progress';
-import { createInterface } from 'readline';
 import util from 'util';
 
-import { findLatestBrowserVersionDirectory } from '../utils/utils.js';
 import { API_URL, getOS } from '../utils/common.js';
 
 const exec = util.promisify(execNonPromise);
@@ -37,87 +35,65 @@ const FAIL_SUM_MATCH_MESSAGE = 'hash_sum_not_matched';
 const EXTRACTED_FOLDER = 'extracted-browser';
 
 export class BrowserChecker {
-  #homedir;
-  #browserPath;
+  #homedir = homedir();
+  #browserPath = join(this.#homedir, '.gologin', 'browser');
   #executableFilePath;
   #skipOrbitaHashChecking = false;
 
-  constructor(skipOrbitaHashChecking) {
-    this.#skipOrbitaHashChecking = skipOrbitaHashChecking;
-    this.#homedir = homedir();
-    this.#browserPath = join(this.#homedir, '.gologin', 'browser');
+  constructor() {
 
-    let executableFilePath = join(this.#browserPath, 'orbita-browser', 'chrome');
-    if (PLATFORM === 'darwin') {
-      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');
-    }
-
-    this.#executableFilePath = executableFilePath;
-    // console.log('executableFilePath:', executableFilePath);
   }
 
-  async checkBrowser(autoUpdateBrowser = false, checkBrowserUpdate = true) {
-    const browserFolderExists = await access(this.#executableFilePath).then(() => true).catch(() => false);
-
-    const { latestVersion: browserLatestVersion, browserDownloadUrl } = await this.getLatestBrowserVersion();
-
-    if (!browserFolderExists) {
-      return this.downloadBrowser(browserLatestVersion, browserDownloadUrl);
-    }
-
-    const currentVersionReq = await this.getCurrentVersion();
-    const currentVersion = (currentVersionReq?.stdout || '').replace(/(\r\n|\n|\r)/gm, '');
-
-    if (browserLatestVersion === currentVersion || !checkBrowserUpdate) {
-      return;
+  async checkBrowser(majorVersion) {
+    const isBrowserFolderExists = await access(join(this.#browserPath, `orbita-browser-${majorVersion}`)).then(() => true).catch(() => false);
+    if (isBrowserFolderExists) {
+      return this.getBrowserExecutablePath(majorVersion);
     }
 
-    if (autoUpdateBrowser) {
-      return this.downloadBrowser(browserLatestVersion, browserDownloadUrl);
-    }
+    await this.downloadBrowser(majorVersion);
 
-    return new Promise(resolve => {
-      const rl = createInterface(process.stdin, process.stdout);
-      const timeout = setTimeout(() => {
-        console.log(`\nContinue with current ${currentVersion} version.`);
-        resolve();
-      }, 10000);
-
-      rl.question(`New Orbita ${browserLatestVersion} is available. Update? [y/n] `, (answer) => {
-        clearTimeout(timeout);
-        rl.close();
-        if (answer && answer[0].toString().toLowerCase() === 'y') {
-          return this.downloadBrowser(browserLatestVersion, browserDownloadUrl).then(() => resolve());
-        }
-
-        console.log(`Continue with current ${currentVersion} version.`);
-        resolve();
-      });
-    });
+    return this.getBrowserExecutablePath(majorVersion);
   }
 
-  async downloadBrowser(latestVersion, browserDownloadUrl) {
-    await this.deleteOldArchives(true);
+  async downloadBrowser(majorVersion) {
     await mkdir(this.#browserPath, { recursive: true });
 
-    const pathStr = join(this.#browserPath, BROWSER_ARCHIVE_NAME);
+    const browserPath = join(this.#browserPath, BROWSER_ARCHIVE_NAME);
 
-    await this.downloadBrowserArchive(browserDownloadUrl, pathStr);
-    await this.checkBrowserArchive(pathStr);
+    const browserDownloadUrl = this.getBrowserDownloadUrl(majorVersion);
+
+    await this.downloadBrowserArchive(browserDownloadUrl, browserPath);
     await this.extractBrowser();
-    await this.checkBrowserSum(latestVersion);
-    console.log('Orbita hash checked successfully');
-    await this.replaceBrowser();
-    await this.addLatestVersion(latestVersion).catch(() => null);
+    await this.replaceBrowser(majorVersion);
     await this.deleteOldArchives();
-    console.log('Orbita updated successfully');
+  }
+
+  getBrowserExecutablePath(majorVersion) {
+    const os = getOS();
+    switch (os) {
+      case 'mac':
+        return join(this.#browserPath, `orbita-browser-${majorVersion}`, 'Orbita-Browser.app', 'Contents', 'MacOS', 'Orbita');
+      case 'win':
+        return join(this.#browserPath, `orbita-browser-${majorVersion}`, 'chrome.exe');
+      case 'macM1':
+        return join(this.#browserPath, `orbita-browser-${majorVersion}`, 'Orbita-Browser.app', 'Contents', 'MacOS', 'Orbita');
+      default:
+        return join(this.#browserPath, `orbita-browser-${majorVersion}`, 'chrome');
+    }
+  }
+
+  getBrowserDownloadUrl(majorVersion) {
+    const os = getOS();
+    switch (os) {
+      case 'mac':
+        return `https://orbita-browser-mac.gologin.com/orbita-browser-latest-${majorVersion}.tar.gz`;
+      case 'win':
+        return `https://orbita-browser-windows.gologin.com/orbita-browser-latest-${majorVersion}.zip`;
+      case 'macM1':
+        return `https://orbita-browser-mac-arm.gologin.com/orbita-browser-latest-${majorVersion}.tar.gz`;
+      default:
+        return `https://orbita-browser-linux.gologin.com/orbita-browser-latest-${majorVersion}.tar.gz`;
+    }
   }
 
   addLatestVersion(latestVersion) {
@@ -208,6 +184,7 @@ export class BrowserChecker {
       if (ARCH === 'arm64') {
         hashLink = MAC_ARM_HASHFILE_LINK;
       }
+
       resultPath = join(this.#browserPath, MAC_HASH_FILE);
     }
 
@@ -282,13 +259,13 @@ export class BrowserChecker {
     }
   }
 
-  async replaceBrowser() {
+  async replaceBrowser(majorVersion) {
     console.log('Copy Orbita to target path');
     if (PLATFORM === 'darwin') {
-      return rename(join(this.#browserPath, EXTRACTED_FOLDER), join(this.#browserPath, 'orbita-browser'))
+      return rename(join(this.#browserPath, EXTRACTED_FOLDER), join(this.#browserPath, `orbita-browser-${majorVersion}`));
     }
 
-    const targetBrowserPath = join(this.#browserPath, 'orbita-browser');
+    const targetBrowserPath = join(this.#browserPath, `orbita-browser-${majorVersion}`);
     await this.deleteDir(targetBrowserPath);
 
     await this.copyDir(

package/src/cookies/cookies-manager.js

@@ -3,6 +3,8 @@ import { join } from 'path';
 import { open } from 'sqlite';
 import sqlite3 from 'sqlite3';
 
+import { ensureDirectoryExists } from '../utils/common.js';
+
 const { access } = fsPromises;
 const { Database, OPEN_READONLY } = sqlite3;
 
@@ -44,7 +46,11 @@ export const createDBFile = async ({
   await db.run(createCookiesTableQuery);
   await db.close();
 
-  cookiesFileSecondPath && await fsPromises.copyFile(cookiesFilePath, cookiesFileSecondPath).catch(console.log);
+  await ensureDirectoryExists(cookiesFilePath);
+  await ensureDirectoryExists(cookiesFileSecondPath);
+  cookiesFileSecondPath && await fsPromises.copyFile(cookiesFilePath, cookiesFileSecondPath).catch((error) => {
+    console.error('error in copyFile createDBFile', error.message);
+  });
 };
 
 export const getUniqueCookies = async (cookiesArr, cookiesFilePath) => {

package/src/gologin.js

@@ -2,7 +2,7 @@ import { execFile, spawn } from 'child_process';
 import debugDefault from 'debug';
 import decompress from 'decompress';
 import decompressUnzip from 'decompress-unzip';
-import { existsSync, mkdirSync,promises as _promises } from 'fs';
+import { existsSync, mkdirSync, promises as _promises } from 'fs';
 import { get as _get } from 'https';
 import { tmpdir } from 'os';
 import { dirname, join, resolve as _resolve, sep } from 'path';
@@ -29,7 +29,7 @@ import {
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
 import { checkAutoLang } from './utils/browser.js';
-import { API_URL, getOsAdvanced } from './utils/common.js';
+import { API_URL, ensureDirectoryExists, getOsAdvanced } from './utils/common.js';
 import { STORAGE_GATEWAY_BASE_URL } from './utils/constants.js';
 import { get, isPortReachable } from './utils/utils.js';
 export { exitAll, GologinApi } from './gologin-api.js';
@@ -92,8 +92,8 @@ export class GoLogin {
     debug('INIT GOLOGIN', this.profile_id);
   }
 
-  async checkBrowser() {
-    return this.browserChecker.checkBrowser(this.autoUpdateBrowser, this.checkBrowserUpdate);
+  async checkBrowser(majorVersion) {
+    this.executablePath = await this.browserChecker.checkBrowser(majorVersion);
   }
 
   async setProfileId(profile_id) {
@@ -466,6 +466,12 @@ export class GoLogin {
       throw new Error('Error fetching profile data');
     }
 
+    if (!this.executablePath) {
+      const { userAgent } = profile.navigator;
+      const [browserMajorVersion] = userAgent.split('Chrome/')[1].split('.');
+      await this.checkBrowser(browserMajorVersion);
+    }
+
     const { navigator = {}, fonts, os: profileOs } = profile;
     this.fontsMasking = fonts?.enableMasking;
     this.profileOs = profileOs;
@@ -487,6 +493,8 @@ export class GoLogin {
       width: parseInt(screenWidth, 10),
       height: parseInt(screenHeight, 10),
     };
+
+    this.createCookiesTableQuery = profile.createCookiesTableQuery;
     if (profile.storageInfo.isNewProfile) {
       this.isFirstSession = true;
       await this.createZeroProfile(profile.createCookiesTableQuery);
@@ -927,7 +935,7 @@ export class GoLogin {
 
     if (this.waitWebsocket) {
       debug('GETTING WS URL FROM BROWSER');
-      const data = await requests.get(`http://127.0.0.1:${remote_debugging_port}/json/version`, { json: true });
+      const data = await requests.get(`http://127.0.0.1:${remote_debugging_port}/json/version`, { json: true, maxAttempts: 10, retryDelay: 1000 });
 
       debug('WS IS', get(data, 'body.webSocketDebuggerUrl', ''));
       this.is_active = true;
@@ -1377,7 +1385,7 @@ export class GoLogin {
     return { primary, secondary };
   }
 
-  async writeCookiesToFile(cookies) {
+  async writeCookiesToFile(cookies, isSecondTry = false) {
     if (!cookies) {
       cookies = await this.getCookies(this.profile_id);
     }
@@ -1404,10 +1412,26 @@ export class GoLogin {
         }
       }
     } catch (error) {
-      console.log(error.message);
+      if (!isSecondTry && (error.message.includes('table cookies has no column') || error.message.includes('NOT NULL constraint failed'))) {
+        await _promises.rm(cookiesPaths.primary, { recursive: true, force: true });
+        await createDBFile({
+          cookiesFilePath: cookiesPaths.primary,
+          cookiesFileSecondPath: cookiesPaths.secondary,
+          createCookiesTableQuery: this.createCookiesTableQuery,
+        });
+        await this.writeCookiesToFile(cookies, true);
+
+        return;
+      }
+
+      console.error(error.message);
     } finally {
       db && await db.close();
-      await copyFile(cookiesPaths.primary, cookiesPaths.secondary).catch(console.log);
+      await ensureDirectoryExists(cookiesPaths.primary);
+      await ensureDirectoryExists(cookiesPaths.secondary);
+      await copyFile(cookiesPaths.primary, cookiesPaths.secondary).catch((error) => {
+        console.error('error in copyFile', error.message);
+      });
     }
   }
 
@@ -1427,16 +1451,6 @@ export class GoLogin {
   }
 
   async start() {
-    if (!this.executablePath) {
-      await this.checkBrowser();
-    }
-
-    const ORBITA_BROWSER = this.executablePath || this.browserChecker.getOrbitaPath;
-
-    const orbitaBrowserExists = await access(ORBITA_BROWSER).then(() => true).catch(() => false);
-    if (!orbitaBrowserExists) {
-      throw new Error(`Orbita browser is not exists on path ${ORBITA_BROWSER}, check executablePath param`);
-    }
 
     await this.createStartup();
     // await this.createBrowserExtension();

package/src/utils/common.js

@@ -1,4 +1,5 @@
 import { exec } from 'child_process';
+import { promises as fsPromises } from 'fs';
 import { homedir } from 'os';
 import { join, sep } from 'path';
 import { promisify } from 'util';
@@ -34,6 +35,17 @@ const getMacArmSpec = async () => {
   return armVersion;
 };
 
+export const ensureDirectoryExists = async (filePath) => {
+  try {
+    const directory = filePath.substring(0, filePath.lastIndexOf('/'));
+    await fsPromises.mkdir(directory, { recursive: true });
+  } catch (error) {
+    if (error.code !== 'EEXIST') {
+      console.error('Error creating directory:', error.message);
+    }
+  }
+};
+
 const getOsAdvanced = async () => {
   const os = getOS();
   if (!['mac', 'macM1'].includes(os)) {

package/src/utils/constants.js

@@ -1 +1 @@
-export const STORAGE_GATEWAY_BASE_URL = 'https://files-gateway.gologin.com';
+export const STORAGE_GATEWAY_BASE_URL = 'https://storage-worker-test.gologin.com';