@letsscrapedata/controller 0.0.70 → 0.1.0

package/dist/index.js

@@ -1219,6 +1219,7 @@ var PlaywrightPage = class extends EventEmitter {
             requestMethod,
             requestUrl,
             requestData,
+            resourceType: request.resourceType(),
             responseData
           });
           loginfo(`##browser cache matched response: ${requestUrl}`);
@@ -1304,6 +1305,9 @@ var PlaywrightPage = class extends EventEmitter {
     logdbg(`##browser LsdPage ${this.#pageId} is allocated`);
     return true;
   }
+  userAgent() {
+    return this.#lsdBrowserContext.userAgent();
+  }
   async waitForElement(selector, options = {}) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -1418,6 +1422,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
   #browserContextIdx;
   #browserContext;
   #browserContextCreationMethod;
+  #userAgent;
   #apiContext;
   #createTime;
   #lastStatusUpdateTime;
@@ -1445,8 +1450,15 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         await lsdPage.maximizeViewport();
       }
     }
+    if (!this.#userAgent && this.#lsdPages.length > 0) {
+      const lsdPage = this.#lsdPages[0];
+      const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+      if (typeof userAgent === "string" && userAgent) {
+        this.#userAgent = userAgent;
+      }
+    }
   }
-  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, maxViewportOfNewPage = true) {
+  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, userAgent = "", maxViewportOfNewPage = true) {
     if (!lsdBrowser || typeof lsdBrowser.browserContexts !== "function") {
       throw new Error(`Invalid lsdBrowser parameter`);
     }
@@ -1459,6 +1471,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
     this.#browserContextIdx = browserContextIdx;
     this.#browserContext = browserContext;
     this.#browserContextCreationMethod = browserContextCreationMethod;
+    this.#userAgent = userAgent;
     const apiRequestContext = browserContext.request;
     this.#apiContext = new PlaywrightApiContext(apiRequestContext);
     const currentTime = getCurrentUnixTime2();
@@ -1612,6 +1625,12 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       }
       lsdPage = this.#lsdPages.find((p) => p.isFree());
       if (lsdPage) {
+        if (!this.#userAgent) {
+          const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+          if (typeof userAgent === "string" && userAgent) {
+            this.#userAgent = userAgent;
+          }
+        }
         lsdPage.use();
         this.#freeGettingLock();
         return lsdPage;
@@ -1718,6 +1737,9 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       return false;
     }
   }
+  userAgent() {
+    return this.#userAgent;
+  }
   _origBrowserContext() {
     return this.#browserContext;
   }
