@aptre/bldr-saucer 0.2.5 → 0.3.1

package/CMakeLists.txt

@@ -19,6 +19,7 @@ set(saucer_serializer "Glaze" CACHE STRING "" FORCE)
 set(saucer_no_version_check ON CACHE BOOL "" FORCE)
 set(saucer_examples OFF CACHE BOOL "" FORCE)
 set(saucer_tests OFF CACHE BOOL "" FORCE)
+set(saucer_exceptions OFF CACHE BOOL "" FORCE)
 
 # cpp-yamux options.
 set(YAMUX_BUILD_TESTS OFF CACHE BOOL "" FORCE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptre/bldr-saucer",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "description": "Native webview bridge for Bldr using Saucer",
   "main": "index.js",
   "repository": {
@@ -33,11 +33,11 @@
     "release:publish": "git push && git push --tags"
   },
   "optionalDependencies": {
-    "@aptre/bldr-saucer-darwin-arm64": "0.2.5",
-    "@aptre/bldr-saucer-darwin-x64": "0.2.5",
-    "@aptre/bldr-saucer-linux-x64": "0.2.5",
-    "@aptre/bldr-saucer-linux-arm64": "0.2.5",
-    "@aptre/bldr-saucer-win32-x64": "0.2.5"
+    "@aptre/bldr-saucer-darwin-arm64": "0.3.1",
+    "@aptre/bldr-saucer-darwin-x64": "0.3.1",
+    "@aptre/bldr-saucer-linux-x64": "0.3.1",
+    "@aptre/bldr-saucer-linux-arm64": "0.3.1",
+    "@aptre/bldr-saucer-win32-x64": "0.3.1"
   },
   "files": [
     "index.js",
@@ -49,6 +49,6 @@
     "@aptre/common": "^0.30.3"
   },
   "dependencies": {
-    "@aptre/protobuf-es-lite": "^0.5.2"
+    "@aptre/protobuf-es-lite": "^1.0.0"
   }
 }

package/src/fetch_proto.cpp

@@ -345,6 +345,33 @@ bool DecodeFetchResponse(const uint8_t* buf, size_t len, FetchResponse& out) {
     return true;
 }
 
