updated workflow, added a test

Author: ItsMeSamey

.github/workflows/ci.yml

@@ -17,109 +17,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Zig
-        shell: bash
-        env:
-          ZIG_VERSION: 0.15.2
-        run: |
-          set -euo pipefail
-          python - <<'PY'
-          import hashlib
-          import json
-          import os
-          import pathlib
-          import shutil
-          import tarfile
-          import urllib.request
-          import zipfile
-
-          version = os.environ["ZIG_VERSION"]
-          runner_os = os.environ["RUNNER_OS"]
-          runner_arch = os.environ["RUNNER_ARCH"]
-
-          os_map = {
-              "Linux": "linux",
-              "macOS": "macos",
-              "Windows": "windows",
-          }
-          arch_map = {
-              "X64": "x86_64",
-              "ARM64": "aarch64",
-              "X86": "x86",
-          }
-
-          os_part = os_map.get(runner_os)
-          arch_part = arch_map.get(runner_arch.upper())
-          if os_part is None or arch_part is None:
-              raise SystemExit(
-                  f"Unsupported runner combination RUNNER_OS={runner_os} RUNNER_ARCH={runner_arch}"
-              )
-
-          artifact_key = f"{arch_part}-{os_part}"
-          with urllib.request.urlopen("https://ziglang.org/download/index.json") as resp:
-              index = json.load(resp)
-
-          release = index.get(version)
-          if release is None:
-              raise SystemExit(f"Zig version {version} is not present in ziglang download index")
-
-          artifact = release.get(artifact_key)
-          if artifact is None:
-              raise SystemExit(f"No Zig artifact for key {artifact_key} in version {version}")
-
-          tarball_url = artifact["tarball"]
-          expected_sha256 = artifact["shasum"]
-
-          out_root = pathlib.Path(os.environ["RUNNER_TEMP"]) / f"zig-{version}-{artifact_key}"
-          if out_root.exists():
-              shutil.rmtree(out_root)
-          out_root.mkdir(parents=True)
-
-          archive_path = out_root / pathlib.Path(tarball_url).name
-          print(f"Downloading {tarball_url}", flush=True)
-          urllib.request.urlretrieve(tarball_url, archive_path)
-
-          digest = hashlib.sha256()
-          with archive_path.open("rb") as f:
-              for chunk in iter(lambda: f.read(1024 * 1024), b""):
-                  digest.update(chunk)
-          actual_sha256 = digest.hexdigest()
-          if actual_sha256.lower() != expected_sha256.lower():
-              raise SystemExit(
-                  f"SHA256 mismatch for {archive_path.name}: {actual_sha256} != {expected_sha256}"
-              )
-
-          extract_dir = out_root / "extract"
-          extract_dir.mkdir()
-          lower_name = archive_path.name.lower()
-          if lower_name.endswith(".zip"):
-              with zipfile.ZipFile(archive_path) as zf:
-                  zf.extractall(extract_dir)
-          else:
-              with tarfile.open(archive_path, "r:*") as tf:
-                  tf.extractall(extract_dir)
-
-          dirs = [p for p in extract_dir.iterdir() if p.is_dir()]
-          if len(dirs) == 1:
-              zig_root = dirs[0]
-          else:
-              candidates = [p for p in extract_dir.rglob("*") if p.is_file() and p.name in ("zig", "zig.exe")]
-              if not candidates:
-                  raise SystemExit("Unable to locate zig executable after extraction")
-              exe = candidates[0]
-              zig_root = exe.parent.parent if exe.parent.name == "bin" else exe.parent
-
-          zig_exe_name = "zig.exe" if runner_os == "Windows" else "zig"
-          zig_path = zig_root / zig_exe_name
-          if not zig_path.exists():
-              zig_path = zig_root / "bin" / zig_exe_name
-          if not zig_path.exists():
-              raise SystemExit(f"Unable to find zig executable under {zig_root}")
-
-          with pathlib.Path(os.environ["GITHUB_PATH"]).open("a", encoding="utf-8") as f:
-              f.write(str(zig_path.parent) + "\n")
-
-          print(f"Installed Zig {version} at {zig_path}", flush=True)
-          PY
+        uses: mlugg/setup-zig@v2.2.1
+        with:
+          version: master
+          cache-key: ${{ runner.os }}-${{ hashFiles('build.zig', 'build.zig.zon') }}
 
       - name: Zig Version
         run: zig version

CONTRIBUTING.md

@@ -4,7 +4,8 @@ Thanks for contributing to WebUI Zig.
 
 ## Development Setup
 
