gologin 1.0.53 → 1.0.55

package/extensions-manager.js

@@ -177,41 +177,6 @@ class ExtensionsManager extends UserExtensionsManager {
     this.#useCookiesExt = useCookiesExt;
   }
 
-  async getExtensionsStrToIncludeAsOrbitaParam(profileExtensions = []) {
-    if (!(Array.isArray(profileExtensions) && profileExtensions.length)) {
-      return [];
-    }
-
-    const folders = await Promise.all([
-      readdir(CHROME_EXTENSIONS_PATH).then(folderNames => folderNames.map(folderName => path.join(CHROME_EXTENSIONS_PATH, folderName))),
-      readdir(USER_EXTENSIONS_PATH).then(folderNames => folderNames.map(folderName => path.join(USER_EXTENSIONS_PATH, folderName))),
-    ]);
-
-    const chromeExtList = [].concat.apply([], folders).filter(Boolean);
-
-    if (!chromeExtList.length) {
-      return [];
-    }
-
-    const formattedIdsList = chromeExtList.map((el) => {
-      const [folderName] = el.split(path.sep).reverse();
-      const [originalId] = folderName.split('@');
-      return {
-        originalId,
-        path: el,
-      };
-    });
-
-    return profileExtensions.map((el) => {
-      const extExisted = formattedIdsList.find(chromeExtPathElem => chromeExtPathElem.originalId === el);
-      if (!extExisted) {
-        return '';
-      }
-
-      return extExisted.path;
-    }).filter(Boolean);
-  }
-
   async updateExtensions() {
     const fileList = await readdir(CHROME_EXTENSIONS_PATH).catch(() => []);
     if (!fileList.length) {

package/gologin.js

@@ -426,15 +426,19 @@ class GoLogin {
             console.log('checkChromeExtensions error: ', e);
             return { profileExtensionsCheckRes: [] };
           }),
-          ExtensionsManagerInst.checkLocalUserChromeExtensions().catch((error) => {
-            console.log('checkUserChromeExtensions error: ', error);
-            return null;
-          }),
+          ExtensionsManagerInst.checkLocalUserChromeExtensions(userChromeExtensions)
+            .then(res => ({ profileUserExtensionsCheckRes: res }))
+            .catch((error) => {
+              console.log('checkUserChromeExtensions error: ', error);
+              return null;
+            }),
         ];
         const extensionsResult = await Promise.all(promises);
 
-        const profileExtensionsPathRes = extensionsResult.find(el => 'profileExtensionsCheckRes' in el) || {};
-        profileExtensionsCheckRes = profileExtensionsPathRes.profileExtensionsCheckRes;
+        const profileExtensionPathRes = extensionsResult.find(el => 'profileExtensionsCheckRes' in el) || {};
+        const profileUserExtensionPathRes = extensionsResult.find(el => 'profileUserExtensionsCheckRes' in el);
+        profileExtensionsCheckRes =
+          (profileExtensionPathRes?.profileExtensionsCheckRes || []).concat(profileUserExtensionPathRes?.profileUserExtensionsCheckRes || []);
       }
 
       let extSettings;

package/package.json

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

package/user-extensions-manager.js

@@ -194,7 +194,11 @@ class UserExtensionsManager {
     }
   }
 
-  checkLocalUserChromeExtensions = async () => {
+  checkLocalUserChromeExtensions = async (userChromeExtensions) => {
+    if (!userChromeExtensions.length) {
+      return;
+    }
+
     const extensionsToDownloadPaths = await request.post(`${this.#API_BASE_URL}/extensions/user_chrome_extensions_paths`, {
       json: true,
       fullResponse: false,
@@ -208,11 +212,14 @@ class UserExtensionsManager {
       }
     }) || [];
 
-    if (!extensionsToDownloadPaths.length) {
-      return;
+    const extensionsToDownloadPathsFiltered =
+      extensionsToDownloadPaths.filter(extPath => userChromeExtensions.some(extId => extPath.includes(extId)));
+
+    if (!extensionsToDownloadPathsFiltered.length) {
+      return this.getExtensionsStrToIncludeAsOrbitaParam(userChromeExtensions, USER_EXTENSIONS_PATH);
     }
 
-    const promises = extensionsToDownloadPaths.map(async awsPath => {
+    const promises = extensionsToDownloadPathsFiltered.map(async awsPath => {
       const [basePath] = awsPath.split('?');
       const [extId] = basePath.split('/').reverse();
       const zipPath = `${path.join(USER_EXTENSIONS_PATH, extId)}.zip`;
@@ -230,7 +237,7 @@ class UserExtensionsManager {
     const zipPaths = await Promise.all(promises).catch(() => []);
 
     if (!zipPaths) {
-      return;
+      return this.getExtensionsStrToIncludeAsOrbitaParam(userChromeExtensions, USER_EXTENSIONS_PATH);
     }
 
     const extractionPromises = composeExtractionPromises(zipPaths, USER_EXTENSIONS_PATH);
@@ -240,6 +247,39 @@ class UserExtensionsManager {
       const [downloadedFolders] = zipPaths.map(archivePath => archivePath.split(path.sep).reverse());
       this.#existedUserExtensions = [...this.#existedUserExtensions, ...downloadedFolders];
     }
+
+    return this.getExtensionsStrToIncludeAsOrbitaParam(userChromeExtensions, USER_EXTENSIONS_PATH);
+  }
+
+  async getExtensionsStrToIncludeAsOrbitaParam(profileExtensions = [], folderPath = CHROME_EXTENSIONS_PATH) {
+    if (!(Array.isArray(profileExtensions) && profileExtensions.length)) {
+      return [];
+    }
+
+    const folders = await readdir(folderPath).then(folderNames => folderNames.map(folderName => path.join(folderPath, folderName)));
+
+    if (!folders.length) {
+      return [];
+    }
+
+    const formattedIdsList = folders.map((el) => {
+      const [folderName] = el.split(path.sep).reverse();
+      const [originalId] = folderName.split('@');
+      return {
+        originalId,
+        path: el,
+      };
+    });
+
+    return profileExtensions.map((el) => {
+      const extExisted = formattedIdsList.find(chromeExtPathElem => chromeExtPathElem.originalId === el);
+
+      if (!extExisted) {
+        return '';
+      }
+
+      return extExisted.path;
+    }).filter(Boolean);
   }
 
   async getExtensionsNameAndImage(extensionsIds, pathToExtensions) {