gologin 2.1.13 → 2.1.15

package/examples/example-cloud.js

@@ -0,0 +1,17 @@
+import { exitAll, GologinApi } from '../src/gologin-api.js';
+
+const token = process.env.GOLOGIN_API_TOKEN; // get token https://app.gologin.com/personalArea/TokenApi
+const gologin = GologinApi({ token });
+
+async function main() {
+  const { browser } = await gologin.launch({ cloud: true });
+  const page = await browser.newPage();
+  await page.goto('https://iphey.com/', { waitUntil: 'networkidle2' });
+  const status = await page.$eval('.trustworthy:not(.hide)', (elt) =>
+    elt?.innerText?.trim(),
+  );
+
+  return status; // Expecting 'Trustworthy'
+}
+
+main().catch(console.error).then(console.info).finally(exitAll);

package/examples/example-iphey.js

@@ -7,7 +7,7 @@ async function main() {
   const { browser } = await gologin.launch();
   const page = await browser.newPage();
   await page.goto('https://iphey.com/', { waitUntil: 'networkidle2' });
-  const status = await page.$eval('.trustworthy-status:not(.hide)', (elt) =>
+  const status = await page.$eval('.trustworthy:not(.hide)', (elt) =>
     elt?.innerText?.trim(),
   );
 

package/package.json

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

package/src/gologin-api.js

@@ -61,15 +61,20 @@ export function GologinApi({ token }) {
   };
 
   const launchCloudProfile = async (params) => {
-    const profileParam = params.profileId
-      ? `&profile=${params.profileId}`
-      : '';
+    const legacyGologin = createLegacyGologin({
+      ...params,
+      token,
+    });
+
+    if (!params.profileId) {
+      const { id } = await legacyGologin.quickCreateProfile();
+      await legacyGologin.setProfileId(id);
+      params.profileId = id;
+    }
 
-    const geolocationParam = params.geolocation
-      ? `&geolocation=${params.geolocation}`
-      : '';
+    legacyGls.push(legacyGologin);
 
-    const browserWSEndpoint = `https://cloud.gologin.com/connect?token=${token}${profileParam}${geolocationParam}`;
+    const browserWSEndpoint = `https://cloudbrowser.gologin.com/connect?token=${token}&profile=${params.profileId}`;
     const browser = await puppeteer.connect({
       browserWSEndpoint,
       ignoreHTTPSErrors: true,
@@ -94,7 +99,9 @@ export function GologinApi({ token }) {
       Promise.allSettled(
         legacyGls.map((gl) => gl.stopLocal({ posting: false })),
       );
-      process.exit(status);
+      Promise.allSettled(
+        legacyGls.map((gl) => gl.stopRemote({ posting: true })),
+      );
     },
 
     delay,

package/src/gologin.js

@@ -63,6 +63,7 @@ export class GoLogin {
     this.isEmptyFonts = false;
     this.isFirstSession = false;
     this.isCloudHeadless = options.isCloudHeadless ?? true;
+    this.storageGatewayUrl = `${STORAGE_GATEWAY_BASE_URL}/upload`;
 
     this.tmpdir = tmpdir();
     this.autoUpdateBrowser = !!options.autoUpdateBrowser;
@@ -218,12 +219,11 @@ export class GoLogin {
   async postFile(fileName, fileBuff) {
     debug('POSTING FILE', fileBuff.length);
     debug('Getting signed URL for S3');
-    const apiUrl = `${STORAGE_GATEWAY_BASE_URL}/upload`;
 
     const bodyBufferBiteLength = Buffer.byteLength(fileBuff);
     console.log('BUFFER SIZE', bodyBufferBiteLength);
 
-    await requests.put(apiUrl, {
+    await requests.put(this.storageGatewayUrl, {
       headers: {
         Authorization: `Bearer ${this.access_token}`,
         browserId: this.profile_id,
@@ -976,14 +976,14 @@ export class GoLogin {
       false;
 
     if (this.uploadCookiesToServer) {
-      await this.uploadProfileCookiesToServer();
+      const updateResult = await this.uploadProfileDataToServer();
+      this.storageGatewayUrl = updateResult.storageGateway.url;
     }
 
     this.is_stopping = true;
     await this.sanitizeProfile();
 
     if (is_posting) {
-      await this.saveBookmarksToDb();
       await this.commitProfile();
     }
 
@@ -1001,6 +1001,35 @@ export class GoLogin {
     return false;
   }
 
+  async uploadProfileDataToServer() {
+    const cookies = await loadCookiesFromFile(this.cookiesFilePath);
+    const bookmarks = await getCurrentProfileBookmarks(this.bookmarksFilePath);
+
+    const body = {
+      cookies,
+      bookmarks,
+      isCookiesEncrypted: true,
+      isStorageGateway: true,
+    };
+
+    const updateResult = await requests.post(`${API_URL}/browser/features/profile/${this.profile_id}/update_after_close`, {
+      headers: {
+        Authorization: `Bearer ${this.access_token}`,
+        'User-Agent': 'gologin-api',
+      },
+      json: body,
+      maxAttempts: 3,
+      retryDelay: 2000,
+      timeout: 20 * 1000,
+    }).catch((e) => {
+      console.log(e);
+
+      return e;
+    });
+
+    return updateResult.body;
+  }
+
   async stopBrowser() {
     if (!this.port) {
       throw new Error('Empty GoLogin port');