chrome-devtools-frontend 1.0.1512349 → 1.0.1513662

package/front_end/core/sdk/ServiceWorkerCacheModel.ts

@@ -29,7 +29,7 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
   readonly #storageAgent: ProtocolProxyApi.StorageApi;
   readonly #storageBucketModel: StorageBucketsModel;
 
-  readonly #cachesInternal = new Map<string, Cache>();
+  readonly #caches = new Map<string, Cache>();
   readonly #storageKeysTracked = new Set<string>();
   readonly #storageBucketsUpdated = new Set<Protocol.Storage.StorageBucket>();
   readonly #throttler = new Common.Throttler.Throttler(2000);
@@ -66,9 +66,9 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
   }
 
   clearForStorageKey(storageKey: string): void {
-    for (const [opaqueId, cache] of this.#cachesInternal.entries()) {
+    for (const [opaqueId, cache] of this.#caches.entries()) {
       if (cache.storageKey === storageKey) {
-        this.#cachesInternal.delete((opaqueId));
+        this.#caches.delete((opaqueId));
         this.cacheRemoved((cache));
       }
     }
@@ -78,10 +78,10 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
   }
 
   refreshCacheNames(): void {
-    for (const cache of this.#cachesInternal.values()) {
+    for (const cache of this.#caches.values()) {
       this.cacheRemoved(cache);
     }
-    this.#cachesInternal.clear();
+    this.#caches.clear();
     const storageBuckets = this.#storageBucketModel.getBuckets();
     for (const storageBucket of storageBuckets) {
       void this.loadCacheNames(storageBucket.bucket);
@@ -94,7 +94,7 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
       console.error(`ServiceWorkerCacheAgent error deleting cache ${cache.toString()}: ${response.getError()}`);
       return;
     }
-    this.#cachesInternal.delete(cache.cacheId);
+    this.#caches.delete(cache.cacheId);
     this.cacheRemoved(cache);
   }
 
@@ -120,14 +120,14 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
   }
 
   caches(): Cache[] {
-    return [...this.#cachesInternal.values()];
+    return [...this.#caches.values()];
   }
 
   override dispose(): void {
-    for (const cache of this.#cachesInternal.values()) {
+    for (const cache of this.#caches.values()) {
       this.cacheRemoved(cache);
     }
-    this.#cachesInternal.clear();
+    this.#caches.clear();
     if (this.#enabled) {
       this.#storageBucketModel.removeEventListener(
           StorageBucketsModelEvents.BUCKET_ADDED, this.storageBucketAdded, this);
@@ -146,13 +146,13 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
 
   private removeStorageBucket(storageBucket: Protocol.Storage.StorageBucket): void {
     let storageKeyCount = 0;
-    for (const [opaqueId, cache] of this.#cachesInternal.entries()) {
+    for (const [opaqueId, cache] of this.#caches.entries()) {
       if (storageBucket.storageKey === cache.storageKey) {
         storageKeyCount++;
       }
       if (cache.inBucket(storageBucket)) {
         storageKeyCount--;
-        this.#cachesInternal.delete((opaqueId));
+        this.#caches.delete((opaqueId));
         this.cacheRemoved((cache));
       }
     }
@@ -175,7 +175,7 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
     function deleteAndSaveOldCaches(this: ServiceWorkerCacheModel, cache: Cache): void {
       if (cache.inBucket(storageBucket) && !updatingCachesIds.has(cache.cacheId)) {
         oldCaches.set(cache.cacheId, cache);
-        this.#cachesInternal.delete(cache.cacheId);
+        this.#caches.delete(cache.cacheId);
       }
     }
 
@@ -191,13 +191,13 @@ export class ServiceWorkerCacheModel extends SDKModel<EventTypes> implements Pro
       }
       const cache = new Cache(this, storageBucket, cacheJson.cacheName, cacheJson.cacheId);
       updatingCachesIds.add(cache.cacheId);
-      if (this.#cachesInternal.has(cache.cacheId)) {
+      if (this.#caches.has(cache.cacheId)) {
         continue;
       }
       newCaches.set(cache.cacheId, cache);
-      this.#cachesInternal.set(cache.cacheId, cache);
+      this.#caches.set(cache.cacheId, cache);
     }
-    this.#cachesInternal.forEach(deleteAndSaveOldCaches, this);
+    this.#caches.forEach(deleteAndSaveOldCaches, this);
     newCaches.forEach(this.cacheAdded, this);
     oldCaches.forEach(this.cacheRemoved, this);
   }

package/front_end/core/sdk/ServiceWorkerManager.ts

@@ -98,14 +98,9 @@ const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined
 
 export class ServiceWorkerManager extends SDKModel<EventTypes> {
   readonly #agent: ProtocolProxyApi.ServiceWorkerApi;
-  readonly #registrationsInternal = new Map<string, ServiceWorkerRegistration>();
+  readonly #registrations = new Map<string, ServiceWorkerRegistration>();
   #enabled = false;
   readonly #forceUpdateSetting: Common.Settings.Setting<boolean>;
-  /** Status of service worker network requests panel */
-  serviceWorkerNetworkRequestsPanelStatus = {
-    isOpen: false,
-    openedAt: 0,
-  };
 
   constructor(target: Target) {
     super(target);
@@ -134,12 +129,12 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
       return;
     }
     this.#enabled = false;
-    this.#registrationsInternal.clear();
+    this.#registrations.clear();
     await this.#agent.invoke_enable();
   }
 
   registrations(): Map<string, ServiceWorkerRegistration> {
-    return this.#registrationsInternal;
+    return this.#registrations;
   }
 
   findVersion(versionId: string): ServiceWorkerVersion|null {
@@ -153,12 +148,12 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   }
 
   deleteRegistration(registrationId: string): void {
-    const registration = this.#registrationsInternal.get(registrationId);
+    const registration = this.#registrations.get(registrationId);
     if (!registration) {
       return;
     }
     if (registration.isRedundant()) {
-      this.#registrationsInternal.delete(registrationId);
+      this.#registrations.delete(registrationId);
       this.dispatchEventToListeners(Events.REGISTRATION_DELETED, registration);
       return;
     }
@@ -170,7 +165,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   }
 
   async updateRegistration(registrationId: string): Promise<void> {
-    const registration = this.#registrationsInternal.get(registrationId);
+    const registration = this.#registrations.get(registrationId);
     if (!registration) {
       return;
     }
@@ -178,7 +173,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   }
 
   async deliverPushMessage(registrationId: Protocol.ServiceWorker.RegistrationID, data: string): Promise<void> {
-    const registration = this.#registrationsInternal.get(registrationId);
+    const registration = this.#registrations.get(registrationId);
     if (!registration) {
       return;
     }
@@ -188,7 +183,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
 
   async dispatchSyncEvent(registrationId: Protocol.ServiceWorker.RegistrationID, tag: string, lastChance: boolean):
       Promise<void> {
-    const registration = this.#registrationsInternal.get(registrationId);
+    const registration = this.#registrations.get(registrationId);
     if (!registration) {
       return;
     }
@@ -197,7 +192,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   }
 
   async dispatchPeriodicSyncEvent(registrationId: Protocol.ServiceWorker.RegistrationID, tag: string): Promise<void> {
-    const registration = this.#registrationsInternal.get(registrationId);
+    const registration = this.#registrations.get(registrationId);
     if (!registration) {
       return;
     }
@@ -223,17 +218,17 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
 
   workerRegistrationUpdated(registrations: Protocol.ServiceWorker.ServiceWorkerRegistration[]): void {
     for (const payload of registrations) {
-      let registration = this.#registrationsInternal.get(payload.registrationId);
+      let registration = this.#registrations.get(payload.registrationId);
       if (!registration) {
         registration = new ServiceWorkerRegistration(payload);
-        this.#registrationsInternal.set(payload.registrationId, registration);
+        this.#registrations.set(payload.registrationId, registration);
         this.dispatchEventToListeners(Events.REGISTRATION_UPDATED, registration);
         continue;
       }
       registration.update(payload);
 
       if (registration.shouldBeRemoved()) {
-        this.#registrationsInternal.delete(registration.id);
+        this.#registrations.delete(registration.id);
         this.dispatchEventToListeners(Events.REGISTRATION_DELETED, registration);
       } else {
         this.dispatchEventToListeners(Events.REGISTRATION_UPDATED, registration);
@@ -244,7 +239,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   workerVersionUpdated(versions: Protocol.ServiceWorker.ServiceWorkerVersion[]): void {
     const registrations = new Set<ServiceWorkerRegistration>();
     for (const payload of versions) {
-      const registration = this.#registrationsInternal.get(payload.registrationId);
+      const registration = this.#registrations.get(payload.registrationId);
       if (!registration) {
         continue;
       }
@@ -253,7 +248,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
     }
     for (const registration of registrations) {
       if (registration.shouldBeRemoved()) {
-        this.#registrationsInternal.delete(registration.id);
+        this.#registrations.delete(registration.id);
         this.dispatchEventToListeners(Events.REGISTRATION_DELETED, registration);
       } else {
         this.dispatchEventToListeners(Events.REGISTRATION_UPDATED, registration);
@@ -262,7 +257,7 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   }
 
   workerErrorReported(payload: Protocol.ServiceWorker.ServiceWorkerErrorMessage): void {
-    const registration = this.#registrationsInternal.get(payload.registrationId);
+    const registration = this.#registrations.get(payload.registrationId);
     if (!registration) {
       return;
     }
@@ -503,7 +498,7 @@ export namespace ServiceWorkerVersion {
 }
 
 export class ServiceWorkerRegistration {
-  #fingerprintInternal!: symbol;
+  #fingerprint!: symbol;
   id!: Protocol.ServiceWorker.RegistrationID;
   scopeURL!: Platform.DevToolsPath.UrlString;
   securityOrigin!: Platform.DevToolsPath.UrlString;
@@ -517,7 +512,7 @@ export class ServiceWorkerRegistration {
   }
 
   update(payload: Protocol.ServiceWorker.ServiceWorkerRegistration): void {
-    this.#fingerprintInternal = Symbol('fingerprint');
+    this.#fingerprint = Symbol('fingerprint');
     this.id = payload.registrationId;
     this.scopeURL = payload.scopeURL as Platform.DevToolsPath.UrlString;
     const parsedURL = new Common.ParsedURL.ParsedURL(payload.scopeURL);
@@ -526,7 +521,7 @@ export class ServiceWorkerRegistration {
   }
 
   fingerprint(): symbol {
-    return this.#fingerprintInternal;
+    return this.#fingerprint;
   }
 
   versionsByMode(): Map<string, ServiceWorkerVersion> {
@@ -538,7 +533,7 @@ export class ServiceWorkerRegistration {
   }
 
   updateVersion(payload: Protocol.ServiceWorker.ServiceWorkerVersion): ServiceWorkerVersion {
-    this.#fingerprintInternal = Symbol('fingerprint');
+    this.#fingerprint = Symbol('fingerprint');
     let version = this.versions.get(payload.versionId);
     if (!version) {
       version = new ServiceWorkerVersion(this, payload);

package/front_end/core/sdk/SourceMap.ts

@@ -153,10 +153,10 @@ export class SourceMap {
   static retainRawSourceMaps = false;
 
   #json: SourceMapV3|null;
-  readonly #compiledURLInternal: Platform.DevToolsPath.UrlString;
+  readonly #compiledURL: Platform.DevToolsPath.UrlString;
   readonly #sourceMappingURL: Platform.DevToolsPath.UrlString;
   readonly #baseURL: Platform.DevToolsPath.UrlString;
-  #mappingsInternal: SourceMapEntry[]|null;
+  #mappings: SourceMapEntry[]|null;
 
   readonly #sourceInfos: SourceInfo[] = [];
   readonly #sourceInfoByURL = new Map<Platform.DevToolsPath.UrlString, SourceInfo>();
@@ -173,12 +173,12 @@ export class SourceMap {
       compiledURL: Platform.DevToolsPath.UrlString, sourceMappingURL: Platform.DevToolsPath.UrlString,
       payload: SourceMapV3) {
     this.#json = payload;
-    this.#compiledURLInternal = compiledURL;
+    this.#compiledURL = compiledURL;
     this.#sourceMappingURL = sourceMappingURL;
     this.#baseURL = (Common.ParsedURL.schemeIs(sourceMappingURL, 'data:')) ? compiledURL : sourceMappingURL;
     this.#debugId = 'debugId' in payload ? (payload.debugId as DebugId | undefined) : undefined;
 
-    this.#mappingsInternal = null;
+    this.#mappings = null;
     if ('sections' in this.#json) {
       if (this.#json.sections.find(section => 'url' in section)) {
         Common.Console.Console.instance().warn(
@@ -218,7 +218,7 @@ export class SourceMap {
   }
 
   compiledURL(): Platform.DevToolsPath.UrlString {
-    return this.#compiledURLInternal;
+    return this.#compiledURL;
   }
 
   url(): Platform.DevToolsPath.UrlString {
@@ -403,7 +403,7 @@ export class SourceMap {
 
   mappings(): SourceMapEntry[] {
     this.#ensureMappingsProcessed();
-    return this.#mappingsInternal ?? [];
+    return this.#mappings ?? [];
   }
 
   private reversedMappings(sourceURL: Platform.DevToolsPath.UrlString): number[] {
@@ -412,19 +412,19 @@ export class SourceMap {
   }
 
   #ensureMappingsProcessed(): void {
-    if (this.#mappingsInternal === null) {
-      this.#mappingsInternal = [];
+    if (this.#mappings === null) {
+      this.#mappings = [];
       try {
         this.eachSection(this.parseMap.bind(this));
       } catch (e) {
         console.error('Failed to parse source map', e);
-        this.#mappingsInternal = [];
+        this.#mappings = [];
       }
 
       // As per spec, mappings are not necessarily sorted.
       this.mappings().sort(SourceMapEntry.compare);
 
-      this.#computeReverseMappings(this.#mappingsInternal);
+      this.#computeReverseMappings(this.#mappings);
     }
 
     if (!SourceMap.retainRawSourceMaps) {

package/front_end/core/sdk/StorageKeyManager.ts

@@ -9,26 +9,26 @@ import {SDKModel} from './SDKModel.js';
 import {Capability, type Target} from './Target.js';
 
 export class StorageKeyManager extends SDKModel<EventTypes> {
-  #mainStorageKeyInternal: string;
-  #storageKeysInternal: Set<string>;
+  #mainStorageKey: string;
+  #storageKeys: Set<string>;
   constructor(target: Target) {
     super(target);
 
-    this.#mainStorageKeyInternal = '';
-    this.#storageKeysInternal = new Set();
+    this.#mainStorageKey = '';
+    this.#storageKeys = new Set();
   }
 
   updateStorageKeys(storageKeys: Set<string>): void {
-    const oldStorageKeys = this.#storageKeysInternal;
-    this.#storageKeysInternal = storageKeys;
+    const oldStorageKeys = this.#storageKeys;
+    this.#storageKeys = storageKeys;
 
     for (const storageKey of oldStorageKeys) {
-      if (!this.#storageKeysInternal.has(storageKey)) {
+      if (!this.#storageKeys.has(storageKey)) {
         this.dispatchEventToListeners(Events.STORAGE_KEY_REMOVED, storageKey);
       }
     }
 
-    for (const storageKey of this.#storageKeysInternal) {
+    for (const storageKey of this.#storageKeys) {
       if (!oldStorageKeys.has(storageKey)) {
         this.dispatchEventToListeners(Events.STORAGE_KEY_ADDED, storageKey);
       }
@@ -36,17 +36,17 @@ export class StorageKeyManager extends SDKModel<EventTypes> {
   }
 
   storageKeys(): string[] {
-    return [...this.#storageKeysInternal];
+    return [...this.#storageKeys];
   }
 
   mainStorageKey(): string {
-    return this.#mainStorageKeyInternal;
+    return this.#mainStorageKey;
   }
 
   setMainStorageKey(storageKey: string): void {
-    this.#mainStorageKeyInternal = storageKey;
+    this.#mainStorageKey = storageKey;
     this.dispatchEventToListeners(Events.MAIN_STORAGE_KEY_CHANGED, {
-      mainStorageKey: this.#mainStorageKeyInternal,
+      mainStorageKey: this.#mainStorageKey,
     });
   }
 }

package/front_end/core/sdk/Target.ts

@@ -11,14 +11,14 @@ import {SDKModel} from './SDKModel.js';
 import type {TargetManager} from './TargetManager.js';
 
 export class Target extends ProtocolClient.InspectorBackend.TargetBase {
-  readonly #targetManagerInternal: TargetManager;
-  #nameInternal: string;
-  #inspectedURLInternal: Platform.DevToolsPath.UrlString = Platform.DevToolsPath.EmptyUrlString;
+  readonly #targetManager: TargetManager;
+  #name: string;
+  #inspectedURL: Platform.DevToolsPath.UrlString = Platform.DevToolsPath.EmptyUrlString;
   #inspectedURLName = '';
   readonly #capabilitiesMask: number;
-  #typeInternal: Type;
-  readonly #parentTargetInternal: Target|null;
-  #idInternal: Protocol.Target.TargetID|'main';
+  #type: Type;
+  readonly #parentTarget: Target|null;
+  #id: Protocol.Target.TargetID|'main';
   #modelByConstructor = new Map<new(arg1: Target) => SDKModel, SDKModel>();
   #isSuspended: boolean;
   /**
@@ -33,7 +33,7 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
    * crbug.com/387258086).
    */
   #hasCrashed = false;
-  #targetInfoInternal: Protocol.Target.TargetInfo|undefined;
+  #targetInfo: Protocol.Target.TargetInfo|undefined;
   #creatingModels?: boolean;
 
   constructor(
@@ -42,8 +42,8 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
       connection: ProtocolClient.InspectorBackend.Connection|null, targetInfo?: Protocol.Target.TargetInfo) {
     const needsNodeJSPatching = type === Type.NODE;
     super(needsNodeJSPatching, parentTarget, sessionId, connection);
-    this.#targetManagerInternal = targetManager;
-    this.#nameInternal = name;
+    this.#targetManager = targetManager;
+    this.#name = name;
     this.#capabilitiesMask = 0;
     switch (type) {
       case Type.FRAME:
@@ -99,11 +99,11 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
       case Type.NODE_WORKER:
         this.#capabilitiesMask = Capability.JS | Capability.NETWORK | Capability.TARGET | Capability.IO;
     }
-    this.#typeInternal = type;
-    this.#parentTargetInternal = parentTarget;
-    this.#idInternal = id;
+    this.#type = type;
+    this.#parentTarget = parentTarget;
+    this.#id = id;
     this.#isSuspended = suspended;
-    this.#targetInfoInternal = targetInfo;
+    this.#targetInfo = targetInfo;
   }
 
   createModels(required: Set<new(arg1: Target) => SDKModel>): void {
@@ -125,32 +125,32 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
   }
 
   id(): Protocol.Target.TargetID|'main' {
-    return this.#idInternal;
+    return this.#id;
   }
 
   name(): string {
-    return this.#nameInternal || this.#inspectedURLName;
+    return this.#name || this.#inspectedURLName;
   }
 
   setName(name: string): void {
-    if (this.#nameInternal === name) {
+    if (this.#name === name) {
       return;
     }
-    this.#nameInternal = name;
-    this.#targetManagerInternal.onNameChange(this);
+    this.#name = name;
+    this.#targetManager.onNameChange(this);
   }
 
   type(): Type {
-    return this.#typeInternal;
+    return this.#type;
   }
 
   override markAsNodeJSForTest(): void {
     super.markAsNodeJSForTest();
-    this.#typeInternal = Type.NODE;
+    this.#type = Type.NODE;
   }
 
   targetManager(): TargetManager {
-    return this.#targetManagerInternal;
+    return this.#targetManager;
   }
 
   hasAllCapabilities(capabilitiesMask: number): boolean {
@@ -160,12 +160,11 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
   }
 
   decorateLabel(label: string): string {
-    return (this.#typeInternal === Type.Worker || this.#typeInternal === Type.ServiceWorker) ? '\u2699 ' + label :
-                                                                                               label;
+    return (this.#type === Type.Worker || this.#type === Type.ServiceWorker) ? '\u2699 ' + label : label;
   }
 
   parentTarget(): Target|null {
-    return this.#parentTargetInternal;
+    return this.#parentTarget;
   }
 
   outermostTarget(): Target|null {
@@ -183,7 +182,7 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
 
   override dispose(reason: string): void {
     super.dispose(reason);
-    this.#targetManagerInternal.removeTarget(this);
+    this.#targetManager.removeTarget(this);
     for (const model of this.#modelByConstructor.values()) {
       model.dispose();
     }
@@ -199,7 +198,7 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
         const model = new modelClass(this);
         this.#modelByConstructor.set(modelClass, model);
         if (!this.#creatingModels) {
-          this.#targetManagerInternal.modelAdded(modelClass, model, this.#targetManagerInternal.isInScope(this));
+          this.#targetManager.modelAdded(modelClass, model, this.#targetManager.isInScope(this));
         }
       }
     }
@@ -211,16 +210,16 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
   }
 
   inspectedURL(): Platform.DevToolsPath.UrlString {
-    return this.#inspectedURLInternal;
+    return this.#inspectedURL;
   }
 
   setInspectedURL(inspectedURL: Platform.DevToolsPath.UrlString): void {
-    this.#inspectedURLInternal = inspectedURL;
+    this.#inspectedURL = inspectedURL;
     const parsedURL = Common.ParsedURL.ParsedURL.fromString(inspectedURL);
-    this.#inspectedURLName = parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + this.#idInternal;
-    this.#targetManagerInternal.onInspectedURLChange(this);
-    if (!this.#nameInternal) {
-      this.#targetManagerInternal.onNameChange(this);
+    this.#inspectedURLName = parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + this.#id;
+    this.#targetManager.onInspectedURLChange(this);
+    if (!this.#name) {
+      this.#targetManager.onNameChange(this);
     }
   }
 
@@ -277,11 +276,11 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
   }
 
   updateTargetInfo(targetInfo: Protocol.Target.TargetInfo): void {
-    this.#targetInfoInternal = targetInfo;
+    this.#targetInfo = targetInfo;
   }
 
   targetInfo(): Protocol.Target.TargetInfo|undefined {
-    return this.#targetInfoInternal;
+    return this.#targetInfo;
   }
 }