Compare commits

..
9 Commits
Author SHA1 Message Date
Twyco f4434a3203 Merge pull request 'KAN-70: Integrate native workspace and update settings' (#170) from feature/KAN-70-native-app-workspace-settings into main
Native JavaScript checks / Native launcher and release tests (push) Successful in 59s
macOS checks / Native Rust tests and unsigned build (push) Successful in 1m30s
macOS release to Hetzner / Validate release ref and configuration (push) Successful in 21s
macOS release to Hetzner / Sign, notarize, verify and publish macOS (push) Successful in 3m23s
CI/CD / test_and_check_app (push) Successful in 6m57s
CI/CD / preconditions (push) Successful in 1s
CI/CD / Publish immutable image (push) Successful in 13s
Reviewed-on: #170
2026-09-29 15:24:44 +00:00
Twyco 912cfc28c2 feat(KAN-70): integrate native workspace and update settings
CI/CD / preconditions (pull_request) Successful in 1s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m2s
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m38s
CI/CD / test_and_check_app (pull_request) Successful in 6m47s
CI/CD / Publish immutable image (pull_request) Skipped
2026-09-29 17:11:10 +02:00
Twyco 752ba2cd38 Merge pull request 'KAN-71: Use interactive WebKit gestures on iOS and macOS' (#169) from fix/KAN-71-native-navigation-scroll into main
macOS checks / Native Rust tests and unsigned build (push) Successful in 1m31s
CI/CD / preconditions (push) Successful in 1s
Native JavaScript checks / Native launcher and release tests (push) Successful in 1m2s
macOS release to Hetzner / Validate release ref and configuration (push) Successful in 22s
macOS release to Hetzner / Sign, notarize, verify and publish macOS (push) Successful in 3m24s
CI/CD / test_and_check_app (push) Successful in 6m43s
CI/CD / Publish immutable image (push) Successful in 1m20s
Reviewed-on: #169
2026-09-29 06:04:38 +00:00
Twyco 1cf7524a7b fix(KAN-71): use interactive WebKit navigation gestures
CI/CD / preconditions (pull_request) Successful in 1s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m13s
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m44s
CI/CD / test_and_check_app (pull_request) Successful in 7m4s
CI/CD / Publish immutable image (pull_request) Skipped
2026-09-29 08:02:10 +02:00
Twyco 386b25858b Merge pull request 'KAN-71: Correct iOS and macOS navigation gestures and scroll bounds' (#168) from fix/KAN-71-native-navigation-scroll into main
macOS checks / Native Rust tests and unsigned build (push) Successful in 1m26s
CI/CD / preconditions (push) Successful in 1s
Native JavaScript checks / Native launcher and release tests (push) Successful in 1m2s
macOS release to Hetzner / Validate release ref and configuration (push) Successful in 21s
macOS release to Hetzner / Sign, notarize, verify and publish macOS (push) Successful in 3m23s
CI/CD / test_and_check_app (push) Successful in 6m37s
CI/CD / Publish immutable image (push) Successful in 1m17s
Reviewed-on: #168
2026-09-29 05:28:53 +00:00
Twyco aa14068c66 chore(KAN-71): bump native version to 0.2.4 and mobile build numbers
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m32s
CI/CD / preconditions (pull_request) Successful in 1s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m1s
CI/CD / test_and_check_app (pull_request) Successful in 6m39s
CI/CD / Publish immutable image (pull_request) Skipped
2026-09-29 07:27:05 +02:00
Twyco 4afaa79834 fix(KAN-71): correct Apple navigation gestures and scroll bounds
CI/CD / preconditions (pull_request) Successful in 2s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m4s
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m31s
CI/CD / test_and_check_app (pull_request) Successful in 6m44s
CI/CD / Publish immutable image (pull_request) Skipped
2026-09-29 07:22:45 +02:00
Twyco 0662a6970e Merge pull request 'KAN-69: Fix macOS startup and window closing; release 0.2.3' (#167) from fix/KAN-69-macos-startup-and-close into main
macOS release to Hetzner / Validate release ref and configuration (push) Successful in 21s
Native JavaScript checks / Native launcher and release tests (push) Successful in 1m1s
CI/CD / Publish immutable image (push) Successful in 1m20s
macOS release to Hetzner / Sign, notarize, verify and publish macOS (push) Successful in 3m8s
CI/CD / preconditions (push) Successful in 1s
macOS checks / Native Rust tests and unsigned build (push) Successful in 1m27s
CI/CD / test_and_check_app (push) Successful in 6m28s
Reviewed-on: #167
2026-09-28 20:01:57 +00:00
Twyco 6820e0b25e fix(KAN-69): hide macOS launcher on startup and quit on close
CI/CD / preconditions (pull_request) Successful in 2s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m1s
CI/CD / test_and_check_app (pull_request) Canceled after 1m34s
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m29s
CI/CD / Publish immutable image (pull_request) Canceled after 0s
2026-09-28 22:00:06 +02:00
39 changed files with 2214 additions and 121 deletions
+10
View File
@@ -1,5 +1,15 @@
# Working Agreements
## Native app versions and build numbers
For every delivered change under `native/`, increment the app version and bundle/build number for the affected platforms in the same change before committing. Do this for fixes and follow-up changes too; do not wait for a separate release or a user reminder.
- macOS changes require a higher macOS app version and `bundle.macOS.bundleVersion`.
- iOS changes require a higher iOS app version and `bundle.iOS.bundleVersion`, including the matching Xcode `MARKETING_VERSION` and `CURRENT_PROJECT_VERSION` in both `project.yml` and `project.pbxproj`.
- Shared changes require a higher general native app version and higher bundle/build numbers for every affected platform. Android changes also require a higher `bundle.android.versionCode`; this metadata rule does not imply Android build support.
- The app version is currently shared: keep `native/package.json`, `native/src-tauri/tauri.conf.json`, the native package entries in `Cargo.toml` and `Cargo.lock`, and the Xcode marketing versions consistent. Use a patch increment unless the requested release calls for a minor or major increment. Never decrease or reuse an existing build number.
- Update the native release notes and run the existing version consistency test. One coordinated increment per delivered change is sufficient; intermediate edits and test reruns do not need additional increments.
## Missing programs and SDKs
If implementation or verification requires a missing program, SDK, runtime, toolchain, or platform component, do not download or install a temporary copy in `/tmp` or another temporary directory. Do not use an ad hoc toolchain as a workaround. Tell the user which prerequisites are missing, ask them to install them permanently and confirm when installation is complete, and wait for that confirmation before continuing dependent work. This rule applies to every implementation task in this project.
@@ -23,6 +23,7 @@ class RequirePasswordChange
if ($request->routeIs([
'logout',
'native-app.edit',
'password.force-change.edit',
'user-password.update',
])) {
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "kanbangit-native",
"version": "0.2.2",
"version": "0.2.6",
"private": true,
"type": "module",
"scripts": {
@@ -25,5 +25,5 @@
"devDependencies": {
"@tauri-apps/cli": "2.11.4"
},
"releaseNotes": "Add the stable Mac download for the KanbanGit website."
"releaseNotes": "Manage local workspace settings in the web app on macOS and iOS, with shared macOS update controls and native recovery for older or unavailable servers."
}
+1 -1
View File
@@ -1770,7 +1770,7 @@ dependencies = [
[[package]]
name = "kanbangit-native"
version = "0.2.2"
version = "0.2.6"
dependencies = [
"semver",
"serde",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "kanbangit-native"
version = "0.2.2"
version = "0.2.6"
description = "KanbanGit native application"
edition = "2021"
publish = false
+71
View File
@@ -1,3 +1,74 @@
fn main() {
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("macos") {
build_navigation();
}
tauri_build::build();
}
fn build_navigation() {
use std::{env, path::PathBuf, process::Command};
println!("cargo:rerun-if-changed=src/navigation.m");
println!("cargo:rerun-if-changed=src/settings.m");
let output = PathBuf::from(env::var_os("OUT_DIR").unwrap());
let object = output.join("navigation.o");
let settings_object = output.join("settings.o");
let archive = output.join("libkanban_navigation.a");
let arch = match env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() {
"aarch64" => "arm64",
"x86_64" => "x86_64",
_ => panic!("Unsupported macOS architecture"),
};
assert!(Command::new("xcrun")
.args([
"--sdk",
"macosx",
"clang",
"-fobjc-arc",
"-fblocks",
"-Wall",
"-Werror",
"-mmacosx-version-min=14.0",
"-arch",
arch,
"-c",
"src/navigation.m",
"-o"
])
.arg(&object)
.status()
.expect("Xcode clang is required")
.success());
assert!(Command::new("xcrun")
.args([
"--sdk",
"macosx",
"clang",
"-fobjc-arc",
"-fblocks",
"-Wall",
"-Werror",
"-mmacosx-version-min=14.0",
"-arch",
arch,
"-c",
"src/settings.m",
"-o"
])
.arg(&settings_object)
.status()
.expect("Xcode clang is required")
.success());
assert!(Command::new("xcrun")
.args(["ar", "crs"])
.arg(&archive)
.arg(&object)
.arg(&settings_object)
.status()
.expect("Xcode ar is required")
.success());
println!("cargo:rustc-link-search=native={}", output.display());
println!("cargo:rustc-link-lib=static=kanban_navigation");
println!("cargo:rustc-link-lib=framework=AppKit");
println!("cargo:rustc-link-lib=framework=WebKit");
}
@@ -65,3 +65,32 @@ struct WorkspaceConnection {
return true
}
}
enum NativeSettingsError: Error { case invalidRequest, incompatibleVersion, invalidServer }
struct NativeSettingsRequest {
let id: Int
let action: String
let payload: [String: Any]
static func parse(_ body: String) throws -> NativeSettingsRequest {
guard body.utf8.count <= 8192,
let value = try JSONSerialization.jsonObject(with: Data(body.utf8)) as? [String: Any],
Set(value.keys) == Set(["version", "id", "action", "payload"]),
let version = value["version"] as? NSNumber, CFGetTypeID(version) != CFBooleanGetTypeID(),
version == 1 else { throw NativeSettingsError.incompatibleVersion }
guard let id = value["id"] as? NSNumber, CFGetTypeID(id) != CFBooleanGetTypeID(),
id.doubleValue >= 0, id.doubleValue <= 9007199254740991, id.doubleValue.rounded() == id.doubleValue,
let action = value["action"] as? String,
let payload = value["payload"] as? [String: Any] else { throw NativeSettingsError.invalidRequest }
switch action {
case "getState", "settingsReady", "openSettings":
guard payload.isEmpty else { throw NativeSettingsError.invalidRequest }
case "setWorkspace":
guard Set(payload.keys) == Set(["server"]), payload["server"] is String else { throw NativeSettingsError.invalidRequest }
default: throw NativeSettingsError.invalidRequest
}
return NativeSettingsRequest(id: id.intValue, action: action, payload: payload)
}
}
@@ -40,8 +40,8 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
private let connectButton = UIButton(type: .system)
private let resumeButton = UIButton(type: .system)
private let toolbar = UIToolbar()
private var historyObservation: NSKeyValueObservation?
private var backButton: UIBarButtonItem!
private var settingsAvailable = false
private var toolbarHeight: NSLayoutConstraint!
private var appearance: UISegmentedControl!
init(defaults: UserDefaults = .standard) {
@@ -94,7 +94,7 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
launcher.isHidden = true
launcher.accessibilityIdentifier = "serverSettings"
launcher.keyboardDismissMode = .interactive
launcher.alwaysBounceVertical = true
launcher.bounces = false
view.addSubview(launcher)
launcher.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
@@ -164,12 +164,12 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
toolbar.isHidden = true
toolbar.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(toolbar)
backButton = UIBarButtonItem(title: text("back"), style: .plain, target: self, action: #selector(goBack))
backButton.accessibilityIdentifier = "workspaceBack"
let settings = UIBarButtonItem(title: text("serverSettings"), style: .plain, target: self, action: #selector(showSettings))
settings.accessibilityIdentifier = "showServerSettings"
toolbar.items = [backButton, UIBarButtonItem(systemItem: .flexibleSpace), settings]
toolbar.items = [UIBarButtonItem(systemItem: .flexibleSpace), settings]
toolbarHeight = toolbar.heightAnchor.constraint(equalToConstant: 44)
NSLayoutConstraint.activate([
toolbarHeight,
toolbar.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
toolbar.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
toolbar.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
@@ -203,19 +203,27 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
guard let data = try? JSONEncoder().encode(selected) else { status.text = text("storageError"); return }
defaults.set(data, forKey: serverKey)
timeout?.cancel()
historyObservation = nil
workspace?.stopLoading()
workspace?.navigationDelegate = nil
workspace?.configuration.userContentController.removeScriptMessageHandler(forName: "kanbanSettings", contentWorld: .page)
workspace?.removeFromSuperview()
connection = WorkspaceConnection()
server = selected
let configuration = WKWebViewConfiguration()
configuration.websiteDataStore = WKWebsiteDataStore(forIdentifier: selected.profile)
// Remote content receives a plain WKWebView, with no native message handlers or Tauri bridge.
let scriptURL = Bundle(for: WorkspaceViewController.self).url(forResource: "workspace-navigation", withExtension: "js")!
let script = try! String(contentsOf: scriptURL, encoding: .utf8)
configuration.userContentController.addUserScript(WKUserScript(source: script, injectionTime: .atDocumentStart, forMainFrameOnly: true))
let settingsURL = Bundle(for: WorkspaceViewController.self).url(forResource: "workspace-settings", withExtension: "js")!
let settingsScript = try! String(contentsOf: settingsURL, encoding: .utf8)
configuration.userContentController.addUserScript(WKUserScript(source: settingsScript, injectionTime: .atDocumentStart, forMainFrameOnly: true))
configuration.userContentController.addScriptMessageHandler(NativeSettingsHandler(controller: self), contentWorld: .page, name: "kanbanSettings")
setSettingsAvailable(false)
let webview = WKWebView(frame: .zero, configuration: configuration)
webview.navigationDelegate = self
webview.uiDelegate = self
webview.allowsBackForwardNavigationGestures = true
webview.scrollView.bounces = false
webview.accessibilityIdentifier = "workspace"
webview.translatesAutoresizingMaskIntoConstraints = false
webview.isHidden = true
@@ -227,9 +235,6 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
webview.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
])
workspace = webview
historyObservation = webview.observe(\.canGoBack, options: [.initial, .new]) { [weak self] view, _ in
self?.backButton.isEnabled = view.canGoBack
}
view.endEditing(true)
address.text = url.absoluteString
launcher.isHidden = true
@@ -273,12 +278,47 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
loading.stopAnimating()
view.endEditing(true)
launcher.isHidden = true
toolbar.isHidden = false
toolbar.isHidden = settingsAvailable
workspace?.isHidden = false
backButton.isEnabled = workspace?.canGoBack == true
}
@objc private func goBack() { if workspace?.canGoBack == true { workspace?.goBack() } }
private func setSettingsAvailable(_ available: Bool) {
settingsAvailable = available
toolbarHeight.constant = available ? 0 : 44
toolbar.isHidden = available || !launcher.isHidden || !connection.ready
}
func handleSettings(_ message: WKScriptMessage, reply: @escaping (Any?, String?) -> Void) {
guard message.webView === workspace, message.frameInfo.isMainFrame,
let source = message.frameInfo.request.url, server?.allows(source) == true,
let current = workspace?.url, server?.allows(current) == true,
let body = message.body as? String else { reply(nil, "untrustedFrame"); return }
do {
let request = try NativeSettingsRequest.parse(body)
var result: Any = NSNull()
switch request.action {
case "getState":
result = ["apiVersion": 1, "platform": "ios", "workspace": server!.url.absoluteString,
"version": Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "unknown",
"capabilities": ["workspace"]] as [String: Any]
case "settingsReady": setSettingsAvailable(true)
case "openSettings": showSettings()
case "setWorkspace":
guard let address = request.payload["server"] as? String,
let url = WorkspaceServer.normalize(address) else { throw NativeSettingsError.invalidServer }
let owner = workspace
DispatchQueue.main.async { [weak self] in
guard let self, self.workspace === owner else { return }
self.open(url)
}
default: throw NativeSettingsError.invalidRequest
}
let data = try JSONSerialization.data(withJSONObject: ["id": request.id, "result": result])
reply(String(decoding: data, as: UTF8.self), nil)
} catch {
reply(nil, String(describing: error))
}
}
func webView(_ webView: WKWebView, decidePolicyFor action: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
guard webView === workspace, let url = action.request.url else { decisionHandler(.cancel); return }
@@ -306,6 +346,7 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
guard webView === workspace else { return }
setSettingsAvailable(false)
pendingNavigation = navigation
beginNavigation()
}
@@ -320,7 +361,6 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
connectButton.setTitle(text("openWorkspace"), for: .normal)
status.text = text("connected")
resumeButton.isHidden = false
backButton.isEnabled = webView.canGoBack
if firstLoad { showWorkspace() }
}
@@ -346,3 +386,13 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
showSettings()
}
}
private final class NativeSettingsHandler: NSObject, WKScriptMessageHandlerWithReply {
weak var controller: WorkspaceViewController?
init(controller: WorkspaceViewController) { self.controller = controller }
func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage,
replyHandler: @escaping (Any?, String?) -> Void) {
guard let controller else { replyHandler(nil, "bridgeUnavailable"); return }
controller.handleSettings(message, reply: replyHandler)
}
}
@@ -95,41 +95,130 @@ final class WorkspaceTests: XCTestCase {
}
@MainActor
func testBackButtonTracksSameDocumentHistory() async throws {
let name = "KAN55-history-\(UUID())"
func testWebKitOwnsInteractiveGesturesAndKeepsScrollBounds() async throws {
let name = "KAN71-history-\(UUID())"
let defaults = try XCTUnwrap(UserDefaults(suiteName: name))
defer { defaults.removePersistentDomain(forName: name) }
let controller = WorkspaceViewController(defaults: defaults)
controller.loadViewIfNeeded()
let url = try XCTUnwrap(WorkspaceServer.normalize("https://example.invalid/"))
controller.open(url)
controller.view.frame = CGRect(x: 0, y: 0, width: 390, height: 844)
let url = URL(string: "https://example.invalid/dashboard")!
controller.open(URL(string: "https://example.invalid/")!)
let webview = try XCTUnwrap(controller.workspace)
webview.stopLoading()
webview.loadSimulatedRequest(URLRequest(url: url), responseHTML: "<html><body><input id='draft' value='unsaved'></body></html>")
var loaded = false
for _ in 0..<50 {
if let value = try? await webview.evaluateJavaScript("document.getElementById('draft')?.value"),
value as? String == "unsaved" { loaded = true; break }
try await Task.sleep(for: .milliseconds(100))
}
XCTAssertTrue(loaded)
_ = try await webview.evaluateJavaScript("history.pushState({}, '', '#ticket')")
let toolbar = try XCTUnwrap(controller.view.subviews.compactMap { $0 as? UIToolbar }.first)
for _ in 0..<20 {
if toolbar.items?.first?.isEnabled == true { break }
try await Task.sleep(for: .milliseconds(50))
}
XCTAssertTrue(webview.canGoBack)
XCTAssertTrue(toolbar.items?.first?.isEnabled == true)
webview.goBack()
var returned = false
for _ in 0..<20 {
if let hash = try? await webview.evaluateJavaScript("location.hash"), hash as? String == "" { returned = true; break }
try await Task.sleep(for: .milliseconds(50))
}
XCTAssertTrue(returned)
let draft = try await webview.evaluateJavaScript("document.getElementById('draft').value")
webview.frame = controller.view.bounds
webview.loadSimulatedRequest(URLRequest(url: url), responseHTML: """
<html><head><meta name="viewport" content="width=device-width,initial-scale=1"></head>
<body style="margin:0"><p>Workspace</p><input id="draft" value="unsaved"></body></html>
""")
try await waitFor(webview, "document.querySelector('#draft')?.value === 'unsaved'")
XCTAssertFalse(webview.canGoBack)
XCTAssertNil(webview.goBack())
XCTAssertNil(webview.goForward())
try await waitFor(webview, "location.pathname === '/dashboard'")
XCTAssertTrue(webview.allowsBackForwardNavigationGestures)
XCTAssertFalse(webview.scrollView.bounces)
XCTAssertFalse(controller.responds(to: NSSelectorFromString("navigateGesture:")))
let customNavigation = try await webview.evaluateJavaScript("typeof window.__kanbanNavigation")
XCTAssertEqual(customNavigation as? String, "undefined")
let draft = try await webview.evaluateJavaScript("document.querySelector('#draft').value")
XCTAssertEqual(draft as? String, "unsaved")
let toolbar = try XCTUnwrap(controller.view.subviews.compactMap { $0 as? UIToolbar }.first)
XCTAssertFalse(toolbar.items!.contains { $0.accessibilityIdentifier == "workspaceBack" })
XCTAssertTrue(toolbar.items!.contains { $0.accessibilityIdentifier == "showServerSettings" })
let scroll = try await webview.evaluateJavaScript("getComputedStyle(document.documentElement).overscrollBehaviorY")
XCTAssertEqual(scroll as? String, "none")
let horizontal = try await webview.evaluateJavaScript("getComputedStyle(document.documentElement).overscrollBehaviorX")
XCTAssertEqual(horizontal as? String, "auto")
controller.open(URL(string: "https://other.invalid/")!)
XCTAssertTrue(try XCTUnwrap(controller.workspace).allowsBackForwardNavigationGestures,
"Changing workspaces must retain native gesture navigation")
}
func testSettingsProtocolRejectsUnsupportedActionsAndInvalidPayloads() throws {
for body in [
#"{"version":2,"id":1,"action":"getState","payload":{}}"#,
#"{"version":true,"id":1,"action":"getState","payload":{}}"#,
#"{"version":1,"id":1,"action":"installUpdate","payload":{"version":"1"}}"#,
#"{"version":1,"id":1,"action":"setWorkspace","payload":{"server":12}}"#,
#"{"version":1,"id":1,"action":"getState","payload":{"extra":1}}"#,
#"{"version":1,"id":1,"action":"shell","payload":{}}"#,
] { XCTAssertThrowsError(try NativeSettingsRequest.parse(body), body) }
XCTAssertThrowsError(try NativeSettingsRequest.parse(String(repeating: "x", count: 8193)))
XCTAssertEqual(try NativeSettingsRequest.parse(#"{"version":1,"id":2,"action":"getState","payload":{}}"#).id, 2)
}
@MainActor
func testSettingsBridgeHidesToolbarOnlyAfterHandshakeAndRejectsFramesAndOldWorkspaces() async throws {
let name = "KAN70-settings-\(UUID())"
let defaults = try XCTUnwrap(UserDefaults(suiteName: name))
defer { defaults.removePersistentDomain(forName: name) }
let controller = WorkspaceViewController(defaults: defaults)
controller.loadViewIfNeeded()
controller.view.frame = CGRect(x: 0, y: 0, width: 390, height: 844)
let url = URL(string: "https://example.invalid/")!
controller.open(url)
let originalProfile = controller.server!.profile
let webview = try XCTUnwrap(controller.workspace)
webview.stopLoading()
webview.loadSimulatedRequest(URLRequest(url: url.appendingPathComponent("login")), responseHTML: "<html><body>Login<iframe srcdoc='<p>frame</p>'></iframe></body></html>")
try await waitFor(webview, "document.readyState === 'complete' && typeof window.kanbanNative === 'object'")
let state = try await callScript(webview, "return await window.kanbanNative.request('getState')") as? [String: Any]
XCTAssertEqual(state?["platform"] as? String, "ios")
XCTAssertEqual(state?["workspace"] as? String, url.absoluteString)
XCTAssertEqual(state?["capabilities"] as? [String], ["workspace"])
XCTAssertNil(state?["updates"])
let toolbar = try XCTUnwrap(controller.view.subviews.compactMap { $0 as? UIToolbar }.first)
XCTAssertFalse(toolbar.isHidden, "Older pages must retain native recovery")
let rejected = try await callScript(webview, """
try {
await window.frames[0].webkit.messageHandlers.kanbanSettings.postMessage(JSON.stringify({version:1,id:2,action:'settingsReady',payload:{}}));
return false;
} catch { return true; }
""")
XCTAssertEqual(rejected as? Bool, true)
XCTAssertFalse(toolbar.isHidden)
_ = try await callScript(webview, "return await window.kanbanNative.request('settingsReady')")
controller.view.layoutIfNeeded()
XCTAssertTrue(toolbar.isHidden)
XCTAssertEqual(toolbar.frame.height, 0)
XCTAssertEqual(webview.frame.minY, controller.view.safeAreaLayoutGuide.layoutFrame.minY, accuracy: 1)
let invalid = try await callScript(webview, "try { await window.kanbanNative.request('setWorkspace', {server:'http://bad.test'}); return false; } catch { return true; }")
XCTAssertEqual(invalid as? Bool, true)
XCTAssertEqual(controller.server?.url, url)
_ = try await callScript(webview, "return await window.kanbanNative.request('openSettings')")
XCTAssertFalse(controller.view.subviews.first { $0.accessibilityIdentifier == "serverSettings" }!.isHidden)
_ = try await callScript(webview, "return await window.kanbanNative.request('setWorkspace', {server:'https://other.invalid/app/'})")
for _ in 0..<50 {
if controller.workspace !== webview { break }
try await Task.sleep(for: .milliseconds(20))
}
XCTAssertFalse(controller.workspace === webview)
XCTAssertNotEqual(controller.server?.profile, originalProfile)
let restored = WorkspaceViewController(defaults: defaults)
restored.loadViewIfNeeded()
XCTAssertEqual(restored.server?.url.absoluteString, "https://other.invalid/app/")
let stale = try await callScript(webview, "try { await window.kanbanNative.request('setWorkspace', {server:'https://stale.invalid/'}); return false; } catch { return true; }")
XCTAssertEqual(stale as? Bool, true)
XCTAssertEqual(controller.server?.url.absoluteString, "https://other.invalid/app/")
}
@MainActor
private func callScript(_ webview: WKWebView, _ script: String) async throws -> Any {
try await withCheckedThrowingContinuation { continuation in
webview.callAsyncJavaScript(script, arguments: [:], in: nil, in: .page) { result in
continuation.resume(with: result)
}
}
}
@MainActor
private func waitFor(_ webview: WKWebView, _ expression: String) async throws {
for _ in 0..<100 {
if let result = try? await webview.evaluateJavaScript(expression), result as? Bool == true { return }
try await Task.sleep(for: .milliseconds(50))
}
XCTFail("WebView condition timed out: \(expression)")
}
func testServerChangesNeverReusePreviousProfile() throws {
@@ -189,7 +278,7 @@ final class WorkspaceTests: XCTestCase {
controller.open(url)
let server = try XCTUnwrap(controller.server)
XCTAssertEqual(controller.workspace?.configuration.websiteDataStore.identifier, server.profile)
XCTAssertTrue(controller.workspace?.configuration.userContentController.userScripts.isEmpty == true)
XCTAssertEqual(controller.workspace?.configuration.userContentController.userScripts.count, 2)
let restored = WorkspaceViewController(defaults: defaults)
restored.loadViewIfNeeded()
XCTAssertEqual(restored.server, server)
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
009F8FEC2765B2F19DC12CA8 /* WorkspaceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DF9B2F499E1EB89EB39BC5 /* WorkspaceTests.swift */; };
0EC5CB2D7F774DBDCA69BCD8 /* workspace-navigation.js in Resources */ = {isa = PBXBuildFile; fileRef = 7676FB8CDCD1B07BCE413319 /* workspace-navigation.js */; };
0FAB3CC7BB466BFF871C0C30 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 31630170C358EA8657E34854 /* Assets.xcassets */; };
205D0CBA33F7D3C59AAD5300 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63685B1189795CAEA85F7AB7 /* QuartzCore.framework */; };
333E7761EA87AE29CE04F1AC /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = F46963153D20DB21D97843E9 /* main.mm */; };
@@ -18,6 +19,8 @@
7245AD23F39C4620BAA3AA92 /* WorkspaceUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED199829CC1B1598F58EDC9B /* WorkspaceUITests.swift */; };
73954B7AADE8C37663BEF288 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA65E67046326EA008175045 /* Metal.framework */; };
98D5B23C9BE2F62C23DF397A /* WorkspacePolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 554AB059B4228085924F4959 /* WorkspacePolicy.swift */; };
99291BB0C1DE7714FB32F554 /* workspace-navigation.js in Resources */ = {isa = PBXBuildFile; fileRef = 7676FB8CDCD1B07BCE413319 /* workspace-navigation.js */; };
99D76D98A2416CAA713186C2 /* workspace-settings.js in Resources */ = {isa = PBXBuildFile; fileRef = BD66652CEDB88ADBAD0A87BA /* workspace-settings.js */; };
A46344B6DF1B3A0F2798B751 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C8C02BC0E757897278EB954A /* Localizable.strings */; };
B939982700E800053A9C7663 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE3B71153677F722CAC6DCF7 /* Security.framework */; };
C362C102D4950A81D89BB8C8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92EBA86D28BBFD1C822CC6F6 /* WebKit.framework */; };
@@ -25,6 +28,7 @@
C53E7EC983C008DF98244C74 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2AB6F9398EA3CB62A68287D2 /* InfoPlist.strings */; };
CD64D99EBD87E6FFC0C9001C /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D581BB90601D7A89F8F188E2 /* MetalKit.framework */; };
D8772A5E508092D6F831058A /* libapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91991DFDB0C064B06DF854ED /* libapp.a */; };
EAD1D5A29503456CEED3B324 /* workspace-settings.js in Resources */ = {isa = PBXBuildFile; fileRef = BD66652CEDB88ADBAD0A87BA /* workspace-settings.js */; };
EB37EAF992C1A156795CAEC0 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CF713E7BFE3F6B5BAA3550E /* CoreGraphics.framework */; };
/* End PBXBuildFile section */
@@ -43,17 +47,21 @@
05A753935B6CB0316DA56D96 /* desktop.rs */ = {isa = PBXFileReference; path = desktop.rs; sourceTree = "<group>"; };
08DF9B2F499E1EB89EB39BC5 /* WorkspaceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceTests.swift; sourceTree = "<group>"; };
0CF713E7BFE3F6B5BAA3550E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
1CDE5C303A96423E2E6A194D /* settings.rs */ = {isa = PBXFileReference; path = settings.rs; sourceTree = "<group>"; };
23960010246A2A72E9940D3F /* kanbangit-native_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "kanbangit-native_iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2B96972F58CC158AB3DFF94A /* lib.rs */ = {isa = PBXFileReference; path = lib.rs; sourceTree = "<group>"; };
31630170C358EA8657E34854 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
47C531812A31207F97A89C5F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4C76059D31C50B198779A5F7 /* en.lproj */ = {isa = PBXFileReference; path = en.lproj; sourceTree = "<group>"; };
554AB059B4228085924F4959 /* WorkspacePolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspacePolicy.swift; sourceTree = "<group>"; };
5F196E34D1B9E14FBD7191F4 /* settings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = settings.m; sourceTree = "<group>"; };
5F71F06AB639140AB9714425 /* metadata.rs */ = {isa = PBXFileReference; path = metadata.rs; sourceTree = "<group>"; };
63685B1189795CAEA85F7AB7 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
6610D376CF901AC1733D394E /* updates.rs */ = {isa = PBXFileReference; path = updates.rs; sourceTree = "<group>"; };
7440C7F0426E6B3977DD1D94 /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
7676FB8CDCD1B07BCE413319 /* workspace-navigation.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "workspace-navigation.js"; sourceTree = "<group>"; };
8243D0C3821DAC731FECF105 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
8C0F963909020429B3D257D5 /* navigation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = navigation.m; sourceTree = "<group>"; };
91991DFDB0C064B06DF854ED /* libapp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp.a; sourceTree = "<group>"; };
92EBA86D28BBFD1C822CC6F6 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
946BA5CC3FD90AD90D101A36 /* kanbangit-native_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "kanbangit-native_iOS.entitlements"; sourceTree = "<group>"; };
@@ -61,6 +69,7 @@
9CAD0AE17A7966154CA29001 /* WorkspaceUITests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = WorkspaceUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A372EBDD353022BDB3E78972 /* WorkspaceTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = WorkspaceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
AEBAD9ABE758897C50BC1F2E /* locale.rs */ = {isa = PBXFileReference; path = locale.rs; sourceTree = "<group>"; };
BD66652CEDB88ADBAD0A87BA /* workspace-settings.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "workspace-settings.js"; sourceTree = "<group>"; };
CA65E67046326EA008175045 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
CAF08AD60D2F29A879CDAEBB /* ios.rs */ = {isa = PBXFileReference; path = ios.rs; sourceTree = "<group>"; };
D13B8D854BEB7757AB95231B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -110,6 +119,7 @@
8606F3EE5A736385061692EF /* Sources */,
335B1262A9019C70C7F887A5 /* src */,
140A7DB7E2461E64B1FBFA70 /* Tests */,
709BE6DF191B953724A55555 /* ui */,
3C9F31BB065F210267ECA390 /* UITests */,
3028C3786B437115B6486F1C /* Frameworks */,
59D2DE9FD94E6D2D64CB0117 /* Products */,
@@ -149,7 +159,10 @@
AEBAD9ABE758897C50BC1F2E /* locale.rs */,
7440C7F0426E6B3977DD1D94 /* main.rs */,
5F71F06AB639140AB9714425 /* metadata.rs */,
8C0F963909020429B3D257D5 /* navigation.m */,
E8BA104C81071623E1FF367D /* server.rs */,
5F196E34D1B9E14FBD7191F4 /* settings.m */,
1CDE5C303A96423E2E6A194D /* settings.rs */,
6610D376CF901AC1733D394E /* updates.rs */,
);
name = src;
@@ -183,6 +196,16 @@
name = Products;
sourceTree = "<group>";
};
709BE6DF191B953724A55555 /* ui */ = {
isa = PBXGroup;
children = (
7676FB8CDCD1B07BCE413319 /* workspace-navigation.js */,
BD66652CEDB88ADBAD0A87BA /* workspace-settings.js */,
);
name = ui;
path = ../../../ui;
sourceTree = "<group>";
};
8606F3EE5A736385061692EF /* Sources */ = {
isa = PBXGroup;
children = (
@@ -251,6 +274,7 @@
buildConfigurationList = 26F675D59EF454AE0D263F35 /* Build configuration list for PBXNativeTarget "WorkspaceTests" */;
buildPhases = (
2A0467365B852D44D1A9FD5B /* Sources */,
DC3295DE0893151786FEA37B /* Resources */,
);
buildRules = (
);
@@ -317,6 +341,17 @@
C53E7EC983C008DF98244C74 /* InfoPlist.strings in Resources */,
34C189B72A1B9EBE33D700D1 /* LaunchScreen.storyboard in Resources */,
A46344B6DF1B3A0F2798B751 /* Localizable.strings in Resources */,
99291BB0C1DE7714FB32F554 /* workspace-navigation.js in Resources */,
99D76D98A2416CAA713186C2 /* workspace-settings.js in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
DC3295DE0893151786FEA37B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0EC5CB2D7F774DBDCA69BCD8 /* workspace-navigation.js in Resources */,
EAD1D5A29503456CEED3B324 /* workspace-settings.js in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -416,7 +451,7 @@
CODE_SIGN_ENTITLEMENTS = "kanbangit-native_iOS/kanbangit-native_iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ZZX2KZGTHU;
ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -432,7 +467,7 @@
);
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
MARKETING_VERSION = 0.2.1;
MARKETING_VERSION = 0.2.6;
PRODUCT_BUNDLE_IDENTIFIER = de.kanbangit.ios;
PRODUCT_MODULE_NAME = KanbanGitNative;
PRODUCT_NAME = KanbanGit;
@@ -593,7 +628,7 @@
CODE_SIGN_ENTITLEMENTS = "kanbangit-native_iOS/kanbangit-native_iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ZZX2KZGTHU;
ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -609,7 +644,7 @@
);
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
MARKETING_VERSION = 0.2.1;
MARKETING_VERSION = 0.2.6;
PRODUCT_BUNDLE_IDENTIFIER = de.kanbangit.ios;
PRODUCT_MODULE_NAME = KanbanGitNative;
PRODUCT_NAME = KanbanGit;
+6 -2
View File
@@ -18,8 +18,8 @@ settingGroups:
DEVELOPMENT_TEAM: ZZX2KZGTHU
ENABLE_USER_SCRIPT_SANDBOXING: false
PRODUCT_BUNDLE_IDENTIFIER: de.kanbangit.ios
MARKETING_VERSION: "0.2.1"
CURRENT_PROJECT_VERSION: "1"
MARKETING_VERSION: "0.2.6"
CURRENT_PROJECT_VERSION: "6"
configs:
debug:
CODE_SIGN_IDENTITY: Apple Development
@@ -42,6 +42,8 @@ targets:
platform: iOS
sources:
- path: Sources
- path: ../../../ui/workspace-navigation.js
- path: ../../../ui/workspace-settings.js
- path: Assets.xcassets
- path: kanbangit-native_iOS
- path: LaunchScreen.storyboard
@@ -114,6 +116,8 @@ targets:
type: bundle.unit-test
platform: iOS
sources:
- path: ../../../ui/workspace-navigation.js
- path: ../../../ui/workspace-settings.js
- path: Tests
- path: Sources/kanbangit-native/WorkspacePolicy.swift
- path: Sources/kanbangit-native/WorkspaceViewController.swift
+131 -35
View File
@@ -17,6 +17,15 @@ struct Connection {
}
impl Connection {
#[cfg(target_os = "macos")]
fn allows_settings(&self, label: &str, url: &Url, main: bool) -> bool {
main && self.label.as_deref() == Some(label)
&& self
.server
.as_ref()
.is_some_and(|server| allows_server_navigation(&server.url, url))
}
fn begin_navigation(&mut self) -> u64 {
self.revision += 1;
self.phase = "connecting";
@@ -177,6 +186,7 @@ fn open_workspace(app: &AppHandle, input: &str) -> Result<(), &'static str> {
.center()
.visible(false)
.data_store_identifier(server.profile)
.initialization_script(include_str!("../../ui/workspace-navigation.js"))
.on_navigation(move |destination| {
if !allows_server_navigation(&server_url, destination) {
open_external(destination);
@@ -227,30 +237,84 @@ fn open_workspace(app: &AppHandle, input: &str) -> Result<(), &'static str> {
})
.build()
.map_err(|_| "connectionError")?;
#[cfg(target_os = "macos")]
window
.with_webview(|webview| unsafe {
unsafe extern "C" {
fn install_workspace_navigation(webview: *mut std::ffi::c_void);
}
install_workspace_navigation(webview.inner().cast());
})
.map_err(|_| "connectionError")?;
#[cfg(target_os = "macos")]
crate::settings::install(app, &window).map_err(|_| "connectionError")?;
let handle = app.clone();
window.on_window_event(move |event| {
if matches!(event, WindowEvent::Destroyed) {
let state = handle.state::<Mutex<Connection>>();
let current = {
let mut state = state.lock().unwrap();
if state.label.as_deref() == Some(&label) {
state.label = None;
state.ready = false;
state.revision += 1;
state.phase = "idle";
true
} else {
false
}
};
if let WindowEvent::CloseRequested { api, .. } = event {
let current = handle
.state::<Mutex<Connection>>()
.lock()
.unwrap()
.label
.as_deref()
== Some(&label);
if current {
show_launcher(&handle);
api.prevent_close();
handle.exit(0);
}
}
});
Ok(())
}
#[cfg(target_os = "macos")]
pub fn allows_settings(app: &AppHandle, label: &str, url: &Url, main: bool) -> bool {
let state = app.state::<Mutex<Connection>>();
let state = state.lock().unwrap();
state.allows_settings(label, url, main)
}
#[cfg(target_os = "macos")]
pub fn settings_action(
app: &AppHandle,
action: crate::settings::Action,
) -> Result<serde_json::Value, &'static str> {
use crate::settings::Action;
match action {
Action::GetState {} => {
let workspace = app
.state::<Mutex<Connection>>()
.lock()
.unwrap()
.server
.as_ref()
.map(|server| server.url.to_string())
.ok_or("bridgeUnavailable")?;
return Ok(
serde_json::json!({"apiVersion":1, "platform":"macos", "workspace":workspace,
"version":app.package_info().version.to_string(), "capabilities":["workspace", "updates"],
"updates":crate::updates::snapshot(app)}),
);
}
Action::SettingsReady {} => {}
Action::OpenSettings {} => show_launcher(app),
Action::SetWorkspace { server } => {
if let Err(error) = open_workspace(app, &server) {
app.state::<Mutex<Connection>>().lock().unwrap().phase = error;
show_launcher(app);
return Err(error);
}
}
Action::CheckForUpdates {} => crate::updates::check_inline(app),
Action::SetUpdatePreferences {
automatic,
interval_hours,
} => crate::updates::save_preferences(app, automatic, interval_hours)?,
Action::InstallUpdate { version } => crate::updates::install(app, Some(&version)),
}
Ok(serde_json::Value::Null)
}
fn handle_launcher_action(app: &AppHandle, destination: &Url) {
let result = match destination.path() {
"/action/updates" => {
@@ -308,6 +372,7 @@ pub fn builder() -> tauri::Builder<tauri::Wry> {
Ok(None) => (None, "idle"),
Err(_) => (None, "storageError"),
};
let startup_server = server.clone();
app.manage(Mutex::new(Connection {
server,
phase,
@@ -392,6 +457,7 @@ pub fn builder() -> tauri::Builder<tauri::Wry> {
.title(en::APP_NAME)
.inner_size(560.0, 720.0)
.min_inner_size(375.0, 640.0)
.visible(false)
.center()
.on_navigation(move |destination| {
if !allows_launcher_navigation(destination) {
@@ -414,25 +480,15 @@ pub fn builder() -> tauri::Builder<tauri::Wry> {
update_launcher(&app);
#[cfg(target_os = "macos")]
crate::updates::refresh(&app);
std::thread::spawn(move || {
let handle = app.clone();
let _ = app.run_on_main_thread(move || {
let server = handle
.state::<Mutex<Connection>>()
.lock()
.unwrap()
.server
.clone();
if let Some(server) = server {
if let Err(error) = open_workspace(&handle, server.url.as_str())
{
handle.state::<Mutex<Connection>>().lock().unwrap().phase =
error;
show_launcher(&handle);
}
}
});
});
let needs_setup = app
.state::<Mutex<Connection>>()
.lock()
.unwrap()
.server
.is_none();
if needs_setup {
show_launcher(&app);
}
}
})
.build()?;
@@ -440,9 +496,25 @@ pub fn builder() -> tauri::Builder<tauri::Wry> {
launcher.on_window_event(move |event| {
if let WindowEvent::CloseRequested { api, .. } = event {
api.prevent_close();
let _ = window.hide();
let has_workspace = window
.app_handle()
.state::<Mutex<Connection>>()
.lock()
.unwrap()
.ready;
if has_workspace {
let _ = window.hide();
} else {
window.app_handle().exit(0);
}
}
});
if let Some(server) = startup_server {
if let Err(error) = open_workspace(app.handle(), server.url.as_str()) {
app.state::<Mutex<Connection>>().lock().unwrap().phase = error;
show_launcher(app.handle());
}
}
Ok(())
})
}
@@ -451,6 +523,30 @@ pub fn builder() -> tauri::Builder<tauri::Wry> {
mod tests {
use super::*;
#[cfg(target_os = "macos")]
#[test]
fn settings_only_accept_the_current_workspace_main_frame() {
let mut state = Connection {
server: Some(Server::new(validate_url("https://example.com/app/").unwrap()).unwrap()),
label: Some("workspace-1".into()),
..Default::default()
};
let url = Url::parse("https://example.com/settings/app").unwrap();
assert!(state.allows_settings("workspace-1", &url, true));
assert!(!state.allows_settings("workspace-1", &url, false));
assert!(!state.allows_settings("workspace-0", &url, true));
for address in [
"https://evil.test",
"http://example.com",
"https://example.com:444/",
"file:///tmp/page",
] {
assert!(!state.allows_settings("workspace-1", &Url::parse(address).unwrap(), true));
}
state.label = Some("workspace-2".into());
assert!(!state.allows_settings("workspace-1", &url, true));
}
#[cfg(target_os = "macos")]
#[test]
fn about_shows_app_version_followed_by_the_actual_build_number() {
+3
View File
@@ -27,3 +27,6 @@ pub use updates::refresh_menu as refresh_update_menu_for_smoke_test;
pub fn run() {
builder().run(context()).expect("Could not start KanbanGit");
}
#[cfg(target_os = "macos")]
mod settings;
+6
View File
@@ -0,0 +1,6 @@
#import <WebKit/WebKit.h>
void install_workspace_navigation(void *pointer) {
WKWebView *webview = (__bridge WKWebView *)pointer;
webview.allowsBackForwardNavigationGestures = YES;
}
+47
View File
@@ -0,0 +1,47 @@
#import <WebKit/WebKit.h>
typedef char *(*SettingsCallback)(const char *, const char *, const char *, bool);
typedef void (*SettingsFree)(char *);
@interface KanbanSettingsHandler : NSObject <WKScriptMessageHandlerWithReply>
@property(nonatomic, weak) WKWebView *webview;
@property(nonatomic, copy) NSString *label;
@property(nonatomic) SettingsCallback callback;
@property(nonatomic) SettingsFree releaseReply;
@end
@implementation KanbanSettingsHandler
- (void)userContentController:(WKUserContentController *)controller
didReceiveScriptMessage:(WKScriptMessage *)message
replyHandler:(void (^)(id, NSString *))replyHandler {
if (message.webView != self.webview || !message.frameInfo.isMainFrame ||
![message.body isKindOfClass:NSString.class]) {
replyHandler(nil, @"untrustedFrame");
return;
}
char *reply = self.callback(self.label.UTF8String,
message.frameInfo.request.URL.absoluteString.UTF8String,
[(NSString *)message.body UTF8String], message.frameInfo.isMainFrame);
if (!reply) { replyHandler(nil, @"bridgeUnavailable"); return; }
NSString *value = [NSString stringWithUTF8String:reply];
self.releaseReply(reply);
replyHandler(value, nil);
}
@end
void install_workspace_settings(void *pointer, const char *label, const char *script,
SettingsCallback callback, SettingsFree releaseReply) {
WKWebView *webview = (__bridge WKWebView *)pointer;
KanbanSettingsHandler *handler = [KanbanSettingsHandler new];
handler.webview = webview;
handler.label = [NSString stringWithUTF8String:label];
handler.callback = callback;
handler.releaseReply = releaseReply;
[webview.configuration.userContentController addScriptMessageHandlerWithReply:handler
contentWorld:WKContentWorld.pageWorld name:@"kanbanSettings"];
[webview.configuration.userContentController addUserScript:[[WKUserScript alloc]
initWithSource:[NSString stringWithUTF8String:script]
injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]];
// The initial document may already have started loading before the handler is attached.
[webview evaluateJavaScript:[NSString stringWithUTF8String:script] completionHandler:nil];
}
+147
View File
@@ -0,0 +1,147 @@
use serde::Deserialize;
use serde_json::{json, Value};
use std::ffi::{c_char, CStr, CString};
use std::sync::OnceLock;
use tauri::{AppHandle, Url};
static APP: OnceLock<AppHandle> = OnceLock::new();
#[derive(Debug, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Request {
pub version: u8,
pub id: u64,
pub action: String,
pub payload: Value,
}
#[derive(Debug, Deserialize)]
#[serde(
tag = "action",
content = "payload",
rename_all = "camelCase",
deny_unknown_fields
)]
pub enum Action {
GetState {},
SettingsReady {},
OpenSettings {},
SetWorkspace {
server: String,
},
CheckForUpdates {},
SetUpdatePreferences {
automatic: bool,
#[serde(rename = "intervalHours")]
interval_hours: u64,
},
InstallUpdate {
version: String,
},
}
pub fn parse(value: &str) -> Result<(u64, Action), &'static str> {
if value.len() > 8192 {
return Err("invalidRequest");
}
let request: Request = serde_json::from_str(value).map_err(|_| "invalidRequest")?;
if request.version != 1 {
return Err("incompatibleVersion");
}
let action =
serde_json::from_value(json!({"action": request.action, "payload": request.payload}))
.map_err(|_| "invalidRequest")?;
Ok((request.id, action))
}
pub fn install(app: &AppHandle, window: &tauri::WebviewWindow) -> tauri::Result<()> {
let _ = APP.set(app.clone());
let label = CString::new(window.label()).unwrap();
let script = CString::new(include_str!("../../ui/workspace-settings.js")).unwrap();
window.with_webview(move |view| unsafe {
unsafe extern "C" {
fn install_workspace_settings(
view: *mut std::ffi::c_void,
label: *const c_char,
script: *const c_char,
callback: extern "C" fn(
*const c_char,
*const c_char,
*const c_char,
bool,
) -> *mut c_char,
free: extern "C" fn(*mut c_char),
);
}
install_workspace_settings(
view.inner().cast(),
label.as_ptr(),
script.as_ptr(),
receive,
release,
);
})
}
extern "C" fn release(value: *mut c_char) {
if !value.is_null() {
unsafe {
drop(CString::from_raw(value));
}
}
}
extern "C" fn receive(
label: *const c_char,
url: *const c_char,
body: *const c_char,
main: bool,
) -> *mut c_char {
let result = std::panic::catch_unwind(|| -> Result<Value, &'static str> {
if label.is_null() || url.is_null() || body.is_null() {
return Err("invalidRequest");
}
let label = unsafe { CStr::from_ptr(label) }
.to_str()
.map_err(|_| "invalidRequest")?;
let url = unsafe { CStr::from_ptr(url) }
.to_str()
.map_err(|_| "invalidRequest")?;
let body = unsafe { CStr::from_ptr(body) }
.to_str()
.map_err(|_| "invalidRequest")?;
let app = APP.get().ok_or("bridgeUnavailable")?;
let url = Url::parse(url).map_err(|_| "untrustedFrame")?;
if !crate::desktop::allows_settings(app, label, &url, main) {
return Err("untrustedFrame");
}
let (id, action) = parse(body)?;
let result = crate::desktop::settings_action(app, action)?;
Ok(json!({"id": id, "result": result}))
})
.unwrap_or(Err("bridgeUnavailable"));
let value = result.unwrap_or_else(|error| json!({"error": error}));
CString::new(value.to_string()).unwrap().into_raw()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn protocol_rejects_unknown_versions_actions_and_malformed_payloads() {
for value in [
r#"{"version":2,"id":1,"action":"getState","payload":{}}"#,
r#"{"version":1,"id":1,"action":"shell","payload":{}}"#,
r#"{"version":1,"id":1,"action":"setWorkspace","payload":{"server":3}}"#,
r#"{"version":1,"id":1,"action":"setUpdatePreferences","payload":{"automatic":"true","intervalHours":6}}"#,
r#"{"version":1,"id":1,"action":"installUpdate","payload":{"version":"1.2.3","url":"https://evil.test"}}"#,
] {
assert!(parse(value).is_err(), "{value}");
}
assert!(parse(&"x".repeat(8193)).is_err());
assert!(matches!(
parse(r#"{"version":1,"id":1,"action":"getState","payload":{}}"#),
Ok((1, Action::GetState {}))
));
}
}
+45 -14
View File
@@ -188,6 +188,12 @@ pub fn check(app: &AppHandle, manual: bool) {
if manual {
show(app);
}
check_with_mode(app, manual);
}
pub fn check_inline(app: &AppHandle) {
check_with_mode(app, true);
}
fn check_with_mode(app: &AppHandle, manual: bool) {
let begin = app
.state::<Mutex<State>>()
.lock()
@@ -297,7 +303,7 @@ fn verify_bundle(archive: &Path, directory: &Path, version: &str) -> Result<(),
command("/usr/bin/codesign", &["--verify", "--deep", "--strict", "-R", "=anchor apple generic and identifier \"de.kanbangit.desktop\" and certificate leaf[subject.OU] = \"ZZX2KZGTHU\" and certificate leaf[field.1.2.840.113635.100.6.1.13] exists", app.to_str().ok_or("verificationError")?])?;
Ok(())
}
fn install(app: &AppHandle, confirmed_version: Option<&str>) {
pub fn install(app: &AppHandle, confirmed_version: Option<&str>) {
let update = {
let state = app.state::<Mutex<State>>();
let mut state = state.lock().unwrap();
@@ -400,24 +406,49 @@ fn action(app: &AppHandle, url: &Url) {
fail(app, "preferencesError");
return;
}
let saved = (|| -> Result<(), Box<dyn std::error::Error>> {
let directory = app.path().app_config_dir()?;
fs::create_dir_all(&directory)?;
let pending = directory.join("update-preferences.pending");
fs::write(&pending, serde_json::to_vec(&preferences)?)?;
fs::rename(pending, directory.join("update-preferences.json"))?;
Ok(())
})();
if saved.is_err() {
fail(app, "preferencesError");
return;
if let Err(error) =
save_preferences(app, preferences.automatic, preferences.interval_hours)
{
fail(app, error);
}
app.state::<Mutex<State>>().lock().unwrap().view.preferences = preferences;
refresh(app);
}
_ => {}
}
}
pub fn snapshot(app: &AppHandle) -> serde_json::Value {
serde_json::to_value(&app.state::<Mutex<State>>().lock().unwrap().view).unwrap()
}
pub fn save_preferences(
app: &AppHandle,
automatic: bool,
interval_hours: u64,
) -> Result<(), &'static str> {
let preferences = Preferences {
automatic,
interval_hours,
};
if !preferences.valid() {
return Err("preferencesError");
}
let state = app.state::<Mutex<State>>();
let mut state = state.lock().unwrap();
if state.busy() {
return Err("updateBusy");
}
let saved = (|| -> Result<(), Box<dyn std::error::Error>> {
let directory = app.path().app_config_dir()?;
fs::create_dir_all(&directory)?;
let pending = directory.join("update-preferences.pending");
fs::write(&pending, serde_json::to_vec(&preferences)?)?;
fs::rename(pending, directory.join("update-preferences.json"))?;
Ok(())
})();
saved.map_err(|_| "preferencesError")?;
state.view.preferences = preferences;
drop(state);
refresh(app);
Ok(())
}
pub fn setup(app: &AppHandle) -> tauri::Result<()> {
app.plugin(
tauri_plugin_updater::Builder::new()
+5 -2
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "KanbanGit",
"version": "0.2.2",
"version": "0.2.6",
"identifier": "de.kanbangit.desktop",
"build": {
"frontendDist": "../ui"
@@ -25,7 +25,7 @@
],
"macOS": {
"minimumSystemVersion": "14.0",
"bundleVersion": "8",
"bundleVersion": "11",
"dmg": {
"windowSize": {
"width": 660,
@@ -40,6 +40,9 @@
"y": 170
}
}
},
"android": {
"versionCode": 2004
}
},
"plugins": {
+1 -1
View File
@@ -5,7 +5,7 @@
"iOS": {
"minimumSystemVersion": "17.0",
"developmentTeam": "ZZX2KZGTHU",
"bundleVersion": "2"
"bundleVersion": "6"
}
}
}
+125 -15
View File
@@ -6,15 +6,27 @@ fn main() {
};
use tauri::{webview::PageLoadEvent, Manager};
let startup = std::env::var("KANBANGIT_SMOKE_STARTUP").unwrap_or_default();
let online = startup == "online";
let needs_setup = matches!(startup.as_str(), "missing" | "invalid");
let passed = Arc::new(AtomicBool::new(false));
let stage = Arc::new(AtomicUsize::new(0));
let page_stage = stage.clone();
let result_passed = passed.clone();
let setup_passed = passed.clone();
let plugin = tauri::plugin::Builder::<tauri::Wry>::new("macos-smoke")
.setup(|app, _| {
.setup(move |app, _| {
let directory = app.path().app_config_dir()?;
std::fs::create_dir_all(&directory)?;
std::fs::write(directory.join("active-server"), "https://127.0.0.1:9/\n0123456789abcdef0123456789abcdef")?;
std::fs::write(directory.join("update-preferences.json"), r#"{"automatic":false,"intervalHours":6}"#)?;
if needs_setup {
if startup == "invalid" {
std::fs::write(directory.join("active-server"), "invalid configuration")?;
}
return Ok(());
}
let server = if online { "https://kanbangit.de/" } else { "https://127.0.0.1:9/" };
std::fs::write(directory.join("active-server"), format!("{server}\n0123456789abcdef0123456789abcdef"))?;
Ok(())
})
.js_init_script(r#"
@@ -27,7 +39,7 @@ fn main() {
}).observe(document, { subtree: true, attributes: true, childList: true });
}
"#)
.js_init_script("window.addEventListener('error', event => { location.href = 'tauri://localhost/__native_smoke_result?passed=false&error=' + encodeURIComponent(event.message || event.target.src); }, true);")
.js_init_script("window.addEventListener('error', event => { location.href = 'tauri://localhost/?smoke=result&passed=false&error=' + encodeURIComponent(event.message || event.target.src); }, true);")
.on_page_load(move |webview, payload| {
eprintln!("Smoke load: {} {:?} {}", webview.label(), payload.event(), payload.url());
@@ -35,6 +47,24 @@ fn main() {
return;
}
if webview.label() == "launcher" {
if needs_setup {
let app = webview.app_handle().clone();
let passed = setup_passed.clone();
std::thread::spawn(move || {
std::thread::sleep(std::time::Duration::from_millis(200));
let handle = app.clone();
app.run_on_main_thread(move || {
let launcher = handle.get_webview_window("launcher").unwrap();
assert!(launcher.is_visible().unwrap(), "First launch and invalid configuration must show setup");
assert!(!handle.webview_windows().keys().any(|label| label.starts_with("workspace-")));
passed.store(true, Ordering::SeqCst);
launcher.close().unwrap();
}).unwrap();
});
return;
}
assert!(!webview.app_handle().get_webview_window("launcher").unwrap().is_visible().unwrap(), "Saved startup must not show the native launcher window");
if online { return; }
webview.eval(r#"
(async () => {
const wait = async predicate => {
@@ -62,6 +92,7 @@ fn main() {
}
input.value = 'https://127.0.0.1:9/';
form.requestSubmit();
await wait(() => status.dataset.state === 'connecting');
await wait(() => status.dataset.state === 'connectionError');
if (input.value !== 'https://127.0.0.1:9/' || document.querySelector('.open-workspace').disabled) throw new Error('Offline recovery failed');
input.value = 'https://kanbangit.de/';
@@ -72,7 +103,7 @@ fn main() {
form.requestSubmit();
document.querySelector('#confirm-switch').click();
} catch (error) {
location.href = 'tauri://localhost/__native_smoke_result?passed=false&reason=' + encodeURIComponent(error.message);
location.href = 'tauri://localhost/?smoke=result&passed=false&reason=' + encodeURIComponent(error.message);
}
})();
"#).unwrap();
@@ -88,16 +119,34 @@ fn main() {
const rendered = document.querySelector('#app')?.innerText.trim().length > 100;
let denied = true;
for (const cmd of ['plugin:path|resolve_directory', 'plugin:window|get_all_windows']) {
try { await window.__TAURI_INTERNALS__.invoke(cmd); denied = false; }
try { await Promise.race([window.__TAURI_INTERNALS__.invoke(cmd), new Promise((_, reject) => setTimeout(() => reject(new Error('IPC timeout')), 3000))]); denied = false; }
catch (error) { denied = denied && String(error).includes('not allowed'); }
}
const api = window.kanbanNative;
if (api?.version !== 1) throw new Error('Versioned settings bridge missing');
const initial = await api.request('getState');
if (initial.platform !== 'macos' || initial.workspace !== 'https://kanbangit.de/' || !initial.capabilities.includes('updates')) throw new Error('Incorrect native settings');
await api.request('setUpdatePreferences', {automatic:false, intervalHours:24});
const changed = await api.request('getState');
if (changed.updates.preferences.automatic || changed.updates.preferences.intervalHours !== 24) throw new Error('Update preferences did not persist');
const invalid = await Promise.race([window.webkit.messageHandlers.kanbanSettings.postMessage(JSON.stringify({version:1,id:5,action:'shell',payload:{}})), new Promise((_, reject) => setTimeout(() => reject(new Error('Raw bridge timeout')), 3000))]);
if (!JSON.parse(invalid).error) throw new Error('Unknown native action accepted');
const frame = document.createElement('iframe');
document.body.append(frame);
if (!frame.contentWindow.webkit?.messageHandlers.kanbanSettings) throw new Error('Frame bridge fixture missing');
let frameDenied = false;
try { await Promise.race([frame.contentWindow.webkit.messageHandlers.kanbanSettings.postMessage(JSON.stringify({version:1,id:6,action:'getState',payload:{}})), new Promise((_, reject) => setTimeout(() => reject(new Error('Frame bridge timeout')), 3000))]); }
catch (error) { frameDenied = String(error).includes('untrustedFrame'); }
if (!frameDenied) throw new Error('Subframe settings access accepted');
const input = document.createElement('input');
input.id = 'kan52-unsaved'; input.value = 'unsaved input'; document.body.append(input);
document.cookie = 'kan52_fixture=isolated; Path=/; Secure; SameSite=Lax';
localStorage.setItem('kan52_fixture', 'isolated');
if (typeof window.__kanbanNavigation !== 'undefined') throw new Error('Custom gesture bridge must be removed');
if (getComputedStyle(document.documentElement).overscrollBehaviorY !== 'none' || getComputedStyle(document.documentElement).overscrollBehaviorX !== 'auto') throw new Error('Scroll boundary policy missing');
const ok = rendered && denied && typeof window.__TAURI__ === 'undefined' && location.pathname === '/login' && history.length === 1;
location.href = '/__native_smoke_result?stage=loaded&passed=' + ok;
})();
})().catch(error => { location.href = '/__native_smoke_result?passed=false&reason=' + encodeURIComponent(String(error)); });
"#).unwrap();
} else {
webview.eval(r#"
@@ -110,7 +159,7 @@ fn main() {
.on_navigation(move |webview, url| {
eprintln!("Smoke navigation: {} {}", webview.label(), url);
if url.path() != "/__native_smoke_result" {
if url.path() != "/__native_smoke_result" && !url.query_pairs().any(|(key, value)| key == "smoke" && value == "result") {
return true;
}
let success = url.query_pairs().any(|(key, value)| key == "passed" && value == "true");
@@ -129,17 +178,25 @@ fn main() {
location.href = '/__native_smoke_result?passed=false&stage=preservation';
}
"#).unwrap();
let launcher = app.get_webview_window("launcher").unwrap();
launcher.show().unwrap();
launcher.eval(r#"
document.querySelector('#server-url').value = 'https://kanbangit.de/login/';
document.querySelector('#server-form').requestSubmit();
document.querySelector('#confirm-switch').click();
window.eval(r#"
window.kanbanNative.request('setWorkspace', {server:'https://kanbangit.de/login/'}).catch(error => {
location.href = '/__native_smoke_result?passed=false&stage=settings-switch&reason=' + encodeURIComponent(error.message);
});
"#).unwrap();
});
} else {
result_passed.store(success, Ordering::SeqCst);
webview.app_handle().exit(if success { 0 } else { 1 });
if success {
let app = webview.app_handle().clone();
let label = webview.label().to_string();
let handle = app.clone();
app.run_on_main_thread(move || {
assert!(!handle.get_webview_window("launcher").unwrap().is_visible().unwrap());
handle.get_webview_window(&label).unwrap().close().unwrap();
}).unwrap();
} else {
webview.app_handle().exit(1);
}
}
false
})
@@ -150,6 +207,25 @@ fn main() {
.plugin(plugin)
.build(context)
.expect("The macOS application must start");
let visibility_handle = app.handle().clone();
let visibility_stage = stage.clone();
let visibility_check = std::thread::spawn(move || {
if needs_setup {
return;
}
for _ in 0..30 {
if visibility_stage.load(Ordering::SeqCst) > 0 {
break;
}
if let Some(launcher) = visibility_handle.get_webview_window("launcher") {
assert!(
!launcher.is_visible().unwrap(),
"Launcher flashed while the workspace was loading"
);
}
std::thread::sleep(std::time::Duration::from_millis(100));
}
});
let config_dir = app.path().app_config_dir().unwrap();
let handle = app.handle().clone();
std::thread::spawn(move || {
@@ -157,7 +233,41 @@ fn main() {
eprintln!("macOS smoke test timed out");
handle.exit(1);
});
app.run_return(|_, _| {});
let closed = Arc::new(AtomicBool::new(false));
let closed_result = closed.clone();
let exit_code = app.run_return(move |app, event| {
if let tauri::RunEvent::ExitRequested { code: Some(0), .. } = event {
closed_result.store(true, Ordering::SeqCst);
assert!(
needs_setup
|| !app
.get_webview_window("launcher")
.unwrap()
.is_visible()
.unwrap(),
"Closing the workspace must not reopen settings"
);
}
});
visibility_check.join().unwrap();
assert_eq!(exit_code, 0);
assert!(
closed.load(Ordering::SeqCst),
"The close button must quit the application"
);
if online {
assert!(std::fs::read_to_string(config_dir.join("active-server"))
.unwrap()
.starts_with("https://kanbangit.de/login/\n"));
let preferences: serde_json::Value = serde_json::from_str(
&std::fs::read_to_string(config_dir.join("update-preferences.json")).unwrap(),
)
.unwrap();
assert_eq!(
preferences,
serde_json::json!({"automatic": false, "intervalHours": 24})
);
}
let _ = std::fs::remove_dir_all(config_dir);
assert!(
passed.load(Ordering::SeqCst),
+43
View File
@@ -578,3 +578,46 @@ for (const change of [
assert.equal(existsSync(f.destination), false);
});
}
test('release versions agree across native manifests', () => {
const read = (path) => readFileSync(new URL(path, import.meta.url), 'utf8');
const config = JSON.parse(read('../src-tauri/tauri.conf.json'));
const ios = JSON.parse(read('../src-tauri/tauri.ios.conf.json'));
const packageInfo = JSON.parse(read('../package.json'));
assert.equal(packageInfo.version, config.version);
assert.equal(
read('../src-tauri/Cargo.toml').match(/^version = "([^"]+)"$/m)?.[1],
config.version,
);
assert.equal(
read('../src-tauri/Cargo.lock').match(
/name = "kanbangit-native"\nversion = "([^"]+)"/,
)?.[1],
config.version,
);
assert.equal(
read('../src-tauri/gen/apple/project.yml').match(
/MARKETING_VERSION: "([^"]+)"/,
)?.[1],
config.version,
);
assert.equal(
read('../src-tauri/gen/apple/project.yml').match(
/CURRENT_PROJECT_VERSION: "([^"]+)"/,
)?.[1],
ios.bundle.iOS.bundleVersion,
);
const project = read(
'../src-tauri/gen/apple/kanbangit-native.xcodeproj/project.pbxproj',
);
for (const [, version] of project.matchAll(
/MARKETING_VERSION = ([^;]+);/g,
)) {
assert.equal(version, config.version);
}
for (const [, version] of project.matchAll(
/CURRENT_PROJECT_VERSION = ([^;]+);/g,
)) {
assert.equal(version, ios.bundle.iOS.bundleVersion);
}
});
+94
View File
@@ -0,0 +1,94 @@
import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { createServer } from 'node:http';
import process from 'node:process';
const { chromium } = await import(
process.env.PLAYWRIGHT_MODULE ?? 'playwright'
);
const script = await readFile(
new URL('../ui/workspace-navigation.js', import.meta.url),
'utf8',
);
const server = createServer((request, response) => {
response.setHeader('Content-Type', 'text/html');
response.end(`<!doctype html><html><head><meta name="viewport" content="width=device-width,initial-scale=1"><style>
body { margin: 0; } #board { overflow-x: auto; width: 300px; height: 100px; }
#board > div { width: 1500px; height: 100px; } dialog { max-height: 200px; overflow-y: auto; }
</style></head><body><p id="page">${request.url}</p><input id="draft" value="retained"><div id="board"><div>Board columns</div></div>
<dialog><button id="close">Close</button><div style="height:1000px">Long dialog</div></dialog><div id="long"></div></body></html>`);
});
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
const browser = await chromium.launch({ channel: 'chrome', headless: true });
const page = await browser.newPage({ viewport: { width: 390, height: 844 } });
await page.addInitScript(script);
const root = `http://127.0.0.1:${server.address().port}`;
try {
await page.goto(root);
assert.equal(
await page.evaluate(() => typeof window.__kanbanNavigation),
'undefined',
);
await page.goto(`${root}/full-page`);
await page.goBack();
await page.waitForURL(`${root}/`);
await page.goForward();
await page.waitForURL(`${root}/full-page`);
await page.locator('#draft').fill('unsaved draft');
assert.equal(await page.locator('#draft').inputValue(), 'unsaved draft');
assert.equal(
await page.evaluate(
() =>
getComputedStyle(document.documentElement).overscrollBehaviorY,
),
'none',
);
assert.equal(
await page.evaluate(
() =>
getComputedStyle(document.documentElement).overscrollBehaviorX,
),
'auto',
);
assert.equal(
await page.evaluate(() => document.documentElement.scrollHeight),
844,
);
await page.mouse.move(380, 400);
await page.mouse.wheel(0, -1000);
await page.waitForTimeout(200);
assert.equal(await page.evaluate(() => scrollY), 0);
await page
.locator('#long')
.evaluate((element) => (element.style.height = '3000px'));
await page.mouse.wheel(0, 1000);
await page.waitForFunction(() => scrollY > 0);
await page.evaluate(() =>
scrollTo(0, document.documentElement.scrollHeight),
);
await page.mouse.wheel(0, 5000);
await page.waitForTimeout(200);
assert.equal(
await page.evaluate(() => scrollY + innerHeight),
await page.evaluate(() => document.documentElement.scrollHeight),
);
await page.evaluate(() => scrollTo(0, 0));
await page.locator('#board').hover();
await page.mouse.wheel(500, 0);
await page.waitForFunction(
() => document.querySelector('#board').scrollLeft > 0,
);
assert.equal(new URL(page.url()).pathname, '/full-page');
await page.locator('dialog').evaluate((dialog) => dialog.showModal());
await page.locator('dialog').hover();
await page.mouse.wheel(0, 500);
await page.waitForFunction(
() => document.querySelector('dialog').scrollTop > 0,
);
console.log(
'PASS: browser-owned history, editable input, short/long scroll bounds, horizontal board and dialog scrolling',
);
} finally {
await browser.close();
await new Promise((resolve) => server.close(resolve));
}
+74
View File
@@ -0,0 +1,74 @@
#import <AppKit/AppKit.h>
#import <WebKit/WebKit.h>
#import "../src-tauri/src/navigation.m"
static void check(BOOL condition, NSString *message) {
if (!condition) {
fprintf(stderr, "FAIL: %s\n", message.UTF8String);
exit(1);
}
}
static void waitUntil(BOOL (^condition)(void), NSString *message) {
NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:10];
while (!condition() && deadline.timeIntervalSinceNow > 0) {
[NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
}
check(condition(), message);
}
@interface WorkspacePages : NSObject <WKURLSchemeHandler, WKNavigationDelegate>
@property(nonatomic) NSUInteger finished;
@end
@implementation WorkspacePages
- (void)webView:(WKWebView *)webView startURLSchemeTask:(id<WKURLSchemeTask>)task {
NSData *body = [[NSString stringWithFormat:@"<html><body>%@<input value='draft'></body></html>", task.request.URL.path]
dataUsingEncoding:NSUTF8StringEncoding];
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:task.request.URL MIMEType:@"text/html"
expectedContentLength:body.length textEncodingName:@"utf-8"];
[task didReceiveResponse:response];
[task didReceiveData:body];
[task didFinish];
}
- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id<WKURLSchemeTask>)task {}
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
self.finished++;
}
@end
int main(void) {
@autoreleasepool {
[NSApplication sharedApplication];
WorkspacePages *pages = [WorkspacePages new];
WKWebViewConfiguration *configuration = [WKWebViewConfiguration new];
configuration.websiteDataStore = WKWebsiteDataStore.nonPersistentDataStore;
[configuration setURLSchemeHandler:pages forURLScheme:@"kanban-test"];
WKWebView *webview = [[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration];
webview.navigationDelegate = pages;
check(!webview.allowsBackForwardNavigationGestures, @"WebKit defaults to disabled gestures");
install_workspace_navigation((__bridge void *)webview);
install_workspace_navigation((__bridge void *)webview);
check(webview.allowsBackForwardNavigationGestures, @"The workspace must enable WebKit's interactive gestures");
check(webview.configuration.userContentController.userScripts.count == 0, @"Enabling gestures must not inject a history adapter");
check([webview goBack] == nil && [webview goForward] == nil, @"Empty history must not navigate");
[webview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"kanban-test://workspace/first"]]];
waitUntil(^BOOL { return pages.finished == 1; }, @"First page must load");
check(!webview.canGoBack && !webview.canGoForward, @"The first page must have no navigation target");
[webview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"kanban-test://workspace/second"]]];
waitUntil(^BOOL { return pages.finished == 2; }, @"Second page must load");
check(webview.canGoBack && !webview.canGoForward, @"Native history must retain the first page");
check([webview goBack] != nil, @"Native back navigation must start");
waitUntil(^BOOL { return pages.finished == 3; }, @"Native back navigation must complete");
check([webview.URL.path isEqualToString:@"/first"] && !webview.canGoBack && webview.canGoForward,
@"Back must restore the first page and retain forward history");
check([webview goBack] == nil, @"Back at the first page must leave it in place");
check([webview goForward] != nil, @"Native forward navigation must start");
waitUntil(^BOOL { return pages.finished == 4; }, @"Native forward navigation must complete");
check([webview.URL.path isEqualToString:@"/second"] && webview.canGoBack && !webview.canGoForward,
@"Forward must restore the second page");
check(webview.allowsBackForwardNavigationGestures, @"Native gestures must remain enabled across page navigation");
puts("PASS: WebKit interactive gesture configuration, full-page back/forward and empty history");
}
}
+58
View File
@@ -0,0 +1,58 @@
import assert from 'node:assert/strict';
import { spawnSync } from 'node:child_process';
import { mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import process from 'node:process';
import test from 'node:test';
import { fileURLToPath } from 'node:url';
test(
'WebKit owns interactive navigation and preserves native back/forward history',
{ skip: process.platform !== 'darwin' },
() => {
const directory = mkdtempSync(join(tmpdir(), 'kanbangit-navigation-'));
const binary = join(directory, 'navigation-test');
try {
const compile = spawnSync(
'xcrun',
[
'--sdk',
'macosx',
'clang',
'-fobjc-arc',
'-fblocks',
'-Wall',
'-Werror',
'-framework',
'AppKit',
'-framework',
'WebKit',
fileURLToPath(
new URL('./navigation-macos.m', import.meta.url),
),
'-o',
binary,
],
{ encoding: 'utf8', timeout: 30000 },
);
assert.equal(
compile.status,
0,
compile.stderr || compile.error?.message,
);
const result = spawnSync(binary, [], {
encoding: 'utf8',
timeout: 30000,
});
assert.equal(
result.status,
0,
result.stderr || result.error?.message,
);
assert.match(result.stdout, /PASS: WebKit/);
} finally {
rmSync(directory, { recursive: true, force: true });
}
},
);
+75
View File
@@ -0,0 +1,75 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import vm from 'node:vm';
import test from 'node:test';
const script = readFileSync(
new URL('../ui/workspace-settings.js', import.meta.url),
'utf8',
);
function context(platform = 'apple', frame = false, protocol = 'https:') {
const calls = [];
const window = { dispatchEvent() {} };
window.top = frame ? {} : window;
if (platform === 'apple') {
window.webkit = {
messageHandlers: {
kanbanSettings: {
postMessage: async (body) => {
const request = JSON.parse(body);
calls.push(request);
return JSON.stringify({
id: request.id,
result: { workspace: 'https://example.test/' },
});
},
},
},
};
}
vm.runInNewContext(script, {
window,
location: { protocol },
Event,
setTimeout,
clearTimeout,
});
return { window, calls };
}
test('Apple WebViews expose a versioned request/reply API without Tauri', async () => {
const { window, calls } = context('apple');
assert.equal(window.kanbanNative.version, 1);
assert.equal(
(await window.kanbanNative.request('getState')).workspace,
'https://example.test/',
);
assert.deepEqual(calls[0], {
version: 1,
id: 1,
action: 'getState',
payload: {},
});
await assert.rejects(
window.kanbanNative.request('shell'),
/unsupportedAction/,
);
assert.equal(calls.length, 1);
assert.equal(window.__TAURI_INTERNALS__, undefined);
assert.equal(context('apple', true).window.kanbanNative, undefined);
assert.equal(
context('apple', false, 'http:').window.kanbanNative,
undefined,
);
});
test('normal browsers receive no native settings API', () => {
assert.equal(context('browser').window.kanbanNative, undefined);
});
test('native errors reject the caller without losing future requests', async () => {
const { window } = context();
window.webkit.messageHandlers.kanbanSettings.postMessage = async () =>
JSON.stringify({ error: 'invalidServer' });
await assert.rejects(
window.kanbanNative.request('setWorkspace', { server: 'bad' }),
/invalidServer/,
);
});
+18
View File
@@ -0,0 +1,18 @@
(() => {
if (window.top !== window) {
return;
}
const constrainScroll = () => {
if (document.documentElement) {
document.documentElement.style.overscrollBehaviorY = 'none';
}
if (document.body) {
document.body.style.overscrollBehaviorY = 'none';
}
};
constrainScroll();
document.addEventListener('DOMContentLoaded', constrainScroll, {
once: true,
});
})();
+58
View File
@@ -0,0 +1,58 @@
(() => {
if (
window !== window.top ||
location.protocol !== 'https:' ||
window.kanbanNative
) {
return;
}
const handler = window.webkit?.messageHandlers?.kanbanSettings;
if (!handler) {
return;
}
let sequence = 0;
const actions = new Set([
'getState',
'settingsReady',
'openSettings',
'setWorkspace',
'checkForUpdates',
'setUpdatePreferences',
'installUpdate',
]);
Object.defineProperty(window, 'kanbanNative', {
value: Object.freeze({
version: 1,
async request(action, payload = {}) {
if (!actions.has(action)) {
throw new Error('unsupportedAction');
}
const message = JSON.stringify({
version: 1,
id: ++sequence,
action,
payload,
});
let timer;
try {
const response = await Promise.race([
handler.postMessage(message).then(JSON.parse),
new Promise((_, reject) => {
timer = setTimeout(
() => reject(new Error('bridgeTimeout')),
10000,
);
}),
]);
if (response.error) {
throw new Error(response.error);
}
return response.result;
} finally {
clearTimeout(timer);
}
},
}),
});
window.dispatchEvent(new Event('kanban-native-ready'));
})();
+9
View File
@@ -3,6 +3,10 @@ import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
import type { DefineComponent } from 'vue';
import { createApp, h } from 'vue';
import '../css/app.css';
import {
initializeNativeApp,
registerNativeRecovery,
} from '@/composables/useNativeApp';
import { createAppearance } from '@/composables/useAppearance';
import { createLocalization } from '@/lib/localization';
@@ -21,6 +25,11 @@ createInertiaApp({
.use(createLocalization(props.initialPage.props.localization))
.use(createAppearance(props.initialPage.props.appearance))
.mount(el);
registerNativeRecovery();
window.addEventListener('kanban-native-ready', () => {
void initializeNativeApp();
});
void initializeNativeApp();
},
progress: {
color: 'var(--primary)',
+136
View File
@@ -0,0 +1,136 @@
import { computed, readonly, ref } from 'vue';
import { isNativeAppState, updateIsBusy } from '@/lib/native-app';
import type { NativeAction, NativeAppState } from '@/types/native-app';
const state = ref<NativeAppState | null>(null);
const pending = ref(false);
const error = ref<string | null>(null);
let initializing = false;
let refreshing: Promise<void> | null = null;
async function request(
action: NativeAction,
payload: Record<string, unknown> = {},
) {
if (typeof window === 'undefined' || window.kanbanNative?.version !== 1) {
throw new Error('bridgeUnavailable');
}
let timer: ReturnType<typeof setTimeout> | undefined;
try {
return await Promise.race([
window.kanbanNative.request(action, payload),
new Promise<never>((_, reject) => {
timer = setTimeout(
() => reject(new Error('bridgeTimeout')),
11000,
);
}),
]);
} finally {
clearTimeout(timer);
}
}
async function refresh() {
if (refreshing) {
return refreshing;
}
refreshing = (async () => {
const result = await request('getState');
if (!isNativeAppState(result)) {
throw new Error('incompatibleVersion');
}
state.value = result;
})();
try {
await refreshing;
} finally {
refreshing = null;
}
}
export async function initializeNativeApp() {
if (
initializing ||
state.value ||
typeof window === 'undefined' ||
window.kanbanNative?.version !== 1
) {
return;
}
initializing = true;
try {
await refresh();
await request('settingsReady');
} catch {
state.value = null;
} finally {
initializing = false;
}
}
export function useNativeApp() {
const busy = computed(
() => pending.value || updateIsBusy(state.value?.updates),
);
async function act(
action: NativeAction,
payload: Record<string, unknown> = {},
) {
if (
pending.value ||
(updateIsBusy(state.value?.updates) && action !== 'openSettings')
) {
return false;
}
pending.value = true;
error.value = null;
try {
await request(action, payload);
if (action !== 'setWorkspace') {
await refresh();
}
return true;
} catch (cause) {
error.value =
cause instanceof Error ? cause.message : 'bridgeUnavailable';
return false;
} finally {
pending.value = false;
}
}
async function poll() {
try {
await refresh();
} catch (cause) {
error.value =
cause instanceof Error ? cause.message : 'bridgeUnavailable';
}
}
return { state: readonly(state), busy, error: readonly(error), act, poll };
}
export async function recoverNativeWorkspace() {
if (!state.value) {
return;
}
try {
await request('openSettings');
} catch {
/* Native recovery remains available from the app menu or toolbar. */
}
}
export function registerNativeRecovery() {
window.addEventListener('offline', () => {
void recoverNativeWorkspace();
});
document.addEventListener('inertia:exception', () => {
void recoverNativeWorkspace();
});
document.addEventListener('inertia:invalid', (event) => {
if (event.detail.response.status >= 400) {
void recoverNativeWorkspace();
}
});
}
@@ -6,11 +6,14 @@ import AppLogo from '@/components/AppLogo.vue';
import AppearanceTabs from '@/components/AppearanceTabs.vue';
import { Button } from '@/components/ui/button';
import { useLocalization } from '@/composables/useLocalization';
import { useNativeApp } from '@/composables/useNativeApp';
import { edit as editNativeApp } from '@/routes/native-app';
import { useMacDownload } from '@/composables/useMacDownload';
import { home } from '@/routes/index';
defineProps<{ title: string; description: string; icon?: Component }>();
const { t } = useLocalization();
const { state: nativeApp } = useNativeApp();
const { macDownloadUrl, showMacDownload } = useMacDownload();
</script>
@@ -25,6 +28,9 @@ const { macDownloadUrl, showMacDownload } = useMacDownload();
class="focus-visible:ring-ring/35 rounded-md outline-none focus-visible:ring-2"
><AppLogo
/></Link>
<Button v-if="nativeApp" as-child variant="outline" size="sm">
<Link :href="editNativeApp()">{{ t('nativeApp.title') }}</Link>
</Button>
<Button
v-if="showMacDownload"
as-child
+13
View File
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { Link } from '@inertiajs/vue3';
import {
AppWindow,
GitBranch,
KeyRound,
Palette,
@@ -10,6 +11,8 @@ import {
} from 'lucide-vue-next';
import { computed } from 'vue';
import { useCurrentUrl } from '@/composables/useCurrentUrl';
import { useNativeApp } from '@/composables/useNativeApp';
import { edit as editNativeApp } from '@/routes/native-app';
import { useLocalization } from '@/composables/useLocalization';
import { toUrl } from '@/lib/utils';
import { edit as editAppearance } from '@/routes/appearance/index';
@@ -20,6 +23,7 @@ import { edit as editSecurity } from '@/routes/security/index';
import type { NavItem } from '@/types';
const { t } = useLocalization();
const { state: nativeApp } = useNativeApp();
const sidebarNavItems = computed<NavItem[]>(() => [
{
title: t('navigation.profile'),
@@ -41,6 +45,15 @@ const sidebarNavItems = computed<NavItem[]>(() => [
href: editApplications(),
icon: KeyRound,
},
...(nativeApp.value
? [
{
title: t('nativeApp.title'),
href: editNativeApp(),
icon: AppWindow,
},
]
: []),
{
title: t('navigation.appearance'),
href: editAppearance(),
+69
View File
@@ -0,0 +1,69 @@
import type { NativeAppState, NativeUpdates } from '@/types/native-app';
export function isNativeAppState(value: unknown): value is NativeAppState {
if (!value || typeof value !== 'object') {
return false;
}
const state = value as NativeAppState;
if (
state.apiVersion !== 1 ||
!['macos', 'ios'].includes(state.platform) ||
typeof state.version !== 'string' ||
typeof state.workspace !== 'string' ||
!Array.isArray(state.capabilities) ||
!state.capabilities.includes('workspace')
) {
return false;
}
try {
if (new URL(state.workspace).protocol !== 'https:') {
return false;
}
} catch {
return false;
}
if (!state.capabilities.includes('updates')) {
return state.updates === undefined;
}
if (state.platform !== 'macos' || !state.updates) {
return false;
}
const updates = state.updates;
return (
[
'idle',
'checking',
'available',
'current',
'downloading',
'verifying',
'installing',
'restarting',
'error',
].includes(updates.phase) &&
typeof updates.currentVersion === 'string' &&
typeof updates.build === 'string' &&
(updates.version === null || typeof updates.version === 'string') &&
(updates.notes === null || typeof updates.notes === 'string') &&
(updates.error === null || typeof updates.error === 'string') &&
Number.isFinite(updates.downloaded) &&
updates.downloaded >= 0 &&
(updates.total === null ||
(Number.isFinite(updates.total) && updates.total >= 0)) &&
typeof updates.preferences?.automatic === 'boolean' &&
[1, 6, 24].includes(updates.preferences.intervalHours)
);
}
export function updateIsBusy(updates?: NativeUpdates): boolean {
return (
!!updates &&
[
'checking',
'downloading',
'verifying',
'installing',
'restarting',
].includes(updates.phase)
);
}
+59
View File
@@ -1,4 +1,63 @@
export const en = {
'nativeApp.title': 'App',
'nativeApp.description': 'Manage the KanbanGit app on this device.',
'nativeApp.workspace': 'Workspace',
'nativeApp.server': 'Server address',
'nativeApp.serverHelp':
'Use an HTTPS installation address without login details, a query or a fragment. This choice is saved on this device.',
'nativeApp.switch': 'Change workspace',
'nativeApp.confirmSwitch': 'Switch workspace',
'nativeApp.switchWarning':
'Switching closes your current workspace and discards unsaved inputs. You will sign in separately on the new server.',
'nativeApp.cancel': 'Cancel',
'nativeApp.unavailable':
'App settings are available in a compatible KanbanGit app.',
'nativeApp.updates': 'Software updates',
'nativeApp.version': 'Installed version {version} (build {build})',
'nativeApp.mobileVersion': 'App version {version}',
'nativeApp.availableVersion': 'Available version: {version}',
'nativeApp.automatic': 'Automatically check for updates',
'nativeApp.interval': 'Check interval',
'nativeApp.hours': 'Every {hours} hours',
'nativeApp.updateHelp':
'Checks run at startup and at the selected interval. Installation and restart require your confirmation.',
'nativeApp.check': 'Check for updates now',
'nativeApp.install': 'Install update',
'nativeApp.installRestart': 'Install and restart',
'nativeApp.installWarning':
'Save your work before continuing. KanbanGit will download and verify the update, then install it and restart. Unsaved inputs will be lost. Your workspace settings and stored sessions are kept.',
'nativeApp.progress': 'Update progress',
'nativeApp.recovery': 'Open native server settings',
'nativeApp.bridgeError':
'The app connection is unavailable or incompatible. Open the native server settings to reconnect, or restart the app.',
'nativeApp.invalidServer':
'Enter a valid HTTPS installation address without login details, a query or a fragment.',
'nativeApp.storageError':
'The workspace could not be saved. Check local storage permissions and try again.',
'nativeApp.networkError':
'The update service or download is unreachable. Check your connection and try again.',
'nativeApp.metadataError':
'The update information is invalid or does not match this Mac. Try again later.',
'nativeApp.signatureError':
'The update signature could not be verified. Nothing was installed. Try again or contact support.',
'nativeApp.verificationError':
'The downloaded app does not match its announced version or publisher. Nothing was installed.',
'nativeApp.installationError':
'The update could not be installed. Move KanbanGit to Applications and check disk space and permissions.',
'nativeApp.preferencesError':
'Update preferences could not be saved. Check local storage permissions and try again.',
'nativeApp.updateBusy':
'An update operation is already running. Please wait.',
'nativeApp.phase.idle': 'Check for the latest stable version of KanbanGit.',
'nativeApp.phase.checking': 'Checking for updates…',
'nativeApp.phase.available': 'A new version of KanbanGit is available.',
'nativeApp.phase.current': 'KanbanGit is up to date.',
'nativeApp.phase.downloading': 'Downloading update…',
'nativeApp.phase.verifying': 'Verifying update…',
'nativeApp.phase.installing': 'Installing update…',
'nativeApp.phase.restarting': 'Restarting KanbanGit…',
'nativeApp.phase.error': 'The update could not be completed.',
'projectAccess.pageTitle': '{project} · Project access',
'projectAccess.title': 'Project access',
'projectAccess.description':
+313
View File
@@ -0,0 +1,313 @@
<script setup lang="ts">
import { Head, Link, usePage } from '@inertiajs/vue3';
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { useLocalization } from '@/composables/useLocalization';
import { useNativeApp } from '@/composables/useNativeApp';
import AppLayout from '@/layouts/AppLayout.vue';
import SettingsLayout from '@/layouts/settings/Layout.vue';
import { home } from '@/routes';
import { edit } from '@/routes/native-app';
import type { TranslationKey } from '@/types/localization';
const { t } = useLocalization();
const { state, busy, error, act, poll } = useNativeApp();
const page = usePage();
const signedIn = computed(() => !!page.props.auth.user);
const address = ref('');
const confirmSwitch = ref(false);
const confirmInstall = ref(false);
const updates = computed(() => state.value?.updates);
watch(
() => updates.value?.version,
() => {
confirmInstall.value = false;
},
);
const breadcrumbs = computed(() => [
{ title: t('nativeApp.title'), href: edit() },
]);
watch(
() => state.value?.workspace,
(workspace) => {
if (workspace) {
address.value = workspace;
}
},
{ immediate: true },
);
watch(address, () => {
confirmSwitch.value = false;
});
const knownErrors: Record<string, TranslationKey> = {
invalidServer: 'nativeApp.invalidServer',
storageError: 'nativeApp.storageError',
networkError: 'nativeApp.networkError',
metadataError: 'nativeApp.metadataError',
signatureError: 'nativeApp.signatureError',
verificationError: 'nativeApp.verificationError',
installationError: 'nativeApp.installationError',
preferencesError: 'nativeApp.preferencesError',
updateBusy: 'nativeApp.updateBusy',
};
const errorMessage = computed(() => {
const value = error.value ?? updates.value?.error;
return value ? t(knownErrors[value] ?? 'nativeApp.bridgeError') : null;
});
const progress = computed(() =>
updates.value?.total
? Math.min(
100,
Math.round(
(updates.value.downloaded / updates.value.total) * 100,
),
)
: undefined,
);
let timer: ReturnType<typeof setTimeout> | undefined;
let active = true;
async function refresh() {
if (state.value) {
await poll();
}
if (active) {
timer = setTimeout(refresh, 1500);
}
}
onMounted(() => {
void refresh();
});
onUnmounted(() => {
active = false;
clearTimeout(timer);
});
async function switchWorkspace() {
if (await act('setWorkspace', { server: address.value })) {
confirmSwitch.value = false;
}
}
async function installUpdate() {
const version = updates.value?.version;
if (version && (await act('installUpdate', { version }))) {
confirmInstall.value = false;
}
}
function setAutomatic(event: Event) {
void act('setUpdatePreferences', {
automatic: (event.target as HTMLInputElement).checked,
intervalHours: updates.value?.preferences.intervalHours,
});
}
function setIntervalHours(event: Event) {
void act('setUpdatePreferences', {
automatic: updates.value?.preferences.automatic,
intervalHours: Number((event.target as HTMLSelectElement).value),
});
}
</script>
<template>
<component
:is="signedIn ? AppLayout : 'main'"
:breadcrumbs="breadcrumbs"
class="min-h-dvh"
>
<Head :title="t('nativeApp.title')" />
<component
:is="signedIn ? SettingsLayout : 'div'"
:class="signedIn ? '' : 'mx-auto grid max-w-3xl gap-6 p-6'"
>
<Link
v-if="!signedIn"
:href="home()"
class="text-primary underline"
>{{ t('auth.home') }}</Link
>
<header class="grid gap-2">
<h2 class="text-title">{{ t('nativeApp.title') }}</h2>
<p class="text-muted-foreground">
{{ t('nativeApp.description') }}
</p>
</header>
<p v-if="!state" role="status">{{ t('nativeApp.unavailable') }}</p>
<template v-else>
<form class="grid gap-4" @submit.prevent="confirmSwitch = true">
<h3 class="text-lg font-semibold">
{{ t('nativeApp.workspace') }}
</h3>
<Label for="native-server">{{
t('nativeApp.server')
}}</Label>
<Input
id="native-server"
v-model="address"
type="url"
required
autocomplete="url"
:disabled="busy"
/>
<p class="text-muted-foreground text-sm">
{{ t('nativeApp.serverHelp') }}
</p>
<Button
type="submit"
:disabled="busy || address === state.workspace"
class="justify-self-start"
>{{ t('nativeApp.switch') }}</Button
>
<div
v-if="confirmSwitch"
class="grid gap-3 rounded-lg border p-4"
role="group"
:aria-label="t('nativeApp.switch')"
>
<p>{{ t('nativeApp.switchWarning') }}</p>
<div class="flex flex-wrap gap-2">
<Button
type="button"
:disabled="busy"
@click="switchWorkspace"
>{{ t('nativeApp.confirmSwitch') }}</Button
>
<Button
type="button"
variant="outline"
:disabled="busy"
@click="confirmSwitch = false"
>{{ t('nativeApp.cancel') }}</Button
>
</div>
</div>
</form>
<section
v-if="updates"
class="grid gap-4 border-t pt-6"
aria-labelledby="native-updates"
>
<h3 id="native-updates" class="text-lg font-semibold">
{{ t('nativeApp.updates') }}
</h3>
<p>
{{
t('nativeApp.version', {
version: updates.currentVersion,
build: updates.build,
})
}}
</p>
<p role="status" aria-live="polite">
{{ t(`nativeApp.phase.${updates.phase}`) }}
</p>
<template
v-if="
['downloading', 'verifying', 'installing'].includes(
updates.phase,
)
"
>
<progress
:value="progress"
max="100"
class="w-full"
:aria-label="t('nativeApp.progress')"
/>
<span v-if="progress !== undefined"
>{{ progress }}%</span
>
</template>
<Label class="flex items-center gap-3">
<input
type="checkbox"
:checked="updates.preferences.automatic"
:disabled="busy"
@change="setAutomatic"
/>
{{ t('nativeApp.automatic') }}
</Label>
<Label for="native-update-interval">{{
t('nativeApp.interval')
}}</Label>
<select
id="native-update-interval"
:value="updates.preferences.intervalHours"
:disabled="busy"
class="bg-background rounded-md border p-2"
@change="setIntervalHours"
>
<option
v-for="hours in [1, 6, 24]"
:key="hours"
:value="hours"
>
{{ t('nativeApp.hours', { hours }) }}
</option>
</select>
<p class="text-muted-foreground text-sm">
{{ t('nativeApp.updateHelp') }}
</p>
<Button
:disabled="busy"
class="justify-self-start"
@click="act('checkForUpdates')"
>{{ t('nativeApp.check') }}</Button
>
<template v-if="updates.version">
<p>
{{
t('nativeApp.availableVersion', {
version: updates.version,
})
}}
</p>
<p v-if="updates.notes" class="whitespace-pre-wrap">
{{ updates.notes }}
</p>
<Button
:disabled="busy"
class="justify-self-start"
@click="confirmInstall = true"
>{{ t('nativeApp.install') }}</Button
>
<div
v-if="confirmInstall"
class="grid gap-3 rounded-lg border p-4"
role="group"
:aria-label="t('nativeApp.install')"
>
<p>{{ t('nativeApp.installWarning') }}</p>
<div class="flex flex-wrap gap-2">
<Button
:disabled="busy"
@click="installUpdate"
>{{ t('nativeApp.installRestart') }}</Button
>
<Button
variant="outline"
:disabled="busy"
@click="confirmInstall = false"
>{{ t('nativeApp.cancel') }}</Button
>
</div>
</div>
</template>
</section>
<p v-else class="text-muted-foreground text-sm">
{{
t('nativeApp.mobileVersion', { version: state.version })
}}
</p>
<p v-if="errorMessage" class="text-destructive" role="alert">
{{ errorMessage }}
</p>
<Button
variant="outline"
class="justify-self-start"
@click="act('openSettings')"
>{{ t('nativeApp.recovery') }}</Button
>
</template>
</component>
</component>
</template>
+7
View File
@@ -0,0 +1,7 @@
import type { NativeBridge } from './native-app';
declare global {
interface Window {
kanbanNative?: NativeBridge;
}
}
+44
View File
@@ -0,0 +1,44 @@
export type NativeUpdatePhase =
| 'idle'
| 'checking'
| 'available'
| 'current'
| 'downloading'
| 'verifying'
| 'installing'
| 'restarting'
| 'error';
export type NativeUpdates = {
phase: NativeUpdatePhase;
currentVersion: string;
build: string;
version: string | null;
notes: string | null;
downloaded: number;
total: number | null;
error: string | null;
preferences: { automatic: boolean; intervalHours: 1 | 6 | 24 };
};
export type NativeAppState = {
apiVersion: 1;
platform: 'macos' | 'ios';
version: string;
workspace: string;
capabilities: string[];
updates?: NativeUpdates;
};
export type NativeAction =
| 'getState'
| 'settingsReady'
| 'openSettings'
| 'setWorkspace'
| 'checkForUpdates'
| 'setUpdatePreferences'
| 'installUpdate';
export type NativeBridge = {
version: number;
request: (
action: NativeAction,
payload?: Record<string, unknown>,
) => Promise<unknown>;
};
+4
View File
@@ -6,6 +6,10 @@ use App\Http\Controllers\Settings\SecurityController;
use App\Http\Controllers\Settings\UserApplicationController;
use Illuminate\Support\Facades\Route;
Route::prefix('settings')->group(function (): void {
Route::inertia('app', 'settings/App')->name('native-app.edit');
});
Route::middleware('auth')
->prefix('settings')
->group(function (): void {
@@ -0,0 +1,33 @@
<?php
namespace Tests\Feature\Settings;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Inertia\Testing\AssertableInertia as Assert;
use Symfony\Component\Process\Process;
use Tests\TestCase;
class NativeAppSettingsTest extends TestCase
{
use RefreshDatabase;
public function test_app_settings_are_accessible_before_and_after_login_without_server_side_device_state(): void
{
$this->withoutVite();
$this->get(route('native-app.edit'))->assertOk()->assertInertia(fn (Assert $page) => $page
->component('settings/App')->where('auth.user', null)->missing('workspace')->missing('updates'));
$this->actingAs(User::factory()->unverified()->create(['must_change_password_on_next_login' => true]))
->get(route('native-app.edit'))->assertOk()->assertInertia(fn (Assert $page) => $page
->component('settings/App')->missing('workspace')->missing('updates'));
}
public function test_native_capabilities_rendering_and_actions(): void
{
$process = new Process(['node', 'tests/Fixtures/native-app.mjs'], base_path());
$process->setTimeout(60);
$process->run();
$this->assertTrue($process->isSuccessful(), $process->getOutput().$process->getErrorOutput());
$this->assertStringContainsString('Native app settings checks passed.', $process->getOutput());
}
}
+248
View File
@@ -0,0 +1,248 @@
import assert from 'node:assert/strict';
import { fileURLToPath } from 'node:url';
import vue from '@vitejs/plugin-vue';
import { createServer } from 'vite';
import { createSSRApp, h } from 'vue';
import { renderToString } from 'vue/server-renderer';
import { createInertiaApp } from '@inertiajs/vue3';
const server = await createServer({
configFile: false,
plugins: [vue()],
resolve: {
alias: {
'@': fileURLToPath(new URL('../../resources/js', import.meta.url)),
},
},
server: { middlewareMode: true, hmr: false, watch: null },
appType: 'custom',
});
try {
const { createLocalization } = await server.ssrLoadModule(
'/resources/js/lib/localization.ts',
);
const { createAppearance } = await server.ssrLoadModule(
'/resources/js/composables/useAppearance.ts',
);
const { initializeNativeApp, useNativeApp, registerNativeRecovery } =
await server.ssrLoadModule('/resources/js/composables/useNativeApp.ts');
const { isNativeAppState } = await server.ssrLoadModule(
'/resources/js/lib/native-app.ts',
);
const App = (
await server.ssrLoadModule('/resources/js/pages/settings/App.vue')
).default;
const Appearance = (
await server.ssrLoadModule(
'/resources/js/pages/settings/Appearance.vue',
)
).default;
const render = async (signedIn = false, component = App) => {
const result = await createInertiaApp({
page: {
component: 'settings/App',
url: '/settings/app',
version: null,
clearHistory: false,
encryptHistory: false,
props: {
name: 'KanbanGit',
errors: {},
sidebarOpen: true,
appearance: 'system',
auth: {
user: signedIn
? { name: 'Test', email: 'test@example.test' }
: null,
permissions: {
globalAdmin: false,
projectCreate: false,
canManageTeams: false,
},
},
navigation: { project: null },
},
},
resolve: () => component,
render: renderToString,
setup: ({ App, props, plugin }) =>
createSSRApp({ render: () => h(App, props) })
.use(plugin)
.use(createLocalization())
.use(createAppearance('system')),
});
return result.body;
};
await initializeNativeApp();
assert.match(await render(), /compatible KanbanGit app/);
assert.doesNotMatch(
await render(true, Appearance),
/href="\/settings\/app"/,
);
let calls = [];
let current = {
apiVersion: 1,
platform: 'ios',
version: '1.0.0',
workspace: 'https://example.test/app/',
capabilities: ['workspace'],
};
const bridge = {
version: 2,
request: async (action, payload) => {
calls.push([action, payload]);
return structuredClone(current);
},
};
globalThis.window = { kanbanNative: bridge };
await initializeNativeApp();
assert.equal(calls.length, 0);
bridge.version = 1;
current.apiVersion = 2;
await initializeNativeApp();
assert.equal(useNativeApp().state.value, null);
current.apiVersion = 1;
await initializeNativeApp();
assert.equal(calls.at(-1)[0], 'settingsReady');
delete globalThis.window;
let html = await render();
assert.match(html, /value="https:\/\/example.test\/app\/"/);
assert.doesNotMatch(
html,
/Check for updates now|Install update|native-update-interval/,
);
assert.match(await render(true, Appearance), /href="\/settings\/app"/);
current = {
...current,
platform: 'macos',
capabilities: ['workspace', 'updates'],
updates: {
phase: 'available',
currentVersion: '1.0.0',
build: '1',
version: '1.1.0',
notes: '<script>bad()</script>',
downloaded: 0,
total: null,
error: null,
preferences: { automatic: true, intervalHours: 6 },
},
};
globalThis.window = { kanbanNative: bridge };
await useNativeApp().poll();
delete globalThis.window;
html = await render(true);
assert.match(html, /Check for updates now/);
assert.match(html, /Install update/);
assert.match(html, /&lt;script&gt;bad/);
assert.doesNotMatch(html, /<script>bad/);
assert.match(html, /id="native-update-interval"[^>]*value="6"/);
for (const phase of [
'checking',
'downloading',
'verifying',
'installing',
'restarting',
'error',
'current',
]) {
current.updates.phase = phase;
current.updates.downloaded = 40;
current.updates.total = 100;
globalThis.window = { kanbanNative: bridge };
await useNativeApp().poll();
if (
[
'checking',
'downloading',
'verifying',
'installing',
'restarting',
].includes(phase)
) {
const before = calls.length;
assert.equal(await useNativeApp().act('checkForUpdates'), false);
assert.equal(calls.length, before);
}
delete globalThis.window;
html = await render();
if (phase === 'downloading') {
assert.match(html, /40%/);
}
}
for (const invalid of [
null,
{},
{ ...current, apiVersion: 2 },
{ ...current, platform: 'unsupported' },
{ ...current, updates: { ...current.updates, phase: 'madeUp' } },
]) {
assert.equal(isNativeAppState(invalid), false);
}
globalThis.window = { kanbanNative: bridge };
calls = [];
const listeners = {};
globalThis.window.addEventListener = (name, callback) => {
listeners[name] = callback;
};
globalThis.document = {
addEventListener: (name, callback) => {
listeners[name] = callback;
},
};
registerNativeRecovery();
for (const name of ['offline', 'inertia:exception', 'inertia:invalid']) {
listeners[name]({ detail: { response: { status: 503 } } });
await new Promise((resolve) => setTimeout(resolve, 0));
assert.equal(calls.at(-1)[0], 'openSettings');
}
const count = calls.length;
listeners['inertia:invalid']({ detail: { response: { status: 200 } } });
assert.equal(calls.length, count);
delete globalThis.document;
calls = [];
await useNativeApp().act('setUpdatePreferences', {
automatic: false,
intervalHours: 24,
});
assert.deepEqual(calls[0], [
'setUpdatePreferences',
{ automatic: false, intervalHours: 24 },
]);
await useNativeApp().act('setWorkspace', { server: 'https://new.test/' });
assert.deepEqual(calls.at(-1), [
'setWorkspace',
{ server: 'https://new.test/' },
]);
let resolve;
bridge.request = () =>
new Promise((done) => {
resolve = done;
});
const first = useNativeApp().act('setWorkspace', {
server: 'https://new.test/',
});
assert.equal(
await useNativeApp().act('setWorkspace', {
server: 'https://duplicate.test/',
}),
false,
);
resolve(null);
await first;
bridge.request = async () => {
throw new Error('invalidServer');
};
assert.equal(
await useNativeApp().act('setWorkspace', {
server: 'http://invalid.test',
}),
false,
);
delete globalThis.window;
assert.match(await render(), /Enter a valid HTTPS/);
console.log('Native app settings checks passed.');
} finally {
delete globalThis.window;
await server.close();
}