rwsdk 0.1.19 → 0.1.20

package/dist/runtime/lib/db/SqliteDurableObject.js

@@ -1,6 +1,6 @@
 import { DODialect } from "kysely-do";
 import { DurableObject } from "cloudflare:workers";
-import { Kysely } from "kysely";
+import { Kysely, ParseJSONResultsPlugin, } from "kysely";
 import { createMigrator } from "./index.js";
 import debug from "../debug.js";
 const log = debug("sdk:do-db");
@@ -13,6 +13,7 @@ export class SqliteDurableObject extends DurableObject {
         this.migrationTableName = migrationTableName;
         this.kysely = new Kysely({
             dialect: new DODialect({ ctx }),
+            plugins: [new ParseJSONResultsPlugin()],
         });
     }
     async initialize() {
@@ -22,7 +23,13 @@ export class SqliteDurableObject extends DurableObject {
         }
         log("Initializing Durable Object database");
         const migrator = createMigrator(this.kysely, this.migrations, this.migrationTableName);
-        await migrator.migrateToLatest();
+        const result = await migrator.migrateToLatest();
+        if (result.error) {
+            console.log("rwsdk/db: Migrations failed, rolling back and throwing with the migration error: %O", result.results);
+            await migrator.migrateDown();
+            throw result.error;
+        }
+        log("Migrations results", result.results);
         this.initialized = true;
         log("Database initialization complete");
     }

package/dist/runtime/lib/db/createDb.js

@@ -1,5 +1,5 @@
 import { Kysely } from "kysely";
-import { requestInfo } from "../../requestInfo/worker.js";
+import { requestInfo, waitForRequestInfo } from "../../requestInfo/worker.js";
 import { DOWorkerDialect } from "./DOWorkerDialect.js";
 const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     const durableObjectId = durableObjectBinding.idFromName(name);
