chore: use custom disposable stack (#10943)

packages/puppeteer-core/package.json

@@ -148,7 +148,6 @@
     "ws": "8.14.1"
   },
   "devDependencies": {
-    "disposablestack": "1.1.1",
     "mitt": "3.0.1",
     "parsel-js": "1.1.2",
     "rxjs": "7.8.1"

packages/puppeteer-core/src/api/Browser.ts

@@ -18,10 +18,10 @@ import {type ChildProcess} from 'child_process';
 
 import {type Protocol} from 'devtools-protocol';
 
-import {Symbol} from '../../third_party/disposablestack/disposablestack.js';
 import {EventEmitter, type EventType} from '../common/EventEmitter.js';
 import {debugError, waitWithTimeout} from '../common/util.js';
 import {Deferred} from '../util/Deferred.js';
+import {asyncDisposeSymbol, disposeSymbol} from '../util/disposable.js';
 
 import type {BrowserContext} from './BrowserContext.js';
 import type {Page} from './Page.js';
@@ -488,12 +488,12 @@ export abstract class Browser extends EventEmitter<BrowserEvents> {
   abstract get connected(): boolean;
 
   /** @internal */
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     return void this.close().catch(debugError);
   }
 
   /** @internal */
-  [Symbol.asyncDispose](): Promise<void> {
+  [asyncDisposeSymbol](): Promise<void> {
     return this.close();
   }
 }

packages/puppeteer-core/src/api/BrowserContext.ts

@@ -16,6 +16,7 @@
 
 import {EventEmitter, type EventType} from '../common/EventEmitter.js';
 import {debugError} from '../common/util.js';
+import {asyncDisposeSymbol, disposeSymbol} from '../util/disposable.js';
 
 import type {Browser, Permission} from './Browser.js';
 import {type Page} from './Page.js';
@@ -226,12 +227,12 @@ export abstract class BrowserContext extends EventEmitter<BrowserContextEvents>
   }
 
   /** @internal */
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     return void this.close().catch(debugError);
   }
 
   /** @internal */
-  [Symbol.asyncDispose](): Promise<void> {
+  [asyncDisposeSymbol](): Promise<void> {
     return this.close();
   }
 }

packages/puppeteer-core/src/api/JSHandle.ts

@@ -16,14 +16,14 @@
 
 import type Protocol from 'devtools-protocol';
 
-import {Symbol} from '../../third_party/disposablestack/disposablestack.js';
 import {
   type EvaluateFuncWith,
   type HandleFor,
   type HandleOr,
 } from '../common/types.js';
 import {debugError, withSourcePuppeteerURLIfNone} from '../common/util.js';
 import {moveable, throwIfDisposed} from '../util/decorators.js';
+import {disposeSymbol, asyncDisposeSymbol} from '../util/disposable.js';
 
 import {type ElementHandle} from './ElementHandle.js';
 import {type Realm} from './Realm.js';
@@ -217,12 +217,12 @@ export abstract class JSHandle<T = unknown> {
   abstract remoteObject(): Protocol.Runtime.RemoteObject;
 
   /** @internal */
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     return void this.dispose().catch(debugError);
   }
 
   /** @internal */
-  [Symbol.asyncDispose](): Promise<void> {
+  [asyncDisposeSymbol](): Promise<void> {
     return this.dispose();
   }
 }

packages/puppeteer-core/src/api/Page.ts

@@ -82,6 +82,7 @@ import {
 import type {Viewport} from '../common/Viewport.js';
 import {assert} from '../util/assert.js';
 import {type Deferred} from '../util/Deferred.js';
+import {asyncDisposeSymbol, disposeSymbol} from '../util/disposable.js';
 
 import type {Browser} from './Browser.js';
 import type {BrowserContext} from './BrowserContext.js';
@@ -2853,12 +2854,12 @@ export abstract class Page extends EventEmitter<PageEvents> {
   }
 
   /** @internal */
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     return void this.close().catch(debugError);
   }
 
   /** @internal */
-  [Symbol.asyncDispose](): Promise<void> {
+  [asyncDisposeSymbol](): Promise<void> {
     return this.close();
   }
 }

packages/puppeteer-core/src/api/Realm.ts

@@ -21,6 +21,7 @@ import {
   type InnerLazyParams,
 } from '../common/types.js';
 import {TaskManager, WaitTask} from '../common/WaitTask.js';
+import {disposeSymbol} from '../util/disposable.js';
 
 import {type ElementHandle} from './ElementHandle.js';
 import {type Environment} from './Environment.js';
