Added RPC support to Durable Objects.

Author: spigaz

worker-build/Cargo.toml

@@ -18,6 +18,8 @@ flate2 = "1.1"
 tar = "0.4"
 ureq = { version = "3.0", features = ["gzip"] }
 clap = { version = "4.5", features = ['derive'] }
+toml = "0.8"
+serde = { version = "1.0", features = ["derive"] }
 worker-codegen = { path = "../worker-codegen", version = "0.1.0" }
 wasm-pack = "0.13"
 

worker-build/src/durable_object/get_durable_object_class_names.rs

@@ -0,0 +1,29 @@
+use crate::wrangler_config::{get_wrangler_config, WranglerConfig};
+use anyhow::Result;
+
+pub fn get_durable_object_class_names() -> Result<Vec<String>> {
+    let config: WranglerConfig = get_wrangler_config()?;
+
+    let mut names = Vec::new();
+
+    if let Some(do_config) = config.durable_objects {
+        for binding in do_config.bindings {
+            if !binding.class_name.is_empty() {
+                if !names.contains(&binding.class_name) {
+                    names.push(binding.class_name);
+                }
+            }
+        }
+    }
+
+    if !names.is_empty() {
+        println!(
+            "[worker-build] Found DO class names in wrangler.toml: {:?}",
+            names
+        );
+    } else {
+        println!("[worker-build] No Durable Object class names found in wrangler.toml [durable_objects].bindings");
+    }
+
+    Ok(names)
+}

worker-build/src/durable_object/get_durable_object_class_names_declaration.rs

@@ -0,0 +1,12 @@
+use anyhow::Result;
+
+pub fn get_durable_object_class_names_declaration(names: &Vec<String>) -> Result<String> {
+    Ok(format!(
+        "const __WORKER_BUILD_DO_NAMES__ = [{}];",
+        names
+            .into_iter()
+            .map(|n| format!("\"{}\"", n))
+            .collect::<Vec<_>>()
+            .join(", ")
+    ))
+}

worker-build/src/durable_object/get_durable_object_class_names_exports.rs

@@ -0,0 +1,14 @@
+pub fn get_durable_object_class_names_exports(names: Vec<String>) -> String {
+    let mut exports = String::new();
+
+    let prefix = "__DO_WRAPPED_";
+
+    for name in names {
+        exports.push_str(&format!(
+            "\nexport const {} = globalThis.{}{};",
+            name, prefix, name
+        ));
+    }
+
+    exports
+}

worker-build/src/durable_object/get_durable_objects_shim.rs

@@ -0,0 +1,23 @@
+use super::{
+    get_durable_object_class_names, get_durable_object_class_names_declaration,
+    get_durable_object_class_names_exports,
+};
+use anyhow::Result;
+
+const SHIM_TEMPLATE: &str = include_str!("../js/durable_objects_shim.js");
+
+pub fn get_durable_objects_shim() -> Result<String> {
+    let names = get_durable_object_class_names()?;
+
+    if names.is_empty() {
+        return Ok("const successfullyWrappedDONames = [];".to_string());
+    }
+
+    let mut shim = get_durable_object_class_names_declaration(&names)?;
+
+    shim.push_str(SHIM_TEMPLATE);
+
+    shim.push_str(&get_durable_object_class_names_exports(names));
+
+    Ok(shim)
+}

worker-build/src/durable_object/inject_durable_objects_shim.rs

@@ -0,0 +1,9 @@
+use super::get_durable_objects_shim;
+use anyhow::Result;
+
+pub fn inject_durable_objects_shim(shim: String) -> Result<String> {
+    Ok(shim.replace(
+        "$DURABLE_OBJECTS_INJECTION_POINT",
+        &get_durable_objects_shim()?,
+    ))
+}

worker-build/src/durable_object/mod.rs

@@ -0,0 +1,11 @@
+mod get_durable_object_class_names;
+mod get_durable_object_class_names_declaration;
+mod get_durable_object_class_names_exports;
+mod get_durable_objects_shim;
+mod inject_durable_objects_shim;
+
+pub use get_durable_object_class_names::get_durable_object_class_names;
+pub use get_durable_object_class_names_declaration::get_durable_object_class_names_declaration;
+pub use get_durable_object_class_names_exports::get_durable_object_class_names_exports;
+pub use get_durable_objects_shim::get_durable_objects_shim;
+pub use inject_durable_objects_shim::inject_durable_objects_shim;

