gologin 2.0.23 → 2.0.26

package/.eslintrc.json

@@ -30,10 +30,7 @@
             ]
           }
         ],
-        "linebreak-style": [
-          "warn",
-          "windows"
-        ],
+        "linebreak-style": 0,
         "quotes": [
           "warn",
           "single"
@@ -55,12 +52,6 @@
           "warn",
           "as-needed"
         ],
-        "camelcase": [
-          "warn",
-          {
-            "ignoreGlobals": true
-          }
-        ],
         "curly": [
           "warn",
           "all"

package/package.json

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

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';
@@ -19,14 +19,15 @@ import {
 } from './browser/browser-user-data-manager.js';
 import {
   getChunckedInsertValues,
+  getCookiesFilePath,
   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';
 import { API_URL } from './utils/common.js';
+import { STORAGE_GATEWAY_BASE_URL } from './utils/constants.js';
 import { get, isPortReachable } from './utils/utils.js';
 
 const { access, unlink, writeFile, readFile } = _promises;
@@ -197,15 +198,19 @@ export class GoLogin {
 
     const token = this.access_token;
     debug('getProfileS3 token=', token, 'profile=', this.profile_id, 's3path=', s3path);
+    const downloadURL = `${STORAGE_GATEWAY_BASE_URL}/download`;
 
-    const s3url = `https://gprofiles-new.gologin.com/${s3path}`.replace(/\s+/mg, '+');
-    debug('loading profile from public s3 bucket, url=', s3url);
-    const profileResponse = await requests.get(s3url, {
+    debug('loading profile from public s3 bucket, url=', downloadURL);
+    const profileResponse = await requests.get(downloadURL, {
       encoding: null,
+      headers: {
+        Authorization: `Bearer ${token}`,
+        browserId: this.profile_id,
+      },
     });
 
     if (profileResponse.statusCode !== 200) {
-      debug(`Gologin S3 BUCKET ${s3url} response error ${profileResponse.statusCode}  - use empty`);
+      debug(`Gologin S3 BUCKET ${downloadURL} response error ${profileResponse.statusCode}  - use empty`);
 
       return '';
     }
@@ -216,27 +221,15 @@ export class GoLogin {
   async postFile(fileName, fileBuff) {
     debug('POSTING FILE', fileBuff.length);
     debug('Getting signed URL for S3');
-    const apiUrl = `${API_URL}/browser/${this.profile_id}/storage-signature`;
-
-    const signedUrl = await requests.get(apiUrl, {
-      headers: {
-        Authorization: `Bearer ${this.access_token}`,
-        'user-agent': 'gologin-api',
-      },
-      maxAttempts: 3,
-      retryDelay: 2000,
-      timeout: 10 * 1000,
-      fullResponse: false,
-    });
-
-    const [uploadedProfileUrl] = signedUrl.split('?');
+    const apiUrl = `${STORAGE_GATEWAY_BASE_URL}/upload`;
 
-    console.log('Uploading profile by signed URL to S3');
     const bodyBufferBiteLength = Buffer.byteLength(fileBuff);
     console.log('BUFFER SIZE', bodyBufferBiteLength);
 
-    await requests.put(signedUrl, {
+    await requests.put(apiUrl, {
       headers: {
+        Authorization: `Bearer ${this.access_token}`,
+        browserId: this.profile_id,
         'Content-Type': 'application/zip',
         'Content-Length': bodyBufferBiteLength,
       },
@@ -249,25 +242,14 @@ export class GoLogin {
       fullResponse: false,
     });
 
-    const uploadedProfileMetadata = await requests.head(uploadedProfileUrl, {
-      maxAttempts: 3,
-      retryDelay: 2000,
-      timeout: 10 * 1000,
-      fullResponse: true,
-    });
-
-    const uploadedFileLength = +uploadedProfileMetadata.headers['content-length'];
-    if (uploadedFileLength !== bodyBufferBiteLength) {
-      console.log('Uploaded file is incorrect. Retry with China File size:', uploadedFileLength);
-      throw new Error('Uploaded file is incorrect. Retry with China File size: ' + uploadedFileLength);
-    }
-
     console.log('Profile has been uploaded to S3 successfully');
   }
 
   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;

package/src/utils/constants.js

@@ -0,0 +1 @@
+export const STORAGE_GATEWAY_BASE_URL = 'https://files-gateway.gologin.com';