alchemy 0.82.0 → 0.82.1

package/src/cloudflare/d1-sql-file.ts

@@ -0,0 +1,52 @@
+import crypto from "node:crypto";
+import fs from "node:fs/promises";
+import path from "pathe";
+
+export interface D1SqlFile {
+  id: string;
+  sql: string;
+  hash: string;
+}
+
+/**
+ * Lists SQL files from the directory, sorted by filename.
+ * @param directory Directory containing .sql files
+ */
+export async function listSqlFiles(directory: string): Promise<D1SqlFile[]> {
+  const files = await Array.fromAsync(
+    fs.glob("**/*.sql", {
+      cwd: directory,
+    }),
+  );
+
+  const sortedFiles = files.sort((a: string, b: string) => {
+    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 Promise.all(sortedFiles.map((id) => readSqlFile(directory, id)));
+}
+
+export async function readSqlFile(
+  directory: string,
+  name: string,
+): Promise<D1SqlFile> {
+  const sql = await fs.readFile(path.resolve(directory, name), "utf-8");
+  const hash = crypto.createHash("sha256").update(sql).digest("hex");
+  const file: D1SqlFile = { id: name, sql, hash };
+  // Make the sql property non-enumerable so it's not included in state. This prevents state store errors caused by large sql files.
+  Object.defineProperty(file, "sql", { enumerable: false });
+  return file;
+}
+
+const getPrefix = (name: string) => {
+  const prefix = name.split("_")[0];
+  const num = Number.parseInt(prefix, 10);
+  return Number.isNaN(num) ? null : num;
+};

package/src/state/d1-state-store.ts

@@ -78,12 +78,11 @@ const upsertDatabase = async (api: CloudflareApi, databaseName: string) => {
   const { listDatabases, createDatabase } = await import(
     "../cloudflare/d1-database.ts"
   );
-  const { applyMigrations, listMigrationsFiles } = await import(
-    "../cloudflare/d1-migrations.ts"
-  );
+  const { listSqlFiles } = await import("../cloudflare/d1-sql-file.ts");
+  const { applyMigrations } = await import("../cloudflare/d1-migrations.ts");
   const migrate = async (databaseId: string) => {
     await applyMigrations({
-      migrationsFiles: await listMigrationsFiles(MIGRATIONS_DIRECTORY),
+      migrationsFiles: await listSqlFiles(MIGRATIONS_DIRECTORY),
       migrationsTable: "migrations",
       accountId: api.accountId,
       databaseId,
@@ -93,17 +92,16 @@ const upsertDatabase = async (api: CloudflareApi, databaseName: string) => {
   };
   const databases = await listDatabases(api, databaseName);
   if (databases[0]) {
-    await migrate(databases[0].id);
+    await migrate(databases[0].uuid);
     return {
-      id: databases[0].id,
+      id: databases[0].uuid,
     };
   }
-  const res = await createDatabase(api, databaseName, {
+  const database = await createDatabase(api, databaseName, {
     readReplication: { mode: "disabled" },
   });
-  assert(res.result.uuid, "Missing UUID for database");
-  await migrate(res.result.uuid);
+  await migrate(database.uuid);
   return {
-    id: res.result.uuid,
+    id: database.uuid,
   };
 };

package/workers/tunnel-proxy.js

@@ -83,7 +83,7 @@ const renderErrorHtml = (props) => `
             Alchemy</a>.</p>
       </div>
       <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
-        <p class="text-sm text-slate-500">Alchemy 0.82.0</p>
+        <p class="text-sm text-slate-500">Alchemy 0.82.1</p>
       </div>
     </div>
   </body>