@@ -1725,7 +1747,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
 
 // src/playwright/browser.ts
 var PlaywrightBrowser = class _PlaywrightBrowser extends EventEmitter3 {
-  static #supportedBrowserTypes = ["chromium", "firefox", "webkit"];
+  static #supportedBrowserTypes = ["chrome", "chromium", "firefox", "webkit"];
   static doesSupport(browserType) {
     return _PlaywrightBrowser.#supportedBrowserTypes.includes(browserType);
   }
@@ -1787,7 +1809,7 @@ var PlaywrightBrowser = class _PlaywrightBrowser extends EventEmitter3 {
     }
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : true;
     for (const browserContext of browserContexts) {
-      const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+      const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), "", maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
     }
     browser.on("disconnected" /* BROWSER_DISCONNECTED */, () => {
@@ -1839,12 +1861,17 @@ var PlaywrightBrowser = class _PlaywrightBrowser extends EventEmitter3 {
       const { proxyUrl: server, username, password } = proxy;
       browserContextOptions.proxy = { server, username, password };
     }
-    if (options?.userAgent) {
-      browserContextOptions.userAgent = options.userAgent;
+    let userAgent = options?.userAgent ? options.userAgent : this.#options.userAgent;
+    const lsdLaunchOptions = this.#options;
+    if (!userAgent && lsdLaunchOptions.headless && lsdLaunchOptions.headlessUserAgent) {
+      userAgent = lsdLaunchOptions.headlessUserAgent;
+    }
+    if (userAgent) {
+      browserContextOptions.userAgent = userAgent;
     }
     const browserContext = await this.#browser.newContext(browserContextOptions);
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
-    const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+    const lsdBrowserContext = new PlaywrightBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
     return lsdBrowserContext;
   }
@@ -2227,6 +2254,7 @@ var PuppeteerPage = class extends EventEmitter4 {
   #page;
   #status;
   #pageId;
+  #userAgent;
   #closeWhenFree;
   #requestInterceptionNum;
   #responseInterceptionNum;
@@ -2250,7 +2278,7 @@ var PuppeteerPage = class extends EventEmitter4 {
     }
     const origCookies = await page.cookies();
     const cookies = origCookies.map((origCookie) => {
-      const { name, value, domain, path, expires, httpOnly, secure, sameSite = "Lax" } = origCookie;
+      const { name, value, domain, path, expires, httpOnly = false, secure, sameSite = "Lax" } = origCookie;
       return { name, value, domain, path, expires, httpOnly, secure, sameSite };
     });
     return cookies;
@@ -2460,6 +2488,7 @@ var PuppeteerPage = class extends EventEmitter4 {
     const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0, relatedId = 0, misc = {} } = pageInfo ? pageInfo : {};
     this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId, relatedId, misc };
     this.#pageId = `PuppeteerPage-${browserIdx}-${browserContextIdx}-${pageIdx}`;
+    this.#userAgent = browserContext.userAgent();
     this.#closeWhenFree = false;
     this.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;
@@ -3028,6 +3057,7 @@ var PuppeteerPage = class extends EventEmitter4 {
               requestMethod,
               requestUrl,
               requestData,
+              resourceType: request.resourceType(),
               responseData
             });
             loginfo(`##browser cache matched response: ${requestUrl}`);
@@ -3055,10 +3085,11 @@ var PuppeteerPage = class extends EventEmitter4 {
     return await this.#lsdBrowserContext.setStateData(stateData);
   }
   async setUserAgent(userAgent) {
-    if (!this.#page) {
+    if (!this.#page || !userAgent) {
       throw new Error("No valid page");
     }
     await this.#page.setUserAgent(userAgent);
+    this.#userAgent = userAgent;
     return true;
   }
   async setViewportSize(viewPortSize) {
@@ -3099,6 +3130,9 @@ var PuppeteerPage = class extends EventEmitter4 {
     logdbg(`##browser LsdPage ${this.#pageId} is allocated`);
     return true;
   }
+  userAgent() {
+    return this.#userAgent;
+  }
   async waitForElement(selector, options = {}) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -3182,9 +3216,9 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
   #browserContext;
   #browserContextCreationMethod;
   /**
-   * the userAgent of pages in this browserContext if userAgent
-   * * Notice: it is not the actual userAgent if !#userAgent (ignored if !#userAgent)
+   * userAgent of BrowserContext
    */
+  #bcUserAgent;
   #userAgent;
   #createTime;
   #lastStatusUpdateTime;
@@ -3211,8 +3245,15 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       if (this.#maxViewportOfNewPage) {
         await lsdPage.maximizeViewport();
       }
-      if (this.#userAgent) {
-        await lsdPage.setUserAgent(this.#userAgent);
+      if (this.#bcUserAgent) {
+        await lsdPage.setUserAgent(this.#bcUserAgent);
+      }
+    }
+    if (!this.#userAgent && this.#lsdPages.length > 0) {
+      const lsdPage = this.#lsdPages[0];
+      const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+      if (typeof userAgent === "string" && userAgent) {
+        this.#userAgent = userAgent;
       }
     }
   }
@@ -3229,6 +3270,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
     this.#browserContextIdx = browserContextIdx;
     this.#browserContext = browserContext;
     this.#browserContextCreationMethod = browserContextCreationMethod;
+    this.#bcUserAgent = userAgent;
     this.#userAgent = userAgent;
     const currentTime = getCurrentUnixTime5();
     this.#createTime = currentTime;
@@ -3259,9 +3301,6 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
           const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime2, lastStatusUpdateTime: currentTime2, taskId: 0, relatedId: 0, misc: {} };
           const lsdPage = new PuppeteerPage(this, page, pageInfo2);
           this.#lsdPages.push(lsdPage);
-          if (this.#userAgent) {
-            await lsdPage.setUserAgent(this.#userAgent);
-          }
           if (this.#maxViewportOfNewPage) {
             await lsdPage.maximizeViewport();
           }
@@ -3389,6 +3428,9 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
         return null;
       }
       const page = await this.#browserContext.newPage();
+      if (this.#bcUserAgent) {
+        await page.setUserAgent({ userAgent: this.#bcUserAgent });
+      }
       await sleep2(2e3);
       const pageInfo = page.pageInfo;
       if (!pageInfo) {
@@ -3398,6 +3440,12 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       }
       lsdPage = this.#lsdPages.find((p) => p.isFree());
       if (lsdPage) {
+        if (!this.#userAgent) {
+          const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+          if (typeof userAgent === "string" && userAgent) {
+            this.#userAgent = userAgent;
+          }
+        }
         lsdPage.use();
         this.#freeGettingLock();
         return lsdPage;
@@ -3504,6 +3552,9 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       return false;
     }
   }
+  userAgent() {
+    return this.#userAgent;
+  }
   _origBrowserContext() {
     return this.#browserContext;
   }
@@ -3511,7 +3562,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
 
 // src/puppeteer/browser.ts
 var PuppeteerBrowser = class _PuppeteerBrowser extends EventEmitter6 {
-  static #supportedBrowserTypes = ["chromium"];
+  static #supportedBrowserTypes = ["chrome", "chromium"];
   static doesSupport(browserType) {
     return _PuppeteerBrowser.#supportedBrowserTypes.includes(browserType);
   }
@@ -3621,8 +3672,12 @@ var PuppeteerBrowser = class _PuppeteerBrowser extends EventEmitter6 {
     if (proxy?.proxyUrl) {
       browserContextOptions.proxyServer = proxy.proxyUrl;
     }
+    let userAgent = options?.userAgent ? options.userAgent : this.#options.userAgent;
+    const lsdLaunchOptions = this.#options;
+    if (!userAgent && lsdLaunchOptions.headless && lsdLaunchOptions.headlessUserAgent) {
+      userAgent = lsdLaunchOptions.headlessUserAgent;
+    }
     const browserContext = await this.#browser.createBrowserContext(browserContextOptions);
-    const userAgent = options?.userAgent ? options.userAgent : "";
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
     const lsdBrowserContext = new PuppeteerBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
@@ -4062,6 +4117,9 @@ var CheerioPage = class extends EventEmitter7 {
   use() {
     throw new Error("Not supported in CheerioPage.");
   }
+  userAgent() {
+    throw new Error("Not supported in CheerioPage.");
+  }
   waitForElement() {
     throw new Error("Not supported in CheerioPage.");
   }
@@ -5224,6 +5282,7 @@ var PatchrightPage = class extends EventEmitter8 {
             requestMethod,
             requestUrl,
             requestData,
+            resourceType: request.resourceType(),
             responseData
           });
           loginfo(`##browser cache matched response: ${requestUrl}`);
@@ -5309,6 +5368,9 @@ var PatchrightPage = class extends EventEmitter8 {
     logdbg(`##browser LsdPage ${this.#pageId} is allocated`);
     return true;
   }
+  userAgent() {
+    return this.#lsdBrowserContext.userAgent();
+  }
   async waitForElement(selector, options = {}) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -5333,7 +5395,7 @@ var PatchrightPage = class extends EventEmitter8 {
     }
     return true;
   }
-  async windowMember(keys) {
+  async windowMember(keys, isolated = true) {
     if (!this.#page) {
       throw new Error("No valid page");
     }
@@ -5372,7 +5434,8 @@ var PatchrightPage = class extends EventEmitter8 {
           return "";
         }
       },
-      keys
+      keys,
+      !!isolated
     );
     return content;
   }
@@ -5423,6 +5486,7 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
   #browserContextIdx;
   #browserContext;
   #browserContextCreationMethod;
+  #userAgent;
   #apiContext;
   #createTime;
   #lastStatusUpdateTime;
@@ -5450,8 +5514,15 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
         await lsdPage.maximizeViewport();
       }
     }
+    if (!this.#userAgent && this.#lsdPages.length > 0) {
+      const lsdPage = this.#lsdPages[0];
+      const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+      if (typeof userAgent === "string" && userAgent) {
+        this.#userAgent = userAgent;
+      }
+    }
   }
-  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, maxViewportOfNewPage = true) {
+  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, userAgent = "", maxViewportOfNewPage = true) {
     if (!lsdBrowser || typeof lsdBrowser.browserContexts !== "function") {
       throw new Error(`Invalid lsdBrowser parameter`);
     }
@@ -5464,6 +5535,7 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
     this.#browserContextIdx = browserContextIdx;
     this.#browserContext = browserContext;
     this.#browserContextCreationMethod = browserContextCreationMethod;
+    this.#userAgent = userAgent;
     const apiRequestContext = browserContext.request;
     this.#apiContext = new PatchrightApiContext(apiRequestContext);
     const currentTime = getCurrentUnixTime8();
@@ -5617,6 +5689,12 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
       }
       lsdPage = this.#lsdPages.find((p) => p.isFree());
       if (lsdPage) {
+        if (!this.#userAgent) {
+          const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+          if (typeof userAgent === "string" && userAgent) {
+            this.#userAgent = userAgent;
+          }
+        }
         lsdPage.use();
         this.#freeGettingLock();
         return lsdPage;
@@ -5723,6 +5801,9 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
       return false;
     }
   }
