gologin 2.0.14 → 2.0.15

package/package.json

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

package/src/cookies/cookies-manager.js

@@ -1,5 +1,9 @@
 import { open } from 'sqlite';
 import sqlite3 from 'sqlite3';
+import { promises as fsPromises } from 'fs';
+import { join } from 'path';
+
+const { access } = fsPromises;
 const { Database, OPEN_READONLY } = sqlite3;
 
 const MAX_SQLITE_VARIABLES = 76;
@@ -171,3 +175,15 @@ export const chunk = (arr, chunkSize = 1, cache = []) => {
 
   return cache;
 }
+
+export const getCookiesFilePath = async (profileId, tmpdir) => {
+  const baseCookiesFilePath = join(tmpdir, `gologin_profile_${profileId}`, 'Default', 'Cookies');
+  const bypassCookiesFilePath = join(tmpdir, `gologin_profile_${profileId}`, 'Default', 'Network', 'Cookies');
+
+  return access(baseCookiesFilePath)
+    .then(() => baseCookiesFilePath)
+    .catch(() => access(bypassCookiesFilePath)
+      .then(() => bypassCookiesFilePath)
+      .catch(() => baseCookiesFilePath)
+    );
+}

package/src/gologin.js

@@ -17,7 +17,12 @@ 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 {
+  getChunckedInsertValues,
+  getDB,
+  loadCookiesFromFile,
+  getCookiesFilePath,
+} 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';
@@ -57,7 +62,7 @@ export class GoLogin {
     this.autoUpdateBrowser = !!options.autoUpdateBrowser;
     this.browserChecker = new BrowserChecker(options.skipOrbitaHashChecking);
     this.uploadCookiesToServer = options.uploadCookiesToServer || false;
-    this.writeCookesFromServer = options.writeCookesFromServer;
+    this.writeCookiesFromServer = options.writeCookiesFromServer;
     this.remote_debugging_port = options.remote_debugging_port || 0;
     this.timezone = options.timezone;
     this.extensionPathsToInstall = [];
@@ -71,7 +76,6 @@ 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);
@@ -83,7 +87,7 @@ export class GoLogin {
 
   async setProfileId(profile_id) {
     this.profile_id = profile_id;
-    this.cookiesFilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`, 'Default', 'Network', 'Cookies');
+    this.cookiesFilePath = await getCookiesFilePath(profile_id, this.tmpdir);
     this.profile_zip_path = join(this.tmpdir, `gologin_${this.profile_id}.zip`);
   }
 
@@ -582,8 +586,9 @@ export class GoLogin {
     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) {
+    debug('writeCookiesFromServer', this.writeCookiesFromServer);
+    this.cookiesFilePath = await getCookiesFilePath(this.profile_id, this.tmpdir);
+    if (this.writeCookiesFromServer) {
       await this.writeCookiesToFile();
     }