alchemy 2.0.0-beta.29 → 2.0.0-beta.30

package/package.json

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

package/src/Apply.ts

@@ -274,9 +274,7 @@ const executePlan = Effect.fnUntraced(function* (
     // Aggregate every collected lifecycle failure into a single parallel Cause
     // so the apply ends with one combined error containing every distinct
     // failure / defect that occurred across the concurrent fibers.
-    yield* Effect.failCause(
-      failures.map((f) => f.cause).reduce(Cause.combine),
-    );
+    yield* Effect.failCause(failures.map((f) => f.cause).reduce(Cause.combine));
   }
 });
 
@@ -882,10 +880,7 @@ const executeNode = (
           type: node.resource.Type,
           cause,
         });
-        yield* Deferred.failCause(
-          ready[fqn],
-          cause as Cause.Cause<never>,
-        );
+        yield* Deferred.failCause(ready[fqn], cause as Cause.Cause<never>);
         yield* session.emit({
           kind: "status-change",
           id: node.resource.LogicalId,

package/src/Cloudflare/StateStore/State.ts

@@ -5,6 +5,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
 import * as HttpApiClient from "effect/unstable/httpapi/HttpApiClient";
 
 import * as Config from "effect/Config";
@@ -204,7 +205,7 @@ export const state = (props?: {
         });
         if (fresh) return fresh;
 
-        const httpState = yield* makeHttpStateStore(credentials);
+        const httpState = yield* makeCloudflareStateStore(credentials);
 
         if (alchemyContext.updateStateStore) {
           yield* deployStateStore(scriptName, httpState);
@@ -245,7 +246,7 @@ export const state = (props?: {
         });
         if (fresh) return fresh;
 
-        const httpState = yield* makeHttpStateStore(credentials);
+        const httpState = yield* makeCloudflareStateStore(credentials);
 
         if (alchemyContext.updateStateStore) {
           yield* deployStateStore(scriptName, httpState);
@@ -287,6 +288,22 @@ export const state = (props?: {
     Layer.orDie,
   );
 
+const makeCloudflareStateStore = Effect.fnUntraced(function* ({
+  url,
+  authToken,
+}: {
+  url: string;
+  authToken: string;
+}) {
+  const access = yield* Access.Access;
+  const accessHeaders = yield* access.getAccessHeaders(new URL(url).host);
+  return yield* makeHttpStateStore({
+    url,
+    authToken,
+    transformClient: HttpClientRequest.setHeaders(accessHeaders),
+  });
+});
+
 /**
  * Non-destructively copy every resource in the
  * `CloudflareStateStore/<scriptName>` stack from `source` into
@@ -350,7 +367,7 @@ const finishBootstrap = ({
     // credentials file (skipping the write in CI), so we don't need
     // to do that explicitly here.
     const { url, authToken } = yield* loginWithCloudflare();
-    const httpState = yield* makeHttpStateStore({ url, authToken });
+    const httpState = yield* makeCloudflareStateStore({ url, authToken });
     // `profileName` is intentionally unused here — `loginWithCloudflare`
     // resolves it itself. Reference it to keep the surrounding API
     // explicit and to avoid an unused-parameter lint.

package/src/State/HttpStateStore.ts

@@ -1,4 +1,5 @@
 import * as Effect from "effect/Effect";
+import { identity } from "effect/Function";
 import * as Schedule from "effect/Schedule";
 import * as HttpClient from "effect/unstable/http/HttpClient";
 import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
@@ -13,14 +14,24 @@ export interface HttpStateStoreProps {
   url: string;
   /** Bearer token used to authenticate every request. */
   authToken: string;
+  transformClient?: (
+    client: HttpClientRequest.HttpClientRequest,
+  ) => HttpClientRequest.HttpClientRequest;
 }
 
-export const makeHttpStateStore = ({ url, authToken }: HttpStateStoreProps) =>
+export const makeHttpStateStore = ({
+  url,
+  authToken,
+  transformClient,
+}: HttpStateStoreProps) =>
   Effect.gen(function* () {
     const apiClient = yield* HttpApiClient.make(StateApi, {
       baseUrl: url,
-      transformClient: HttpClient.mapRequest(
-        HttpClientRequest.bearerToken(authToken),
+      transformClient: HttpClient.mapRequest((req) =>
+        req.pipe(
+          HttpClientRequest.bearerToken(authToken),
+          transformClient ?? identity,
+        ),
       ),
     });
     const state = apiClient.state;