+bool DecodeEvalJSRequest(const uint8_t* buf, size_t len, EvalJSRequest& out) {
+    size_t offset = 0;
+    while (offset < len) {
+        uint32_t field;
+        uint8_t wire;
+        if (!decodeTag(buf, len, offset, field, wire)) return false;
+        switch (field) {
+            case 1: { // code
+                if (wire != kLengthDelimited) return false;
+                if (!decodeString(buf, len, offset, out.code)) return false;
+                break;
+            }
+            default:
+                if (!skipField(buf, len, offset, wire)) return false;
+                break;
+        }
+    }
+    return true;
+}
+
+std::vector<uint8_t> EncodeEvalJSResponse(const EvalJSResponse& resp) {
+    std::vector<uint8_t> buf;
+    encodeString(buf, 1, resp.result);
+    encodeString(buf, 2, resp.error);
+    return buf;
+}
+
 bool DecodeSaucerInit(const uint8_t* buf, size_t len, SaucerInit& out) {
     size_t offset = 0;
     while (offset < len) {

package/src/fetch_proto.h

@@ -57,6 +57,23 @@ struct FetchResponse {
     ResponseData data;
 };
 
+// EvalJSRequest corresponds to saucer.EvalJSRequest.
+struct EvalJSRequest {
+    std::string code; // field 1
+};
+
+// EvalJSResponse corresponds to saucer.EvalJSResponse.
+struct EvalJSResponse {
+    std::string result; // field 1
+    std::string error;  // field 2
+};
+
+// DecodeEvalJSRequest decodes an EvalJSRequest protobuf message.
+bool DecodeEvalJSRequest(const uint8_t* buf, size_t len, EvalJSRequest& out);
+
+// EncodeEvalJSResponse encodes an EvalJSResponse protobuf message.
+std::vector<uint8_t> EncodeEvalJSResponse(const EvalJSResponse& resp);
+
 // EncodeFetchRequest_Info serializes a FetchRequest with request_info (field 1).
 std::vector<uint8_t> EncodeFetchRequest_Info(const FetchRequestInfo& info);
 

package/src/main.cpp

@@ -5,6 +5,7 @@
 #include "scheme_forwarder.h"
 
 #include <atomic>
+#include <condition_variable>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
@@ -12,8 +13,64 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <unordered_map>
 #include <vector>
 
+// EvalRegistry tracks pending eval requests and their results.
+// Worker threads register a request ID, execute JS that posts results via
+// the saucer message channel, then wait on a condition variable for the
+// message handler to deliver the result.
+struct EvalRegistry {
+    struct Pending {
+        bool ready = false;
+        std::string result;
+        std::string error;
+    };
+
+    std::mutex mtx;
+    std::condition_variable cv;
+    std::unordered_map<std::string, Pending> pending;
+
+    // Register registers a new eval request and returns the ID.
+    void Register(const std::string& id) {
+        std::lock_guard<std::mutex> lock(mtx);
+        pending[id] = Pending{};
+    }
+
+    // Deliver delivers a result for a pending eval request.
+    // Returns true if the ID was found.
+    bool Deliver(const std::string& id, const std::string& result, const std::string& error) {
+        std::lock_guard<std::mutex> lock(mtx);
+        auto it = pending.find(id);
+        if (it == pending.end()) {
+            return false;
+        }
+        it->second.ready = true;
+        it->second.result = result;
+        it->second.error = error;
+        cv.notify_all();
+        return true;
+    }
+
+    // Wait waits for a result for the given eval ID (up to timeout_ms).
+    // Returns the response, with empty fields on timeout.
+    bldr::proto::EvalJSResponse Wait(const std::string& id, int timeout_ms) {
+        std::unique_lock<std::mutex> lock(mtx);
+        cv.wait_for(lock, std::chrono::milliseconds(timeout_ms), [this, &id] {
+            auto it = pending.find(id);
+            return it != pending.end() && it->second.ready;
+        });
+        bldr::proto::EvalJSResponse resp;
+        auto it = pending.find(id);
+        if (it != pending.end()) {
+            resp.result = std::move(it->second.result);
+            resp.error = std::move(it->second.error);
+            pending.erase(it);
+        }
+        return resp;
+    }
+};
+
 coco::stray start(saucer::application* app) {
     const char* runtime_id_env = std::getenv("BLDR_RUNTIME_ID");
     if (!runtime_id_env) {
@@ -56,8 +113,16 @@ coco::stray start(saucer::application* app) {
     // Register bldr:// scheme BEFORE creating the webview.
     saucer::webview::register_scheme("bldr");
 
+    // Construct a per-instance storage path from the runtime ID.
+    // This ensures concurrent bldr-saucer instances don't share webview storage.
+    auto storage = std::filesystem::temp_directory_path() / ("bldr-saucer-" + runtime_id);
+
     auto window = saucer::window::create(app).value();
-    auto webview = saucer::smartview::create({.window = window});
+    auto webview = saucer::smartview::create({
+        .window = window,
+        .non_persistent_data_store = true,
+        .storage_path = storage,
+    });
 
     window->set_title("Bldr");
     window->set_size({1024, 768});
@@ -90,10 +155,49 @@ coco::stray start(saucer::application* app) {
     auto webview_mtx = std::make_shared<std::mutex>();
     auto webview_alive = std::make_shared<std::atomic<bool>>(true);
 
+    // Eval result registry: worker threads register pending evals, the message
+    // handler delivers results from JavaScript back to the waiting thread.
+    auto eval_registry = std::make_shared<EvalRegistry>();
+
+    // Register a message handler to intercept eval results from JavaScript.
+    // The Go side wraps JS code so it posts the result via postMessage with a
+    // prefix format: __bldr_eval:<eval_id>:r:<result> or __bldr_eval:<eval_id>:e:<error>.
+    // The smartview's own handler returns unhandled for unrecognized messages,
+    // so this handler sees them next.
+    constexpr std::string_view eval_prefix = "__bldr_eval:";
+    webview->on<saucer::webview::event::message>([eval_registry, eval_prefix](std::string_view message) -> saucer::status {
+        if (!message.starts_with(eval_prefix)) {
+            return saucer::status::unhandled;
+        }
+
+        // Parse prefix format: __bldr_eval:<eval_id>:<type>:<data>
+        auto rest = message.substr(eval_prefix.size());
+        auto sep1 = rest.find(':');
+        if (sep1 == std::string_view::npos || sep1 + 2 >= rest.size()) {
+            return saucer::status::unhandled;
+        }
+        auto sep2 = rest.find(':', sep1 + 1);
+        if (sep2 == std::string_view::npos) {
+            return saucer::status::unhandled;
+        }
+
+        std::string eval_id(rest.substr(0, sep1));
+        char type = rest[sep1 + 1];
+        std::string data(rest.substr(sep2 + 1));
+
+        if (type == 'r') {
+            eval_registry->Deliver(eval_id, data, "");
+        } else {
+            eval_registry->Deliver(eval_id, "", data);
+        }
+        return saucer::status::handled;
+    });
+
     // Start accept loop for Go-initiated streams (debug eval).
     // webview is a std::expected; use &(*webview) to get a pointer to the contained value.
     auto* webview_ptr = &(*webview);
-    std::thread accept_thread([session, webview_ptr, webview_mtx, webview_alive]() {
+    auto eval_counter = std::make_shared<std::atomic<uint64_t>>(0);
+    std::thread accept_thread([session, webview_ptr, webview_mtx, webview_alive, eval_registry, eval_counter]() {
         while (true) {
             auto [stream, err] = session->Accept();
             if (err != yamux::Error::OK || !stream) {
@@ -101,7 +205,7 @@ coco::stray start(saucer::application* app) {
             }
 
             // Handle each stream in a detached thread so accept loop continues.
-            std::thread([stream, webview_ptr, webview_mtx, webview_alive]() {
+            std::thread([stream, webview_ptr, webview_mtx, webview_alive, eval_registry, eval_counter]() {
                 // Read length-prefixed command frame.
                 uint8_t len_buf[4];
                 size_t total = 0;
@@ -132,7 +236,28 @@ coco::stray start(saucer::application* app) {
                     return;
                 }
 
-                std::string code(data.begin(), data.end());
+                // Decode the EvalJSRequest protobuf from Go.
+                bldr::proto::EvalJSRequest req;
+                if (!bldr::proto::DecodeEvalJSRequest(data.data(), data.size(), req)) {
+                    stream->Close();
+                    return;
+                }
+
+                // The code from Go is already wrapped in an async IIFE that posts
+                // the result via postMessage. It contains a placeholder __EVAL_ID__
+                // that we replace with a unique ID for result correlation.
+                std::string code = std::move(req.code);
+                std::string eval_id = "e" + std::to_string(eval_counter->fetch_add(1));
+
+                // Replace the __EVAL_ID__ placeholder with the actual eval ID.
+                const std::string placeholder = "__EVAL_ID__";
+                auto pos = code.find(placeholder);
+                if (pos != std::string::npos) {
+                    code.replace(pos, placeholder.size(), eval_id);
+                }
+
+                // Register the eval request before executing the code.
+                eval_registry->Register(eval_id);
 
                 // Execute the JavaScript code in the webview (guarded against shutdown).
                 // Cast to webview* to call webview::execute(cstring_view) instead of
@@ -145,13 +270,19 @@ coco::stray start(saucer::application* app) {
                     }
                 }
 
-                // Write a simple "ok" response.
-                std::string resp = "ok";
+                // Wait for the JavaScript result (30 second timeout).
+                auto resp = eval_registry->Wait(eval_id, 30000);
+                if (resp.result.empty() && resp.error.empty()) {
+                    resp.error = "eval timeout";
+                }
+
+                // Encode the EvalJSResponse protobuf and send it back.
+                auto resp_buf = bldr::proto::EncodeEvalJSResponse(resp);
                 uint8_t resp_len_buf[4];
-                uint32_t resp_len = static_cast<uint32_t>(resp.size());
+                uint32_t resp_len = static_cast<uint32_t>(resp_buf.size());
                 std::memcpy(resp_len_buf, &resp_len, 4);
                 stream->Write(resp_len_buf, 4);
-                stream->Write(reinterpret_cast<const uint8_t*>(resp.data()), resp.size());
+                stream->Write(resp_buf.data(), resp_buf.size());
                 stream->Close();
             }).detach();
         }

package/src/scheme_forwarder.cpp

@@ -14,14 +14,30 @@ static std::string toLower(const std::string& s) {
     return out;
 }
 
+// corsHeaders are Access-Control headers added to all scheme responses.
+// WebKit treats custom scheme origins as opaque (null), so all fetch requests
+// from pages loaded via bldr:// are cross-origin. These headers allow them.
+static const std::map<std::string, std::string> corsHeaders = {
+    {"Access-Control-Allow-Origin", "*"},
+    {"Access-Control-Allow-Methods", "GET, POST, OPTIONS"},
+    {"Access-Control-Allow-Headers", "*"},
+};
+
 // sendError sends an error response to the saucer writer.
 static void sendError(saucer::scheme::stream_writer& writer, int status) {
-    writer.start({.mime = "text/plain", .status = status});
+    writer.start({.mime = "text/plain", .headers = corsHeaders, .status = status});
     writer.finish();
 }
 
 void SchemeForwarder::forward(const saucer::scheme::request& req,
                                saucer::scheme::stream_writer& writer) {
+    // Handle CORS preflight directly without forwarding to Go.
+    if (toLower(req.method()) == "options") {
+        writer.start({.mime = "text/plain", .headers = corsHeaders, .status = 204});
+        writer.finish();
+        return;
+    }
+
     // Open a new yamux stream.
     auto [stream, err] = session_->OpenStream();
     if (err != yamux::Error::OK || !stream) {
@@ -93,9 +109,9 @@ void SchemeForwarder::forward(const saucer::scheme::request& req,
         if (resp.has_info && !started) {
             started = true;
 
-            // Extract Content-Type header (case-insensitive).
+            // Extract Content-Type header (case-insensitive) and merge CORS headers.
             std::string mime = "application/octet-stream";
-            std::map<std::string, std::string> hdrs;
+            std::map<std::string, std::string> hdrs(corsHeaders);
             for (const auto& [key, val] : resp.info.headers) {
                 if (toLower(key) == "content-type") {
                     mime = val;