+  userAgent() {
+    return this.#userAgent;
+  }
   _origBrowserContext() {
     return this.#browserContext;
   }
@@ -5730,7 +5811,7 @@ var PatchrightBrowserContext = class extends EventEmitter9 {
 
 // src/patchright/browser.ts
 var PatchrightBrowser = class _PatchrightBrowser extends EventEmitter10 {
-  static #supportedBrowserTypes = ["chromium", "firefox", "webkit"];
+  static #supportedBrowserTypes = ["chrome", "chromium", "firefox", "webkit"];
   static doesSupport(browserType) {
     return _PatchrightBrowser.#supportedBrowserTypes.includes(browserType);
   }
@@ -5792,7 +5873,7 @@ var PatchrightBrowser = class _PatchrightBrowser extends EventEmitter10 {
     }
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : true;
     for (const browserContext of browserContexts) {
-      const lsdBrowserContext = new PatchrightBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+      const lsdBrowserContext = new PatchrightBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), "", maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
     }
     browser.on("disconnected" /* BROWSER_DISCONNECTED */, () => {
@@ -5844,12 +5925,17 @@ var PatchrightBrowser = class _PatchrightBrowser extends EventEmitter10 {
       const { proxyUrl: server, username, password } = proxy;
       browserContextOptions.proxy = { server, username, password };
     }
-    if (options?.userAgent) {
-      browserContextOptions.userAgent = options.userAgent;
+    let userAgent = options?.userAgent ? options.userAgent : this.#options.userAgent;
+    const lsdLaunchOptions = this.#options;
+    if (!userAgent && lsdLaunchOptions.headless && lsdLaunchOptions.headlessUserAgent) {
+      userAgent = lsdLaunchOptions.headlessUserAgent;
+    }
+    if (userAgent) {
+      browserContextOptions.userAgent = userAgent;
     }
     const browserContext = await this.#browser.newContext(browserContextOptions);
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
-    const lsdBrowserContext = new PatchrightBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+    const lsdBrowserContext = new PatchrightBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
     return lsdBrowserContext;
   }
@@ -7048,6 +7134,7 @@ var CamoufoxPage = class extends EventEmitter11 {
             requestMethod,
             requestUrl,
             requestData,
+            resourceType: request.resourceType(),
             responseData
           });
           loginfo(`##browser cache matched response: ${requestUrl}`);
@@ -7133,6 +7220,9 @@ var CamoufoxPage = class extends EventEmitter11 {
     logdbg(`##browser LsdPage ${this.#pageId} is allocated`);
     return true;
   }
+  userAgent() {
+    return this.#lsdBrowserContext.userAgent();
+  }
   async waitForElement(selector, options = {}) {
     if (!this.#page) {
       throw new Error("No valid page");
@@ -7247,6 +7337,7 @@ var CamoufoxBrowserContext = class extends EventEmitter12 {
   #browserContextIdx;
   #browserContext;
   #browserContextCreationMethod;
+  #userAgent;
   #apiContext;
   #createTime;
   #lastStatusUpdateTime;
@@ -7274,8 +7365,15 @@ var CamoufoxBrowserContext = class extends EventEmitter12 {
         await lsdPage.maximizeViewport();
       }
     }
+    if (!this.#userAgent && this.#lsdPages.length > 0) {
+      const lsdPage = this.#lsdPages[0];
+      const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+      if (typeof userAgent === "string" && userAgent) {
+        this.#userAgent = userAgent;
+      }
+    }
   }
-  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, maxViewportOfNewPage = true) {
+  constructor(lsdBrowser, browserContext, browserContextCreationMethod, incognito = false, proxy = null, browserIdx = 0, browserContextIdx = 0, maxPagesPerBrowserContext = 20, maxPageFreeSeconds = 0, userAgent = "", maxViewportOfNewPage = true) {
     if (!lsdBrowser || typeof lsdBrowser.browserContexts !== "function") {
       throw new Error(`Invalid lsdBrowser parameter`);
     }
@@ -7288,6 +7386,7 @@ var CamoufoxBrowserContext = class extends EventEmitter12 {
     this.#browserContextIdx = browserContextIdx;
     this.#browserContext = browserContext;
     this.#browserContextCreationMethod = browserContextCreationMethod;
+    this.#userAgent = userAgent;
     const apiRequestContext = browserContext.request;
     this.#apiContext = new CamoufoxApiContext(apiRequestContext);
     const currentTime = getCurrentUnixTime11();
@@ -7441,6 +7540,12 @@ var CamoufoxBrowserContext = class extends EventEmitter12 {
       }
       lsdPage = this.#lsdPages.find((p) => p.isFree());
       if (lsdPage) {
+        if (!this.#userAgent) {
+          const userAgent = await lsdPage.evaluate(() => navigator.userAgent);
+          if (typeof userAgent === "string" && userAgent) {
+            this.#userAgent = userAgent;
+          }
+        }
         lsdPage.use();
         this.#freeGettingLock();
         return lsdPage;
@@ -7547,6 +7652,9 @@ var CamoufoxBrowserContext = class extends EventEmitter12 {
       return false;
     }
   }
+  userAgent() {
+    return this.#userAgent;
+  }
   _origBrowserContext() {
     return this.#browserContext;
   }
@@ -7616,7 +7724,7 @@ var CamoufoxBrowser = class _CamoufoxBrowser extends EventEmitter13 {
     }
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : true;
     for (const browserContext of browserContexts) {
-      const lsdBrowserContext = new CamoufoxBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+      const lsdBrowserContext = new CamoufoxBrowserContext(this, browserContext, "launch", incognito, this.#proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), "", maxViewportOfNewPage);
       this.#lsdBrowserContexts.push(lsdBrowserContext);
     }
     browser.on("disconnected" /* BROWSER_DISCONNECTED */, () => {
@@ -7668,12 +7776,17 @@ var CamoufoxBrowser = class _CamoufoxBrowser extends EventEmitter13 {
       const { proxyUrl: server, username, password } = proxy;
       browserContextOptions.proxy = { server, username, password };
     }
-    if (options?.userAgent) {
-      browserContextOptions.userAgent = options.userAgent;
+    let userAgent = options?.userAgent ? options.userAgent : this.#options.userAgent;
+    const lsdLaunchOptions = this.#options;
+    if (!userAgent && lsdLaunchOptions.headless && lsdLaunchOptions.headlessUserAgent) {
+      userAgent = lsdLaunchOptions.headlessUserAgent;
+    }
+    if (userAgent) {
+      browserContextOptions.userAgent = userAgent;
     }
     const browserContext = await this.#browser.newContext(browserContextOptions);
     const { maxViewportOfNewPage = this.#options.maxViewportOfNewPage } = options ? options : {};
-    const lsdBrowserContext = new CamoufoxBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), maxViewportOfNewPage);
+    const lsdBrowserContext = new CamoufoxBrowserContext(this, browserContext, "new", true, proxy, this.#browserIdx, this.#nextBrowserContextIdx++, this.#maxPagesPerBrowserContext(), this.#maxPageFreeSeconds(), userAgent, maxViewportOfNewPage);
     this.#lsdBrowserContexts.push(lsdBrowserContext);
     return lsdBrowserContext;
   }
@@ -7762,11 +7875,13 @@ var LsdBrowserController = class _LsdBrowserController {
     }
     this.#puppeteer = puppeteer;
     this.#playwrightBrowserTypes = {
+      chrome: playwright.chromium,
       chromium: playwright.chromium,
       firefox: playwright.firefox,
       webkit: playwright.webkit
     };
     this.#patchrightBrowserTypes = {
+      chrome: playwright.chromium,
       chromium: patchright.chromium,
       firefox: patchright.firefox,
       webkit: patchright.webkit
@@ -7776,7 +7891,7 @@ var LsdBrowserController = class _LsdBrowserController {
     _LsdBrowserController.#forbidConstructor = true;
   }
   #playwrightBrowserType(browserType, connectFlag = false) {
-    if (browserType === "chromium") {
+    if (browserType === "chrome" || browserType === "chromium") {
       return this.#playwrightBrowserTypes.chromium;
     } else if (connectFlag) {
       throw new Error(`playwright only can connect to chromium browser, not support ${browserType} browser`);
@@ -7789,7 +7904,7 @@ var LsdBrowserController = class _LsdBrowserController {
     }
   }
   #patchrightBrowserType(browserType, connectFlag = false) {
-    if (browserType === "chromium") {
+    if (browserType === "chrome" || browserType === "chromium") {
       return this.#patchrightBrowserTypes.chromium;
     } else if (connectFlag) {
       throw new Error(`patchright only can connect to chromium browser, not support ${browserType} browser`);
@@ -7802,7 +7917,7 @@ var LsdBrowserController = class _LsdBrowserController {
     }
   }
   #puppeteerProduct(browserType) {
-    if (browserType === "chromium") {
+    if (browserType === "chrome" || browserType === "chromium") {
       return "chrome";
     } else {
       throw new Error(`Invalid puppeteer product ${browserType}`);
@@ -7819,6 +7934,7 @@ var LsdBrowserController = class _LsdBrowserController {
         throw new Error(`BrowserControllerType ${browserControllerType} doesnot support browserType ${browserType}`);
       }
       switch (browserType) {
+        case "chrome":
         case "chromium":
         case "firefox":
         case "webkit":
@@ -7832,6 +7948,7 @@ var LsdBrowserController = class _LsdBrowserController {
         throw new Error(`BrowserControllerType ${browserControllerType} doesnot support browserType ${browserType}`);
       }
       switch (browserType) {
+        case "chrome":
         case "chromium":
         case "firefox":
         case "webkit":
@@ -7866,11 +7983,12 @@ var LsdBrowserController = class _LsdBrowserController {
       // incognito
       proxyPerBrowserContext = false,
       userDataDir = "",
-      userAgent = ""
+      userAgent = "",
+      headlessUserAgent = ""
     } = options ? options : {};
     let browserPid = 0;
     const incognito = typeof options?.incognito === "boolean" ? options.incognito : browserControllerType === "puppeteer" ? false : true;
-    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, maxViewportOfNewPage, proxy, timeout, args, executablePath, maxWindowSize, headless, minBrowserContexts, incognito, proxyPerBrowserContext, userDataDir, userAgent };
+    const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, maxViewportOfNewPage, proxy, timeout, args, executablePath, maxWindowSize, headless, minBrowserContexts, incognito, proxyPerBrowserContext, userDataDir, userAgent, headlessUserAgent };
     let idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--incoginto"));
     if (idx >= 0) {
       logwarn(`##browser controller Please use options.incognito instead when launching new browser.`);
@@ -7892,6 +8010,11 @@ var LsdBrowserController = class _LsdBrowserController {
       args.splice(idx, 1);
     }
     let lsdBrowser;
+    if (browserType === "chrome" && ["playwright", "patchright", "puppeteer"].includes(browserControllerType)) {
+      if (!executablePath) {
+        throw new Error("Invalid executablePath when to launch chrome");
+      }
+    }
     if (browserControllerType === "playwright") {
       const launchOptions = { headless, timeout };
       if (executablePath) {
@@ -7906,11 +8029,12 @@ var LsdBrowserController = class _LsdBrowserController {
       } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
         launchOptions.proxy = { server: "proxyPerBrowserContext" };
       }
-      if (browserType === "chromium") {
+      if (browserType === "chrome" || browserType === "chromium") {
+        if (browserType === "chrome") {
+          launchOptions.channel = "chrome";
+        }
         if (incognito) {
           args.push("--incognito");
-        } else if (userDataDir) {
-          args.push(`--user-data-dir=${userDataDir}`);
         }
       }
       if (args.length > 0) {
@@ -7947,11 +8071,12 @@ var LsdBrowserController = class _LsdBrowserController {
       } else if (proxyPerBrowserContext && browserType === "chromium" && this.#osPlatform.startsWith("win")) {
         launchOptions.proxy = { server: "proxyPerBrowserContext" };
       }
-      if (browserType === "chromium") {
+      if (browserType === "chrome" || browserType === "chromium") {
+        if (browserType === "chrome") {
+          launchOptions.channel = "chrome";
+        }
         if (incognito) {
           args.push("--incognito");
-        } else if (userDataDir) {
-          args.push(`--user-data-dir=${userDataDir}`);
         }
       }
       if (args.length > 0) {
@@ -7987,11 +8112,15 @@ var LsdBrowserController = class _LsdBrowserController {
       if (!args.includes("--no-sandbox")) {
         args.push("--no-sandbox");
       }
-      if (browserType === "chromium") {
+      if (browserType === "chrome" || browserType === "chromium") {
+        if (browserType === "chrome") {
+          launchOptions.channel = "chrome";
+        }
         if (incognito) {
           args.push("--incognito");
-        } else if (userDataDir) {
-          args.push(`--user-data-dir=${userDataDir}`);
+        }
+        if (userDataDir) {
+          launchOptions.userDataDir = userDataDir;
         }
         if (proxy?.proxyUrl && proxy.proxyUrl !== "default") {
           args.push(`--proxy-server=${proxy.proxyUrl}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsscrapedata/controller",
-  "version": "0.0.70",
+  "version": "0.1.0",
   "description": "Unified browser / HTML controller interfaces that support patchright, camoufox, playwright, puppeteer and cheerio",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -44,20 +44,15 @@
     "puppeteer",
     "cheerio",
     "crawler",
-    "scraper",
-    "apify"
+    "scraper"
   ],
   "dependencies": {
-    "@letsscrapedata/utils": "^0.0.29",
+    "@letsscrapedata/utils": "^0.0.33",
     "camoufox-js-lsd": "^0.6.5",
-    "cheerio": "^1.0.0",
-    "patchright": "^1.52.5",
-    "playwright": "^1.54.2",
-    "playwright-extra": "^4.3.6",
-    "puppeteer": "^24.16.0",
-    "puppeteer-extra": "^3.3.6",
-    "puppeteer-extra-plugin-stealth": "^2.11.2",
-    "utils": "^0.3.1"
+    "cheerio": "^1.1.2",
+    "patchright": "^1.56.1",
+    "playwright": "^1.56.1",
+    "puppeteer": "^24.25.0"
   },
   "devDependencies": {
     "@types/cheerio": "^0.22.35",