export-runtime 0.0.18 → 0.0.20

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

@@ -351,6 +351,9 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
         const result = await dispatchMessage(dispatcher, msg, env, wsSession);
 
+        // Don't send if connection closed during dispatch
+        if (isClosed) return;
+
         // Extract token from auth responses
         if (result?.value?.token && msg.type === "auth") {
           wsSession.token = result.value.token;
@@ -358,6 +361,8 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
 
         if (result) safeSend(stringify({ ...result, id }));
       } catch (err) {
+        // Don't send errors if connection is closed or error is about closed connection
+        if (isClosed || String(err).includes("Connection closed")) return;
         if (id !== undefined) safeSend(stringify({ type: "error", id, error: String(err) }));
       }
     });

package/package.json

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

package/rpc.js

@@ -38,6 +38,7 @@ export function createRpcDispatcher(moduleMap) {
   const iterators = new Map();
   const streams = new Map();
   let nextId = 1;
+  let closed = false;
 
   const requireInstance = (id) => {
     const inst = instances.get(id);
@@ -115,9 +116,11 @@ export function createRpcDispatcher(moduleMap) {
     },
 
     async rpcIterateNext(iteratorId) {
+      if (closed) throw new Error("Connection closed");
       const iter = iterators.get(iteratorId);
       if (!iter) throw new Error("Iterator not found");
       const { value, done } = await iter.next();
+      if (closed) throw new Error("Connection closed");
       if (done) iterators.delete(iteratorId);
       return { type: "iterate-result", value, done: !!done };
     },
@@ -130,10 +133,12 @@ export function createRpcDispatcher(moduleMap) {
     },
 
     async rpcStreamRead(streamId) {
+      if (closed) throw new Error("Connection closed");
       const entry = streams.get(streamId);
       if (!entry) throw new Error("Stream not found");
       if (!entry.reader) entry.reader = entry.stream.getReader();
       const { value, done } = await entry.reader.read();
+      if (closed) throw new Error("Connection closed");
       if (done) streams.delete(streamId);
       const v = value instanceof Uint8Array ? Array.from(value) : value;
       return { type: "stream-result", value: v, done: !!done };
@@ -149,6 +154,23 @@ export function createRpcDispatcher(moduleMap) {
     },
 
     clearAll() {
+      closed = true;
+      // Cancel all active iterators
+      for (const iter of iterators.values()) {
+        try {
+          if (iter?.return) iter.return(undefined);
+        } catch {}
+      }
+      // Cancel all active streams
+      for (const entry of streams.values()) {
+        try {
+          if (entry.reader) {
+            entry.reader.cancel();
+          } else if (entry.stream) {
+            entry.stream.cancel();
+          }
+        } catch {}
+      }
       instances.clear();
       iterators.clear();
       streams.clear();