@@ -102,7 +103,7 @@ export abstract class Realm implements Disposable {
 
   #disposed = false;
   /** @internal */
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     this.#disposed = true;
     this.taskManager.terminateAll(
       new Error('waitForFunction failed: frame got detached.')

packages/puppeteer-core/src/bidi/Frame.ts

@@ -34,6 +34,7 @@ import {
   waitWithTimeout,
 } from '../common/util.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 
 import {
   getWaitUntilSingle,
@@ -250,15 +251,15 @@ export class BidiFrame extends Frame {
     return this.#disposed;
   }
 
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     if (this.#disposed) {
       return;
     }
     this.#disposed = true;
     this.#abortDeferred.reject(new Error('Frame detached'));
     this.#context.dispose();
-    this.sandboxes[MAIN_SANDBOX][Symbol.dispose]();
-    this.sandboxes[PUPPETEER_SANDBOX][Symbol.dispose]();
+    this.sandboxes[MAIN_SANDBOX][disposeSymbol]();
+    this.sandboxes[PUPPETEER_SANDBOX][disposeSymbol]();
   }
 
   #exposedFunctions = new Map<string, ExposeableFunction<never[], unknown>>();

packages/puppeteer-core/src/bidi/NetworkManager.ts

@@ -22,6 +22,7 @@ import {
   EventSubscription,
   type EventType,
 } from '../common/EventEmitter.js';
+import {DisposableStack} from '../util/disposable.js';
 
 import {type BidiConnection} from './Connection.js';
 import {type BidiFrame} from './Frame.js';

packages/puppeteer-core/src/bidi/Page.ts

@@ -59,6 +59,7 @@ import {
 import {type Viewport} from '../common/Viewport.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 
 import {type BidiBrowser} from './Browser.js';
 import {type BidiBrowserContext} from './BrowserContext.js';
@@ -314,7 +315,7 @@ export class BidiPage extends Page {
     for (const child of frame.childFrames()) {
       this.#removeFramesRecursively(child);
     }
-    frame[Symbol.dispose]();
+    frame[disposeSymbol]();
     this.#networkManager.clearMapAfterFrameDispose(frame);
     this.#frameTree.removeFrame(frame);
     this.emit(PageEvent.FrameDetached, frame);

packages/puppeteer-core/src/bidi/Realm.ts

@@ -11,6 +11,7 @@ import {
   isString,
 } from '../common/util.js';
 import type PuppeteerUtil from '../injected/injected.js';
+import {disposeSymbol} from '../util/disposable.js';
 import {stringifyFunction} from '../util/Function.js';
 
 import {type BidiConnection} from './Connection.js';
@@ -198,7 +199,7 @@ export class BidiRealm extends EventEmitter<Record<EventType, any>> {
       : createBidiHandle(sandbox, result.result);
   }
 
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     this.connection.off(
       Bidi.ChromiumBidi.Script.EventNames.RealmCreated,
       this.handleRealmCreated

packages/puppeteer-core/src/cdp/Binding.ts

@@ -1,5 +1,6 @@
 import {JSHandle} from '../api/JSHandle.js';
 import {debugError} from '../common/util.js';
+import {DisposableStack} from '../util/disposable.js';
 import {isErrorLike} from '../util/ErrorLike.js';
 
 import {type ExecutionContext} from './ExecutionContext.js';

packages/puppeteer-core/src/cdp/Coverage.ts

@@ -20,6 +20,7 @@ import {type CDPSession} from '../api/CDPSession.js';
 import {EventSubscription} from '../common/EventEmitter.js';
 import {debugError, PuppeteerURL} from '../common/util.js';
 import {assert} from '../util/assert.js';
+import {DisposableStack} from '../util/disposable.js';
 
 /**
  * The CoverageEntry class represents one entry of the coverage report.

packages/puppeteer-core/src/cdp/Frame.ts

@@ -23,6 +23,7 @@ import {type Page, type WaitTimeoutOptions} from '../api/Page.js';
 import {setPageContent} from '../common/util.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 import {isErrorLike} from '../util/ErrorLike.js';
 
 import {
@@ -338,12 +339,12 @@ export class CdpFrame extends Frame {
     return this.#detached;
   }
 
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     if (this.#detached) {
       return;
     }
     this.#detached = true;
-    this.worlds[MAIN_WORLD][Symbol.dispose]();
-    this.worlds[PUPPETEER_WORLD][Symbol.dispose]();
+    this.worlds[MAIN_WORLD][disposeSymbol]();
+    this.worlds[PUPPETEER_WORLD][disposeSymbol]();
   }
 }

packages/puppeteer-core/src/cdp/FrameManager.ts

@@ -24,6 +24,7 @@ import {type TimeoutSettings} from '../common/TimeoutSettings.js';
 import {debugError, PuppeteerURL, UTILITY_WORLD_NAME} from '../common/util.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 import {isErrorLike} from '../util/ErrorLike.js';
 
 import {CdpCDPSession} from './CDPSession.js';
@@ -561,7 +562,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
     for (const child of frame.childFrames()) {
       this.#removeFramesRecursively(child);
     }
-    frame[Symbol.dispose]();
+    frame[disposeSymbol]();
     this._frameTree.removeFrame(frame);
     this.emit(FrameManagerEvent.FrameDetached, frame);
     frame.emit(FrameEvent.FrameDetached, frame);

packages/puppeteer-core/src/cdp/IsolatedWorld.ts

@@ -32,6 +32,7 @@ import {
   withSourcePuppeteerURLIfNone,
 } from '../common/util.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 
 import {type Binding} from './Binding.js';
 import {type ExecutionContext, createCdpHandle} from './ExecutionContext.js';
@@ -278,8 +279,8 @@ export class IsolatedWorld extends Realm {
     return newHandle;
   }
 
-  [Symbol.dispose](): void {
-    super[Symbol.dispose]();
+  [disposeSymbol](): void {
+    super[disposeSymbol]();
     this.client.off('Runtime.bindingCalled', this.#onBindingCalled);
   }
 }

packages/puppeteer-core/src/cdp/LifecycleWatcher.ts

@@ -22,6 +22,7 @@ import {type TimeoutError} from '../common/Errors.js';
 import {EventSubscription} from '../common/EventEmitter.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
+import {DisposableStack} from '../util/disposable.js';
 
 import {type CdpFrame} from './Frame.js';
 import {FrameManagerEvent} from './FrameManager.js';

packages/puppeteer-core/src/cdp/NetworkManager.ts

@@ -16,7 +16,7 @@
 
 import type {Protocol} from 'devtools-protocol';
 
-import {type CDPSession, CDPSessionEvent} from '../api/CDPSession.js';
+import {CDPSessionEvent, type CDPSession} from '../api/CDPSession.js';
 import type {Frame} from '../api/Frame.js';
 import {
   EventEmitter,
@@ -25,12 +25,13 @@ import {
 } from '../common/EventEmitter.js';
 import {debugError, isString} from '../common/util.js';
 import {assert} from '../util/assert.js';
+import {DisposableStack} from '../util/disposable.js';
 
 import {CdpHTTPRequest} from './HTTPRequest.js';
 import {CdpHTTPResponse} from './HTTPResponse.js';
 import {
-  type FetchRequestId,
   NetworkEventManager,
+  type FetchRequestId,
 } from './NetworkEventManager.js';
 
 /**

packages/puppeteer-core/src/common/EventEmitter.ts

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import {Symbol} from '../../third_party/disposablestack/disposablestack.js';
 import mitt, {
   type Emitter,
   type EventHandlerMap,
   type EventType,
 } from '../../third_party/mitt/index.js';
+import {disposeSymbol} from '../util/disposable.js';
 
 export {
   /**
@@ -230,7 +230,7 @@ export class EventSubscription<
     this.#target.on(this.#type, this.#handler);
   }
 
-  [Symbol.dispose](): void {
+  [disposeSymbol](): void {
     this.#target.off(this.#type, this.#handler);
   }
 }

packages/puppeteer-core/src/common/HandleIterator.ts

@@ -15,6 +15,7 @@
  */
 
 import {type JSHandle} from '../api/JSHandle.js';
+import {DisposableStack, disposeSymbol} from '../util/disposable.js';
 
 import {type AwaitableIterable, type HandleFor} from './types.js';
 
@@ -47,7 +48,7 @@ async function* fastTransposeIteratorHandle<T>(
   using stack = new DisposableStack();
   stack.defer(() => {
     for (using handle of handles) {
-      handle[Symbol.dispose]();
+      handle[disposeSymbol]();
     }
   });
   yield* handles;

packages/puppeteer-core/src/common/util.ts

@@ -29,6 +29,7 @@ import {type Page} from '../api/Page.js';
 import {isNode} from '../environment.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
+import {disposeSymbol} from '../util/disposable.js';
 import {isErrorLike} from '../util/ErrorLike.js';
 
 import {debug} from './Debug.js';
@@ -614,7 +615,7 @@ export class Mutex {
     constructor(mutex: Mutex) {
       this.#mutex = mutex;
     }
-    [Symbol.dispose](): void {
+    [disposeSymbol](): void {
       return this.#mutex.release();
     }
   };

packages/puppeteer-core/src/node/PipeTransport.ts

@@ -17,6 +17,7 @@ import {type ConnectionTransport} from '../common/ConnectionTransport.js';
 import {EventSubscription} from '../common/EventEmitter.js';
 import {debugError} from '../common/util.js';
 import {assert} from '../util/assert.js';
+import {DisposableStack} from '../util/disposable.js';
 
 /**
  * @internal