-- Zig `0.15.2+` (see `build.zig.zon`)
+- Zig `0.16.0-dev+`
+- CI tracks Zig `master` via `mlugg/setup-zig`
 - Linux, macOS, or Windows
 
 Core commands:

README.md

@@ -2,7 +2,7 @@
 
 A Zig-first WebUI runtime with typed RPC, deterministic launch policy, native host launch paths, and browser/web fallbacks.
 
-![Zig](https://img.shields.io/badge/Zig-0.15.2%2B-f7a41d)
+![Zig](https://img.shields.io/badge/Zig-0.16--dev%20%2F%20master-f7a41d)
 ![Platforms](https://img.shields.io/badge/Platforms-Linux%20%7C%20macOS%20%7C%20Windows-2ea44f)
 ![Mode](https://img.shields.io/badge/Transport-WebView%20%2B%20Browser%20%2B%20Web-0366d6)
 

src/backends/macos_browser_host.zig

@@ -114,7 +114,15 @@ fn buildAppleScriptForControl(
         ),
         .restore => std.fmt.allocPrint(
             allocator,
-            "tell application \"System Events\" to tell (first window of (first process whose unix id is {d})) to set value of attribute \"AXMinimized\" to false",
+            "tell application \"System Events\" to tell (first window of (first process whose unix id is {d})) to try\n" ++
+                "set value of attribute \"AXFullScreen\" to false\n" ++
+                "end try\n" ++
+                "try\n" ++
+                "set value of attribute \"AXZoomed\" to false\n" ++
+                "end try\n" ++
+                "try\n" ++
+                "set value of attribute \"AXMinimized\" to false\n" ++
+                "end try",
             .{pid},
         ),
         .maximize => std.fmt.allocPrint(
@@ -162,6 +170,15 @@ test "applescript control template contains target pid and command semantics" {
     try std.testing.expect(std.mem.indexOf(u8, script, "AXMinimized") != null);
 }
 
+test "restore applescript clears fullscreen zoom and minimized state" {
+    const script = try buildAppleScriptForControl(std.testing.allocator, 4242, .restore);
+    defer std.testing.allocator.free(script);
+    try std.testing.expect(std.mem.indexOf(u8, script, "unix id is 4242") != null);
+    try std.testing.expect(std.mem.indexOf(u8, script, "AXFullScreen") != null);
+    try std.testing.expect(std.mem.indexOf(u8, script, "AXZoomed") != null);
+    try std.testing.expect(std.mem.indexOf(u8, script, "AXMinimized") != null);
+}
+
 test "applescript zoom fallback template contains target pid" {
     const script = try buildAppleScriptForZoomFallback(std.testing.allocator, 3001);
     defer std.testing.allocator.free(script);

src/root/app.zig

@@ -293,15 +293,6 @@ pub const App = struct {
             state.state_mutex.unlock();
             state.terminateLaunchedBrowser(self.allocator);
             state.stopServer();
-            if (state.event_callback.handler) |handler| {
-                const event = Event{
-                    .window_id = state.id,
-                    .kind = .disconnected,
-                    .name = "disconnected",
-                    .payload = "",
-                };
-                handler(state.event_callback.context, &event);
-            }
         }
     }
 };

src/root/tests.zig

@@ -239,6 +239,32 @@ test "window lifecycle" {
     app.shutdown();
 }
 
+test "app shutdown does not synthesize disconnected event without a frontend" {
+    const Capture = struct {
+        var disconnected_count: usize = 0;
+
+        fn onEvent(_: ?*anyopaque, event: *const Event) void {
+            if (event.kind == .disconnected) disconnected_count += 1;
+        }
+    };
+
+    Capture.disconnected_count = 0;
+
+    var gpa = std.heap.DebugAllocator(.{}){};
+    defer _ = gpa.deinit();
+
+    var app = try App.init(gpa.allocator(), .{});
+    defer app.deinit();
+
+    var win = try app.newWindow(.{ .title = "ShutdownDisconnectNoFrontend" });
+    win.onEvent(Capture.onEvent, null);
+    try win.showHtml("<html><body>shutdown-disconnect-no-frontend</body></html>");
+    try app.run();
+
+    app.shutdown();
+    try std.testing.expectEqual(@as(usize, 0), Capture.disconnected_count);
+}
+
 test "browser fallback serves window html over local http" {
     var gpa = std.heap.DebugAllocator(.{}){};
     defer _ = gpa.deinit();