Handle Docker labels more carefully - may be null in some (edge?) cases

Author: pimterry

src/interceptors/docker/docker-commands.ts

@@ -51,7 +51,7 @@ export function isImageAvailable(docker: Docker, name: string) {
 }
 
 export function isInterceptedContainer(container: Docker.ContainerInspectInfo, port: string | number) {
-    return container.Config.Labels[DOCKER_CONTAINER_LABEL] === port.toString();
+    return container.Config.Labels?.[DOCKER_CONTAINER_LABEL] === port.toString();
 }
 
 const envArrayToObject = (envArray: string[] | null | undefined) =>

src/interceptors/docker/docker-data-injection.ts

@@ -102,7 +102,7 @@ export function ensureDockerInjectionVolumeExists(certContent: string) {
         const existingVolume = await docker.getVolume(DOCKER_DATA_VOLUME_NAME).inspect()
             .catch<false>(() => false);
         const isCertOutdated = existingVolume &&
-            existingVolume.Labels[DOCKER_VOLUME_CERT_LABEL] !== certContent;
+            existingVolume.Labels?.[DOCKER_VOLUME_CERT_LABEL] !== certContent;
 
         if (existingVolume && !isCertOutdated) return; // We're all good!
 
@@ -214,7 +214,7 @@ async function cleanupDataInjectionTools(docker: Docker) {
     });
     await Promise.all(
         blankContainers
-        .filter(c => c.Labels[DOCKER_BLANK_TAG] !== undefined) // Be extra careful
+        .filter(c => c.Labels?.[DOCKER_BLANK_TAG] !== undefined) // Be extra careful
         .map(c => docker.getContainer(c.Id).remove({ force: true }))
     );
 
@@ -224,7 +224,7 @@ async function cleanupDataInjectionTools(docker: Docker) {
 
     await Promise.all(
         blankImages
-        .filter(i => i.Labels[DOCKER_BLANK_TAG] !== undefined) // Be extra careful
+        .filter(i => i.Labels?.[DOCKER_BLANK_TAG] !== undefined) // Be extra careful
         .map(i => docker.getImage(i.Id).remove({ force: true }))
     );
 }

src/interceptors/docker/docker-interceptor.ts

@@ -55,7 +55,7 @@ export class DockerContainerInterceptor implements Interceptor {
                 id: containerData.Id,
                 names: containerData.Names,
                 command: containerData.Command,
-                labels: containerData.Labels,
+                labels: containerData.Labels ?? {},
                 state: containerData.State,
                 status: containerData.Status,
                 image: containerData.Image,
@@ -83,7 +83,7 @@ export class DockerContainerInterceptor implements Interceptor {
         if (!await this.isActivable()) return false;
 
         return Object.values((await this.getContainers())).some((target) => {
-            target.Labels[DOCKER_CONTAINER_LABEL] === proxyPort.toString()
+            target.Labels?.[DOCKER_CONTAINER_LABEL] === proxyPort.toString()
         });
     }