@@ -12,6 +12,13 @@ const createDurableObjectDb = (durableObjectBinding, name = "main") => {
 export function createDb(durableObjectBinding, name = "main") {
     const cacheKey = `${durableObjectBinding}_${name}`;
     const doCreateDb = () => {
+        if (!requestInfo.rw) {
+            throw new Error(`
+  rwsdk: A database created using createDb() was accessed before requestInfo was available.
+
+  Please make sure database access is happening in a request handler or action handler.
+  `);
+        }
         let db = requestInfo.rw.databases.get(cacheKey);
         if (!db) {
             db = createDurableObjectDb(durableObjectBinding, name);
@@ -19,7 +26,7 @@ export function createDb(durableObjectBinding, name = "main") {
         }
         return db;
     };
-    doCreateDb();
+    waitForRequestInfo().then(() => doCreateDb());
     return new Proxy({}, {
         get(target, prop, receiver) {
             const db = doCreateDb();

package/dist/runtime/requestInfo/worker.d.ts

@@ -1,5 +1,8 @@
 import { RequestInfo, DefaultAppContext } from "./types";
-export declare const requestInfo: RequestInfo<DefaultAppContext>;
+type DefaultRequestInfo = RequestInfo<DefaultAppContext>;
+export declare const requestInfo: DefaultRequestInfo;
 export declare function getRequestInfo(): RequestInfo;
-export declare function runWithRequestInfo<Result>(context: Record<string, any>, fn: () => Result): Result;
-export declare function runWithRequestInfoOverrides<Result>(overrides: Record<string, any>, fn: () => Result): Result;
+export declare function waitForRequestInfo(): Promise<DefaultRequestInfo>;
+export declare function runWithRequestInfo<Result>(nextRequestInfo: DefaultRequestInfo, fn: () => Result): Result;
+export declare function runWithRequestInfoOverrides<Result>(overrides: Partial<DefaultRequestInfo>, fn: () => Result): Result;
+export {};

package/dist/runtime/requestInfo/worker.js

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from "async_hooks";
+const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
 const REQUEST_INFO_KEYS = ["request", "params", "ctx", "headers", "rw", "cf"];
@@ -20,8 +21,15 @@ export function getRequestInfo() {
     }
     return store;
 }
-export function runWithRequestInfo(context, fn) {
-    return requestInfoStore.run(context, fn);
+export function waitForRequestInfo() {
+    return requestInfoDeferred.promise;
+}
+export function runWithRequestInfo(nextRequestInfo, fn) {
+    const runWithRequestInfoFn = () => {
+        requestInfoDeferred.resolve(nextRequestInfo);
+        return fn();
+    };
+    return requestInfoStore.run(nextRequestInfo, runWithRequestInfoFn);
 }
 export function runWithRequestInfoOverrides(overrides, fn) {
     const requestInfo = requestInfoStore.getStore();
@@ -29,5 +37,5 @@ export function runWithRequestInfoOverrides(overrides, fn) {
         ...requestInfo,
         ...overrides,
     };
-    return requestInfoStore.run(newRequestInfo, fn);
+    return runWithRequestInfo(newRequestInfo, fn);
 }

package/dist/runtime/script.d.ts

@@ -1,5 +1,5 @@
 export declare const defineScript: (fn: ({ env }: {
-    env: Env;
+    env: Cloudflare.Env;
 }) => Promise<unknown>) => {
-    fetch(request: Request, env: Env): Promise<Response>;
+    fetch: (request: Request, env: Env, cf: ExecutionContext) => Promise<Response>;
 };

package/dist/runtime/script.js

@@ -1,8 +1,11 @@
+import { defineApp } from "./worker";
+import { env } from "cloudflare:workers";
 export const defineScript = (fn) => {
-    return {
-        async fetch(request, env) {
+    const app = defineApp([
+        async () => {
             await fn({ env });
             return new Response("Done!");
         },
-    };
+    ]);
+    return app;
 };

package/dist/scripts/debug-sync.mjs

@@ -136,10 +136,8 @@ export const debugSync = async (opts) => {
         throw e;
     }
     // Initial sync for watch mode. We do it *after* acquiring the lock.
-    let initialSyncOk = false;
     try {
         await performSync(sdkDir, targetDir);
-        initialSyncOk = true;
     }
     catch (error) {
         console.error("❌ Initial sync failed:", error);
@@ -196,9 +194,9 @@ export const debugSync = async (opts) => {
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
-    if (initialSyncOk) {
-        runWatchedCommand();
-    }
+    // Run the watched command even if the initial sync fails. This allows the
+    // user to see application errors and iterate more quickly.
+    runWatchedCommand();
 };
 if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
     const args = process.argv.slice(2);

package/dist/scripts/worker-run.mjs

@@ -1,9 +1,13 @@
+import path from "path";
 import { resolve } from "path";
 import { writeFile } from "fs/promises";
 import { unstable_readConfig } from "wrangler";
 import { createServer as createViteServer } from "vite";
 import tmp from "tmp-promise";
 import baseDebug from "debug";
+import enhancedResolve from "enhanced-resolve";
+import { readFile } from "fs/promises";
+import { Lang, parse } from "@ast-grep/napi";
 import { redwood } from "../vite/index.mjs";
 import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
 const debug = baseDebug("rwsdk:worker-run");
@@ -22,28 +26,71 @@ export const runWorkerScript = async (relativeScriptPath) => {
     debug("Using wrangler config: %s", workerConfigPath);
     const workerConfig = unstable_readConfig({
         config: workerConfigPath,
+        env: "dev",
     });
-    const tmpWorkerPath = await tmp.file({
-        postfix: ".json",
+    const durableObjectsToExport = workerConfig.durable_objects?.bindings
+        .filter((binding) => !binding.script_name)
+        .map((binding) => binding.class_name) ?? [];
+    const workerEntryRelativePath = workerConfig.main;
+    const workerEntryPath = workerEntryRelativePath ?? path.join(process.cwd(), "src/worker.tsx");
+    const durableObjectExports = [];
+    if (durableObjectsToExport.length > 0) {
+        const resolver = enhancedResolve.create.sync({
+            extensions: [".mts", ".ts", ".tsx", ".mjs", ".js", ".jsx", ".json"],
+        });
+        const workerEntryContents = await readFile(workerEntryPath, "utf-8");
+        const workerEntryAst = parse(Lang.Tsx, workerEntryContents);
+        const exportDeclarations = [
+            ...workerEntryAst.root().findAll('export { $$$EXPORTS } from "$MODULE"'),
+            ...workerEntryAst.root().findAll("export { $$$EXPORTS } from '$MODULE'"),
+            ...workerEntryAst.root().findAll("export { $$$EXPORTS } from '$MODULE'"),
+        ];
+        for (const exportDeclaration of exportDeclarations) {
+            const moduleMatch = exportDeclaration.getMatch("MODULE");
+            const exportsMatch = exportDeclaration.getMultipleMatches("EXPORTS");
+            if (!moduleMatch || exportsMatch.length === 0) {
+                continue;
+            }
+            const modulePath = moduleMatch.text();
+            const specifiers = exportsMatch.map((m) => m.text().trim());
+            for (const specifier of specifiers) {
+                if (durableObjectsToExport.includes(specifier)) {
+                    const resolvedPath = resolver(path.dirname(workerEntryPath), modulePath);
+                    durableObjectExports.push(`export { ${specifier} } from "${resolvedPath}";`);
+                }
+            }
+        }
+    }
+    const tmpDir = await tmp.dir({
+        prefix: "rw-worker-run-",
+        unsafeCleanup: true,
     });
+    const relativeTmpWorkerEntryPath = "worker.tsx";
+    const tmpWorkerPath = path.join(tmpDir.path, "wrangler.json");
+    const tmpWorkerEntryPath = path.join(tmpDir.path, relativeTmpWorkerEntryPath);
     const scriptWorkerConfig = {
         ...workerConfig,
-        configPath: tmpWorkerPath.path,
-        userConfigPath: tmpWorkerPath.path,
-        main: scriptPath,
+        configPath: tmpWorkerPath,
+        userConfigPath: tmpWorkerPath,
+        main: relativeTmpWorkerEntryPath,
     };
     try {
-        await writeFile(tmpWorkerPath.path, JSON.stringify(scriptWorkerConfig, null, 2));
-        debug("Worker config written to: %s", tmpWorkerPath.path);
+        await writeFile(tmpWorkerPath, JSON.stringify(scriptWorkerConfig, null, 2));
+        await writeFile(tmpWorkerEntryPath, `
+${durableObjectExports.join("\n")}
+export { default } from "${scriptPath}";
+`);
+        debug("Worker config written to: %s", tmpWorkerPath);
+        debug("Worker entry written to: %s", tmpWorkerEntryPath);
         process.env.RWSDK_WORKER_RUN = "1";
         const server = await createViteServer({
             configFile: false,
             plugins: [
                 redwood({
-                    configPath: tmpWorkerPath.path,
+                    configPath: tmpWorkerPath,
                     includeCloudflarePlugin: true,
                     entry: {
-                        worker: scriptPath,
+                        worker: tmpWorkerEntryPath,
                     },
                 }),
             ],
@@ -65,13 +112,12 @@ export const runWorkerScript = async (relativeScriptPath) => {
         }
         finally {
             debug("Closing server...");
-            await server.close();
+            server.close();
             debug("Server closed");
         }
     }
     finally {
         debug("Closing inspector servers...");
-        await tmpWorkerPath.cleanup();
         debug("Temporary files cleaned up");
     }
     // todo(justinvdm, 01 Apr 2025): Investigate what handles are remaining open

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {