Provides minor adjustments to the "getWorkerByRegistration" refactoring

src/setupWorker/start/utils/getWorkerByRegistration.ts

@@ -1,14 +1,20 @@
 /**
- * Attempts to resolve a Service Worker instance from any of its states:
- * active, installing, or waiting.
+ * Attempts to resolve a Service Worker instance from a given registration,
+ * regardless of its state (active, installing, waiting).
  */
 export const getWorkerByRegistration = (
  registration: ServiceWorkerRegistration,
  absoluteWorkerUrl: string,
 ): ServiceWorker | null => {
- return (
- [registration.active, registration.installing, registration.waiting].find(
- (worker) => worker?.scriptURL === absoluteWorkerUrl,
- ) || null
- )
+ const allStates = [
+ registration.active,
+ registration.installing,
+ registration.waiting,
+ ]
+ const existingStates = allStates.filter(Boolean) as ServiceWorker[]
+ const mockWorker = existingStates.find((worker) => {
+ return worker.scriptURL === absoluteWorkerUrl
+ })
+
+ return mockWorker || null
 }

src/setupWorker/start/utils/getWorkerInstance.ts

@@ -1,5 +1,5 @@
-import { getWorkerByRegistration } from './getWorkerByRegistration'
 import { until } from '@open-draft/until'
+import { getWorkerByRegistration } from './getWorkerByRegistration'
 import { ServiceWorkerInstanceTuple } from '../../glossary'
 import { getAbsoluteWorkerUrl } from '../../../utils/getAbsoluteWorkerUrl'
 
@@ -16,9 +16,9 @@ export const getWorkerInstance = async (
 
  const [, mockRegistrations] = await until(async () => {
  const registrations = await navigator.serviceWorker.getRegistrations()
- return registrations.filter((registration) =>
- getWorkerByRegistration(registration, absoluteWorkerUrl),
- )
+ return registrations.filter((registration) => {
+ return getWorkerByRegistration(registration, absoluteWorkerUrl)
+ })
  })
 
  if (!navigator.serviceWorker.controller && mockRegistrations.length > 0) {
@@ -31,7 +31,7 @@ export const getWorkerInstance = async (
  location.reload()
  }
 
- const existingRegistration = mockRegistrations[0]
+ const [existingRegistration] = mockRegistrations
 
  if (existingRegistration) {
  // Update existing service worker to ensure it's up-to-date
@@ -47,6 +47,8 @@ export const getWorkerInstance = async (
  async () => {
  const registration = await navigator.serviceWorker.register(url, options)
  return [
+ // Compare existing worker registration by its worker URL,
+ // to prevent irrelevant workers to resolve here (such as Codesandbox worker).
  getWorkerByRegistration(registration, absoluteWorkerUrl),
  registration,
  ]