rwsdk 0.1.8 → 0.1.9

package/bin/rwsync

@@ -1,2 +1,12 @@
 #!/bin/sh
-DIR=$PWD && (cd "${@:-$RWSDK_REPO}/sdk" && pnpm debug:sync $DIR)
+set -e
+
+# This script is a lightweight wrapper that passes all arguments to the underlying
+# debug:sync Node.js script.
+# The RWSDK_REPO env var should point to the root of the sdk repo.
+
+# Capture the current directory *before* changing it
+TARGET_DIR=$PWD
+
+cd "${RWSDK_REPO}/sdk"
+pnpm debug:sync "$TARGET_DIR" "$@"

package/dist/runtime/lib/realtime/client.js

@@ -1,6 +1,5 @@
 import { initClient } from "../../client";
 import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
-import { IS_DEV } from "../../constants";
 import { MESSAGE_TYPE } from "./shared";
 const DEFAULT_KEY = "default";
 export const initRealtimeClient = ({ key = DEFAULT_KEY, } = {}) => {
@@ -12,12 +11,13 @@ export const realtimeTransport = ({ key = DEFAULT_KEY }) => (transportContext) =
     let isConnected = false;
     const clientId = crypto.randomUUID();
     const clientUrl = new URL(window.location.href);
+    const isHttps = clientUrl.protocol === "https:";
     clientUrl.protocol = "";
     clientUrl.host = "";
     const setupWebSocket = () => {
         if (ws)
             return;
-        const protocol = IS_DEV ? "ws" : "wss";
+        const protocol = isHttps ? "wss" : "ws";
         ws = new WebSocket(`${protocol}://${window.location.host}/__realtime?` +
             `key=${encodeURIComponent(key)}&` +
             `url=${encodeURIComponent(clientUrl.toString())}&` +

package/dist/scripts/debug-sync.d.mts

@@ -1,8 +1,6 @@
 export interface DebugSyncOptions {
     targetDir: string;
     sdkDir?: string;
-    dev?: boolean;
-    watch?: boolean;
-    build?: boolean;
+    watch?: string | boolean;
 }
 export declare const debugSync: (opts: DebugSyncOptions) => Promise<void>;

package/dist/scripts/debug-sync.mjs

@@ -1,26 +1,38 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { $ } from "../lib/$.mjs";
+import { $ } from "execa";
 import fs from "node:fs/promises";
 import { existsSync } from "node:fs";
+import chokidar from "chokidar";
+import { lock } from "proper-lockfile";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const getPackageManagerInfo = (targetDir) => {
+    const pnpmResult = {
+        name: "pnpm",
+        lockFile: "pnpm-lock.yaml",
+        command: "add",
+    };
     if (existsSync(path.join(targetDir, "yarn.lock"))) {
         return { name: "yarn", lockFile: "yarn.lock", command: "add" };
     }
     if (existsSync(path.join(targetDir, "pnpm-lock.yaml"))) {
-        return { name: "pnpm", lockFile: "pnpm-lock.yaml", command: "add" };
+        return pnpmResult;
     }
-    return { name: "npm", lockFile: "package-lock.json", command: "install" };
+    if (existsSync(path.join(targetDir, "package-lock.json"))) {
+        return { name: "npm", lockFile: "package-lock.json", command: "install" };
+    }
+    return pnpmResult;
 };
-const performSync = async (sdkDir, targetDir) => {
-    console.log("🏗️  rebuilding sdk...");
-    await $({ cwd: sdkDir, stdio: "inherit", shell: true }) `pnpm build`;
-    console.log("📦 packing sdk...");
-    const packResult = await $({ cwd: sdkDir, shell: true }) `npm pack`;
+const performFullSync = async (sdkDir, targetDir) => {
+    console.log("📦 Packing SDK...");
+    const packResult = await $ `npm pack`;
     const tarballName = packResult.stdout?.trim() ?? "";
+    if (!tarballName) {
+        console.error("❌ Failed to get tarball name from npm pack.");
+        return;
+    }
     const tarballPath = path.resolve(sdkDir, tarballName);
-    console.log(` installing ${tarballName} in ${targetDir}...`);
+    console.log(`💿 Installing ${tarballName} in ${targetDir}...`);
     const pm = getPackageManagerInfo(targetDir);
     const packageJsonPath = path.join(targetDir, "package.json");
     const lockfilePath = path.join(targetDir, pm.lockFile);
@@ -31,15 +43,18 @@ const performSync = async (sdkDir, targetDir) => {
         .readFile(lockfilePath, "utf-8")
         .catch(() => null);
     try {
-        let installCommand = `${pm.name} ${pm.command} ${tarballPath}`;
+        const cmd = pm.name;
+        const args = [pm.command];
         if (pm.name === "yarn") {
-            installCommand = `yarn add file:${tarballPath}`;
+            args.push(`file:${tarballPath}`);
         }
-        await $({
+        else {
+            args.push(tarballPath);
+        }
+        await $(cmd, args, {
             cwd: targetDir,
             stdio: "inherit",
-            shell: true,
-        }) `${installCommand}`;
+        });
     }
     finally {
         if (originalPackageJson) {
@@ -54,67 +69,140 @@ const performSync = async (sdkDir, targetDir) => {
             // ignore if deletion fails
         });
     }
-    console.log("✅ done syncing");
+};
+const performFastSync = async (sdkDir, targetDir) => {
+    console.log("⚡️ No dependency changes, performing fast sync...");
+    const sdkPackageJson = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"));
+    const filesToSync = sdkPackageJson.files || [];
+    for (const file of filesToSync) {
+        const source = path.join(sdkDir, file);
+        const destination = path.join(targetDir, "node_modules/rwsdk", file);
+        if (existsSync(source)) {
+            await fs.cp(source, destination, { recursive: true, force: true });
+        }
+    }
+    // Always copy package.json
+    await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
+};
+const performSync = async (sdkDir, targetDir) => {
+    console.log("🏗️  Rebuilding SDK...");
+    await $ `pnpm build`;
+    const sdkPackageJsonPath = path.join(sdkDir, "package.json");
+    const installedSdkPackageJsonPath = path.join(targetDir, "node_modules/rwsdk/package.json");
+    let packageJsonChanged = true;
+    if (existsSync(installedSdkPackageJsonPath)) {
+        const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
+        const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
+        if (sdkPackageJsonContent === installedSdkPackageJsonContent) {
+            packageJsonChanged = false;
+        }
+    }
+    if (packageJsonChanged) {
+        console.log("📦 package.json changed, performing full sync...");
+        await performFullSync(sdkDir, targetDir);
+    }
+    else {
+        await performFastSync(sdkDir, targetDir);
+    }
+    console.log("✅ Done syncing");
 };
 export const debugSync = async (opts) => {
-    const { targetDir, sdkDir = process.cwd(), dev, watch, build } = opts;
+    const { targetDir, sdkDir = process.cwd(), watch } = opts;
     if (!targetDir) {
         console.error("❌ Please provide a target directory as an argument.");
         process.exit(1);
     }
-    const thisScriptPath = fileURLToPath(import.meta.url);
-    const syncCommand = `tsx ${thisScriptPath} --_sync ${sdkDir} ${targetDir}`;
-    // Run initial sync
-    await performSync(sdkDir, targetDir);
-    if (!process.env.NO_CLEAN_VITE) {
-        console.log("🧹 Cleaning Vite cache...");
-        await $({
-            stdio: "inherit",
-            shell: true,
-            cwd: targetDir,
-        }) `rm -rf ${targetDir}/node_modules/.vite*`;
-    }
-    // If dev flag is present, clean vite cache and start dev server
-    if (dev) {
-        console.log("🚀 Starting dev server...");
-        await $({ stdio: "inherit", shell: true, cwd: targetDir }) `npm run dev`;
+    // If not in watch mode, just do a one-time sync and exit.
+    if (!watch) {
+        await performSync(sdkDir, targetDir);
+        return;
     }
-    // Start watching if watch flag is present
-    else if (watch) {
-        console.log("👀 Watching for changes...");
-        $({
-            stdio: "inherit",
-            shell: true,
-            cwd: sdkDir,
-        }) `npx chokidar-cli './src/**' './package.json' -c "${syncCommand}"`;
+    // --- Watch Mode Logic ---
+    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 });
+    // "Touch" the file to ensure it exists before locking
+    await fs.appendFile(lockfilePath, "").catch(() => { });
+    try {
+        release = await lock(lockfilePath, { retries: 0 });
     }
-    else if (build) {
-        console.log("🏗️ Running build in target directory...");
-        await $({
-            stdio: "inherit",
-            shell: true,
-            cwd: targetDir,
-        }) `npm run build`;
+    catch (e) {
+        if (e.code === "ELOCKED") {
+            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);
+        }
+        throw e;
     }
+    // Initial sync for watch mode. We do it *after* acquiring the lock.
+    await performSync(sdkDir, targetDir);
+    const filesToWatch = [
+        path.join(sdkDir, "src"),
+        path.join(sdkDir, "types"),
+        path.join(sdkDir, "bin"),
+        path.join(sdkDir, "package.json"),
+    ];
+    console.log("👀 Watching for changes...");
+    let childProc = null;
+    const runWatchedCommand = () => {
+        if (typeof watch === "string") {
+            console.log(`\n> ${watch}\n`);
+            childProc = $({
+                stdio: "inherit",
+                shell: true,
+                cwd: targetDir,
+                reject: false,
+            }) `${watch}`;
+        }
+    };
+    const watcher = chokidar.watch(filesToWatch, {
+        ignoreInitial: true,
+        cwd: sdkDir,
+    });
+    watcher.on("all", async () => {
+        console.log("\nDetected change, re-syncing...");
+        if (childProc && !childProc.killed) {
+            console.log("Stopping running process...");
+            childProc.kill();
+            await childProc.catch(() => {
+                /* ignore kill errors */
+            });
+        }
+        await performSync(sdkDir, targetDir);
+        runWatchedCommand();
+    });
+    const cleanup = async () => {
+        console.log("\nCleaning up...");
+        if (childProc && !childProc.killed) {
+            childProc.kill();
+        }
+        await release();
+        process.exit();
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+    runWatchedCommand();
 };
 if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
     const args = process.argv.slice(2);
-    const flags = new Set(args.filter((arg) => arg.startsWith("--")));
-    const positionalArgs = args.filter((arg) => !arg.startsWith("--"));
-    if (flags.has("--_sync")) {
-        const [sdkDir, targetDir] = positionalArgs;
-        await performSync(sdkDir, targetDir);
-    }
-    else {
-        const targetDir = positionalArgs[0] ?? process.cwd();
-        debugSync({
-            targetDir,
-            sdkDir: process.env.RWSDK_REPO
-                ? path.resolve(__dirname, process.env.RWSDK_REPO, "sdk")
-                : path.resolve(__dirname, "..", ".."),
-            dev: flags.has("--dev"),
-            watch: flags.has("--watch"),
-            build: flags.has("--build"),
-        });
+    const watchFlagIndex = args.indexOf("--watch");
+    let watchCmd = watchFlagIndex !== -1;
+    let cmdArgs = args;
+    if (watchFlagIndex !== -1) {
+        if (watchFlagIndex + 1 < args.length &&
+            !args[watchFlagIndex + 1].startsWith("--")) {
+            watchCmd = args[watchFlagIndex + 1];
+        }
+        // remove --watch and its potential command from args
+        const watchArgCount = typeof watchCmd === "string" ? 2 : 1;
+        cmdArgs = args.filter((_, i) => i < watchFlagIndex || i >= watchFlagIndex + watchArgCount);
     }
+    const targetDir = cmdArgs[0] ?? process.cwd();
+    const sdkDir = path.resolve(__dirname, "..", "..");
+    debugSync({
+        targetDir,
+        sdkDir,
+        watch: watchCmd,
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -120,6 +120,7 @@
     "@types/react-dom": "^19.1.2",
     "@types/react-is": "^19.0.0",
     "@vitejs/plugin-react": "^4.3.4",
+    "chokidar": "^3.6.0",
     "debug": "^4.4.0",
     "enhanced-resolve": "^5.18.1",
     "eventsource-parser": "^3.0.0",
@@ -134,6 +135,7 @@
     "magic-string": "^0.30.17",
     "miniflare": "^4.20250405.0",
     "picocolors": "^1.1.1",
+    "proper-lockfile": "^4.1.2",
     "puppeteer-core": "^22.8.1",
     "react": "19.2.0-canary-39cad7af-20250411",
     "react-dom": "19.2.0-canary-39cad7af-20250411",
@@ -154,6 +156,7 @@
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.14.0",
+    "@types/proper-lockfile": "^4.1.4",
     "semver": "^7.7.1",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",