gologin 2.0.5 → 2.0.7

package/examples/example-create-profile.js

@@ -18,6 +18,10 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
       resolution: '1024x768',
       platform: 'mac',
     },
+    proxyEnabled: false,
+    proxy: {
+      mode: 'none',
+    }
   });
 
   console.log('profile id=', profile_id);

package/package.json

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

package/src/browser/browser-user-data-manager.js

@@ -1,13 +1,17 @@
 import { createHash } from 'crypto';
 import { createWriteStream, promises as _promises, rmdirSync } from 'fs';
 import { homedir, tmpdir } from 'os';
-import { join, resolve, sep } from 'path';
+import { join, resolve, sep, dirname } from 'path';
+import { fileURLToPath } from 'url';
 import requestretry from 'requestretry';
 
 import { fontsCollection } from '../../fonts.js';
 
 const { access, readFile, writeFile, mkdir, readdir, copyFile, rename } = _promises;
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
 const FONTS_URL = 'https://fonts.gologin.com/';
 const FONTS_DIR_NAME = 'fonts';
 
@@ -115,7 +119,7 @@ export const copyFontsConfigFile = async (profilePath) => {
     return;
   }
 
-  const fileContent = await readFile(resolve(__dirname, 'fonts_config'), 'utf-8');
+  const fileContent = await readFile(resolve(__dirname, '..', '..', 'fonts_config'), 'utf-8');
   const result = fileContent.replace(/\$\$GOLOGIN_FONTS\$\$/g, join(profilePath, FONTS_DIR_NAME));
 
   const defaultFolderPath = join(profilePath, 'Default');

package/src/gologin.js

@@ -1,4 +1,4 @@
-import { exec as execNonPromise, execFile, spawn } from 'child_process';
+import { execFile, spawn } from 'child_process';
 import debug from 'debug';
 import decompress from 'decompress';
 import decompressUnzip from 'decompress-unzip';
@@ -9,7 +9,6 @@ import { join, resolve as _resolve,sep } from 'path';
 import requests from 'requestretry';
 import rimraf from 'rimraf';
 import ProxyAgent from 'simple-proxy-agent';
-import util from 'util';
 
 import { fontsCollection } from '../fonts.js';
 import { updateProfileProxy, updateProfileResolution, updateProfileUserAgent } from './browser/browser-api.js';
@@ -19,8 +18,8 @@ import { composeFonts, downloadCookies, setExtPathsAndRemoveDeleted,
 import { getChunckedInsertValues, getDB, loadCookiesFromFile } from './cookies/cookies-manager.js';
 import ExtensionsManager from './extensions/extensions-manager.js';
 import { archiveProfile } from './profile/profile-archiver.js';
+import { get, isPortReachable } from './utils/utils.js';
 import { API_URL } from './utils/common.js';
-import { get } from './utils/utils.js';
 
 const exec = util.promisify(execNonPromise);
 
@@ -644,27 +643,27 @@ export class GoLogin {
     debug('CHECKING PORT AVAILABLE', port);
 
     try {
-      const { stdout, stderr } = await exec(`lsof -i:${port}`);
-      if (stdout && stdout.match(/LISTEN/gmi)) {
-        debug(`PORT ${port} IS BUSY`);
+      const portAvailable = await isPortReachable(port, { host: 'localhost' });
+      if (portAvailable) {
+        debug(`PORT ${port} IS OPEN`);
 
-        return false;
+        return true;
       }
     } catch (e) {
       console.log(e);
     }
 
-    debug(`PORT ${port} IS OPEN`);
+    debug(`PORT ${port} IS BUSY`);
 
-    return true;
+    return false;
   }
 
   async getRandomPort() {
     let port = this.getRandomInt(20000, 40000);
-    let port_available = this.checkPortAvailable(port);
-    while (!port_available) {
+    let portAvailable = await this.checkPortAvailable(port);
+    while (!portAvailable) {
       port = this.getRandomInt(20000, 40000);
-      port_available = await this.checkPortAvailable(port);
+      portAvailable = await this.checkPortAvailable(port);
     }
 
     return port;

package/src/profile/profile-archiver.js

@@ -14,7 +14,12 @@ export const archiveProfile = async (profileFolder = '', tryAgain = true) => {
 
   const archive = new AdmZip();
   archive.addLocalFolder(path.join(profileFolder, 'Default'), 'Default');
-  archive.addLocalFile(path.join(profileFolder, 'First Run'));
+  try {
+    archive.addLocalFile(path.join(profileFolder, 'First Run'));
+  } catch(e) {
+    archive.addFile('First Run', Buffer.from(''));
+  }
+
   const dirsToRemove = getDirectoriesForArchiver();
   dirsToRemove.forEach(entry => archive.deleteFile(entry));
 

package/src/utils/utils.js

@@ -1,3 +1,5 @@
+import net from 'node:net';
+
 export const get = (value, path, defaultValue) =>
   String(path).split('.').reduce((acc, v) => {
     try {
@@ -9,3 +11,12 @@ export const get = (value, path, defaultValue) =>
     return acc;
   }, value);
 
+export const isPortReachable = (port) => new Promise(resolve => {
+  const checker = net.createServer()
+    .once('error', () => {
+      resolve(false);
+    })
+    .once('listening', () => checker.once('close', () => resolve(true)).close())
+    .listen(port);
+});
+