@distilled.cloud/fly-io 1.0.0-rc.10 → 1.0.0-rc.12

package/lib/sprites-mint.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sprites-mint.test.d.ts.map

package/lib/sprites-mint.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sprites-mint.test.d.ts","sourceRoot":"","sources":["../src/sprites-mint.test.ts"],"names":[],"mappings":""}

package/lib/sprites-mint.test.js

@@ -0,0 +1,170 @@
+import { describe, expect, test } from "bun:test";
+import * as API from "@distilled.cloud/core/api";
+import * as Cause from "effect/Cause";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Redacted from "effect/Redacted";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
+import { Credentials } from "./credentials.js";
+import { SpritesProtocol } from "./protocol.js";
+import { ListSpritesRequest } from "./services/sprites.js";
+const mintFixture = (apiKey) => Effect.gen(function* () {
+    const protocol = yield* API.Protocol;
+    const attempts = yield* Effect.forEach([0, 1], () => Effect.gen(function* () {
+        return {
+            started: yield* Deferred.make(),
+            response: yield* Deferred.make(),
+        };
+    }));
+    const discoveries = [];
+    const mints = [];
+    let credentialReads = 0;
+    const client = HttpClient.make((request) => Effect.gen(function* () {
+        if (request.url === "https://fly.test/v1/tokens/current") {
+            discoveries.push(request);
+            return HttpClientResponse.fromWeb(request, Response.json({ tokens: [{ org_slug: "mint-test" }] }));
+        }
+        if (request.method !== "POST" ||
+            request.url !==
+                "https://api.sprites.dev/v1/organizations/mint-test/tokens") {
+            return yield* Effect.die("Unexpected test transport request");
+        }
+        const attempt = attempts[mints.length];
+        mints.push(request);
+        if (!attempt)
+            return yield* Effect.die("Unexpected mint attempt");
+        yield* Deferred.succeed(attempt.started, undefined);
+        const { status, body } = yield* Deferred.await(attempt.response);
+        return HttpClientResponse.fromWeb(request, Response.json(body, { status }));
+    }));
+    const encode = protocol
+        .encode({
+        input: {},
+        inputAst: ListSpritesRequest.ast,
+        config: { input: ListSpritesRequest },
+    })
+        .pipe(Effect.provideService(HttpClient.HttpClient, client), Effect.provideService(Credentials, Effect.sync(() => {
+        credentialReads++;
+        return {
+            apiKey: Redacted.make(apiKey),
+            apiBaseUrl: "https://fly.test",
+        };
+    })));
+    return {
+        encode,
+        discoveries,
+        mints,
+        credentialReads: () => credentialReads,
+        started: (attempt = 0) => Deferred.await(attempts[attempt].started),
+        respond: (body, status = 200, attempt = 0) => Deferred.succeed(attempts[attempt].response, { status, body }),
+    };
+}).pipe(Effect.provide(SpritesProtocol));
+describe("Sprites token mint coordination", () => {
+    test("shares concurrent minting and reuses the successful token without exposing it in request JSON", () => Effect.runPromise(Effect.gen(function* () {
+        const fixture = yield* mintFixture("mint-concurrent-fly-secret");
+        const owner = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started();
+        const waiters = yield* Effect.forEach(Array.from({ length: 20 }), () => fixture.encode.pipe(Effect.forkChild({ startImmediately: true })));
+        expect(fixture.credentialReads()).toBe(21);
+        expect(fixture.discoveries).toHaveLength(1);
+        expect(fixture.mints).toHaveLength(1);
+        yield* fixture.respond({ token: "mint-concurrent-sprites-secret" });
+        const requests = yield* Effect.forEach([owner, ...waiters], Fiber.join);
+        requests.push(yield* fixture.encode);
+        for (const request of requests) {
+            expect(request.url).toBe("https://api.sprites.dev/v1/sprites");
+            expect(request.headers.authorization).toBe("Bearer mint-concurrent-sprites-secret");
+            expect(JSON.stringify(request)).not.toContain("mint-concurrent-sprites-secret");
+        }
+        expect(fixture.mints[0].headers.authorization).toBe("FlyV1 mint-concurrent-fly-secret");
+        for (const request of [...fixture.discoveries, ...fixture.mints]) {
+            expect(JSON.stringify(request)).not.toContain("mint-concurrent-fly-secret");
+        }
+        expect(fixture.credentialReads()).toBe(22);
+        expect(fixture.discoveries).toHaveLength(1);
+        expect(fixture.mints).toHaveLength(1);
+    }).pipe(Effect.timeout("2 seconds"))));
+    test("shares a failed mint and allows a subsequent successful retry", () => Effect.runPromise(Effect.gen(function* () {
+        const fixture = yield* mintFixture("mint-retry-fly-secret");
+        const owner = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started();
+        const waiter = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        expect(fixture.credentialReads()).toBe(2);
+        expect(fixture.mints).toHaveLength(1);
+        yield* fixture.respond({ message: "synthetic mint failure" }, 500);
+        const exits = yield* Fiber.awaitAll([owner, waiter]);
+        for (const exit of exits) {
+            expect(Exit.isFailure(exit)).toBe(true);
+            if (Exit.isFailure(exit)) {
+                expect(Cause.pretty(exit.cause)).toContain("synthetic mint failure");
+                expect(Cause.pretty(exit.cause)).not.toContain("mint-retry-fly-secret");
+            }
+        }
+        expect(exits[0]).toEqual(exits[1]);
+        const retry = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started(1);
+        yield* fixture.respond({ token: "mint-retry-sprites-secret" }, 200, 1);
+        expect((yield* Fiber.join(retry)).headers.authorization).toBe("Bearer mint-retry-sprites-secret");
+        expect((yield* fixture.encode).headers.authorization).toBe("Bearer mint-retry-sprites-secret");
+        expect(fixture.discoveries).toHaveLength(2);
+        expect(fixture.mints).toHaveLength(2);
+    }).pipe(Effect.timeout("2 seconds"))));
+    test("isolates pending and successful tokens for separate credentials", () => Effect.runPromise(Effect.gen(function* () {
+        const first = yield* mintFixture("mint-isolation-first");
+        const second = yield* mintFixture("mint-isolation-second");
+        const firstFiber = yield* first.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        const secondFiber = yield* second.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* first.started();
+        yield* second.started();
+        expect(first.mints[0].headers.authorization).toBe("FlyV1 mint-isolation-first");
+        expect(second.mints[0].headers.authorization).toBe("FlyV1 mint-isolation-second");
+        yield* second.respond({ token: "sprites-isolation-second" });
+        expect((yield* Fiber.join(secondFiber)).headers.authorization).toBe("Bearer sprites-isolation-second");
+        yield* first.respond({ token: "sprites-isolation-first" });
+        expect((yield* Fiber.join(firstFiber)).headers.authorization).toBe("Bearer sprites-isolation-first");
+        expect((yield* first.encode).headers.authorization).toBe("Bearer sprites-isolation-first");
+        expect((yield* second.encode).headers.authorization).toBe("Bearer sprites-isolation-second");
+        expect(first.mints).toHaveLength(1);
+        expect(second.mints).toHaveLength(1);
+    }).pipe(Effect.timeout("2 seconds"))));
+    test("interrupting a waiter does not cancel or evict the active mint", () => Effect.runPromise(Effect.gen(function* () {
+        const fixture = yield* mintFixture("mint-interrupted-waiter");
+        const owner = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started();
+        const waiter = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        expect(fixture.credentialReads()).toBe(2);
+        yield* Fiber.interrupt(waiter);
+        expect(Exit.hasInterrupts(yield* Fiber.await(waiter))).toBe(true);
+        const replacementWaiter = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        expect(fixture.credentialReads()).toBe(3);
+        expect(fixture.mints).toHaveLength(1);
+        yield* fixture.respond({ token: "sprites-after-waiter-interruption" });
+        for (const fiber of [owner, replacementWaiter]) {
+            expect((yield* Fiber.join(fiber)).headers.authorization).toBe("Bearer sprites-after-waiter-interruption");
+        }
+        expect(fixture.discoveries).toHaveLength(1);
+    }).pipe(Effect.timeout("2 seconds"))));
+    test("owner interruption releases all waiters and allows another mint", () => Effect.runPromise(Effect.gen(function* () {
+        const fixture = yield* mintFixture("mint-interrupted-owner");
+        const owner = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started();
+        const waiters = yield* Effect.forEach([0, 1, 2], () => fixture.encode.pipe(Effect.forkChild({ startImmediately: true })));
+        expect(fixture.credentialReads()).toBe(4);
+        expect(fixture.mints).toHaveLength(1);
+        yield* Fiber.interrupt(owner);
+        for (const exit of yield* Fiber.awaitAll([owner, ...waiters])) {
+            expect(Exit.hasInterrupts(exit)).toBe(true);
+        }
+        const retry = yield* fixture.encode.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* fixture.started(1);
+        yield* fixture.respond({ token: "sprites-after-interruption" }, 200, 1);
+        expect((yield* Fiber.join(retry)).headers.authorization).toBe("Bearer sprites-after-interruption");
+        expect((yield* fixture.encode).headers.authorization).toBe("Bearer sprites-after-interruption");
+        expect(fixture.discoveries).toHaveLength(2);
+        expect(fixture.mints).toHaveLength(2);
+    }).pipe(Effect.timeout("2 seconds"))));
+});
+//# sourceMappingURL=sprites-mint.test.js.map

