alchemy 2.0.0-beta.42 → 2.0.0-beta.44

package/src/Cloudflare/D1/D1SqlFile.ts

@@ -1,55 +0,0 @@
-import crypto from "node:crypto";
-import * as Effect from "effect/Effect";
-import * as FileSystem from "effect/FileSystem";
-import * as Path from "effect/Path";
-
-export interface D1SqlFile {
-  id: string;
-  sql: string;
-  hash: string;
-}
-
-/**
- * Recursively list `.sql` files under `directory`, sorted by their numeric
- * prefix (e.g. `0001_init.sql`) and then by name.
- */
-export const listSqlFiles = (directory: string) =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const entries = yield* fs.readDirectory(directory, { recursive: true });
-
-    const sqlFiles = entries
-      .filter((name) => name.endsWith(".sql"))
-      .sort((a, b) => {
-        const aNum = getPrefix(a);
-        const bNum = getPrefix(b);
-        if (aNum !== null && bNum !== null) return aNum - bNum;
-        if (aNum !== null) return -1;
-        if (bNum !== null) return 1;
-        return a.localeCompare(b);
-      });
-
-    return yield* Effect.all(sqlFiles.map((id) => readSqlFile(directory, id)));
-  });
-
-/**
- * Read a single `.sql` file relative to `directory` and compute its content
- * hash. The `sql` field is marked non-enumerable so it isn't serialized into
- * resource state.
- */
-export const readSqlFile = (directory: string, name: string) =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const path = yield* Path.Path;
-    const sql = yield* fs.readFileString(path.resolve(directory, name));
-    const hash = crypto.createHash("sha256").update(sql).digest("hex");
-    const file: D1SqlFile = { id: name, sql, hash };
-    Object.defineProperty(file, "sql", { enumerable: false });
-    return file;
-  });
-
-const getPrefix = (name: string): number | null => {
-  const prefix = name.split("_")[0];
-  const num = Number.parseInt(prefix, 10);
-  return Number.isNaN(num) ? null : num;
-};

package/src/Cloudflare/Local/Sidecar.ts

@@ -1,81 +0,0 @@
-import { RuntimeError } from "@distilled.cloud/cloudflare-runtime/RuntimeError";
-import * as Effect from "effect/Effect";
-import * as Schema from "effect/Schema";
-import { BundleError } from "../../Bundle/Bundle.ts";
-import type { ResourceBinding } from "../../Resource.ts";
-import * as RpcClient from "../../Sidecar/RpcClient.ts";
-import { defineSchema } from "../../Sidecar/RpcHandler.ts";
-import type { Worker, WorkerProps } from "../Workers/Worker.ts";
-
-export interface ReconcileOptions {
-  id: string;
-  props: WorkerProps;
-  bindings: ResourceBinding<Worker["Binding"]>[];
-  stack: { name: string; stage: string };
-  instanceId: string;
-}
-
-export class ValidationError extends Schema.TaggedErrorClass<ValidationError>()(
-  "ValidationError",
-  {
-    message: Schema.String,
-    hint: Schema.optional(Schema.String),
-    value: Schema.Unknown,
-  },
-) {}
-
-export const ServeResult = Schema.Struct({
-  workerId: Schema.String,
-  workerName: Schema.String,
-  logpush: Schema.UndefinedOr(Schema.Boolean),
-  url: Schema.String,
-  tags: Schema.Array(Schema.String).pipe(Schema.mutable),
-  durableObjectNamespaces: Schema.Record(Schema.String, Schema.String),
-  domains: Schema.Array(
-    Schema.Struct({
-      hostname: Schema.String,
-      id: Schema.String,
-      zoneId: Schema.String,
-    }),
-  ).pipe(Schema.mutable),
-  crons: Schema.Array(Schema.String).pipe(Schema.mutable),
-  accountId: Schema.String,
-});
-export type ServeResult = typeof ServeResult.Type;
-
-export const ServeError = Schema.Union([
-  RuntimeError,
-  BundleError,
-  ValidationError,
-]);
-export type ServeError = typeof ServeError.Type;
-
-export const DiffResult = Schema.Struct({
-  action: Schema.Literals(["update", "noop"]),
-});
-export type DiffResult = typeof DiffResult.Type;
-
-export const SidecarSchema = defineSchema<Sidecar["Service"]>({
-  diff: { success: DiffResult, error: Schema.Never },
-  reconcile: {
-    success: ServeResult,
-    error: ServeError,
-  },
-  delete: { success: Schema.Void, error: Schema.Never },
-});
-
-export class Sidecar extends RpcClient.RpcClientService<
-  Sidecar,
-  {
-    readonly diff: (options: ReconcileOptions) => Effect.Effect<DiffResult>;
-    readonly reconcile: (
-      options: ReconcileOptions,
-    ) => Effect.Effect<ServeResult, ServeError>;
-    readonly delete: (id: string) => Effect.Effect<void>;
-  }
->()("Sidecar") {}
-
-export const SidecarLive = RpcClient.layer(Sidecar, {
-  main: import.meta.resolve("./SidecarServer.ts", import.meta.url),
-  schema: SidecarSchema,
-});

