feat: implement cancellation

Signed-off-by: Philippe Martin <phmartin@redhat.com>
containers · Nov 8, 2023 · 4ea5a5e · 4ea5a5e
1 parent b8352c3
commit 4ea5a5e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/packages/main/src/plugin/image-checker.ts b/packages/main/src/plugin/image-checker.ts
@@ -1,4 +1,5 @@
 import type {
+  CancellationToken,
   Disposable,
   ImageCheckerProvider,
   ImageCheckerProviderMetadata,
@@ -63,11 +64,11 @@ export class ImageCheckerImpl {
     });
   }
 
-  async check(providerId: string, image: ImageInfo): Promise<ImageChecks | undefined> {
+  async check(providerId: string, image: ImageInfo, token?: CancellationToken): Promise<ImageChecks | undefined> {
     const provider = this._imageCheckerProviders.get(providerId);
     if (provider === undefined) {
       throw new Error('provider not found with id ' + providerId);
     }
-    return provider.provider.check(image);
+    return provider.provider.check(image, token);
   }
 }
diff --git a/packages/main/src/plugin/index.ts b/packages/main/src/plugin/index.ts
@@ -1953,8 +1953,18 @@ export class PluginSystem {
 
     this.ipcHandle(
       'image-checker:check',
-      async (_listener, id: string, image: ImageInfo): Promise<containerDesktopAPI.ImageChecks | undefined> => {
-        return imageChecker.check(id, image);
+      async (
+        _listener,
+        id: string,
+        image: ImageInfo,
+        tokenId?: number,
+      ): Promise<containerDesktopAPI.ImageChecks | undefined> => {
+        let token;
+        if (tokenId) {
+          const tokenSource = cancellationTokenRegistry.getCancellationTokenSource(tokenId);
+          token = tokenSource?.token;
+        }
+        return imageChecker.check(id, image, token);
       },
     );
 

diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
@@ -1679,8 +1679,12 @@ function initExposure(): void {
 
   contextBridge.exposeInMainWorld(
     'imageCheck',
-    async (id: string, image: string): Promise<containerDesktopAPI.ImageChecks | undefined> => {
-      return ipcInvoke('image-checker:check', id, image);
+    async (
+      id: string,
+      image: string,
+      cancellationToken?: number,
+    ): Promise<containerDesktopAPI.ImageChecks | undefined> => {
+      return ipcInvoke('image-checker:check', id, image, cancellationToken);
     },
   );
 }