@letsscrapedata/controller 0.0.35 → 0.0.37

package/dist/index.cjs

@@ -1375,10 +1375,10 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
       return null;
     }
   }
-  hasNewPage(pageNum = 1) {
+  hasFreePage(pageNum = 1) {
     if (this.#maxPagesPerBrowserContext - this.#lsdPages.length > pageNum) {
       return true;
-    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => p.isFree()).length > pageNum) {
+    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => !p.isFree()).length > pageNum) {
       return true;
     } else {
       return false;
@@ -1446,6 +1446,7 @@ var import_utils4 = require("@letsscrapedata/utils");
 var PlaywrightBrowser = class extends import_node_events3.default {
   #browser;
   #browserIdx;
+  #pid;
   #lsdBrowserContexts;
   #browserControllerType;
   #browserType;
@@ -1470,7 +1471,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
-  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
+  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0, pid = 0) {
     if (!browser || typeof browser.contexts !== "function") {
       throw new Error(`Invalid playwright browser parameter`);
     }
@@ -1478,6 +1479,7 @@ var PlaywrightBrowser = class extends import_node_events3.default {
     const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
+    this.#pid = pid;
     this.#lsdBrowserContexts = [];
     this.#browserControllerType = "playwright";
     this.#browserType = browerType;
@@ -1597,6 +1599,17 @@ var PlaywrightBrowser = class extends import_node_events3.default {
   options() {
     return this.#options;
   }
+  pid() {
+    return this.#pid;
+  }
+  async pidUsage() {
+    if (this.#pid > 0) {
+      const usage = await (0, import_utils4.getPerformanceOfPidTree)(this.#pid, "MB");
+      return usage;
+    } else {
+      return { cpu: 0, memory: 0 };
+    }
+  }
   async version() {
     const version = await this.#browser.version();
     return version;
@@ -2882,10 +2895,10 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
       return null;
     }
   }
-  hasNewPage(pageNum = 1) {
+  hasFreePage(pageNum = 1) {
     if (this.#maxPagesPerBrowserContext - this.#lsdPages.length > pageNum) {
       return true;
-    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => p.isFree()).length > pageNum) {
+    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => !p.isFree()).length > pageNum) {
       return true;
     } else {
       return false;
@@ -2953,6 +2966,7 @@ var import_utils8 = require("@letsscrapedata/utils");
 var PuppeteerBrowser = class extends import_node_events6.default {
   #browser;
   #browserIdx;
+  #pid;
   #lsdBrowserContexts;
   #browserControllerType;
   #browserType;
@@ -2980,7 +2994,7 @@ var PuppeteerBrowser = class extends import_node_events6.default {
     return this.#options.userAgent ? this.#options.userAgent : "";
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
-  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
+  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0, pid = 0) {
     if (!browser || typeof browser.browserContexts !== "function") {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
@@ -2988,6 +3002,7 @@ var PuppeteerBrowser = class extends import_node_events6.default {
     const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
+    this.#pid = pid;
     this.#lsdBrowserContexts = [];
     this.#browserControllerType = "puppeteer";
     this.#browserType = browerType;
@@ -3100,6 +3115,17 @@ var PuppeteerBrowser = class extends import_node_events6.default {
   options() {
     return this.#options;
   }
+  pid() {
+    return this.#pid;
+  }
+  async pidUsage() {
+    if (this.#pid > 0) {
+      const usage = await (0, import_utils8.getPerformanceOfPidTree)(this.#pid, "MB");
+      return usage;
+    } else {
+      return { cpu: 0, memory: 0 };
+    }
+  }
   async version() {
     const version = await this.#browser.version();
     return version;
@@ -17382,6 +17408,7 @@ var LsdBrowserController = class _LsdBrowserController {
       userDataDir = "",
       userAgent = ""
     } = 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 };
     let idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--incoginto"));
@@ -17433,8 +17460,19 @@ var LsdBrowserController = class _LsdBrowserController {
       if (!actOptions.executablePath) {
         actOptions.executablePath = playwrightBrowserType.executablePath();
       }
-      const browser = await playwrightBrowserType.launch(launchOptions);
-      lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
+      if (options.launchMethod === "launchServer") {
+        const browserServer = await playwrightBrowserType.launchServer(launchOptions);
+        const process = browserServer.process();
+        if (process?.pid) {
+          browserPid = process.pid;
+        }
+        const wsEndpoint = browserServer.wsEndpoint();
+        const browser = await playwrightBrowserType.connect(wsEndpoint);
+        lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
+      } else {
+        const browser = await playwrightBrowserType.launch(launchOptions);
+        lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
+      }
     } else if (browserControllerType === "puppeteer") {
       const product = this.#puppeteerProduct(browserType);
       const launchOptions = { headless, timeout, product };
@@ -17467,7 +17505,11 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = this.#puppeteer.executablePath();
       }
       const browser = await this.#puppeteer.launch(launchOptions);
-      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
+      const browserProcess = browser.process();
+      if (browserProcess?.pid) {
+        browserPid = browserProcess.pid;
+      }
+      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
     }
@@ -17494,16 +17536,25 @@ var LsdBrowserController = class _LsdBrowserController {
     if (typeof browserUrl !== "string" || !browserUrl.toLowerCase().startsWith("http://")) {
       throw new Error(`Invalid browserUrl ${browserUrl} in connect`);
     }
+    const u = new URL(browserUrl);
+    const port = u.port ? parseInt(u.port) : 80;
+    const pids = await (0, import_utils15.getPidsListeningOnPort)(port);
+    let browserPid = 0;
+    if (pids.length !== 1) {
+      (0, import_utils15.logerr)(`##browser pids.length ${pids.length} is not 1 when trying to connect to browserUrl ${browserUrl}`);
+    } else {
+      browserPid = pids[0];
+    }
     const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, maxViewportOfNewPage, proxy, timeout, browserUrl, executablePath, headless, incognito, userAgent };
     if (browserControllerType === "playwright") {
       const playwrightBrowserType = this.#playwrightBrowserType(browserType, true);
       const browser = await playwrightBrowserType.connectOverCDP(browserUrl);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++);
+      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++, browserPid);
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);
       const browser = await this.#puppeteer.connect({ browserURL: browserUrl });
-      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
+      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++, browserPid);
       ;
       return lsdBrowser;
     } else {

package/dist/index.d.cts

@@ -31,9 +31,6 @@ interface PlaywrightBrowserTypes {
     firefox: BrowserType;
     webkit: BrowserType;
 }
-type BrowserControllerOptions = {
-    browserControllerType: BrowserControllerType;
-};
 interface BrowserOptions {
     /**
      * Interval between closing free pages (seconds) if greater than 0
@@ -71,6 +68,11 @@ interface BrowserOptions {
      */
     timeout?: number;
 }
+/**
+ * * puppeteer: launchServer is the same as launch
+ * * playwright: use "launchServer" if it's necessary to call LsdBrowser.pid()/pidUsage()
+ */
+type BrowserLaunchMethod = "launch" | "launchServer";
 interface LsdLaunchOptions extends BrowserOptions {
     args?: string[];
     executablePath?: string;
@@ -102,6 +104,10 @@ interface LsdLaunchOptions extends BrowserOptions {
      */
     userAgent?: string;
     userDataDir?: string;
+    /**
+     * @default "launch"
+     */
+    launchMethod?: BrowserLaunchMethod;
 }
 interface LsdConnectOptions extends BrowserOptions {
     /**
@@ -927,7 +933,7 @@ interface LsdBrowserContext extends EventEmitter {
      * * refer to getPage()
      * @param pageNum default 1, the number of free pages
      */
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -962,6 +968,18 @@ interface LsdBrowser extends EventEmitter {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    /**
+     * * puppeteer: return pid of connected or launched browser
+     * * playwright: return pid of connected browser that is launched manually or using launchServer, or else return 0
+     */
+    pid(): number;
+    /**
+     * get the cpu utility(%) and memory usage(MB) of browser processes if pid is greater than 0 (refer to pid())
+     */
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1025,7 +1043,7 @@ interface BrowserManager {
 
 declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     #private;
-    constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number);
+    constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
@@ -1037,6 +1055,11 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    pid(): number;
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1048,7 +1071,7 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     getPage(always?: boolean): Promise<LsdPage | null>;
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -1136,7 +1159,7 @@ declare class PlaywrightElement implements LsdElement {
 
 declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     #private;
-    constructor(browser: Browser$1, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number);
+    constructor(browser: Browser$1, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
     newBrowserContext(options?: LsdBrowserContextOptions | undefined): Promise<LsdBrowserContext | null>;
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
@@ -1148,6 +1171,11 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    pid(): number;
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1159,7 +1187,7 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     getPage(always?: boolean): Promise<LsdPage | null>;
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -1336,4 +1364,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };
+export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserManager, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };

package/dist/index.d.ts

@@ -31,9 +31,6 @@ interface PlaywrightBrowserTypes {
     firefox: BrowserType;
     webkit: BrowserType;
 }
-type BrowserControllerOptions = {
-    browserControllerType: BrowserControllerType;
-};
 interface BrowserOptions {
     /**
      * Interval between closing free pages (seconds) if greater than 0
@@ -71,6 +68,11 @@ interface BrowserOptions {
      */
     timeout?: number;
 }
+/**
+ * * puppeteer: launchServer is the same as launch
+ * * playwright: use "launchServer" if it's necessary to call LsdBrowser.pid()/pidUsage()
+ */
+type BrowserLaunchMethod = "launch" | "launchServer";
 interface LsdLaunchOptions extends BrowserOptions {
     args?: string[];
     executablePath?: string;
@@ -102,6 +104,10 @@ interface LsdLaunchOptions extends BrowserOptions {
      */
     userAgent?: string;
     userDataDir?: string;
+    /**
+     * @default "launch"
+     */
+    launchMethod?: BrowserLaunchMethod;
 }
 interface LsdConnectOptions extends BrowserOptions {
     /**
@@ -927,7 +933,7 @@ interface LsdBrowserContext extends EventEmitter {
      * * refer to getPage()
      * @param pageNum default 1, the number of free pages
      */
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -962,6 +968,18 @@ interface LsdBrowser extends EventEmitter {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    /**
+     * * puppeteer: return pid of connected or launched browser
+     * * playwright: return pid of connected browser that is launched manually or using launchServer, or else return 0
+     */
+    pid(): number;
+    /**
+     * get the cpu utility(%) and memory usage(MB) of browser processes if pid is greater than 0 (refer to pid())
+     */
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1025,7 +1043,7 @@ interface BrowserManager {
 
 declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     #private;
-    constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number);
+    constructor(browser: Browser, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
     newBrowserContext(options?: LsdBrowserContextOptions): Promise<LsdBrowserContext | null>;
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
@@ -1037,6 +1055,11 @@ declare class PlaywrightBrowser extends EventEmitter implements LsdBrowser {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    pid(): number;
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1048,7 +1071,7 @@ declare class PlaywrightBrowserContext extends EventEmitter implements LsdBrowse
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     getPage(always?: boolean): Promise<LsdPage | null>;
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -1136,7 +1159,7 @@ declare class PlaywrightElement implements LsdElement {
 
 declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     #private;
-    constructor(browser: Browser$1, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number);
+    constructor(browser: Browser$1, browerType: LsdBrowserType, browserCreateMethod: BrowserCreationMethod, options: LsdLaunchOptions | LsdConnectOptions, browserIdx?: number, pid?: number);
     newBrowserContext(options?: LsdBrowserContextOptions | undefined): Promise<LsdBrowserContext | null>;
     close(): Promise<boolean>;
     browserContexts(): LsdBrowserContext[];
@@ -1148,6 +1171,11 @@ declare class PuppeteerBrowser extends EventEmitter implements LsdBrowser {
     isConnected(): boolean;
     isHeadless(): boolean;
     options(): LsdLaunchOptions | LsdConnectOptions;
+    pid(): number;
+    pidUsage(): Promise<{
+        cpu: number;
+        memory: number;
+    }>;
     version(): Promise<string>;
     _origBrowser(): AllBrowser;
 }
@@ -1159,7 +1187,7 @@ declare class PuppeteerBrowserContext extends EventEmitter implements LsdBrowser
     close(): Promise<boolean>;
     closeFreePages(maxPageFreeSeconds?: number): Promise<boolean>;
     getPage(always?: boolean): Promise<LsdPage | null>;
-    hasNewPage(pageNum?: number): boolean;
+    hasFreePage(pageNum?: number): boolean;
     id(): string;
     isIncognito(): boolean;
     page(pageIdx: number): LsdPage | null;
@@ -1336,4 +1364,4 @@ declare class LsdBrowserController implements LsdBrowserController$1 {
 }
 declare const controller: LsdBrowserController;
 
-export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };
+export { type AllApiRequestContext, type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerType, type BrowserCreationMethod, type BrowserLaunchMethod, type BrowserManager, type BrowserStateData, CheerioElement, type CheerioNode, CheerioPage, type CookieItem, type GotoOptions, type IframeOption, type InputOptions, type KeyInput, type KeyPressOptions, type LocalStorageItem, type LocalStorageOrigin, type LowerCasePaperFormat, type LsdBrowser, type LsdBrowserContext, type LsdBrowserContextOptions, type LsdBrowserController$1 as LsdBrowserController, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type MouseClickType, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, type PlaywrightBrowserTypes, PlaywrightElement, PlaywrightPage, type ProxyInController, PuppeteerBrowser, PuppeteerBrowserContext, PuppeteerElement, PuppeteerPage, type RequestInterceptionAction, type RequestInterceptionOption, type RequestMatch, type RequestMethod, type RequestResourceType, type ResponseHandler, type ResponseHandlerOptions, type ResponseInterceptionItem, type ResponseInterceptionOption, type ResponseMatch, type ResponsePageData, type ScreenshotOptions, type SelectOptions, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, controller };

package/dist/index.js

@@ -1356,10 +1356,10 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
       return null;
     }
   }
-  hasNewPage(pageNum = 1) {
+  hasFreePage(pageNum = 1) {
     if (this.#maxPagesPerBrowserContext - this.#lsdPages.length > pageNum) {
       return true;
-    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => p.isFree()).length > pageNum) {
+    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => !p.isFree()).length > pageNum) {
       return true;
     } else {
       return false;
@@ -1423,10 +1423,11 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
 };
 
 // src/playwright/browser.ts
-import { logerr as logerr3, loginfo as loginfo4, logwarn as logwarn3 } from "@letsscrapedata/utils";
+import { getPerformanceOfPidTree, logerr as logerr3, loginfo as loginfo4, logwarn as logwarn3 } from "@letsscrapedata/utils";
 var PlaywrightBrowser = class extends EventEmitter3 {
   #browser;
   #browserIdx;
+  #pid;
   #lsdBrowserContexts;
   #browserControllerType;
   #browserType;
@@ -1451,7 +1452,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     return this.#options.maxPageFreeSeconds ? this.#options.maxPageFreeSeconds : 900;
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
-  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
+  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0, pid = 0) {
     if (!browser || typeof browser.contexts !== "function") {
       throw new Error(`Invalid playwright browser parameter`);
     }
@@ -1459,6 +1460,7 @@ var PlaywrightBrowser = class extends EventEmitter3 {
     const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
+    this.#pid = pid;
     this.#lsdBrowserContexts = [];
     this.#browserControllerType = "playwright";
     this.#browserType = browerType;
@@ -1578,6 +1580,17 @@ var PlaywrightBrowser = class extends EventEmitter3 {
   options() {
     return this.#options;
   }
+  pid() {
+    return this.#pid;
+  }
+  async pidUsage() {
+    if (this.#pid > 0) {
+      const usage = await getPerformanceOfPidTree(this.#pid, "MB");
+      return usage;
+    } else {
+      return { cpu: 0, memory: 0 };
+    }
+  }
   async version() {
     const version = await this.#browser.version();
     return version;
@@ -2863,10 +2876,10 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
       return null;
     }
   }
-  hasNewPage(pageNum = 1) {
+  hasFreePage(pageNum = 1) {
     if (this.#maxPagesPerBrowserContext - this.#lsdPages.length > pageNum) {
       return true;
-    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => p.isFree()).length > pageNum) {
+    } else if (this.#maxPagesPerBrowserContext - this.#lsdPages.filter((p) => !p.isFree()).length > pageNum) {
       return true;
     } else {
       return false;
@@ -2930,10 +2943,11 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
 };
 
 // src/puppeteer/browser.ts
-import { logerr as logerr7, loginfo as loginfo7, logwarn as logwarn5 } from "@letsscrapedata/utils";
+import { getPerformanceOfPidTree as getPerformanceOfPidTree2, logerr as logerr7, loginfo as loginfo7, logwarn as logwarn5 } from "@letsscrapedata/utils";
 var PuppeteerBrowser = class extends EventEmitter6 {
   #browser;
   #browserIdx;
+  #pid;
   #lsdBrowserContexts;
   #browserControllerType;
   #browserType;
@@ -2961,7 +2975,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     return this.#options.userAgent ? this.#options.userAgent : "";
   }
   // 构造函数：缺省只能由LsdBrowserController.launch/connect调用创建实例!!!
-  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0) {
+  constructor(browser, browerType, browserCreateMethod, options, browserIdx = 0, pid = 0) {
     if (!browser || typeof browser.browserContexts !== "function") {
       throw new Error(`Invalid puppeteer browser parameter`);
     }
@@ -2969,6 +2983,7 @@ var PuppeteerBrowser = class extends EventEmitter6 {
     const { closeFreePagesIntervalSeconds = 300, maxPageFreeSeconds = 900, maxViewportOfNewPage = true, headless = false, executablePath = "" } = options;
     this.#browser = browser;
     this.#browserIdx = browserIdx;
+    this.#pid = pid;
     this.#lsdBrowserContexts = [];
     this.#browserControllerType = "puppeteer";
     this.#browserType = browerType;
@@ -3081,6 +3096,17 @@ var PuppeteerBrowser = class extends EventEmitter6 {
   options() {
     return this.#options;
   }
+  pid() {
+    return this.#pid;
+  }
+  async pidUsage() {
+    if (this.#pid > 0) {
+      const usage = await getPerformanceOfPidTree2(this.#pid, "MB");
+      return usage;
+    } else {
+      return { cpu: 0, memory: 0 };
+    }
+  }
   async version() {
     const version = await this.#browser.version();
     return version;
@@ -17264,7 +17290,7 @@ var CheerioPage = class extends EventEmitter7 {
 import os from "os";
 import puppeteer from "puppeteer";
 import playwright, { request as apiRequest } from "playwright";
-import { logwarn as logwarn6, unreachable as unreachable5 } from "@letsscrapedata/utils";
+import { getPidsListeningOnPort, logerr as logerr8, logwarn as logwarn6, unreachable as unreachable5 } from "@letsscrapedata/utils";
 import puppeteerExtra from "puppeteer-extra";
 import * as playwrightExtra from "playwright-extra";
 import StealthPlugin from "puppeteer-extra-plugin-stealth";
@@ -17363,6 +17389,7 @@ var LsdBrowserController = class _LsdBrowserController {
       userDataDir = "",
       userAgent = ""
     } = 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 };
     let idx = args.findIndex((arg) => arg.toLowerCase().startsWith("--incoginto"));
@@ -17414,8 +17441,19 @@ var LsdBrowserController = class _LsdBrowserController {
       if (!actOptions.executablePath) {
         actOptions.executablePath = playwrightBrowserType.executablePath();
       }
-      const browser = await playwrightBrowserType.launch(launchOptions);
-      lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
+      if (options.launchMethod === "launchServer") {
+        const browserServer = await playwrightBrowserType.launchServer(launchOptions);
+        const process = browserServer.process();
+        if (process?.pid) {
+          browserPid = process.pid;
+        }
+        const wsEndpoint = browserServer.wsEndpoint();
+        const browser = await playwrightBrowserType.connect(wsEndpoint);
+        lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
+      } else {
+        const browser = await playwrightBrowserType.launch(launchOptions);
+        lsdBrowser = new PlaywrightBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
+      }
     } else if (browserControllerType === "puppeteer") {
       const product = this.#puppeteerProduct(browserType);
       const launchOptions = { headless, timeout, product };
@@ -17448,7 +17486,11 @@ var LsdBrowserController = class _LsdBrowserController {
         actOptions.executablePath = this.#puppeteer.executablePath();
       }
       const browser = await this.#puppeteer.launch(launchOptions);
-      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++);
+      const browserProcess = browser.process();
+      if (browserProcess?.pid) {
+        browserPid = browserProcess.pid;
+      }
+      lsdBrowser = new PuppeteerBrowser(browser, browserType, "launch", actOptions, this.#nextBrowserIdx++, browserPid);
     } else {
       throw new Error(`Invalid browserControllerType: ${browserControllerType} in launch`);
     }
@@ -17475,16 +17517,25 @@ var LsdBrowserController = class _LsdBrowserController {
     if (typeof browserUrl !== "string" || !browserUrl.toLowerCase().startsWith("http://")) {
       throw new Error(`Invalid browserUrl ${browserUrl} in connect`);
     }
+    const u = new URL(browserUrl);
+    const port = u.port ? parseInt(u.port) : 80;
+    const pids = await getPidsListeningOnPort(port);
+    let browserPid = 0;
+    if (pids.length !== 1) {
+      logerr8(`##browser pids.length ${pids.length} is not 1 when trying to connect to browserUrl ${browserUrl}`);
+    } else {
+      browserPid = pids[0];
+    }
     const actOptions = { closeFreePagesIntervalSeconds, maxBrowserContextsPerBrowser, maxPagesPerBrowserContext, maxPageFreeSeconds, maxViewportOfNewPage, proxy, timeout, browserUrl, executablePath, headless, incognito, userAgent };
     if (browserControllerType === "playwright") {
       const playwrightBrowserType = this.#playwrightBrowserType(browserType, true);
       const browser = await playwrightBrowserType.connectOverCDP(browserUrl);
-      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++);
+      const lsdBrowser = new PlaywrightBrowser(browser, browserType, "connect", actOptions, this.#nextBrowserIdx++, browserPid);
       return lsdBrowser;
     } else if (browserControllerType === "puppeteer") {
       this.#puppeteerProduct(browserType);
       const browser = await this.#puppeteer.connect({ browserURL: browserUrl });
-      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++);
+      const lsdBrowser = new PuppeteerBrowser(browser, browserType, "connect", options, this.#nextBrowserIdx++, browserPid);
       ;
       return lsdBrowser;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsscrapedata/controller",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "description": "Unified browser / HTML controller interfaces that support playwright, puppeteer and cheerio",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -34,7 +34,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@letsscrapedata/utils": "^0.0.7",
+    "@letsscrapedata/utils": "^0.0.12",
     "playwright": "^1.43.0",
     "playwright-extra": "^4.3.6",
     "puppeteer": "^22.6.3",