package/src/Cloudflare/Local/SidecarHandlers.ts

@@ -1,491 +0,0 @@
-import {
-  Runtime,
-  type BindingHook,
-  type BindingServices,
-  type HyperdriveOrigin,
-  type Module,
-  type Assets as RuntimeAssets,
-  type DurableObjectNamespace as RuntimeDurableObjectNamespace,
-  type RuntimeServices,
-} from "@distilled.cloud/cloudflare-runtime";
-import {
-  Ai,
-  Assets,
-  Browser,
-  D1,
-  Data,
-  DurableObjectNamespace,
-  Hyperdrive,
-  Images,
-  Json,
-  KvNamespace,
-  R2Bucket,
-  Service,
-  Text,
-  VersionMetadata,
-  WasmModule,
-  WorkerLoader,
-} from "@distilled.cloud/cloudflare-runtime/bindings";
-import * as LocalProxy from "@distilled.cloud/cloudflare-runtime/proxy/LocalProxy";
-import * as Cause from "effect/Cause";
-import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
-import * as Fiber from "effect/Fiber";
-import * as Hash from "effect/Hash";
-import * as Layer from "effect/Layer";
-import * as Path from "effect/Path";
-import * as Redacted from "effect/Redacted";
-import * as Result from "effect/Result";
-import * as Scope from "effect/Scope";
-import * as Stream from "effect/Stream";
-import type * as Bundle from "../../Bundle/Bundle.ts";
-import { InstanceId } from "../../InstanceId.ts";
-import { Stack } from "../../Stack.ts";
-import { Stage } from "../../Stage.ts";
-import { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
-import { getCompatibility } from "../Workers/Compatibility.ts";
-import * as Vite from "../Workers/Vite.ts";
-import type { Worker, WorkerAssetsConfig } from "../Workers/Worker.ts";
-import { getCronBindings } from "../Workers/WorkerAsyncBindings.ts";
-import type { WorkerBinding } from "../Workers/WorkerBinding.ts";
-import {
-  WorkerBundle,
-  type WorkerBundleOptions,
-} from "../Workers/WorkerBundle.ts";
-import { createWorkerName } from "../Workers/WorkerName.ts";
-import {
-  ServeError,
-  ServeResult,
-  Sidecar,
-  ValidationError,
-  type ReconcileOptions,
-} from "./Sidecar.ts";
-
-export const SidecarHandlers = Layer.effect(
-  Sidecar,
-  Effect.gen(function* () {
-    const { accountId } = yield* CloudflareEnvironment;
-    const bundler = yield* WorkerBundle;
-    const runtime = yield* Runtime;
-    const path = yield* Path.Path;
-    const localProxy = yield* LocalProxy.LocalProxy;
-
-    const toRuntimeModules = Effect.fn(function* (bundle: Bundle.BundleOutput) {
-      const modules: Module[] = [];
-      for (const file of bundle.files) {
-        const ext = path.extname(file.path);
-        const type = moduleTypeFromExtension(ext);
-        if (type === "SourceMap") continue;
-        if (type === "Data" || type === "Wasm") {
-          if (!(file.content instanceof Uint8Array)) {
-            return yield* new ValidationError({
-              message: `Expected Uint8Array for ${file.path} (${type})`,
-              value: file.content,
-            });
-          }
-          modules.push({
-            name: file.path,
-            type,
-            content: file.content,
-          });
-        } else {
-          if (typeof file.content !== "string") {
-            return yield* new ValidationError({
-              message: `Expected string for ${file.path} (${type})`,
-              value: file.content,
-            });
-          }
-          modules.push({
-            name: file.path,
-            type,
-            content: file.content,
-          });
-        }
-      }
-      return modules;
-    });
-
-    const serveScoped = Effect.fnUntraced(function* (
-      worker: WorkerConfig,
-      bundle: Bundle.BundleOutput,
-    ) {
-      const scope = yield* Effect.flatMap(Effect.scope, Scope.fork);
-      const address = yield* runtime
-        .start({
-          name: worker.name,
-          compatibilityDate: worker.compatibility.date,
-          compatibilityFlags: worker.compatibility.flags,
-          bindings: worker.workerBindings as never,
-          hyperdrives: worker.hyperdrives,
-          durableObjectNamespaces: toRuntimeDurableObjectNamespaces(
-            worker.durableObjectNamespaces,
-          ),
-          modules: yield* toRuntimeModules(bundle),
-          assets: toRuntimeAssets(worker.assets),
-        })
-        .pipe(Scope.provide(scope));
-      const previous = workerdScopes.get(worker.id);
-      if (previous) {
-        yield* Effect.forkDetach(Scope.close(previous, Exit.void));
-      }
-      workerdScopes.set(worker.id, scope);
-      yield* localProxy.setLocalAddress(worker.id, address);
-      return address;
-    });
-
-    const buildConfig = Effect.fn(function* ({
-      id,
-      props,
-      bindings,
-      stack,
-      instanceId,
-    }: ReconcileOptions) {
-      const name = yield* createWorkerName(id, props.name).pipe(
-        Effect.provideService(Stack, stack),
-        Effect.provideService(Stage, stack.stage),
-        Effect.provideService(InstanceId, instanceId),
-      );
-      const compatibility = getCompatibility(props);
-      const workerBindings: BindingHook<BindingServices>[] = [];
-      const durableObjectNamespaces: Record<string, string> = {};
-      const hyperdrives: Record<string, Required<HyperdriveOrigin>> = {};
-      for (const { data } of bindings) {
-        for (const binding of data.bindings ?? []) {
-          if (binding.type === "durable_object_namespace") {
-            durableObjectNamespaces[binding.name] = binding.className!;
-          }
-          workerBindings.push(yield* toRuntimeBinding(binding));
-        }
-        if (data.hyperdrives) {
-          for (const [id, origin] of Object.entries(data.hyperdrives)) {
-            hyperdrives[id] = {
-              scheme: origin.scheme,
-              host: origin.host,
-              port: origin.port,
-              user: origin.user,
-              database: origin.database,
-              password: Redacted.isRedacted(origin.password)
-                ? Redacted.value(origin.password)
-                : origin.password,
-              sslmode: origin.sslmode,
-            };
-          }
-        }
-      }
-      for (const [key, value] of Object.entries(props.env ?? {})) {
-        if (value === undefined) continue;
-        if (Redacted.isRedacted(value)) {
-          workerBindings.push(Text.binding(key, Redacted.value(value)));
-        } else if (typeof value === "string") {
-          workerBindings.push(Text.binding(key, value));
-        } else {
-          workerBindings.push(Json.binding(key, value));
-        }
-      }
-      return {
-        id,
-        name,
-        compatibility,
-        workerBindings,
-        durableObjectNamespaces,
-        hyperdrives,
-        bundleOptions: {
-          id,
-          main: props.main,
-          compatibility,
-          entry: props.isExternal
-            ? { kind: "external" }
-            : { kind: "effect", exports: (props.exports ?? {}) as any },
-          stack: { name: stack.name, stage: stack.stage },
-          userOptions: props.build,
-        } satisfies WorkerBundleOptions,
-        assets: props.assets,
-      };
-    });
-
-    type WorkerConfig = Effect.Success<ReturnType<typeof buildConfig>>;
-
-    const runServer = Effect.fnUntraced(function* (worker: WorkerConfig) {
-      let start = Date.now();
-      let status: "start" | "update" = "start";
-      yield* bundler.watch(worker.bundleOptions).pipe(
-        Stream.tap((event) => {
-          if (event._tag === "Start") {
-            start = Date.now();
-            if (status === "update") {
-              return Effect.log(`[${worker.id}] Rebuilding`);
-            }
-          } else if (event._tag === "Error") {
-            return Effect.logError(`[${worker.id}] Bundle error`, event.error);
-          }
-          return Effect.void;
-        }),
-        Stream.filterMap((event) =>
-          event._tag === "Success"
-            ? Result.succeed(event.output)
-            : Result.failVoid,
-        ),
-        Stream.mapEffect((bundle) =>
-          serveScoped(worker, bundle).pipe(
-            Effect.exit,
-            Effect.tap((exit) => {
-              if (exit._tag === "Success") {
-                const message = Effect.log(
-                  `[${worker.id}] ${status === "update" ? "Updated" : "Started"} in ${Math.round(Date.now() - start)}ms`,
-                );
-                status = "update";
-                return message;
-              } else {
-                return Effect.logError(
-                  `[${worker.id}] Error`,
-                  Cause.squash(exit.cause),
-                );
-              }
-            }),
-          ),
-        ),
-        Stream.runDrain,
-        Effect.forkScoped,
-      );
-    });
-
-    const rootScope = yield* Effect.scope;
-    const workerdScopes = new Map<string, Scope.Closeable>();
-
-    const context = yield* Effect.context<RuntimeServices>();
-    const instances = new Map<
-      string,
-      {
-        hash: number;
-        fiber: Fiber.Fiber<ServeResult, ServeError>;
-        scope: Scope.Closeable;
-      }
-    >();
-
-    const runInstance = Effect.fn(function* (options: ReconcileOptions) {
-      const { id, props, bindings } = options;
-      const config = yield* buildConfig(options);
-      const url = yield* localProxy.registerWorker(id);
-      if (props.vite) {
-        console.log("starting vite dev server", id);
-        const devServer = yield* Vite.viteDev(
-          props.vite.rootDir,
-          props.env ?? {},
-          {
-            compatibilityDate: config.compatibility.date,
-            compatibilityFlags: config.compatibility.flags,
-            worker: {
-              name: config.name,
-              bindings: config.workerBindings,
-              durableObjectNamespaces: toRuntimeDurableObjectNamespaces(
-                config.durableObjectNamespaces,
-              ),
-              hyperdrives: config.hyperdrives,
-              assets: toRuntimeAssets(config.assets),
-            },
-            context,
-          },
-        );
-        console.log("vite dev server started", id);
-        const localAddress = devServer.resolvedUrls!.local[0].slice(0, -1);
-        yield* localProxy.setLocalAddress(id, localAddress);
-      } else {
-        yield* runServer(config);
-      }
-      return {
-        workerId: config.name,
-        workerName: config.name,
-        logpush: undefined,
-        url,
-        tags: [],
-        durableObjectNamespaces: config.durableObjectNamespaces,
-        domains: [],
-        crons: Array.from(
-          new Set([...getCronBindings(bindings), ...(props.crons ?? [])]),
-        ),
-        accountId,
-      } satisfies Worker["Attributes"];
-    });
-
-    return Sidecar.of({
-      diff: Effect.fn(function* (options) {
-        const hash = Hash.structure(options);
-        return {
-          action: instances.get(options.id)?.hash === hash ? "noop" : "update",
-        };
-      }),
-      reconcile: Effect.fn(function* (options) {
-        const hash = Hash.structure(options);
-        const existing = instances.get(options.id);
-        if (existing) {
-          if (existing.hash === hash) {
-            yield* Effect.log(
-              `[${options.id}] No changes, using existing instance`,
-            );
-            return yield* Fiber.join(existing.fiber);
-          }
-          yield* Effect.log(
-            `[${options.id}] Changes detected, interrupting existing instance`,
-          );
-          yield* Fiber.interrupt(existing.fiber);
-          yield* Scope.close(existing.scope, Exit.void);
-          instances.delete(options.id);
-        }
-        const scope = yield* Scope.fork(rootScope);
-        const fiber = yield* runInstance(options).pipe(
-          Effect.forkDetach,
-          Scope.provide(scope),
-        );
-        instances.set(options.id, { hash, fiber, scope });
-        return yield* Fiber.join(fiber).pipe(
-          Effect.onExit((exit) =>
-            Effect.sync(() => {
-              if (exit._tag === "Failure") {
-                instances.delete(options.id);
-              }
-            }),
-          ),
-        );
-      }),
-      delete: Effect.fn(function* (id) {
-        const existing = instances.get(id);
-        if (existing) {
-          yield* Fiber.interrupt(existing.fiber);
-          yield* Scope.close(existing.scope, Exit.void);
-          instances.delete(id);
-        }
-      }),
-    });
-  }),
-);
-
-const toRuntimeBinding = Effect.fnUntraced(function* (b: WorkerBinding) {
-  const unsupported = () =>
-    new ValidationError({
-      message: `${b.type} bindings are not supported in local mode`,
-      value: b,
-    });
-  switch (b.type) {
-    case "ai":
-      return Ai.remote(b.name);
-    case "analytics_engine":
-      return yield* unsupported();
-    case "artifacts":
-      return yield* unsupported();
-    case "assets":
-      return Assets.binding(b.name);
-    case "browser":
-      return Browser.binding(b.name);
-    case "d1":
-      return D1.remote(b.name, b.id);
-    case "data_blob":
-      return Data.binding(b.name, Buffer.from(b.part));
-    case "dispatch_namespace":
-      return yield* unsupported();
-    case "durable_object_namespace":
-      return DurableObjectNamespace.local({
-        name: b.name,
-        className: b.className!,
-        scriptName: b.scriptName,
-      });
-    case "hyperdrive":
-      return Hyperdrive.binding(b.name, b.id);
-    case "images":
-      return Images.remote(b.name);
-    case "inherit":
-      return yield* unsupported();
-    case "json":
-      return Json.binding(b.name, b.json);
-    case "kv_namespace":
-      return KvNamespace.remote(b.name, b.namespaceId);
-    case "mtls_certificate":
-      return yield* unsupported();
-    case "pipelines":
-      return yield* unsupported();
-    case "plain_text":
-      return Text.binding(b.name, b.text);
-    case "queue":
-      return yield* unsupported();
-    case "r2_bucket":
-      return R2Bucket.remote(b.name, b.bucketName, b.jurisdiction);
-    case "ratelimit":
-      return yield* unsupported();
-    case "secret_key":
-      return yield* unsupported();
-    case "secret_text":
-      return Text.binding(b.name, b.text);
-    case "secrets_store_secret":
-      return yield* unsupported();
-    case "send_email":
-      return yield* unsupported();
-    case "service":
-      return Service.local({ name: b.name, scriptName: b.service });
-    case "text_blob":
-      return Data.binding(b.name, Buffer.from(b.part));
-    case "vectorize":
-      return yield* unsupported();
-    case "version_metadata":
-      return VersionMetadata.binding(b.name);
-    case "wasm_module":
-      return WasmModule.binding(b.name, Buffer.from(b.part));
-    case "worker_loader":
-      return WorkerLoader.binding(b.name);
-    case "workflow":
-      return yield* unsupported();
-    default:
-      return yield* unsupported();
-  }
-});
-
-const toRuntimeAssets = (
-  assets: WorkerAssetsConfig | undefined,
-): RuntimeAssets | undefined => {
-  if (!assets) return undefined;
-  if (typeof assets === "string") {
-    return {
-      directory: assets,
-    };
-  }
-  return {
-    directory: "directory" in assets ? assets.directory : assets.path,
-    headers: assets.config?.headers,
-    redirects: assets.config?.redirects,
-    htmlHandling: assets.config?.htmlHandling,
-    notFoundHandling: assets.config?.notFoundHandling,
-    runWorkerFirst: assets.config?.runWorkerFirst,
-    serveDirectly: assets.config?.serveDirectly,
-  };
-};
-
-const toRuntimeDurableObjectNamespaces = (
-  namespaces: Record<string, string>,
-): RuntimeDurableObjectNamespace[] => {
-  return Object.entries(namespaces).map(([className, namespaceId]) => ({
-    className,
-    uniqueKey: namespaceId,
-    sql: true,
-  }));
-};
-
-const moduleTypeFromExtension = (ext: string): Module["type"] | "SourceMap" => {
-  switch (ext) {
-    case ".wasm":
-      return "Wasm";
-    case ".txt":
-    case ".html":
-    case ".sql":
-    case ".custom":
-      return "Text";
-    case ".bin":
-      return "Data";
-    case ".mjs":
-    case ".js":
-      return "ESModule";
-    case ".cjs":
-      return "CommonJsModule";
-    case ".map":
-      return "SourceMap";
-    default:
-      return "Text";
-  }
-};

package/src/Cloudflare/Local/SidecarServer.ts

@@ -1,70 +0,0 @@
-import {
-  layerLocalProxy,
-  layerRuntime,
-} from "@distilled.cloud/cloudflare-runtime/RuntimeServices";
-import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import * as Path from "effect/Path";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import * as AlchemyContext from "../../AlchemyContext.ts";
-import { AuthProviders } from "../../Auth/AuthProvider.ts";
-import { CredentialsStoreLive } from "../../Auth/Credentials.ts";
-import { ProfileLive } from "../../Auth/Profile.ts";
-import * as RpcServer from "../../Sidecar/RpcServer.ts";
-import * as RpcServices from "../../Sidecar/RpcServices.ts";
-import {
-  httpServer,
-  PlatformServices,
-  runMain,
-} from "../../Util/PlatformServices.ts";
-import { CloudflareAuth } from "../Auth/AuthProvider.ts";
-import * as CloudflareEnvironment from "../CloudflareEnvironment.ts";
-import * as Credentials from "../Credentials.ts";
-import { Sidecar, SidecarSchema } from "./Sidecar.ts";
-import { SidecarHandlers } from "./SidecarHandlers.ts";
-
-const apiServices = Layer.merge(
-  Credentials.fromAuthProvider(),
-  CloudflareEnvironment.fromProfile(),
-).pipe(
-  Layer.provide(CloudflareAuth),
-  Layer.provide(Layer.succeed(AuthProviders, {})),
-  Layer.provide(ProfileLive),
-  Layer.provide(CredentialsStoreLive),
-);
-
-const runtimeServices = SidecarHandlers.pipe(
-  Layer.provide(layerLocalProxy(1337)),
-  Layer.provide(
-    Layer.unwrap(
-      Effect.gen(function* () {
-        const { accountId } =
-          yield* CloudflareEnvironment.CloudflareEnvironment;
-        const { dotAlchemy } = yield* AlchemyContext.AlchemyContext;
-        const path = yield* Path.Path;
-        return layerRuntime({
-          api: {
-            accountId,
-          },
-          storage: {
-            directory: path.join(dotAlchemy, "local"),
-          },
-        });
-      }),
-    ),
-  ),
-  Layer.provide(
-    Layer.mergeAll(apiServices, FetchHttpClient.layer, httpServer()),
-  ),
-);
-
-const services = Layer.provideMerge(
-  Layer.provideMerge(runtimeServices, RpcServices.layer(import.meta.url)),
-  PlatformServices,
-);
-
-RpcServer.makeRpcServer(Sidecar, SidecarSchema).pipe(
-  Effect.provide(services),
-  Effect.scoped,
-  runMain,
-);