Use AbortSignal APIs for cancellation (internal-15053)

GitOrigin-RevId: 340c60cf2545304876ff2123c22d959b0e2420ea

Author: stepankuzmin

3d-style/source/tiled_3d_model_worker_source.ts

@@ -156,7 +156,7 @@ class Tiled3dModelWorkerSource implements WorkerSource {
             delete this.loading[uid];
             workerTile.status = 'done';
             this.loaded[uid] = workerTile;
-            if (err instanceof DOMException && err.name === 'AbortError') return null;
+            if (controller.signal.aborted) return null;
             throw err;
         }
 

3d-style/util/loaders.ts

@@ -352,7 +352,7 @@ export async function decodeGLTF(arrayBuffer: ArrayBuffer, byteOffset: number =
         await Promise.all(bufferLoads);
     }
 
-    if (signal && signal.aborted) throw new DOMException('Aborted', 'AbortError');
+    if (signal) signal.throwIfAborted();
 
     const assetLoads: Promise<unknown>[] = [];
     const dracoUsed = extensionsUsed && extensionsUsed.includes(DRACO_EXT);
@@ -374,7 +374,7 @@ export async function decodeGLTF(arrayBuffer: ArrayBuffer, byteOffset: number =
         await Promise.all(assetLoads);
     }
 
-    if (signal && signal.aborted) throw new DOMException('Aborted', 'AbortError');
+    if (signal) signal.throwIfAborted();
 
     if (dracoUsed && meshes) {
         for (const {primitives} of meshes) {

src/source/load_vector_tile.ts

@@ -108,7 +108,7 @@ export function loadVectorTile(
                 });
             })
             .catch((err: Error) => {
-                if (err.name === 'AbortError') return;
+                if (controller.signal.aborted) return;
                 // HTTP 404 on a sparse tileset: the tile intentionally doesn't exist.
                 // Convert to empty result — no parent fallback for HTTP sources.
                 if (isHttpNotFound(err)) {

src/source/raster_array_tile.ts

@@ -178,7 +178,7 @@ class RasterArrayTile extends Tile implements Tile {
                     callback(error as Error);
                 }
             })
-            .catch((err: Error) => { if (err.name !== 'AbortError') callback(err); });
+            .catch((err: Error) => { if (!controller.signal.aborted) callback(err); });
 
         return this.request;
     }
