alchemy 0.85.1 → 0.86.0

package/lib/docker/container.js

@@ -1,5 +1,5 @@
 import { Resource } from "../resource.js";
-import { DockerApi } from "./api.js";
+import { DockerApi, normalizeDuration } from "./api.js";
 /**
  * Create and manage a Docker Container
  *
@@ -66,7 +66,7 @@ import { DockerApi } from "./api.js";
  *   start: true
  * });
  */
-export const Container = Resource("docker::Container", async function (id, props) {
+export const Container = Resource("docker::Container", { alwaysUpdate: true }, async function (id, props) {
     // Initialize Docker API client
     const api = new DockerApi();
     // Get image reference
@@ -91,29 +91,47 @@ export const Container = Resource("docker::Container", async function (id, props
     // Check if container already exists
     const containerExists = await api.containerExists(containerName);
     if (containerExists) {
-        if (this.phase === "update") {
-            // Remove existing container for update
-            await api.removeContainer(containerName, true);
+        // Create phase - check for adoption
+        if (this.phase === "create" && !props.adopt) {
+            throw new Error(`Container "${containerName}" already exists. Use adopt: true to adopt it.`);
+        }
+        const [containerInfo] = await api.inspectContainer(containerName);
+        // Compute what changes are needed
+        if (shouldReplace(imageRef, props, containerInfo)) {
+            // Need to recreate - remove existing container
+            if (this.phase === "update") {
+                // In update phase, we can replace the resource
+                // Force because we need to delete the old one first if the name is the same
+                return this.replace(true);
+            }
+            else {
+                // In create phase, we cannot replace the resource, so manually delete instead
+                await api.removeContainer(containerName, true);
+            }
         }
         else {
-            // Create phase - check for adoption
-            if (!props.adopt) {
-                throw new Error(`Container "${containerName}" already exists. Use adopt: true to adopt it.`);
+            // Apply incremental changes without recreating the container
+            const { toConnect, toDisconnect } = getNetworkChanges(props, containerInfo);
+            // Apply network disconnections
+            for (const network of toDisconnect) {
+                await api.disconnectNetwork(containerInfo.Id, network);
+            }
+            // Apply network connections
+            for (const network of toConnect) {
+                await api.connectNetwork(containerInfo.Id, network.name, {
+                    aliases: network.aliases,
+                });
             }
-            // Adopt existing container
-            const containerInfos = await api.inspectContainer(containerName);
-            const containerInfo = containerInfos[0];
-            let adoptedState = containerInfo.State.Status;
             // Optionally start the container if requested
             if (props.start && containerInfo.State.Status !== "running") {
-                await api.startContainer(containerName);
-                adoptedState = "running";
+                await api.startContainer(containerInfo.Id);
+                containerState = "running";
             }
             return {
                 ...props,
                 id: containerInfo.Id,
                 name: containerName,
-                state: adoptedState,
+                state: containerState,
                 createdAt: new Date(containerInfo.Created).getTime(),
             };
         }
@@ -165,4 +183,215 @@ export const Container = Resource("docker::Container", async function (id, props
         createdAt: Date.now(),
     };
 });
+function getNetworkChanges(props, containerInfo) {
+    const currentNetworks = new Set(Object.keys(containerInfo.NetworkSettings.Networks || {}));
+    const desiredNetworks = new Map((props.networks || []).map((n) => [n.name, n]));
+    const toConnect = [];
+    const toDisconnect = [];
+    for (const network of currentNetworks) {
+        if (!desiredNetworks.has(network) && network !== "bridge") {
+            toDisconnect.push(network);
+        }
+    }
+    for (const [name, config] of desiredNetworks) {
+        if (!currentNetworks.has(name)) {
+            toConnect.push(config);
+        }
+    }
+    return { toConnect, toDisconnect };
+}
+function shouldReplace(imageRef, props, containerInfo) {
+    // Check immutable properties that require recreation
+    // Image change - compare the image ID/digest if available
+    // The container stores the resolved image ID, so we compare against imageRef
+    if (containerInfo.Config.Image !== imageRef) {
+        return true;
+    }
+    // Command change
+    const containerCmd = containerInfo.Config.Cmd || [];
+    if (props.command && // only compare if command is set; otherwise we'd be comparing against the image's default command
+        (props.command.length !== containerCmd.length ||
+            !props.command.every((c, i) => c === containerCmd[i]))) {
+        return true;
+    }
+    // Environment variables
+    if (!compareEnv(props.environment, containerInfo.Config.Env)) {
+        return true;
+    }
+    // Port bindings
+    if (!comparePorts(props.ports, containerInfo.HostConfig.PortBindings)) {
+        return true;
+    }
+    // Volume bindings
+    if (!compareVolumes(props.volumes, containerInfo.HostConfig.Binds)) {
+        return true;
+    }
+    // Healthcheck
+    if (!compareHealthcheck(props.healthcheck, containerInfo.Config.Healthcheck)) {
+        return true;
+    }
+    // Restart policy
+    if (!compareRestartPolicy(props.restart, containerInfo.HostConfig.RestartPolicy)) {
+        return true;
+    }
+    // AutoRemove (removeOnExit)
+    if ((props.removeOnExit || false) !== containerInfo.HostConfig.AutoRemove) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Normalize port mappings to a comparable format
+ * @internal
+ */
+function normalizePortMappings(ports) {
+    const map = new Map();
+    if (!ports)
+        return map;
+    for (const port of ports) {
+        const protocol = port.protocol || "tcp";
+        map.set(`${port.external}`, `${port.internal}/${protocol}`);
+    }
+    return map;
+}
+/**
+ * Normalize volume mappings to a comparable format
+ * @internal
+ */
+function normalizeVolumeMappings(volumes) {
+    const set = new Set();
+    if (!volumes)
+        return set;
+    for (const volume of volumes) {
+        const readOnlyFlag = volume.readOnly ? ":ro" : "";
+        set.add(`${volume.hostPath}:${volume.containerPath}${readOnlyFlag}`);
+    }
+    return set;
+}
+/**
+ * Compare environment variables
+ * @internal
+ */
+function compareEnv(propsEnv, containerEnv) {
+    const propsEntries = Object.entries(propsEnv || {}).sort(([a], [b]) => a.localeCompare(b));
+    const containerEntries = (containerEnv || [])
+        .map((e) => {
+        const idx = e.indexOf("=");
+        return idx >= 0 ? [e.slice(0, idx), e.slice(idx + 1)] : null;
+    })
+        .filter((e) => e !== null)
+        // Filter out PATH and other system env vars that Docker adds
+        .filter(([key]) => propsEnv && key in propsEnv)
+        .sort(([a], [b]) => a.localeCompare(b));
+    if (propsEntries.length !== containerEntries.length)
+        return false;
+    for (let i = 0; i < propsEntries.length; i++) {
+        if (propsEntries[i][0] !== containerEntries[i][0] ||
+            propsEntries[i][1] !== containerEntries[i][1]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Compare port bindings
+ * @internal
+ */
+function comparePorts(propsPorts, containerPorts) {
+    const propsMap = normalizePortMappings(propsPorts);
+    // Extract container port mappings
+    const containerMap = new Map();
+    if (containerPorts) {
+        for (const [containerPort, bindings] of Object.entries(containerPorts)) {
+            if (bindings && bindings.length > 0) {
+                containerMap.set(bindings[0].HostPort, containerPort);
+            }
+        }
+    }
+    if (propsMap.size !== containerMap.size)
+        return false;
+    for (const [hostPort, containerPort] of propsMap) {
+        if (containerMap.get(hostPort) !== containerPort)
+            return false;
+    }
+    return true;
+}
+/**
+ * Compare volume bindings
+ * @internal
+ */
+function compareVolumes(propsVolumes, containerBinds) {
+    const propsSet = normalizeVolumeMappings(propsVolumes);
+    const containerSet = new Set(containerBinds || []);
+    if (propsSet.size !== containerSet.size)
+        return false;
+    for (const bind of propsSet) {
+        if (!containerSet.has(bind))
+            return false;
+    }
+    return true;
+}
+/**
+ * Compare healthcheck configuration
+ * @internal
+ */
+function compareHealthcheck(propsHc, containerHc) {
+    // Both undefined/null
+    if (!propsHc && !containerHc)
+        return true;
+    // One defined, one not
+    if (!propsHc || !containerHc)
+        return false;
+    // Compare command
+    const propsCmd = Array.isArray(propsHc.cmd)
+        ? propsHc.cmd.join(" ")
+        : propsHc.cmd;
+    const containerCmd = containerHc.Test
+        ? containerHc.Test.slice(1).join(" ")
+        : "";
+    if (propsCmd !== containerCmd)
+        return false;
+    // Helper to convert Duration to nanoseconds for comparison
+    const toNanos = (d) => {
+        if (d === undefined)
+            return 0;
+        const str = normalizeDuration(d);
+        const match = str.match(/^(\d+(?:\.\d+)?)(ms|s|m|h)$/);
+        if (!match)
+            return 0;
+        const value = parseFloat(match[1]);
+        const unit = match[2];
+        switch (unit) {
+            case "ms":
+                return value * 1_000_000;
+            case "s":
+                return value * 1_000_000_000;
+            case "m":
+                return value * 60 * 1_000_000_000;
+            case "h":
+                return value * 3600 * 1_000_000_000;
+            default:
+                return 0;
+        }
+    };
+    if (toNanos(propsHc.interval) !== (containerHc.Interval || 0))
+        return false;
+    if (toNanos(propsHc.timeout) !== (containerHc.Timeout || 0))
+        return false;
+    if ((propsHc.retries || 0) !== (containerHc.Retries || 0))
+        return false;
+    if (toNanos(propsHc.startPeriod) !== (containerHc.StartPeriod || 0))
+        return false;
+    if (toNanos(propsHc.startInterval) !== (containerHc.StartInterval || 0))
+        return false;
+    return true;
+}
+/**
+ * Compare restart policy
+ * @internal
+ */
+function compareRestartPolicy(propsRestart, containerRestart) {
+    const propsPolicy = propsRestart || "no";
+    return propsPolicy === containerRestart.Name;
+}
 //# sourceMappingURL=container.js.map

package/lib/docker/container.js.map

@@ -1 +1 @@
-{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/docker/container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/docker/container.ts"],"names":[],"mappings":"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"}

package/lib/test/bun.js

@@ -61,7 +61,7 @@ export function test(meta, defaultOptions) {
         const _options = typeof args[1] === "object" ? args[1] : undefined;
         const timeout = typeof args[args.length - 1] === "number"
             ? args[args.length - 1]
-            : 120000;
+            : 150000;
         const spread = (obj) => obj && typeof obj === "object"
             ? Object.fromEntries(Object.entries(obj).flatMap(([k, v]) => v !== undefined ? [[k, v]] : []))
             : {};

package/lib/test/vitest.js

@@ -84,7 +84,7 @@ export function test(meta, defaultOptions = {
         const _options = typeof args[1] === "object" ? args[1] : undefined;
         const timeout = typeof args[args.length - 1] === "number"
             ? args[args.length - 1]
-            : 120000;
+            : 150000;
         const spread = (obj) => obj && typeof obj === "object"
             ? Object.fromEntries(Object.entries(obj).flatMap(([k, v]) => v !== undefined ? [[k, v]] : []))
             : {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.85.1",
+  "version": "0.86.0",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
   "homepage": "https://alchemy.run",

package/src/cloudflare/index.ts

@@ -73,6 +73,7 @@ export * from "./vectorize-index.ts";
 export * from "./vectorize-metadata-index.ts";
 export * from "./version-metadata.ts";
 export * from "./vite/vite.ts";
+export * from "./vpc-service-ref.ts";
 export * from "./vpc-service.ts";
 export * from "./warp-default-profile.ts";
 export * from "./warp-device-profile.ts";

package/src/cloudflare/sveltekit/plugin.ts

@@ -2,17 +2,11 @@ import adapter, { type AdapterOptions } from "@sveltejs/adapter-cloudflare";
 import type { Adapter } from "@sveltejs/kit";
 import { getPlatformProxyOptions } from "../cloudflare-env-proxy.ts";
 
-const isSvelteLanguageServer = !!process.argv.find((arg) =>
-  arg.includes("svelte-language-server"),
-);
-
 export default (options?: AdapterOptions): Adapter => {
-  if (isSvelteLanguageServer) {
-    // the svelte language server runs from the root and therefore may be running in a different cwd than the `Website.cwd`
-    // for now, we work around this by returning a noop adapter to avoid breaking svelte intellisense
+  if (shouldDisable()) {
     return {
-      adapt() {},
       name: "alchemy-noop",
+      adapt() {},
     };
   }
   const { platformProxy: proxyOptions, ...config } = options ?? {};
@@ -23,3 +17,18 @@ export default (options?: AdapterOptions): Adapter => {
     ...config,
   });
 };
+
+/**
+ * Return true for `svelte-language-server`, `svelte-check`, and `svelte-kit sync`. This is because:
+ * - The svelte language server runs from the root and therefore may be running in a different cwd than the `Website.cwd`, so disable to avoid breaking intellisense
+ * - The `svelte-check` and `svelte-kit sync` commands do not require Cloudflare-specific configuration, so disable to avoid breaking the commands
+ */
+function shouldDisable(argv = process.argv): boolean {
+  return (
+    argv.some(
+      (arg) =>
+        arg.includes("svelte-check") || arg.includes("svelte-language-server"),
+    ) ||
+    (argv.some((arg) => arg.includes("svelte-kit")) && argv.includes("sync"))
+  );
+}

package/src/cloudflare/vite/vite.ts

@@ -2,6 +2,7 @@ import path from "pathe";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
+import { withSkipPathValidation } from "../miniflare/paths.ts";
 import {
   spreadBuildProps,
   spreadDevProps,
@@ -34,8 +35,9 @@ export async function Vite<B extends Bindings>(
       port = args[index + 1];
     } else {
       try {
-        const config = await import(
-          path.resolve(props.cwd ?? process.cwd(), "vite.config.ts")
+        const config = await withSkipPathValidation(
+          () =>
+            import(path.resolve(props.cwd ?? process.cwd(), "vite.config.ts")),
         );
         port = config.default?.server?.port ?? 5173;
       } catch {}

package/src/cloudflare/vpc-service-ref.ts

@@ -0,0 +1,60 @@
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
+import {
+  findVpcServiceByName,
+  getService,
+  type VpcService,
+} from "./vpc-service.ts";
+
+export type VpcServiceRefProps = CloudflareApiOptions &
+  (
+    | {
+        /**
+         * The Cloudflare-assigned ID for the VPC service.
+         */
+        serviceId: string;
+      }
+    | {
+        /**
+         * The name of the VPC service.
+         */
+        name: string;
+      }
+  );
+
+/**
+ * A reference to a VPC service.
+ */
+export type VpcServiceRef = VpcService;
+
+/**
+ * Reference an existing [VPC Service](https://developers.cloudflare.com/workers-vpc/configuration/vpc-services/) without managing its lifecycle.
+ *
+ * @example
+ * ```ts
+ * // Reference by ID
+ * const vpcService = await VpcServiceRef({
+ *   serviceId: "123e4567-e89b-12d3-a456-426614174000",
+ * });
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Reference by name
+ * const vpcService = await VpcServiceRef({
+ *   name: "my-vpc-service",
+ * });
+ * ```
+ */
+export async function VpcServiceRef(
+  props: VpcServiceRefProps,
+): Promise<VpcServiceRef> {
+  const api = await createCloudflareApi(props);
+  if ("name" in props) {
+    const service = await findVpcServiceByName(api, props.name);
+    if (!service) {
+      throw new Error(`VPC service "${props.name}" not found`);
+    }
+    return service;
+  }
+  return await getService(api, props.serviceId);
+}

package/src/cloudflare/vpc-service.ts

@@ -258,21 +258,18 @@ export const VpcService = Resource(
     switch (this.phase) {
       case "create": {
         const adopt = props.adopt ?? this.scope.adopt;
-        const service = await createService(api, input).catch(async (err) => {
+        return await createService(api, input).catch(async (err) => {
           if (isCloudflareApiError(err, { code: 5101 }) && adopt) {
-            const services = await listServices(api);
-            const service = services.find((s) => s.name === input.name);
+            const service = await findVpcServiceByName(api, input.name);
             if (service) {
-              return await updateService(api, service.service_id, input);
+              return await updateService(api, service.serviceId, input);
             }
           }
           throw err;
         });
-        return formatOutput(service);
       }
       case "update": {
-        const service = await updateService(api, this.output.serviceId, input);
-        return formatOutput(service);
+        return await updateService(api, this.output.serviceId, input);
       }
     }
 
@@ -299,34 +296,6 @@ export const VpcService = Resource(
       const { tunnel, ...rest } = network;
       return { tunnel_id: tunnel.tunnelId, ...rest };
     }
-
-    function formatOutput(service: ConnectivityService): VpcService {
-      return {
-        name: service.name,
-        serviceId: service.service_id,
-        serviceType: service.type,
-        tcpPort: service.tcp_port,
-        appProtocol: service.app_protocol,
-        httpPort: service.http_port,
-        httpsPort: service.https_port,
-        host:
-          "hostname" in service.host
-            ? {
-                hostname: service.host.hostname,
-                resolverNetwork: {
-                  tunnelId: service.host.resolver_network.tunnel_id,
-                  resolverIps: service.host.resolver_network.resolver_ips,
-                },
-              }
-            : {
-                ...service.host,
-                network: { tunnelId: service.host.network.tunnel_id },
-              },
-        createdAt: new Date(service.created_at).getTime(),
-        updatedAt: new Date(service.updated_at).getTime(),
-        type: "vpc_service",
-      };
-    }
   },
 );
 
@@ -337,14 +306,15 @@ export const VpcService = Resource(
 export async function createService(
   api: CloudflareApi,
   body: ConnectivityService.Input,
-): Promise<ConnectivityService> {
-  return await extractCloudflareResult<ConnectivityService>(
-    `create connectivity service`,
+): Promise<VpcService> {
+  const service = await extractCloudflareResult<ConnectivityService>(
+    "create connectivity service",
     api.post(
       `/accounts/${api.accountId}/connectivity/directory/services`,
       body,
     ),
   );
+  return formatVpcService(service);
 }
 
 /**
@@ -374,28 +344,32 @@ export async function deleteService(
 export async function getService(
   api: CloudflareApi,
   serviceId: string,
-): Promise<ConnectivityService> {
-  return await extractCloudflareResult<ConnectivityService>(
+): Promise<VpcService> {
+  const service = await extractCloudflareResult<ConnectivityService>(
     `get connectivity service "${serviceId}"`,
     api.get(
       `/accounts/${api.accountId}/connectivity/directory/services/${serviceId}`,
     ),
   );
+  return formatVpcService(service);
 }
 
 /**
  * List connectivity (VPC) services for the account.
  * @internal
  */
-export async function listServices(
+export async function findVpcServiceByName(
   api: CloudflareApi,
-): Promise<ConnectivityService[]> {
-  return await extractCloudflareResult<ConnectivityService[]>(
-    `list connectivity services`,
+  name: string,
+): Promise<VpcService | undefined> {
+  const services = await extractCloudflareResult<ConnectivityService[]>(
+    "list connectivity services",
     api.get(
       `/accounts/${api.accountId}/connectivity/directory/services?per_page=1000`,
     ),
   );
+  const service = services.find((s) => s.name === name);
+  return service ? formatVpcService(service) : undefined;
 }
 
 /**
@@ -406,14 +380,47 @@ export async function updateService(
   api: CloudflareApi,
   serviceId: string,
   body: ConnectivityService.Input,
-): Promise<ConnectivityService> {
-  return await extractCloudflareResult<ConnectivityService>(
+): Promise<VpcService> {
+  const service = await extractCloudflareResult<ConnectivityService>(
     `update connectivity service "${serviceId}"`,
     api.put(
       `/accounts/${api.accountId}/connectivity/directory/services/${serviceId}`,
       body,
     ),
   );
+  return formatVpcService(service);
+}
+
+/**
+ * Format an API response into a VpcService resource.
+ * @internal
+ */
+function formatVpcService(service: ConnectivityService): VpcService {
+  return {
+    name: service.name,
+    serviceId: service.service_id,
+    serviceType: service.type,
+    tcpPort: service.tcp_port,
+    appProtocol: service.app_protocol,
+    httpPort: service.http_port,
+    httpsPort: service.https_port,
+    host:
+      "hostname" in service.host
+        ? {
+            hostname: service.host.hostname,
+            resolverNetwork: {
+              tunnelId: service.host.resolver_network.tunnel_id,
+              resolverIps: service.host.resolver_network.resolver_ips,
+            },
+          }
+        : {
+            ...service.host,
+            network: { tunnelId: service.host.network.tunnel_id },
+          },
+    createdAt: new Date(service.created_at).getTime(),
+    updatedAt: new Date(service.updated_at).getTime(),
+    type: "vpc_service",
+  };
 }
 
 interface ConnectivityService extends ConnectivityService.Input {