gologin 2.1.7 → 2.1.9

package/package.json

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

package/src/cookies/cookies-manager.js

@@ -57,6 +57,13 @@ export const createDBFile = async ({
   cookiesFileSecondPath && await fsPromises.copyFile(cookiesFilePath, cookiesFileSecondPath).catch(console.log);
 };
 
+export const getUniqueCookies = async (cookiesArr, cookiesFilePath) => {
+  const cookiesInFile = await loadCookiesFromFile(cookiesFilePath);
+  const existingCookieNames = new Set(cookiesInFile.map(c => `${c.name}-${c.value.toString('base64')}`));
+
+  return cookiesArr.filter(cookie => !existingCookieNames.has(`${cookie.name}-${cookie.value.toString('base64')}`));
+};
+
 export const getChunckedInsertValues = (cookiesArr) => {
   const todayUnix = Math.floor(new Date().getTime() / 1000.0);
   const chunckedCookiesArr = chunk(cookiesArr, MAX_SQLITE_VARIABLES);

package/src/gologin.js

@@ -22,6 +22,7 @@ import {
   getChunckedInsertValues,
   getCookiesFilePath,
   getDB,
+  getUniqueCookies,
   loadCookiesFromFile,
 } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
@@ -59,7 +60,7 @@ export class GoLogin {
     this.profileOs = 'lin';
     this.waitWebsocket = options.waitWebsocket ?? true;
     this.isEmptyFonts = false;
-
+    this.isFirstSession = false;
     this.isCloudHeadless = options.isCloudHeadless ?? true;
 
     this.tmpdir = tmpdir();
@@ -397,7 +398,7 @@ export class GoLogin {
     const preferencesFilePath = _resolve(defaultFilePath, 'Preferences');
     const bookmarksFilePath = _resolve(defaultFilePath, 'Bookmarks');
     const cookiesFilePath = _resolve(defaultFilePath, 'Network', 'Cookies');
-    const secondCookiesFilePath = _resolve(defaultFilePath, 'Cookies');
+    const cookiesFileSecondPath = _resolve(defaultFilePath, 'Cookies');
 
     await mkdir(_resolve(defaultFilePath, 'Network'), { recursive: true }).catch(console.log);
 
@@ -406,7 +407,7 @@ export class GoLogin {
       writeFile(bookmarksFilePath, JSON.stringify(zeroProfileBookmarks), { mode: 0o666 }),
       createDBFile({
         cookiesFilePath,
-        secondCookiesFilePath,
+        cookiesFileSecondPath,
         createCookiesTableQuery,
       }),
     ]);
@@ -439,8 +440,10 @@ export class GoLogin {
       height: parseInt(screenHeight, 10),
     };
     if (profile.storageInfo.isNewProfile) {
+      this.isFirstSession = true;
       await this.createZeroProfile(profile.createCookiesTableQuery);
     } else {
+      this.isFirstSession = false;
       await this.downloadProfileAndExtract(profile, local);
     }
 
@@ -609,6 +612,7 @@ export class GoLogin {
     gologin.screenHeight = this.resolution.height;
     debug('writeCookiesFromServer', this.writeCookiesFromServer);
     this.cookiesFilePath = await getCookiesFilePath(this.profile_id, this.tmpdir);
+
     if (this.writeCookiesFromServer) {
       await this.writeCookiesToFile(profile.cookies?.cookies);
     }
@@ -922,7 +926,7 @@ export class GoLogin {
         params = params.concat(this.extra_params);
       }
 
-      if (this.restoreLastSession) {
+      if (!this.isFirstSession && this.restoreLastSession) {
         params.push('--restore-last-session');
       }
 
@@ -1360,25 +1364,22 @@ export class GoLogin {
     const resultCookies = cookies.map((el) => ({ ...el, value: Buffer.from(el.value) }));
     let db;
     const profilePath = join(this.tmpdir, `gologin_profile_${this.profile_id}`);
-    console.log('profilePath', profilePath);
+
     const defaultFilePath = _resolve(profilePath, 'Default');
-    const cookiesFilePath = _resolve(defaultFilePath, 'Network', 'Cookies');
-    const secondCookiesFilePath = _resolve(defaultFilePath, 'Cookies');
+    const cookiesFilePath = _resolve(defaultFilePath, 'Cookies');
+    const secondCookiesFilePath = _resolve(defaultFilePath, 'Network', 'Cookies');
     try {
       db = await getDB(cookiesFilePath, false);
-      if (resultCookies.length) {
-        const chunckInsertValues = getChunckedInsertValues(resultCookies);
-
+      const cookiesToInsert = await getUniqueCookies(resultCookies, cookiesFilePath);
+      // console.log('cookiesToInsert', cookiesToInsert);
+      if (cookiesToInsert.length) {
+        const chunckInsertValues = getChunckedInsertValues(cookiesToInsert);
+        console.log('chunckInsertValues', chunckInsertValues);
         for (const [query, queryParams] of chunckInsertValues) {
           const insertStmt = await db.prepare(query);
           await insertStmt.run(queryParams);
           await insertStmt.finalize();
         }
-      } else {
-        const query = 'delete from cookies';
-        const insertStmt = await db.prepare(query);
-        await insertStmt.run();
-        await insertStmt.finalize();
       }
     } catch (error) {
       console.log(error.message);