@letsscrapedata/controller 0.0.4 → 0.0.6

package/dist/index.cjs

@@ -505,6 +505,9 @@ var PlaywrightPage = class extends import_node_events.default {
           popupPageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
           pageInfo.openType = "popup";
           evtData = this.browserContext().page(pageIdx);
+          if (evtData && page.pageInfo?.taskId) {
+            pageInfo.relatedId = page.pageInfo.taskId;
+          }
         } else {
           (0, import_utils2.logerr)(`##browser  ${pageId} has popup without page.pageInfo`);
         }
@@ -524,8 +527,8 @@ var PlaywrightPage = class extends import_node_events.default {
     this.#page = page;
     this.#status = "free";
     const currentTime = (0, import_utils2.getCurrentUnixTime)();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId };
+    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 = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
@@ -811,14 +814,20 @@ var PlaywrightPage = class extends import_node_events.default {
       throw new Error("Invalid paras in setPageInfo");
     }
     const actPageInfo = this.#page.pageInfo;
-    if (pageInfo.openType && ["launch", "newpage", "popup", "connect", "other"].includes(pageInfo.openType)) {
-      actPageInfo.openType = pageInfo.openType;
+    const { lastStatusUpdateTime, taskId, relatedId, misc } = pageInfo;
+    if (typeof lastStatusUpdateTime === "number") {
+      actPageInfo.lastStatusUpdateTime = lastStatusUpdateTime;
+    }
+    if (typeof taskId === "number") {
+      actPageInfo.taskId = taskId;
     }
-    if (typeof pageInfo.lastStatusUpdateTime === "number") {
-      actPageInfo.lastStatusUpdateTime = pageInfo.lastStatusUpdateTime;
+    if (typeof relatedId === "number") {
+      actPageInfo.relatedId = relatedId;
     }
-    if (typeof pageInfo.taskId === "number") {
-      actPageInfo.taskId = pageInfo.taskId;
+    if (misc && typeof misc === "object") {
+      for (const key of Object.keys(misc)) {
+        actPageInfo.misc[key] = misc[key];
+      }
     }
     return true;
   }
@@ -1095,7 +1104,7 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
     const openType = this.#lsdBrowser.browserCreationMethod();
     const lastStatusUpdateTime = (0, import_utils3.getCurrentUnixTime)();
     for (const page of pages) {
-      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0 };
+      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0, relatedId: 0, misc: {} };
       const lsdPage = new PlaywrightPage(this, page, pageInfo);
       this.#lsdPages.push(lsdPage);
       (0, import_utils3.loginfo)(`##browser  ${lsdPage.id()} ${openType}ed`);
@@ -1129,7 +1138,7 @@ var PlaywrightBrowserContext = class extends import_node_events2.default {
         (0, import_utils3.logwarn)(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
       } else {
         const currentTime = (0, import_utils3.getCurrentUnixTime)();
-        const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0 };
+        const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0, relatedId: 0, misc: {} };
         const lsdPage = new PlaywrightPage(this, page, pageInfo2);
         this.#lsdPages.push(lsdPage);
         (0, import_utils3.loginfo)(`##browser ${lsdPage.id()} created`);
@@ -1916,6 +1925,9 @@ var PuppeteerPage = class extends import_node_events4.default {
           popupPageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
           pageInfo.openType = "popup";
           evtData = this.browserContext().page(pageIdx);
+          if (evtData && page.pageInfo?.taskId) {
+            pageInfo.relatedId = page.pageInfo.taskId;
+          }
         } else {
           (0, import_utils6.logerr)(`##browser  ${pageId} has popup without page.pageInfo`);
         }
@@ -1935,8 +1947,8 @@ var PuppeteerPage = class extends import_node_events4.default {
     this.#page = page;
     this.#status = "free";
     const currentTime = (0, import_utils6.getCurrentUnixTime)();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId };
+    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 = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;
@@ -2225,14 +2237,20 @@ var PuppeteerPage = class extends import_node_events4.default {
       throw new Error("Invalid paras in setPageInfo");
     }
     const actPageInfo = this.#page.pageInfo;
-    if (pageInfo.openType && ["launch", "newpage", "popup", "connect", "other"].includes(pageInfo.openType)) {
-      actPageInfo.openType = pageInfo.openType;
+    const { lastStatusUpdateTime, taskId, relatedId, misc } = pageInfo;
+    if (typeof lastStatusUpdateTime === "number") {
+      actPageInfo.lastStatusUpdateTime = lastStatusUpdateTime;
+    }
+    if (typeof taskId === "number") {
+      actPageInfo.taskId = taskId;
     }
-    if (typeof pageInfo.lastStatusUpdateTime === "number") {
-      actPageInfo.lastStatusUpdateTime = pageInfo.lastStatusUpdateTime;
+    if (typeof relatedId === "number") {
+      actPageInfo.relatedId = relatedId;
     }
-    if (typeof pageInfo.taskId === "number") {
-      actPageInfo.taskId = pageInfo.taskId;
+    if (misc && typeof misc === "object") {
+      for (const key of Object.keys(misc)) {
+        actPageInfo.misc[key] = misc[key];
+      }
     }
     return true;
   }
@@ -2498,7 +2516,7 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
     const openType = this.#lsdBrowser.browserCreationMethod();
     const lastStatusUpdateTime = (0, import_utils7.getCurrentUnixTime)();
     for (const page of pages) {
-      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0 };
+      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0, relatedId: 0, misc: {} };
       const lsdPage = new PuppeteerPage(this, page, pageInfo);
       if (this.#userAgent) {
         await lsdPage.setUserAgent(this.#userAgent);
@@ -2541,7 +2559,7 @@ var PuppeteerBrowserContext = class extends import_node_events5.default {
           (0, import_utils7.logwarn)(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
         } else {
           const currentTime = (0, import_utils7.getCurrentUnixTime)();
-          const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0 };
+          const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0, relatedId: 0, misc: {} };
           const lsdPage = new PuppeteerPage(this, page, pageInfo2);
           if (this.#userAgent) {
             await lsdPage.setUserAgent(this.#userAgent);

package/dist/index.d.cts

@@ -151,7 +151,7 @@ type PageStatus = "free" | "busy" | "closed";
  * * other:
  */
 type PageOpenType = "newpage" | "popup" | "manual" | "launch" | "connect" | "other";
-type PageInfo = {
+interface PageInfo {
     /**
      * browser index in all browsers, that starts from 1
      * @default 0
@@ -187,7 +187,35 @@ type PageInfo = {
      * @default 0
      */
     taskId: number;
-};
+    /**
+     * @default 0
+     */
+    relatedId: number;
+    /**
+     * customised page information
+     */
+    misc: Record<string, string | number>;
+}
+interface UpdatablePageInfo {
+    /**
+     * 上次status变化时间：如果status为free，表示空闲开始时间；如果status为busy，表示TE开始数据
+     * @default current unix time
+     */
+    lastStatusUpdateTime?: number;
+    /**
+     * 正在执行的task的ID，参见enumSpecialTaskId
+     * @default 0
+     */
+    taskId?: number;
+    /**
+     * @default 0
+     */
+    relatedId?: number;
+    /**
+     * customised page information
+     */
+    misc?: Record<string, string | number>;
+}
 interface PageExtInPuppeteer extends Page$1 {
     pageInfo?: PageInfo;
 }
@@ -780,7 +808,7 @@ interface LsdPage extends EventEmitter {
      * @param localStorageItems
      */
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     /**
      * Intercept requests that meet the conditions(requestMatch) to perform an action(action and fulfill).
      * @param options
@@ -967,7 +995,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     setCookies(cookies: CookieItem[]): Promise<boolean>;
     setExtraHTTPHeaders(headers: Record<string, string>): Promise<boolean>;
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     setRequestInterception(options: RequestInterceptionOption | RequestInterceptionOption[]): Promise<boolean>;
     setResponseInterception(options: ResponseInterceptionOption | ResponseInterceptionOption[]): Promise<boolean>;
     setStateData(stateData: StateData): Promise<boolean>;
@@ -1074,7 +1102,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     setCookies(cookies: CookieItem[]): Promise<boolean>;
     setExtraHTTPHeaders(headers: Record<string, string>): Promise<boolean>;
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     setRequestInterception(options: RequestInterceptionOption | RequestInterceptionOption[]): Promise<boolean>;
     setResponseInterception(options: ResponseInterceptionOption | ResponseInterceptionOption[]): Promise<boolean>;
     setStateData(stateData: StateData): Promise<boolean>;
@@ -1183,4 +1211,4 @@ declare class CheerioElement implements LsdElement {
     scrollIntoView(): Promise<boolean>;
 }
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, 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, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, 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, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };

package/dist/index.d.ts

@@ -151,7 +151,7 @@ type PageStatus = "free" | "busy" | "closed";
  * * other:
  */
 type PageOpenType = "newpage" | "popup" | "manual" | "launch" | "connect" | "other";
-type PageInfo = {
+interface PageInfo {
     /**
      * browser index in all browsers, that starts from 1
      * @default 0
@@ -187,7 +187,35 @@ type PageInfo = {
      * @default 0
      */
     taskId: number;
-};
+    /**
+     * @default 0
+     */
+    relatedId: number;
+    /**
+     * customised page information
+     */
+    misc: Record<string, string | number>;
+}
+interface UpdatablePageInfo {
+    /**
+     * 上次status变化时间：如果status为free，表示空闲开始时间；如果status为busy，表示TE开始数据
+     * @default current unix time
+     */
+    lastStatusUpdateTime?: number;
+    /**
+     * 正在执行的task的ID，参见enumSpecialTaskId
+     * @default 0
+     */
+    taskId?: number;
+    /**
+     * @default 0
+     */
+    relatedId?: number;
+    /**
+     * customised page information
+     */
+    misc?: Record<string, string | number>;
+}
 interface PageExtInPuppeteer extends Page$1 {
     pageInfo?: PageInfo;
 }
@@ -780,7 +808,7 @@ interface LsdPage extends EventEmitter {
      * @param localStorageItems
      */
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     /**
      * Intercept requests that meet the conditions(requestMatch) to perform an action(action and fulfill).
      * @param options
@@ -967,7 +995,7 @@ declare class PlaywrightPage extends EventEmitter implements LsdPage {
     setCookies(cookies: CookieItem[]): Promise<boolean>;
     setExtraHTTPHeaders(headers: Record<string, string>): Promise<boolean>;
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     setRequestInterception(options: RequestInterceptionOption | RequestInterceptionOption[]): Promise<boolean>;
     setResponseInterception(options: ResponseInterceptionOption | ResponseInterceptionOption[]): Promise<boolean>;
     setStateData(stateData: StateData): Promise<boolean>;
@@ -1074,7 +1102,7 @@ declare class PuppeteerPage extends EventEmitter implements LsdPage {
     setCookies(cookies: CookieItem[]): Promise<boolean>;
     setExtraHTTPHeaders(headers: Record<string, string>): Promise<boolean>;
     setLocalStroage(localStorageItems: LocalStorageItem[]): Promise<boolean>;
-    setPageInfo(pageInfo: PageInfo): boolean;
+    setPageInfo(pageInfo: UpdatablePageInfo): boolean;
     setRequestInterception(options: RequestInterceptionOption | RequestInterceptionOption[]): Promise<boolean>;
     setResponseInterception(options: ResponseInterceptionOption | ResponseInterceptionOption[]): Promise<boolean>;
     setStateData(stateData: StateData): Promise<boolean>;
@@ -1183,4 +1211,4 @@ declare class CheerioElement implements LsdElement {
     scrollIntoView(): Promise<boolean>;
 }
 
-export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, 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, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };
+export { type AllBrowser, type AllBrowserContext, type AllFrame, type AllPage, type AllResponse, type BrowserControllerOptions, type BrowserControllerType, type BrowserCreationMethod, type BrowserManager, 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, type LsdBrowserType, type LsdConnectOptions, type LsdElement, type LsdLaunchOptions, type LsdPage, type MouseClickOptions, type NavigationWaitUntil, type PDFMargin, type PDFOptions, type PageEvent, type PageExtInPlaywright, type PageExtInPuppeteer, type PageInfo, type PageOpenType, type PageStatus, type PaperFormat, PlaywrightBrowser, PlaywrightBrowserContext, PlaywrightElement, PlaywrightPage, type Proxy, 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 ScreenshotOptions, type SelectOptions, type StateData, type UpdatablePageInfo, type ViewportSize, type WaitElementOptions, type WaitElementState, type WaitNavigationOptions, defaultProxy };

package/dist/index.js

@@ -486,6 +486,9 @@ var PlaywrightPage = class extends EventEmitter {
           popupPageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
           pageInfo.openType = "popup";
           evtData = this.browserContext().page(pageIdx);
+          if (evtData && page.pageInfo?.taskId) {
+            pageInfo.relatedId = page.pageInfo.taskId;
+          }
         } else {
           logerr(`##browser  ${pageId} has popup without page.pageInfo`);
         }
@@ -505,8 +508,8 @@ var PlaywrightPage = class extends EventEmitter {
     this.#page = page;
     this.#status = "free";
     const currentTime = getCurrentUnixTime();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId };
+    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 = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#resquestInterceptionOptions = [];
     this.#responseInterceptionOptions = [];
@@ -792,14 +795,20 @@ var PlaywrightPage = class extends EventEmitter {
       throw new Error("Invalid paras in setPageInfo");
     }
     const actPageInfo = this.#page.pageInfo;
-    if (pageInfo.openType && ["launch", "newpage", "popup", "connect", "other"].includes(pageInfo.openType)) {
-      actPageInfo.openType = pageInfo.openType;
+    const { lastStatusUpdateTime, taskId, relatedId, misc } = pageInfo;
+    if (typeof lastStatusUpdateTime === "number") {
+      actPageInfo.lastStatusUpdateTime = lastStatusUpdateTime;
+    }
+    if (typeof taskId === "number") {
+      actPageInfo.taskId = taskId;
     }
-    if (typeof pageInfo.lastStatusUpdateTime === "number") {
-      actPageInfo.lastStatusUpdateTime = pageInfo.lastStatusUpdateTime;
+    if (typeof relatedId === "number") {
+      actPageInfo.relatedId = relatedId;
     }
-    if (typeof pageInfo.taskId === "number") {
-      actPageInfo.taskId = pageInfo.taskId;
+    if (misc && typeof misc === "object") {
+      for (const key of Object.keys(misc)) {
+        actPageInfo.misc[key] = misc[key];
+      }
     }
     return true;
   }
@@ -1076,7 +1085,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
     const openType = this.#lsdBrowser.browserCreationMethod();
     const lastStatusUpdateTime = getCurrentUnixTime2();
     for (const page of pages) {
-      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0 };
+      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0, relatedId: 0, misc: {} };
       const lsdPage = new PlaywrightPage(this, page, pageInfo);
       this.#lsdPages.push(lsdPage);
       loginfo2(`##browser  ${lsdPage.id()} ${openType}ed`);
@@ -1110,7 +1119,7 @@ var PlaywrightBrowserContext = class extends EventEmitter2 {
         logwarn2(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
       } else {
         const currentTime = getCurrentUnixTime2();
-        const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0 };
+        const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0, relatedId: 0, misc: {} };
         const lsdPage = new PlaywrightPage(this, page, pageInfo2);
         this.#lsdPages.push(lsdPage);
         loginfo2(`##browser ${lsdPage.id()} created`);
@@ -1897,6 +1906,9 @@ var PuppeteerPage = class extends EventEmitter4 {
           popupPageId = `page-${browserIdx}-${browserContextIdx}-${pageIdx}`;
           pageInfo.openType = "popup";
           evtData = this.browserContext().page(pageIdx);
+          if (evtData && page.pageInfo?.taskId) {
+            pageInfo.relatedId = page.pageInfo.taskId;
+          }
         } else {
           logerr5(`##browser  ${pageId} has popup without page.pageInfo`);
         }
@@ -1916,8 +1928,8 @@ var PuppeteerPage = class extends EventEmitter4 {
     this.#page = page;
     this.#status = "free";
     const currentTime = getCurrentUnixTime3();
-    const { browserIdx = 0, browserContextIdx = 0, pageIdx = 0, openType = "other", openTime = currentTime, lastStatusUpdateTime = currentTime, taskId = 0 } = pageInfo ? pageInfo : {};
-    this.#page.pageInfo = { browserIdx, browserContextIdx, pageIdx, openType, openTime, lastStatusUpdateTime, taskId };
+    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 = `page${browserIdx}-${browserContextIdx}-${pageIdx}`;
     this.#requestInterceptionNum = 0;
     this.#responseInterceptionNum = 0;
@@ -2206,14 +2218,20 @@ var PuppeteerPage = class extends EventEmitter4 {
       throw new Error("Invalid paras in setPageInfo");
     }
     const actPageInfo = this.#page.pageInfo;
-    if (pageInfo.openType && ["launch", "newpage", "popup", "connect", "other"].includes(pageInfo.openType)) {
-      actPageInfo.openType = pageInfo.openType;
+    const { lastStatusUpdateTime, taskId, relatedId, misc } = pageInfo;
+    if (typeof lastStatusUpdateTime === "number") {
+      actPageInfo.lastStatusUpdateTime = lastStatusUpdateTime;
+    }
+    if (typeof taskId === "number") {
+      actPageInfo.taskId = taskId;
     }
-    if (typeof pageInfo.lastStatusUpdateTime === "number") {
-      actPageInfo.lastStatusUpdateTime = pageInfo.lastStatusUpdateTime;
+    if (typeof relatedId === "number") {
+      actPageInfo.relatedId = relatedId;
     }
-    if (typeof pageInfo.taskId === "number") {
-      actPageInfo.taskId = pageInfo.taskId;
+    if (misc && typeof misc === "object") {
+      for (const key of Object.keys(misc)) {
+        actPageInfo.misc[key] = misc[key];
+      }
     }
     return true;
   }
@@ -2479,7 +2497,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
     const openType = this.#lsdBrowser.browserCreationMethod();
     const lastStatusUpdateTime = getCurrentUnixTime4();
     for (const page of pages) {
-      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0 };
+      const pageInfo = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType, openTime: this.#createTime, lastStatusUpdateTime, taskId: 0, relatedId: 0, misc: {} };
       const lsdPage = new PuppeteerPage(this, page, pageInfo);
       if (this.#userAgent) {
         await lsdPage.setUserAgent(this.#userAgent);
@@ -2522,7 +2540,7 @@ var PuppeteerBrowserContext = class extends EventEmitter5 {
           logwarn4(`##browser page-${browserIdx2}-${browserContextIdx2}-${pageIdx} has been already created`);
         } else {
           const currentTime = getCurrentUnixTime4();
-          const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0 };
+          const pageInfo2 = { browserIdx: this.#browserIdx, browserContextIdx: this.#browserContextIdx, pageIdx: this.#nextPageIdx++, openType: "other", openTime: currentTime, lastStatusUpdateTime: currentTime, taskId: 0, relatedId: 0, misc: {} };
           const lsdPage = new PuppeteerPage(this, page, pageInfo2);
           if (this.#userAgent) {
             await lsdPage.setUserAgent(this.#userAgent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsscrapedata/controller",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Unified browser / HTML controller interfaces that support playwright, puppeteer and cheerio",
   "type": "module",
   "main": "./dist/index.mjs",