gologin 2.0.24 → 2.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gologin",
-  "version": "2.0.24",
+  "version": "2.0.27",
   "description": "A high-level API to control Orbita browser over GoLogin API",
   "main": "./src/gologin.js",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "git+https://github.com/gologinapp/gologin.git"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "type": "module",
   "author": "The GoLogin Authors",

package/src/gologin.js

@@ -5,7 +5,7 @@ import decompressUnzip from 'decompress-unzip';
 import { existsSync, mkdirSync, promises as _promises } from 'fs';
 import { get as _get } from 'https';
 import { tmpdir } from 'os';
-import { join, resolve as _resolve,sep } from 'path';
+import { dirname, join, resolve as _resolve, sep } from 'path';
 import requests from 'requestretry';
 import rimraf from 'rimraf';
 import ProxyAgent from 'simple-proxy-agent';
@@ -35,8 +35,6 @@ const { access, unlink, writeFile, readFile } = _promises;
 const SEPARATOR = sep;
 const OS_PLATFORM = process.platform;
 
-// process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
-
 const debug = debugDefault('gologin');
 const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
@@ -60,7 +58,7 @@ export class GoLogin {
       this.waitWebsocket = false;
     }
 
-    this.isCloudHeadless = options.isCloudHeadless || true;
+    this.isCloudHeadless = options.isCloudHeadless ?? true;
     this.isNewCloudBrowser = true;
     if (options.isNewCloudBrowser === false) {
       this.isNewCloudBrowser = false;
@@ -247,7 +245,9 @@ export class GoLogin {
 
   async emptyProfileFolder() {
     debug('get emptyProfileFolder');
-    const profile = await readFile(_resolve(__dirname, 'zero_profile.zip'));
+    const currentDir = dirname(new URL(import.meta.url).pathname);
+    const zeroProfilePath = join(currentDir, '..', 'zero_profile.zip');
+    const profile = await readFile(_resolve(zeroProfilePath));
     debug('emptyProfileFolder LENGTH ::', profile.length);
 
     return profile;
@@ -1422,7 +1422,7 @@ export class GoLogin {
         return this.waitDebuggingUrl(delay_ms, try_count + 1, remoteOrbitaUrl);
       }
 
-      return { 'status': 'failure', wsUrl, 'message': 'Check proxy settings', 'profile_id': this.profile_id };
+      return { status: 'failure', wsUrl, message: 'Check proxy settings', 'profile_id': this.profile_id };
     }
 
     const remoteOrbitaUrlWithoutProtocol = remoteOrbitaUrl.replace('https://', '');
@@ -1440,20 +1440,27 @@ export class GoLogin {
     }
     */
 
-    // if (profileResponse.body === 'ok') {
     const profile = await this.getProfile();
-
     const profileResponse = await requests.post(`${API_URL}/browser/${this.profile_id}/web`, {
       headers: { 'Authorization': `Bearer ${this.access_token}` },
       json: { isNewCloudBrowser: this.isNewCloudBrowser, isHeadless: this.isCloudHeadless },
-    });
+    }).catch(() => null);
 
-    debug('profileResponse', profileResponse.statusCode, profileResponse.body);
+    if (!profileResponse) {
+      throw new Error('invalid request');
+    }
+
+    const { body, statusCode } = profileResponse;
+    debug('profileResponse', statusCode, body);
 
     if (profileResponse.statusCode === 401) {
       throw new Error('invalid token');
     }
 
+    if (body.status === 'profileStatuses.pending') {
+      return { status: 'pending', message: 'remote browser is being prepared, please try in 1 minute.' };
+    }
+
     let remoteOrbitaUrl = `https://${this.profile_id}.orbita.gologin.com`;
     if (this.isNewCloudBrowser) {
       if (!profileResponse.body.remoteOrbitaUrl) {
@@ -1487,10 +1494,10 @@ export class GoLogin {
 
     const wsUrl = await this.waitDebuggingUrl(delay_ms, 0, remoteOrbitaUrl);
     if (wsUrl !== '') {
-      return { 'status': 'success', wsUrl };
+      return { status: 'success', wsUrl };
     }
 
-    return { 'status': 'failure', 'message': profileResponse.body };
+    return { status: 'failure', message: body };
   }
 
   async stopRemote() {