@aptre/bldr-saucer 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptre/bldr-saucer",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Native webview bridge for Bldr using Saucer",
   "main": "index.js",
   "license": "MIT",
@@ -38,11 +38,11 @@
     "release:publish": "git push && git push --tags"
   },
   "optionalDependencies": {
-    "@aptre/bldr-saucer-darwin-arm64": "0.4.2",
-    "@aptre/bldr-saucer-darwin-x64": "0.4.2",
-    "@aptre/bldr-saucer-linux-x64": "0.4.2",
-    "@aptre/bldr-saucer-linux-arm64": "0.4.2",
-    "@aptre/bldr-saucer-win32-x64": "0.4.2"
+    "@aptre/bldr-saucer-darwin-arm64": "0.4.4",
+    "@aptre/bldr-saucer-darwin-x64": "0.4.4",
+    "@aptre/bldr-saucer-linux-x64": "0.4.4",
+    "@aptre/bldr-saucer-linux-arm64": "0.4.4",
+    "@aptre/bldr-saucer-win32-x64": "0.4.4"
   },
   "files": [
     "index.js",

package/src/fetch_proto.cpp

@@ -394,6 +394,30 @@ bool DecodeSaucerInit(const uint8_t* buf, size_t len, SaucerInit& out) {
                 out.external_links = static_cast<uint32_t>(v);
                 break;
             }
+            case 3: { // app_name
+                if (wire != kLengthDelimited) return false;
+                if (!decodeString(buf, len, offset, out.app_name)) return false;
+                break;
+            }
+            case 4: { // window_title
+                if (wire != kLengthDelimited) return false;
+                if (!decodeString(buf, len, offset, out.window_title)) return false;
+                break;
+            }
+            case 5: { // window_width
+                if (wire != kVarint) return false;
+                uint64_t v;
+                if (!decodeVarint(buf, len, offset, v)) return false;
+                out.window_width = static_cast<uint32_t>(v);
+                break;
+            }
+            case 6: { // window_height
+                if (wire != kVarint) return false;
+                uint64_t v;
+                if (!decodeVarint(buf, len, offset, v)) return false;
+                out.window_height = static_cast<uint32_t>(v);
+                break;
+            }
             default:
                 if (!skipField(buf, len, offset, wire)) return false;
                 break;

package/src/fetch_proto.h

@@ -13,6 +13,10 @@ namespace proto {
 struct SaucerInit {
     bool dev_tools = false;      // field 1
     uint32_t external_links = 0; // field 2 (enum ExternalLinks)
+    std::string app_name;        // field 3
+    std::string window_title;    // field 4
+    uint32_t window_width = 0;   // field 5
+    uint32_t window_height = 0;  // field 6
 };
 
 // DecodeSaucerInit decodes a SaucerInit protobuf message.

package/src/main.cpp

@@ -123,8 +123,21 @@ coco::stray start(saucer::application* app) {
         .storage_path = storage,
     });
 
-    window->set_title("Bldr");
-    window->set_size({1024, 768});
+    // Apply branding from SaucerInit, with defaults.
+    std::string title = saucer_init.window_title;
+    if (title.empty()) {
+        title = saucer_init.app_name;
+    }
+    if (title.empty()) {
+        title = "Bldr";
+    }
+    window->set_title(title);
+
+    uint32_t win_w = saucer_init.window_width;
+    uint32_t win_h = saucer_init.window_height;
+    if (win_w == 0) win_w = 1024;
+    if (win_h == 0) win_h = 768;
+    window->set_size({static_cast<int>(win_w), static_cast<int>(win_h)});
 
     // Handle bldr:// scheme: forward all requests to Go over yamux.
     webview->handle_scheme("bldr", [forwarder](saucer::scheme::request req, saucer::scheme::executor executor) {
@@ -133,6 +146,20 @@ coco::stray start(saucer::application* app) {
         }).detach();
     });
 
+    // SPA guard: the app only works at /index.html with hash routing.
+    // If something tries to navigate to e.g. bldr:///feed.xml, block it.
+    webview->on<saucer::webview::event::navigate>([](const saucer::navigation& nav) -> saucer::policy {
+        auto target = nav.url();
+        if (target.scheme() != "bldr") {
+            return saucer::policy::block;
+        }
+        auto p = target.path().string();
+        if (p != "/index.html" && p != "/" && !p.empty()) {
+            return saucer::policy::block;
+        }
+        return saucer::policy::allow;
+    });
+
     // Navigate via HTML redirect (works around WebKit's loadFileURL issue with custom schemes).
     std::string nav_url = "bldr:///index.html";
     const char* doc_id_env = std::getenv("BLDR_WEB_DOCUMENT_ID");
@@ -302,7 +329,20 @@ coco::stray start(saucer::application* app) {
 }
 
 int main() {
-    auto app_result = saucer::application::create({.id = "bldr"});
+    // Parse SaucerInit early to get the app name for the application ID.
+    std::string app_id = "bldr";
+    const char* init_b64 = std::getenv("BLDR_SAUCER_INIT");
+    if (init_b64) {
+        auto data = bldr::proto::Base64Decode(init_b64);
+        if (!data.empty()) {
+            bldr::proto::SaucerInit init;
+            if (bldr::proto::DecodeSaucerInit(data.data(), data.size(), init) && !init.app_name.empty()) {
+                app_id = init.app_name;
+            }
+        }
+    }
+
+    auto app_result = saucer::application::create({.id = app_id});
     if (!app_result) {
         std::cerr << "[bldr-saucer] failed to create application" << std::endl;
         return 1;