export-runtime 0.0.17 → 0.0.19

package/bin/generate-types.mjs

@@ -10,40 +10,55 @@ import { fileURLToPath } from "url";
 const cwd = process.cwd();
 
 // --- Read package.json for configuration ---
+// First check local package.json, then parent (for exportc-style projects)
 
-const pkgPath = path.join(cwd, "package.json");
-if (!fs.existsSync(pkgPath)) {
-  console.error("package.json not found in", cwd);
-  process.exit(1);
+const localPkgPath = path.join(cwd, "package.json");
+const parentPkgPath = path.join(cwd, "..", "package.json");
+
+let pkg = null;
+let rootPkg = null;
+let isExportcProject = false;
+
+if (fs.existsSync(localPkgPath)) {
+  pkg = JSON.parse(fs.readFileSync(localPkgPath, "utf8"));
+}
+
+// Check if parent has cloudflare config (exportc-style project)
+if (fs.existsSync(parentPkgPath)) {
+  rootPkg = JSON.parse(fs.readFileSync(parentPkgPath, "utf8"));
+  if (rootPkg.cloudflare) {
+    isExportcProject = true;
+  }
 }
 
-const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+// Use root package.json's cloudflare config if available (exportc project)
+const cloudflareConfig = isExportcProject ? (rootPkg.cloudflare || {}) : (pkg?.cloudflare || {});
+const securityConfig = isExportcProject ? (rootPkg.security || {}) : (pkg?.security || {});
 
-// Required fields
-const workerName = pkg.name;
+// Worker name - from cloudflare.name, or package name
+const workerName = cloudflareConfig.name || pkg?.name;
 if (!workerName) {
-  console.error("package.json must have a 'name' field for the Worker name");
+  console.error("Worker name required: set 'cloudflare.name' in package.json or provide a package 'name'");
   process.exit(1);
 }
 
-const exportsEntry = pkg.exports;
+// Source entry - from cloudflare.exports or package exports
+const exportsEntry = cloudflareConfig.exports || pkg?.exports;
 if (!exportsEntry) {
-  console.error("package.json must have an 'exports' field pointing to the source entry (e.g., './src' or './src/index.ts')");
+  console.error("package.json must have 'cloudflare.exports' or 'exports' field pointing to the source entry (e.g., './src' or './')");
   process.exit(1);
 }
 
-// Optional: static assets directory
-const assetsDir = pkg.main || null;
+// Optional: static assets directory (from cloudflare.assets only, not main)
+const assetsDir = cloudflareConfig.assets || null;
 
-// Optional: Cloudflare bindings configuration (d1, r2, kv, auth)
-const cloudflareConfig = pkg.cloudflare || {};
+// Cloudflare bindings configuration (d1, r2, kv, auth)
 const d1Bindings = cloudflareConfig.d1 || [];
 const r2Bindings = cloudflareConfig.r2 || [];
 const kvBindings = cloudflareConfig.kv || [];
 const authConfig = cloudflareConfig.auth || null;
 
-// Optional: Security configuration
-const securityConfig = pkg.security || {};
+// Security configuration
 const accessConfig = securityConfig.access || {};
 const allowedOrigins = accessConfig.origin || []; // empty = allow all (default Workers behavior)
 
@@ -68,7 +83,9 @@ validateBindings(kvBindings, "KV");
 
 // --- Resolve source directory from exports field ---
 
-const exportsPath = path.resolve(cwd, exportsEntry.replace(/^\.\//, ""));
+// For exportc projects, resolve relative to parent directory
+const baseDir = isExportcProject ? path.join(cwd, "..") : cwd;
+const exportsPath = path.resolve(baseDir, exportsEntry.replace(/^\.\//, ""));
 const srcDir = fs.existsSync(exportsPath) && fs.statSync(exportsPath).isDirectory()
   ? exportsPath
   : path.dirname(exportsPath);
@@ -397,14 +414,17 @@ const wranglerLines = [
   ``,
 ];
 
-// Add static assets configuration if main is specified and directory exists
+// Add static assets configuration if assets is specified and directory exists
 if (assetsDir) {
+  // For exportc projects, assets path is relative to parent directory
   const normalizedAssetsDir = assetsDir.startsWith("./") ? assetsDir : `./${assetsDir}`;
-  const absoluteAssetsDir = path.resolve(cwd, normalizedAssetsDir);
+  const absoluteAssetsDir = path.resolve(baseDir, normalizedAssetsDir);
+  // In wrangler.toml, path should be relative to export/ directory for exportc projects
+  const wranglerAssetsPath = isExportcProject ? `../${normalizedAssetsDir.replace(/^\.\//, "")}` : normalizedAssetsDir;
   if (fs.existsSync(absoluteAssetsDir)) {
     wranglerLines.push(
       `[assets]`,
-      `directory = "${normalizedAssetsDir}"`,
+      `directory = "${wranglerAssetsPath}"`,
       `binding = "ASSETS"`,
       `run_worker_first = true`,
       ``,

package/handler.js

@@ -320,10 +320,22 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
   };
 
   const wireWebSocket = (server, dispatcher, env, onClose) => {
-    // Track session state for this WebSocket connection
+    // Track session state and connection state for this WebSocket connection
     const wsSession = { token: null };
+    let isClosed = false;
+
+    // Safe send that ignores errors when connection is closed
+    const safeSend = (data) => {
+      if (isClosed) return;
+      try {
+        server.send(data);
+      } catch {
+        // Connection already closed, ignore
+      }
+    };
 
     server.addEventListener("message", async (event) => {
+      if (isClosed) return;
       let id;
       try {
         const msg = parse(event.data);
@@ -333,7 +345,7 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
         if (msg.type === "auth" && msg.token && !msg.method) {
           // Direct token send on reconnect - just update session
           wsSession.token = msg.token;
-          server.send(stringify({ type: "auth-result", id, success: true }));
+          safeSend(stringify({ type: "auth-result", id, success: true }));
           return;
         }
 
@@ -344,12 +356,20 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
           wsSession.token = result.value.token;
         }
 
-        if (result) server.send(stringify({ ...result, id }));
+        if (result) safeSend(stringify({ ...result, id }));
       } catch (err) {
-        if (id !== undefined) server.send(stringify({ type: "error", id, error: String(err) }));
+        if (id !== undefined) safeSend(stringify({ type: "error", id, error: String(err) }));
       }
     });
-    if (onClose) server.addEventListener("close", onClose);
+
+    server.addEventListener("close", () => {
+      isClosed = true;
+      if (onClose) onClose();
+    });
+
+    server.addEventListener("error", () => {
+      isClosed = true;
+    });
   };
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-runtime",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "Cloudflare Workers ESM Export Framework Runtime",
   "keywords": [
     "cloudflare",