alchemy 0.85.2 → 0.87.0

package/src/docker/api.ts

@@ -106,9 +106,21 @@ export type ContainerInfo = {
         Aliases: string[] | null;
       }
     > | null;
+    Ports?: Record<
+      string,
+      Array<{ HostIp: string; HostPort: string }> | null
+    > | null;
   };
 };
 
+export type ContainerRuntimeInfo = {
+  /**
+   * Map of internal container ports to their bound host ports.
+   * Format: "internalPort/protocol" -> hostPort (number)
+   */
+  ports: Record<string, number>;
+};
+
 /**
  * Docker API client that wraps Docker CLI commands
  */

package/src/docker/container.ts

@@ -1,6 +1,12 @@
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
-import { DockerApi, normalizeDuration, type ContainerInfo } from "./api.ts";
+import { Secret } from "../secret.ts";
+import {
+  DockerApi,
+  normalizeDuration,
+  type ContainerInfo,
+  type ContainerRuntimeInfo,
+} from "./api.ts";
 import type { Image } from "./image.ts";
 import type { RemoteImage } from "./remote-image.ts";
 
@@ -140,7 +146,7 @@ export interface ContainerProps {
   /**
    * Environment variables
    */
-  environment?: Record<string, string>;
+  environment?: Record<string, string | Secret>;
 
   /**
    * Port mappings
@@ -207,6 +213,11 @@ export interface Container extends ContainerProps {
    * Time when the container was created
    */
   createdAt: number;
+
+  /**
+   * Inspect the container to get detailed information
+   */
+  inspect(): Promise<ContainerRuntimeInfo>;
 }
 
 /**
@@ -370,6 +381,13 @@ export const Container = Resource(
           name: containerName,
           state: containerState,
           createdAt: new Date(containerInfo.Created).getTime(),
+          inspect: async () => {
+            const [info] = await api.inspectContainer(containerName);
+            if (!info) {
+              throw new Error(`Container ${containerName} not found`);
+            }
+            return toRuntimeInfo(info);
+          },
         };
       }
     }
@@ -396,7 +414,7 @@ export const Container = Resource(
     // Create new container
     const containerId = await api.createContainer(imageRef, containerName, {
       ports: portMappings,
-      env: props.environment,
+      env: normalizeEnvironment(props.environment),
       volumes: volumeMappings,
       cmd: props.command,
       healthcheck: props.healthcheck,
@@ -424,10 +442,46 @@ export const Container = Resource(
       name: containerName,
       state: containerState,
       createdAt: Date.now(),
+      inspect: async () => {
+        const [info] = await api.inspectContainer(containerName);
+        if (!info) {
+          throw new Error(`Container ${containerName} not found`);
+        }
+        return toRuntimeInfo(info);
+      },
     };
   },
 );
 
+function toRuntimeInfo(info: ContainerInfo): ContainerRuntimeInfo {
+  const ports: Record<string, number> = {};
+  const networkSettings = info.NetworkSettings;
+
+  if (networkSettings?.Ports) {
+    for (const [internal, bindings] of Object.entries(networkSettings.Ports)) {
+      if (bindings && bindings.length > 0) {
+        ports[internal] = parseInt(bindings[0].HostPort, 10);
+      }
+    }
+  }
+
+  // Also check HostConfig.PortBindings as a fallback or additional source
+  // though NetworkSettings.Ports is usually the source of truth for running containers
+  if (info.HostConfig.PortBindings) {
+    for (const [internal, bindings] of Object.entries(
+      info.HostConfig.PortBindings,
+    )) {
+      if (bindings && bindings.length > 0 && !(internal in ports)) {
+        ports[internal] = parseInt(bindings[0].HostPort, 10);
+      }
+    }
+  }
+
+  return {
+    ports,
+  };
+}
+
 function getNetworkChanges(
   props: ContainerProps,
   containerInfo: ContainerInfo,
@@ -477,7 +531,12 @@ function shouldReplace(
   }
 
   // Environment variables
-  if (!compareEnv(props.environment, containerInfo.Config.Env)) {
+  if (
+    !compareEnv(
+      normalizeEnvironment(props.environment),
+      containerInfo.Config.Env,
+    )
+  ) {
     return true;
   }
 
@@ -513,6 +572,21 @@ function shouldReplace(
   return false;
 }
 
+/**
+ * Unwrap secrets in given environment variables
+ * @internal
+ */
+function normalizeEnvironment(
+  environment: Record<string, string | Secret> | undefined,
+): Record<string, string> {
+  return Object.fromEntries(
+    Object.entries(environment ?? {}).map(([key, value]) => [
+      key,
+      Secret.unwrap(value),
+    ]),
+  );
+}
+
 /**
  * Normalize port mappings to a comparable format
  * @internal

package/workers/tunnel-proxy.js

@@ -83,7 +83,7 @@ const renderErrorHtml = (props) => `
             Alchemy</a>.</p>
       </div>
       <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
-        <p class="text-sm text-slate-500">Alchemy 0.85.2</p>
+        <p class="text-sm text-slate-500">Alchemy 0.87.0</p>
       </div>
     </div>
   </body>