rwsdk 0.2.0-alpha.6 → 0.2.0-alpha.6-test.20250806102744

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

@@ -1,6 +1,7 @@
 import { Kysely } from "kysely";
-import { requestInfo, waitForRequestInfo } from "../../requestInfo/worker.js";
+import { requestInfo } from "../../requestInfo/worker.js";
 import { DOWorkerDialect } from "./DOWorkerDialect.js";
+const moduleLevelDbCache = new Map();
 const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     const durableObjectId = durableObjectBinding.idFromName(name);
     const stub = durableObjectBinding.get(durableObjectId);
@@ -10,26 +11,23 @@ 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);
+    const getDb = () => {
+        let db = moduleLevelDbCache.get(name);
         if (!db) {
             db = createDurableObjectDb(durableObjectBinding, name);
-            requestInfo.rw.databases.set(cacheKey, db);
+            moduleLevelDbCache.set(name, db);
+        }
+        if (requestInfo.rw) {
+            if (!requestInfo.rw.databases) {
+                requestInfo.rw.databases = new Map();
+            }
+            requestInfo.rw.databases.set(name, db);
         }
         return db;
     };
-    waitForRequestInfo().then(() => doCreateDb());
     return new Proxy({}, {
-        get(target, prop, receiver) {
-            const db = doCreateDb();
+        get(target, prop) {
+            const db = getDb();
             const value = db[prop];
             if (typeof value === "function") {
                 return value.bind(db);

package/dist/scripts/debug-sync.mjs

@@ -24,108 +24,12 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return pnpmResult;
 };
-/**
- * @summary Workaround for pnpm's local tarball dependency resolution.
- *
- * @description
- * When installing a new version of the SDK from a local tarball (e.g., during
- * development with `rwsync`), pnpm creates a new, uniquely-named directory in
- * the `.pnpm` store (e.g., `rwsdk@file+...`).
- *
- * A challenge arises when other packages list `rwsdk` as a peer dependency.
- * pnpm may not consistently update the symlinks for these peer dependencies
- * to point to the newest `rwsdk` instance. This can result in a state where
- * multiple versions of `rwsdk` coexist in `node_modules`, with some parts of
- * the application using a stale version.
- *
- * This function addresses the issue by:
- * 1. Identifying the most recently installed `rwsdk` instance in the `.pnpm`
- *    store after a `pnpm install` run.
- * 2. Forcefully updating the top-level `node_modules/rwsdk` symlink to point
- *    to this new instance.
- * 3. Traversing all other `rwsdk`-related directories in the `.pnpm` store
- *    and updating their internal `rwsdk` symlinks to also point to the correct
- *    new instance.
- *
- * I am sorry for this ugly hack, I am sure there is a better way, and that it is me
- * doing something wrong. The aim is not to go down this rabbit hole right now
- * -- @justinvdm
- */
-const hackyPnpmSymlinkFix = async (targetDir) => {
-    console.log("💣 Performing pnpm symlink fix...");
-    const pnpmDir = path.join(targetDir, "node_modules", ".pnpm");
-    if (!existsSync(pnpmDir)) {
-        console.log("   🤔 No .pnpm directory found.");
-        return;
-    }
-    try {
-        const entries = await fs.readdir(pnpmDir);
-        // Find ALL rwsdk directories, not just file-based ones, to handle
-        // all kinds of stale peer dependencies.
-        const rwsdkDirs = entries.filter((e) => e.startsWith("rwsdk@"));
-        console.log("   Found rwsdk directories:", rwsdkDirs);
-        if (rwsdkDirs.length === 0) {
-            console.log("   🤔 No rwsdk directories found to hack.");
-            return;
-        }
-        let latestDir = "";
-        let latestMtime = new Date(0);
-        for (const dir of rwsdkDirs) {
-            const fullPath = path.join(pnpmDir, dir);
-            const stats = await fs.stat(fullPath);
-            if (stats.mtime > latestMtime) {
-                latestMtime = stats.mtime;
-                latestDir = dir;
-            }
-        }
-        console.log("   Latest rwsdk directory:", latestDir);
-        if (!latestDir) {
-            console.log("   🤔 Could not determine the latest rwsdk directory.");
-            return;
-        }
-        const goldenSourcePath = path.join(pnpmDir, latestDir, "node_modules", "rwsdk");
-        if (!existsSync(goldenSourcePath)) {
-            console.error(`   ❌ Golden source path does not exist: ${goldenSourcePath}`);
-            return;
-        }
-        console.log(`   🎯 Golden rwsdk path is: ${goldenSourcePath}`);
-        // 1. Fix top-level symlink
-        const topLevelSymlink = path.join(targetDir, "node_modules", "rwsdk");
-        await fs.rm(topLevelSymlink, { recursive: true, force: true });
-        await fs.symlink(goldenSourcePath, topLevelSymlink, "dir");
-        console.log(`   ✅ Symlinked ${topLevelSymlink} -> ${goldenSourcePath}`);
-        // 2. Fix peer dependency symlinks
-        const allPnpmDirs = await fs.readdir(pnpmDir);
-        for (const dir of allPnpmDirs) {
-            if (dir === latestDir || !dir.includes("rwsdk"))
-                continue;
-            const peerSymlink = path.join(pnpmDir, dir, "node_modules", "rwsdk");
-            if (existsSync(peerSymlink)) {
-                await fs.rm(peerSymlink, { recursive: true, force: true });
-                await fs.symlink(goldenSourcePath, peerSymlink, "dir");
-                console.log(`   ✅ Hijacked symlink in ${dir}`);
-            }
-        }
-    }
-    catch (error) {
-        console.error("   ❌ Failed during hacky pnpm symlink fix:", error);
-    }
-};
-const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
+const performFullSync = async (sdkDir, targetDir) => {
     const sdkPackageJsonPath = path.join(sdkDir, "package.json");
     let originalSdkPackageJson = null;
     let tarballPath = "";
     let tarballName = "";
     try {
-        if (cacheBust) {
-            console.log("💥 Cache-busting version for full sync...");
-            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
-            const packageJson = JSON.parse(originalSdkPackageJson);
-            const now = Date.now();
-            // This is a temporary version used for cache busting
-            packageJson.version = `${packageJson.version}-dev.${now}`;
-            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
-        }
         console.log("📦 Packing SDK...");
         const packResult = await $({ cwd: sdkDir }) `npm pack`;
         tarballName = packResult.stdout?.trim() ?? "";
@@ -145,47 +49,25 @@ const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
             .readFile(lockfilePath, "utf-8")
             .catch(() => null);
         try {
-            if (pm.name === "pnpm") {
-                console.log("🛠️  Using pnpm overrides to install SDK...");
-                if (originalPackageJson) {
-                    const targetPackageJson = JSON.parse(originalPackageJson);
-                    targetPackageJson.pnpm = targetPackageJson.pnpm || {};
-                    targetPackageJson.pnpm.overrides =
-                        targetPackageJson.pnpm.overrides || {};
-                    targetPackageJson.pnpm.overrides.rwsdk = `file:${tarballPath}`;
-                    await fs.writeFile(packageJsonPath, JSON.stringify(targetPackageJson, null, 2));
-                }
-                // We use install here, which respects the overrides.
-                // We also don't want to fail if the lockfile is out of date.
-                await $("pnpm", ["install", "--no-frozen-lockfile"], {
-                    cwd: targetDir,
-                    stdio: "inherit",
-                });
-                if (process.env.RWSDK_PNPM_SYMLINK_FIX) {
-                    await hackyPnpmSymlinkFix(targetDir);
-                }
+            const cmd = pm.name;
+            const args = [pm.command];
+            if (pm.name === "yarn") {
+                args.push(`file:${tarballPath}`);
             }
             else {
-                const cmd = pm.name;
-                const args = [pm.command];
-                if (pm.name === "yarn") {
-                    args.push(`file:${tarballPath}`);
-                }
-                else {
-                    args.push(tarballPath);
-                }
-                await $(cmd, args, {
-                    cwd: targetDir,
-                    stdio: "inherit",
-                });
+                args.push(tarballPath);
             }
+            await $(cmd, args, {
+                cwd: targetDir,
+                stdio: "inherit",
+            });
         }
         finally {
             if (originalPackageJson) {
                 console.log("Restoring package.json...");
                 await fs.writeFile(packageJsonPath, originalPackageJson);
             }
-            if (originalLockfile && pm.name !== "pnpm") {
+            if (originalLockfile) {
                 console.log(`Restoring ${pm.lockFile}...`);
                 await fs.writeFile(lockfilePath, originalLockfile);
             }
@@ -218,13 +100,17 @@ const performFastSync = async (sdkDir, targetDir) => {
     // Always copy package.json
     await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
 };
+const areDependenciesEqual = (deps1, deps2) => {
+    // Simple string comparison for this use case is sufficient
+    return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
+};
 const performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
     await $ `pnpm build`;
     const forceFullSync = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
     if (forceFullSync) {
         console.log("🏃 Force full sync mode is enabled.");
-        await performFullSync(sdkDir, targetDir, true);
+        await performFullSync(sdkDir, targetDir);
         console.log("✅ Done syncing");
         return;
     }
@@ -234,15 +120,17 @@ const performSync = async (sdkDir, targetDir) => {
     if (existsSync(installedSdkPackageJsonPath)) {
         const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
         const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        if (sdkPackageJsonContent === installedSdkPackageJsonContent) {
+        const sdkPkg = JSON.parse(sdkPackageJsonContent);
+        const installedPkg = JSON.parse(installedSdkPackageJsonContent);
+        if (areDependenciesEqual(sdkPkg.dependencies, installedPkg.dependencies) &&
+            areDependenciesEqual(sdkPkg.devDependencies, installedPkg.devDependencies) &&
+            areDependenciesEqual(sdkPkg.peerDependencies, installedPkg.peerDependencies)) {
             packageJsonChanged = false;
         }
     }
     if (packageJsonChanged) {
         console.log("📦 package.json changed, performing full sync...");
-        // We always cache-bust on a full sync now to ensure pnpm's overrides
-        // see a new version and the hacky symlink fix runs on a clean slate.
-        await performFullSync(sdkDir, targetDir, true);
+        await performFullSync(sdkDir, targetDir);
     }
     else {
         await performFastSync(sdkDir, targetDir);
@@ -261,8 +149,7 @@ export const debugSync = async (opts) => {
         return;
     }
     // --- Watch Mode Logic ---
-    // Use global lock based on SDK directory since all instances sync from the same source
-    const lockfilePath = path.join(sdkDir, ".rwsync.lock");
+    const lockfilePath = path.join(targetDir, "node_modules", ".rwsync.lock");
     let release;
     // Ensure the directory for the lockfile exists
     await fs.mkdir(path.dirname(lockfilePath), { recursive: true });
@@ -273,7 +160,7 @@ export const debugSync = async (opts) => {
     }
     catch (e) {
         if (e.code === "ELOCKED") {
-            console.error(`❌ Another rwsync process is already running for this SDK.`);
+            console.error(`❌ Another rwsync process is already watching ${targetDir}.`);
             console.error(`   If this is not correct, please remove the lockfile at ${lockfilePath}`);
             process.exit(1);
         }

package/package.json

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