@alchemy.run/fly 2.0.0-beta.84 → 2.0.0-beta.85

package/src/WriteCertificatesHttp.ts

@@ -43,7 +43,7 @@ export const certificatesWriteClient = (
       return yield* authorize(
         machines
           .createAppAcmeCertificate({ app_name: yield* appName, hostname })
-          .pipe(Effect.catchTag("Conflict", () => Effect.succeed(undefined))),
+          .pipe(Effect.catchTag("Conflict", () => Effect.undefined)),
       );
     }),
     upload: Effect.fn("Fly.Certificates.upload")(function* (request) {
@@ -78,7 +78,7 @@ export const certificatesWriteClient = (
       return yield* authorize(
         machines
           .getAppCertificate({ app_name: yield* appName, hostname })
-          .pipe(Effect.catchTag("NotFound", () => Effect.succeed(undefined))),
+          .pipe(Effect.catchTag("NotFound", () => Effect.undefined)),
       );
     }),
     remove: Effect.fn("Fly.Certificates.remove")(function* (hostname) {

package/src/bluegreen.ts

@@ -102,7 +102,7 @@ export const setRouting = (
       yield* getMachineById(appName, machineId).pipe(
         Effect.filterOrFail(
           (machine) => machine !== undefined && machine.cordoned === cordoned,
-          () => new ReplicaNotCreated({ appName, name: machineId }),
+          () => new ReplicaNotCreated({ appName, resourceName: machineId }),
         ),
         Effect.retry({
           times: 8,
@@ -293,7 +293,9 @@ export const reconcileBlueGreen = Effect.fn(function* (
     reusable?.[0] ??
     (yield* sha256Object({
       workload,
-      predecessors: owned.map((machine) => machine.id).sort(),
+      predecessors: owned
+        .map((machine) => machine.id)
+        .sort((a, b) => ((a ?? "") < (b ?? "") ? -1 : (a ?? "") > (b ?? "") ? 1 : 0)),
     })).slice(0, 20);
   const desired = reusable?.[1] ?? [];
   if (
@@ -417,7 +419,7 @@ export const reconcileBlueGreen = Effect.fn(function* (
           ),
           Effect.filterOrFail(
             (machine) => machine !== undefined,
-            () => new ReplicaNotCreated({ appName: input.appName, name }),
+            () => new ReplicaNotCreated({ appName: input.appName, resourceName: name }),
           ),
           Effect.retry({
             times: 8,
@@ -446,7 +448,8 @@ export const reconcileBlueGreen = Effect.fn(function* (
             Effect.catchReason("HttpClientError", "TransportError", () => readback),
           );
       }
-      if (!current?.id) return yield* new ReplicaNotCreated({ appName: input.appName, name });
+      if (!current?.id)
+        return yield* new ReplicaNotCreated({ appName: input.appName, resourceName: name });
       const leased = (yield* leaseSnapshot(input.appName, [current], leases))[0];
       if (!leased?.id)
         return yield* ambiguous(

package/src/hosted.ts

@@ -70,13 +70,12 @@ export const MACHINE_PLATFORM = "linux/amd64";
 export interface FlyBuildOptions extends Bundle.BundleConfig {
   /**
    * Native or Node-only packages to install into the Machine image with
-   * `npm install` instead of bundling them. `pg` is CommonJS: Rolldown's
-   * interop turns `Client` into a namespace (`The superclass is not a
-   * constructor`). Same `build.install` shape as Lambda.
+   * `npm install` instead of bundling them. Same `build.install` shape as
+   * Lambda.
    *
    * @example
    * ```typescript
-   * build: { install: ["pg"] }
+   * build: { install: ["sharp"] }
    * ```
    */
   readonly install?: PackageInstall;

package/src/internal/RemoteBuilder.ts

@@ -37,7 +37,9 @@ const HEALTH_INTERVAL = Duration.seconds(5);
 const MAX_PENDING_POLLS = 240;
 /** How often, and how long, to wait for the builder's push to reach `registry.fly.io`. */
 const UPSTREAM_POLL = Duration.seconds(2);
-const MAX_UPSTREAM_POLLS = 90;
+const MAX_UPSTREAM_POLLS = 30;
+/** Pushes of one image before giving up on it reaching the registry. */
+const MAX_PUSHES = 3;
 
 export class RemoteBuilderError extends Data.TaggedError("Fly.RemoteBuilderError")<{
   operation: string;
@@ -170,7 +172,13 @@ export const buildOnRemoteBuilder = Effect.fn(function* (input: {
       () => input.docker.run(["buildx", "rm", builder]).pipe(Effect.ignore),
     );
 
-    yield* input.docker.image
+    // The builder pushes through its host's registry mirror, which forwards
+    // to registry.fly.io. Machines pull from there, so confirm the tag landed
+    // (usually within seconds) while the builder is still held. The mirror
+    // occasionally drops a push without an error, so a tag that hasn't
+    // landed is pushed again: the builder has every layer cached, so a
+    // repeat build only re-sends the image.
+    const build = input.docker.image
       .build(
         {
           context: input.contextDir,
@@ -193,25 +201,35 @@ export const buildOnRemoteBuilder = Effect.fn(function* (input: {
           }),
         }),
       );
-
-    // The builder pushes through its host's registry mirror, which forwards
-    // to registry.fly.io. Machines pull from there, so confirm the tag landed
-    // (usually within seconds) while the builder is still held.
-    const started = yield* Clock.currentTimeMillis;
-    yield* input.docker.run(["buildx", "imagetools", "inspect", "--raw", input.imageRef]).pipe(
-      Effect.provideService(DockerEnvironment, {
-        DOCKER_AUTH_CONFIG: JSON.stringify({
-          auths: { [input.registry.server]: { auth: basicAuth(input.registry) } },
-        }),
-      }),
-      Effect.retry({ schedule: Schedule.spaced(UPSTREAM_POLL), times: MAX_UPSTREAM_POLLS }),
-      Effect.mapError(
-        () =>
-          new RemoteBuilderError({
-            operation: "upload",
-            message: `${input.imageRef} did not reach ${input.registry.server}`,
+    const landed = input.docker
+      .run(["buildx", "imagetools", "inspect", "--raw", input.imageRef])
+      .pipe(
+        Effect.provideService(DockerEnvironment, {
+          DOCKER_AUTH_CONFIG: JSON.stringify({
+            auths: { [input.registry.server]: { auth: basicAuth(input.registry) } },
           }),
+        }),
+        Effect.retry({ schedule: Schedule.spaced(UPSTREAM_POLL), times: MAX_UPSTREAM_POLLS }),
+        Effect.mapError(
+          () =>
+            new RemoteBuilderError({
+              operation: "upload",
+              message: `${input.imageRef} did not reach ${input.registry.server} after ${MAX_PUSHES} pushes`,
+            }),
+        ),
+      );
+    const started = yield* Clock.currentTimeMillis;
+    yield* build.pipe(
+      Effect.andThen(landed),
+      Effect.tapError((error) =>
+        error._tag === "Fly.RemoteBuilderError" && error.operation === "upload"
+          ? note(`${input.imageRef} hasn't reached ${input.registry.server} yet`)
+          : Effect.void,
       ),
+      Effect.retry({
+        while: (error) => error._tag === "Fly.RemoteBuilderError" && error.operation === "upload",
+        times: MAX_PUSHES - 1,
+      }),
     );
     const waited = (yield* Clock.currentTimeMillis) - started;
     yield* note(`${input.imageRef} available on ${input.registry.server} after ${waited}ms`);

package/src/replicas.ts

@@ -42,7 +42,7 @@ const waitBackoff = Schedule.exponential("500 millis");
 const SERVICE_CHECK_NAME_PREFIX = "servicecheck-";
 
 export class ReplicaNotCreated extends Data.TaggedError("Fly.ReplicaNotCreated")<{
-  name: string;
+  resourceName: string;
   appName: string;
 }> {}
 
@@ -115,7 +115,7 @@ export const gone = (machine: FlyMachine | undefined) =>
 export const getMachineById = (appName: string, machineId: string) =>
   machines.getMachine({ app_name: appName, machine_id: machineId }).pipe(
     Effect.map((machine) => (gone(machine) ? undefined : machine)),
-    Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+    Effect.catchTag("NotFound", () => Effect.undefined),
   );
 
 /**
@@ -137,7 +137,7 @@ const getLeasedMachine = (appName: string, machineId: string) =>
 const getLeasedMachineById = (appName: string, machineId: string) =>
   getLeasedMachine(appName, machineId).pipe(
     Effect.map((machine) => (gone(machine) ? undefined : machine)),
-    Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+    Effect.catchTag("NotFound", () => Effect.undefined),
   );
 
 export const listMachinesByApp = (appName: string) =>
@@ -1163,7 +1163,7 @@ const reconcileLeasedReplicas = Effect.fn(function* (
       );
       const volumeId = volume?.id;
       if (volumeId === undefined) {
-        return yield* new ReplicaNotCreated({ name, appName: input.appName });
+        return yield* new ReplicaNotCreated({ resourceName: name, appName: input.appName });
       }
       usedVolumeIds.add(volumeId);
       mounts.push({ volume: volumeId, path: group.disk.path });
@@ -1187,7 +1187,7 @@ const reconcileLeasedReplicas = Effect.fn(function* (
           skip_launch: input.skipLaunch === true ? true : undefined,
           min_secrets_version: input.minSecretsVersion,
         })
-        .pipe(Effect.catchTag("Conflict", () => Effect.succeed(undefined)));
+        .pipe(Effect.catchTag("Conflict", () => Effect.undefined));
       current =
         created ??
         (yield* listMachinesByApp(input.appName).pipe(
@@ -1200,11 +1200,11 @@ const reconcileLeasedReplicas = Effect.fn(function* (
           ),
         ));
       if (current === undefined || current.id === undefined) {
-        return yield* new ReplicaNotCreated({ name, appName: input.appName });
+        return yield* new ReplicaNotCreated({ resourceName: name, appName: input.appName });
       }
       const observed = (yield* leaseSnapshot(input.appName, [current], leases))[0];
       if (!observed || input.configDrifted(observed, { mounts, metadata })) {
-        return yield* new ReplicaNotCreated({ name, appName: input.appName });
+        return yield* new ReplicaNotCreated({ resourceName: name, appName: input.appName });
       }
       current = observed;
     } else if (
@@ -1243,7 +1243,7 @@ const reconcileLeasedReplicas = Effect.fn(function* (
             !sameChecks(observed.config?.checks, config.checks) ||
             !sameStopConfig(observed.config?.stop_config, config.stop_config)
           )
-            return yield* new ReplicaNotCreated({ appName: input.appName, name });
+            return yield* new ReplicaNotCreated({ appName: input.appName, resourceName: name });
           return observed;
         }).pipe(
           Effect.retry({