gologin 2.1.17 → 2.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "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

@@ -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';
@@ -493,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);
@@ -507,6 +509,7 @@ export class GoLogin {
     const prefFileExists = await access(pref_file_name).then(() => true).catch(() => false);
     if (!prefFileExists) {
       debug('Preferences file not exists waiting', pref_file_name, '. Using empty profile');
+      await mkdir(join(profilePath, 'Default'), { recursive: true });
       await writeFile(pref_file_name, '{}');
     }
 
@@ -1383,7 +1386,7 @@ export class GoLogin {
     return { primary, secondary };
   }
 
-  async writeCookiesToFile(cookies) {
+  async writeCookiesToFile(cookies, isSecondTry = false) {
     if (!cookies) {
       cookies = await this.getCookies(this.profile_id);
     }
@@ -1410,10 +1413,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);
+      });
     }
   }
 

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)) {