package/lib/sprites-mint.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/fly-io",
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -89,7 +89,7 @@
     }
   },
   "dependencies": {
-    "@distilled.cloud/core": "1.0.0-rc.10"
+    "@distilled.cloud/core": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",

package/src/protocol.test.ts

@@ -0,0 +1,174 @@
+import { describe, expect, test } from "bun:test";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
+import { credentials } from "./credentials.ts";
+import { BadRequest, UnknownFlyIoError } from "./errors.ts";
+import type { FlyIoOpContext } from "./protocol.ts";
+import * as Retry from "./retry.ts";
+import {
+  MachineStartFromCreatedState,
+  MachineWaitTimeout,
+  startMachine,
+  stopMachine,
+  waitMachine,
+} from "./services/machines.ts";
+
+const recordedMessage =
+  "failed_precondition: unable to start machine from current state: 'created'";
+const machine = { app_name: "decoder-test", machine_id: "machine-test" };
+
+const decodeError = <A, E>(
+  operation: Effect.Effect<A, E, FlyIoOpContext>,
+  status: number,
+  body: string,
+) =>
+  Effect.runPromise(
+    operation.pipe(
+      Retry.none,
+      Effect.provide(
+        Layer.mergeAll(
+          Layer.succeed(
+            HttpClient.HttpClient,
+            HttpClient.make((request) =>
+              Effect.sync(() =>
+                HttpClientResponse.fromWeb(
+                  request,
+                  new Response(body, { status }),
+                ),
+              ),
+            ),
+          ),
+          credentials({
+            apiKey: "decoder-test",
+            apiBaseUrl: "https://fly.test",
+          }),
+        ),
+      ),
+      Effect.flip,
+    ),
+  );
+
+// The suite recorded the message, but not the HTTP status or raw envelope.
+const envelopes = [
+  { name: "error", body: JSON.stringify({ error: recordedMessage }) },
+  { name: "message", body: JSON.stringify({ message: recordedMessage }) },
+  {
+    name: "errors.detail",
+    body: JSON.stringify({ errors: { detail: recordedMessage } }),
+  },
+  { name: "plain text", body: recordedMessage },
+];
+
+describe("Machines start precondition decoding", () => {
+  for (const status of [400, 412]) {
+    for (const { name, body } of envelopes) {
+      test(`decodes the exact recorded message from ${name} at ${status}`, async () => {
+        const error = await decodeError(startMachine(machine), status, body);
+        expect(error).toBeInstanceOf(MachineStartFromCreatedState);
+        expect(error).toMatchObject({ message: recordedMessage });
+      });
+    }
+
+    test(`does not specialize unrelated ${status} errors`, async () => {
+      for (const message of [
+        "invalid machine configuration",
+        "failed_precondition: unable to start machine from current state: 'destroyed'",
+        "failed_precondition: unable to stop machine from current state: 'created'",
+      ]) {
+        const error = await decodeError(
+          startMachine(machine),
+          status,
+          JSON.stringify({ error: message }),
+        );
+        expect(error).toBeInstanceOf(
+          status === 400 ? BadRequest : UnknownFlyIoError,
+        );
+        expect(error).toMatchObject({ message });
+      }
+    });
+  }
+
+  test("only specializes startMachine", async () => {
+    const error = await decodeError(
+      stopMachine(machine),
+      412,
+      JSON.stringify({ error: recordedMessage }),
+    );
+    expect(error).toBeInstanceOf(UnknownFlyIoError);
+    expect(error).toMatchObject({ message: recordedMessage });
+  });
+});
+
+describe("Machines wait timeout decoding", () => {
+  const recordedWaitMessage =
+    "deadline_exceeded: machine failed to reach desired state, started, currently stopped";
+
+  // Statuses are synthetic; the live failure only captured the message.
+  for (const status of [408, 412]) {
+    test(`decodes the recorded waiter failure at ${status}`, async () => {
+      const error = await decodeError(
+        waitMachine(machine),
+        status,
+        JSON.stringify({ error: recordedWaitMessage }),
+      );
+      expect(error).toBeInstanceOf(MachineWaitTimeout);
+      expect(error).toMatchObject({ message: recordedWaitMessage });
+    });
+  }
+
+  test("decodes the recorded waiter failure from plain text", async () => {
+    const error = await decodeError(
+      waitMachine(machine),
+      412,
+      recordedWaitMessage,
+    );
+    expect(error).toBeInstanceOf(MachineWaitTimeout);
+    expect(error).toMatchObject({ message: recordedWaitMessage });
+  });
+
+  test("matches other desired and current machine states", async () => {
+    const message =
+      "deadline_exceeded: machine failed to reach desired state, stopped, currently stopping";
+    const error = await decodeError(
+      waitMachine(machine),
+      412,
+      JSON.stringify({ error: message }),
+    );
+    expect(error).toBeInstanceOf(MachineWaitTimeout);
+    expect(error).toMatchObject({ message });
+  });
+
+  for (const status of [400, 412]) {
+    test(`does not specialize unrelated waiter errors at ${status}`, async () => {
+      for (const message of [
+        "deadline_exceeded: request timed out",
+        "failed_precondition: machine failed to reach desired state, started, currently stopped",
+        "machine failed to reach desired state, started, currently stopped",
+        `other failure: ${recordedWaitMessage}`,
+        `${recordedWaitMessage}; invalid configuration`,
+      ]) {
+        const error = await decodeError(
+          waitMachine(machine),
+          status,
+          JSON.stringify({ error: message }),
+        );
+        expect(error).toBeInstanceOf(
+          status === 400 ? BadRequest : UnknownFlyIoError,
+        );
+        expect(error).toMatchObject({ message });
+      }
+    });
+  }
+
+  test("only specializes waitMachine", async () => {
+    const error = await decodeError(
+      startMachine(machine),
+      412,
+      JSON.stringify({ error: recordedWaitMessage }),
+    );
+    expect(error).toBeInstanceOf(UnknownFlyIoError);
+    expect(error).toMatchObject({ message: recordedWaitMessage });
+  });
+});

package/src/protocol.ts

@@ -19,7 +19,9 @@
  * `Authorization: Bearer` on sprite ops. There is no `SPRITES_TOKEN`.
  */
 import * as Context from "effect/Context";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
@@ -432,34 +434,42 @@ const mintOnce = (fly: Config) =>
         }),
       );
     }