worker-build/src/js/durable_objects_shim.js

@@ -0,0 +1,28 @@
+import { DurableObject } from "cloudflare:workers";
+
+const successfullyWrappedDONames = [];
+const globalStorePrefix = "__DO_WRAPPED_"; // For globalThis storage
+
+if (typeof __WORKER_BUILD_DO_NAMES__ !== 'undefined' && Array.isArray(__WORKER_BUILD_DO_NAMES__)) {
+    __WORKER_BUILD_DO_NAMES__.forEach(className => {
+        const OriginalClass = imports[className];
+        if (typeof OriginalClass === 'function' && OriginalClass.prototype && typeof OriginalClass.prototype.fetch === 'function') {
+            console.log(`[shim.js] Wrapping DO (identified by worker-build): ${className}`);
+            successfullyWrappedDONames.push(className);
+            const WrappedClass = class extends DurableObject {
+                constructor(state, env) { super(state, env); this._inner = new OriginalClass(state, env); }
+                async fetch(request) { return this._inner.fetch(request); }
+            };
+            Object.getOwnPropertyNames(OriginalClass.prototype).forEach(methodName => {
+                if (methodName !== 'constructor' && methodName !== 'fetch') {
+                    if (typeof OriginalClass.prototype[methodName] === 'function') {
+                        WrappedClass.prototype[methodName] = function(...args) { return this._inner[methodName](...args); };
+                    }
+                }
+            });
+            globalThis[`${globalStorePrefix}${className}`] = WrappedClass;
+        } else {
+            console.warn(`[shim.js] DO '${className}' (from __WORKER_BUILD_DO_NAMES__) not found/invalid in wasm imports.`);
+        }
+    });
+}

worker-build/src/js/shim.js

@@ -1,5 +1,4 @@
 import * as imports from "./index_bg.js";
-export * from "./index_bg.js";
 import wasmModule from "./index.wasm";
 import { WorkerEntrypoint } from "cloudflare:workers";
 
@@ -12,7 +11,7 @@ imports.__wbg_set_wasm(instance.exports);
 // Run the worker's initialization function.
 instance.exports.__wbindgen_start?.();
 
-export { wasmModule };
+$DURABLE_OBJECTS_INJECTION_POINT
 
 class Entrypoint extends WorkerEntrypoint {
 	async fetch(request) {
@@ -31,6 +30,7 @@ class Entrypoint extends WorkerEntrypoint {
 }
 
 const EXCLUDE_EXPORT = [
+	...successfullyWrappedDONames,
 	"IntoUnderlyingByteSource",
 	"IntoUnderlyingSink",
 	"IntoUnderlyingSource",
@@ -44,10 +44,11 @@ const EXCLUDE_EXPORT = [
 	"getMemory",
 ];
 
-Object.keys(imports).map((k) => {
+Object.keys(imports).forEach((k) => {
 	if (!(EXCLUDE_EXPORT.includes(k) | k.startsWith("__"))) {
 		Entrypoint.prototype[k] = imports[k];
 	}
 });
 
 export default Entrypoint;
+export { wasmModule };

worker-build/src/main.rs

@@ -11,6 +11,7 @@ use std::{
 use anyhow::Result;
 
 use clap::Parser;
+use durable_object::inject_durable_objects_shim;
 use wasm_pack::command::build::{Build, BuildOptions};
 
 const OUT_DIR: &str = "build";
@@ -19,7 +20,9 @@ const WORKER_SUBDIR: &str = "worker";
 
 const SHIM_TEMPLATE: &str = include_str!("./js/shim.js");
 
+mod durable_object;
 mod install;
+mod wrangler_config;
 
 pub fn main() -> Result<()> {
     // Our tests build the bundle ourselves.
@@ -54,6 +57,8 @@ pub fn main() -> Result<()> {
         shim_template.replace("$WAIT_UNTIL_RESPONSE", "")
     };
 
+    let shim = inject_durable_objects_shim(shim)?;
+
     write_string_to_file(worker_path("shim.js"), shim)?;
 
     bundle(&esbuild_path)?;