@@ -316,7 +316,7 @@ class RasterArrayTile extends Tile implements Tile {
             const controller = new AbortController();
             getArrayBuffer(rangeRequestParams, controller.signal)
                 .then(({data: buffer}) => onDataLoaded(null, buffer))
-                .catch((err: Error) => { if (err.name !== 'AbortError') onDataLoaded(err); });
+                .catch((err: Error) => { if (!controller.signal.aborted) onDataLoaded(err); });
 
             if (layerId !== null) {
                 const fetchQueue = this._fetchQueuePerLayer.get(layerId) || [];

src/source/raster_array_tile_worker_source.ts

@@ -101,7 +101,7 @@ class RasterArrayTileWorkerSource implements WorkerSource {
             const mrt = await workerTile.parse(data);
             return {mrt, headers};
         } catch (err) {
-            if (err instanceof DOMException && err.name === 'AbortError') return null;
+            if (controller.signal.aborted) return null;
             workerTile.status = 'done';
             this.loaded[uid] = workerTile;
             throw err;

src/source/raster_dem_tile_worker_source.ts

@@ -40,7 +40,7 @@ class RasterDEMTileWorkerSource implements WorkerSource {
             result.headers = headers;
             return result;
         } catch (err) {
-            if (err instanceof DOMException && err.name === 'AbortError') return null;
+            if (controller.signal.aborted) return null;
             throw err;
         } finally {
             delete this.loading[uid];
@@ -87,7 +87,6 @@ class RasterDEMTileWorkerSource implements WorkerSource {
             return result;
         } catch (err) {
             if (controller.signal.aborted) return null;
-            if (err instanceof DOMException && err.name === 'AbortError') return null;
             throw err;
         } finally {
             delete this.loading[uid];

src/util/actor.ts

@@ -102,7 +102,7 @@ class Actor<Outbox extends MessageMap> {
         const buffers: Set<Transferable> = new Set();
 
         if (signal && signal.aborted) {
-            return Promise.reject(new DOMException('Aborted', 'AbortError'));
+            return Promise.reject(signal.reason as Error);
         }
 
         this.target.postMessage({
@@ -122,7 +122,7 @@ class Actor<Outbox extends MessageMap> {
             if (signal) {
                 const abortHandler = () => {
                     this.pendingResponses.delete(id);
-                    reject(new DOMException('Aborted', 'AbortError'));
+                    reject(signal.reason as Error);
                 };
                 signal.addEventListener('abort', abortHandler, {once: true});
                 entry.detach = () => signal.removeEventListener('abort', abortHandler);

src/util/ajax.ts

@@ -157,7 +157,7 @@ async function makeFetchRequest<T>(requestParameters: RequestParameters, signal?
             if ((err as Error).message !== 'SecurityError') warnOnce((err as Error).toString());
         }
         if (cached && cached.fresh) {
-            if (signal && signal.aborted) throw new DOMException('Aborted', 'AbortError');
+            if (signal) signal.throwIfAborted();
             return readResponse<T>(requestParameters, cached.response);
         }
     }
@@ -173,7 +173,7 @@ async function makeFetchRequest<T>(requestParameters: RequestParameters, signal?
         throw new Error(`${(err as Error).message} ${requestParameters.url}`, {cause: err});
     }
 
-    if (signal && signal.aborted) throw new DOMException('Aborted', 'AbortError');
+    if (signal) signal.throwIfAborted();
     if (!fetched.ok) throw new AJAXError(fetched.statusText, fetched.status, requestParameters.url);
 
     // Clone before reading the body; cache the clone after the read completes. Aborting
@@ -195,7 +195,7 @@ async function makeXMLHttpRequest<T>(requestParameters: RequestParameters, signa
         const onAbort = () => {
             signal.removeEventListener('abort', onAbort);
             xhr.abort();
-            reject(new DOMException('Aborted', 'AbortError'));
+            reject(signal.reason as Error);
         };
 
         if (signal) {
@@ -253,9 +253,7 @@ async function makeXMLHttpRequest<T>(requestParameters: RequestParameters, signa
 }
 
 async function makeRequest<T>(requestParameters: RequestParameters, signal?: AbortSignal): Promise<RequestResponse<T>> {
-    if (signal && signal.aborted) {
-        throw new DOMException('Aborted', 'AbortError');
-    }
+    if (signal) signal.throwIfAborted();
 
     if (isFileURL(requestParameters.url)) {
         return makeXMLHttpRequest<T>(requestParameters, signal);
@@ -299,7 +297,7 @@ resetImageRequestQueue();
 function acquireImageRequest(signal?: AbortSignal): Promise<() => void> {
     return new Promise((resolve, reject) => {
         if (signal && signal.aborted) {
-            reject(new DOMException('Aborted', 'AbortError'));
+            reject(signal.reason as Error);
             return;
         }
 
@@ -327,7 +325,7 @@ function acquireImageRequest(signal?: AbortSignal): Promise<() => void> {
         const cancel = () => {
             const index = imageRequestQueue.indexOf(dequeue);
             if (index !== -1) imageRequestQueue.splice(index, 1);
-            reject(new DOMException('Aborted', 'AbortError'));
+            reject(signal.reason as Error);
         };
 
         if (signal) signal.addEventListener('abort', cancel);
@@ -354,9 +352,7 @@ export async function getImage(requestParameters: RequestParameters, signal?: Ab
             throw new Error(`Could not load image because of ${(e as Error).message}. Please make sure to use a supported image type such as PNG or JPEG. Note that SVGs are not supported.`, {cause: e});
         }
         // A late-resolving body must not deliver after abort, or it resurrects torn-down ImageSource state.
-        if (signal && signal.aborted) {
-            throw new DOMException('Aborted', 'AbortError');
-        }
+        if (signal) signal.throwIfAborted();
         return {data: bitmap, headers};
     } finally {
         release();