-    // Cache the raw string — Effect.cached must not hold a Redacted (the
-    // registry entry is not restored from a memoized Exit).
+    // Cache the raw string, not a Redacted whose registry entry may be erased.
     return token;
   });
 
 const mintedTokens = new Map<string, string>();
-const mintInFlight = new Map<string, ReturnType<typeof mintOnce>>();
+const mintInFlight = new Map<
+  string,
+  Deferred.Deferred<string, Effect.Error<ReturnType<typeof mintOnce>>>
+>();
 
 /** Mint (and process-wide cache) a Sprites bearer from `FLY_API_TOKEN`. */
 const mintSpritesToken = (fly: Config) =>
-  Effect.gen(function* () {
-    const key = Redacted.value(fly.apiKey);
-    const hit = mintedTokens.get(key);
-    if (hit !== undefined) return hit;
-    const pending = mintInFlight.get(key);
-    if (pending !== undefined) return yield* pending;
-    const run = mintOnce(fly).pipe(
-      Effect.tap((token) =>
-        Effect.sync(() => {
-          mintedTokens.set(key, token);
-          mintInFlight.delete(key);
-        }),
-      ),
-      Effect.tapError(() => Effect.sync(() => mintInFlight.delete(key))),
-    );
-    mintInFlight.set(key, run);
-    return yield* run;
-  });
+  Effect.uninterruptibleMask((restore) =>
+    Effect.suspend(() => {
+      const key = Redacted.value(fly.apiKey);
+      const hit = mintedTokens.get(key);
+      if (hit !== undefined) return Effect.succeed(hit);
+      const pending = mintInFlight.get(key);
+      if (pending !== undefined) return restore(Deferred.await(pending));
+      const result = Deferred.makeUnsafe<
+        string,
+        Effect.Error<ReturnType<typeof mintOnce>>
+      >();
+      mintInFlight.set(key, result);
+      return restore(mintOnce(fly)).pipe(
+        Effect.onExit((exit) =>
+          Effect.gen(function* () {
+            if (Exit.isSuccess(exit)) mintedTokens.set(key, exit.value);
+            // Release all waiters, including on defects and owner interruption.
+            mintInFlight.delete(key);
+            yield* Deferred.done(result, exit);
+          }),
+        ),
+      );
+    }),
+  );
 
 const encodeSpritesRequest = ({
   input,

package/src/services/machines.ts

@@ -19,6 +19,37 @@ import * as Retry from "../retry.ts";
 
 export type { FlyIoOpError, FlyIoOpContext };
 
+export class MachineStartFromCreatedState
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<MachineStartFromCreatedState>()(
+      "MachineStartFromCreatedState",
+      {
+        message: S.String,
+      },
+    ),
+    [
+      {
+        message:
+          "failed_precondition: unable to start machine from current state: 'created'",
+      },
+    ],
+  ) {}
+
+export class MachineWaitTimeout
+  extends /*@__PURE__*/ T.applyErrorMatchers(
+    /*@__PURE__*/ S.TaggedError<MachineWaitTimeout>()("MachineWaitTimeout", {
+      message: S.String,
+    }),
+    [
+      {
+        message: {
+          matches:
+            "^deadline_exceeded: machine failed to reach desired state, [a-z_]+, currently [a-z_]+$",
+        },
+      },
+    ],
+  ) {}
+
 export interface AuthenticateTokenRequest {
   header?: string;
 }
@@ -7214,6 +7245,7 @@ export type StartMachineError =
   | Forbidden
   | NotFound
   | Conflict
+  | MachineStartFromCreatedState
   | FlyIoOpError;
 /** Start Machine Start a specific Machine within an app. */
 export const startMachine: API.OperationMethod<
@@ -7224,7 +7256,13 @@ export const startMachine: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: StartMachineRequest,
   output: StartMachineResponse,
-  errors: [BadRequest, Forbidden, NotFound, Conflict],
+  errors: [
+    BadRequest,
+    Forbidden,
+    NotFound,
+    Conflict,
+    MachineStartFromCreatedState,
+  ],
   protocol: FlyIoProtocol,
   retry: Retry.Retry,
 }));
@@ -7422,6 +7460,7 @@ export type WaitMachineError =
   | Forbidden
   | NotFound
   | GatewayTimeout
+  | MachineWaitTimeout
   | FlyIoOpError;
 /** Wait for State Wait for a Machine to reach a specific state. Specify the desired state with the state parameter. See the [Machine states table](https://fly.io/docs/machines/working-with-machines/#machine-states) for a list of possible states. The default for this parameter is `started`. This request will block for up to 60 seconds. Set a shorter timeout with the timeout parameter. */
 export const waitMachine: API.OperationMethod<
@@ -7432,7 +7471,7 @@ export const waitMachine: API.OperationMethod<
 > = /*@__PURE__*/ API.make(() => ({
   input: WaitMachineRequest,
   output: WaitMachineResponse,
-  errors: [BadRequest, Forbidden, NotFound, GatewayTimeout],
+  errors: [BadRequest, Forbidden, NotFound, GatewayTimeout, MachineWaitTimeout],
   protocol: FlyIoProtocol,
   retry: Retry.Retry,
 }));