接入原生壳应用角标能力
新增 HostBridge app.setBadgeCount 契约和 H5 能力门控 Expo 壳按平台声明能力并在 iOS 调用系统角标 API Tauri 壳通过主窗口设置任务栏角标并校验 payload 补齐角标能力测试、漂移检查和架构文档
This commit is contained in:
@@ -18,6 +18,7 @@ const EXPORT_TEXT_MAX_BYTES: usize = 5 * 1024 * 1024;
|
||||
const EXPORT_IMAGE_MAX_BYTES: usize = 5 * 1024 * 1024;
|
||||
const EXPORT_FILE_NAME_FALLBACK: &str = "genarrative-export.txt";
|
||||
const EXPORT_FILE_NAME_MAX_LENGTH: usize = 120;
|
||||
const BADGE_COUNT_MAX: i64 = 99999;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
@@ -83,6 +84,7 @@ fn capabilities() -> Vec<&'static str> {
|
||||
"navigation.openNativePage",
|
||||
"app.openExternalUrl",
|
||||
"app.setTitle",
|
||||
"app.setBadgeCount",
|
||||
"clipboard.writeText",
|
||||
"file.exportText",
|
||||
"file.exportImage",
|
||||
@@ -195,6 +197,31 @@ fn normalize_window_title(raw_title: &str) -> Option<String> {
|
||||
Some(title.chars().take(80).collect())
|
||||
}
|
||||
|
||||
fn badge_count_payload(request: &HostBridgeRequest) -> Result<Option<i64>, HostBridgeResponse> {
|
||||
let count = request
|
||||
.payload
|
||||
.as_ref()
|
||||
.and_then(|value| value.get("count"))
|
||||
.and_then(Value::as_i64)
|
||||
.ok_or_else(|| {
|
||||
failed(
|
||||
request.id.clone(),
|
||||
"invalid_request",
|
||||
"count must be an integer between 0 and 99999",
|
||||
)
|
||||
})?;
|
||||
|
||||
if !(0..=BADGE_COUNT_MAX).contains(&count) {
|
||||
return Err(failed(
|
||||
request.id.clone(),
|
||||
"invalid_request",
|
||||
"count must be an integer between 0 and 99999",
|
||||
));
|
||||
}
|
||||
|
||||
Ok(if count == 0 { None } else { Some(count) })
|
||||
}
|
||||
|
||||
fn normalize_export_file_name(raw_file_name: &str) -> String {
|
||||
let mut file_name = String::new();
|
||||
let mut last_was_space = false;
|
||||
@@ -286,7 +313,10 @@ fn export_image_extension(mime_type: &str) -> Option<&'static str> {
|
||||
fn normalize_export_image_file_name(raw_file_name: &str, mime_type: &str) -> String {
|
||||
let mut file_name = normalize_export_file_name(raw_file_name);
|
||||
let extension = export_image_extension(mime_type).unwrap_or("png");
|
||||
if !file_name.to_ascii_lowercase().ends_with(&format!(".{}", extension)) {
|
||||
if !file_name
|
||||
.to_ascii_lowercase()
|
||||
.ends_with(&format!(".{}", extension))
|
||||
{
|
||||
file_name.push('.');
|
||||
file_name.push_str(extension);
|
||||
}
|
||||
@@ -306,7 +336,13 @@ fn export_image_payload(
|
||||
let mime_type = payload
|
||||
.get("mimeType")
|
||||
.and_then(Value::as_str)
|
||||
.ok_or_else(|| failed(request.id.clone(), "invalid_request", "mimeType is required"))?;
|
||||
.ok_or_else(|| {
|
||||
failed(
|
||||
request.id.clone(),
|
||||
"invalid_request",
|
||||
"mimeType is required",
|
||||
)
|
||||
})?;
|
||||
if export_image_extension(mime_type).is_none() {
|
||||
return Err(failed(
|
||||
request.id.clone(),
|
||||
@@ -320,7 +356,13 @@ fn export_image_payload(
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.filter(|value| !value.is_empty())
|
||||
.ok_or_else(|| failed(request.id.clone(), "invalid_request", "base64Data is required"))?;
|
||||
.ok_or_else(|| {
|
||||
failed(
|
||||
request.id.clone(),
|
||||
"invalid_request",
|
||||
"base64Data is required",
|
||||
)
|
||||
})?;
|
||||
let bytes = BASE64_STANDARD.decode(base64_data).map_err(|_| {
|
||||
failed(
|
||||
request.id.clone(),
|
||||
@@ -600,6 +642,20 @@ async fn host_bridge_request(
|
||||
None => failed(request.id, "host_error", "main window not found"),
|
||||
}
|
||||
}
|
||||
"app.setBadgeCount" => {
|
||||
let count = match badge_count_payload(&request) {
|
||||
Ok(count) => count,
|
||||
Err(response) => return response,
|
||||
};
|
||||
|
||||
match app.get_webview_window("main") {
|
||||
Some(window) => match window.set_badge_count(count) {
|
||||
Ok(()) => ok(request.id, json!(true)),
|
||||
Err(error) => failed(request.id, "host_error", error.to_string()),
|
||||
},
|
||||
None => failed(request.id, "host_error", "main window not found"),
|
||||
}
|
||||
}
|
||||
"share.setTarget" => {
|
||||
let target = request
|
||||
.payload
|
||||
@@ -697,6 +753,10 @@ mod tests {
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.contains(&json!("app.setTitle")));
|
||||
assert!(result["capabilities"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.contains(&json!("app.setBadgeCount")));
|
||||
assert!(result["capabilities"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
@@ -809,6 +869,33 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn badge_count_payload_accepts_clear_and_positive_counts() {
|
||||
let mut clear = request("app.setBadgeCount");
|
||||
clear.payload = Some(json!({ "count": 0 }));
|
||||
assert_eq!(badge_count_payload(&clear).expect("clear badge"), None);
|
||||
|
||||
let mut count = request("app.setBadgeCount");
|
||||
count.payload = Some(json!({ "count": 12 }));
|
||||
assert_eq!(badge_count_payload(&count).expect("badge count"), Some(12));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn badge_count_payload_rejects_invalid_counts() {
|
||||
for count in [json!(-1), json!(1.5), json!(100000), json!("1")] {
|
||||
let mut invalid = request("app.setBadgeCount");
|
||||
invalid.payload = Some(json!({ "count": count }));
|
||||
|
||||
let response = badge_count_payload(&invalid).expect_err("invalid count");
|
||||
let error = response.error.expect("error");
|
||||
assert_eq!(error.code, "invalid_request");
|
||||
assert_eq!(
|
||||
error.message,
|
||||
"count must be an integer between 0 and 99999"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn export_file_name_normalization_rejects_path_like_characters() {
|
||||
assert_eq!(
|
||||
@@ -908,7 +995,10 @@ mod tests {
|
||||
"mimeType": "image/png"
|
||||
}));
|
||||
let response = export_image_payload(&invalid_base64).expect_err("invalid base64");
|
||||
assert_eq!(response.error.expect("error").message, "base64Data is invalid");
|
||||
assert_eq!(
|
||||
response.error.expect("error").message,
|
||||
"base64Data is invalid"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -922,7 +1012,10 @@ mod tests {
|
||||
|
||||
let response = export_image_payload(&invalid).expect_err("oversized image");
|
||||
|
||||
assert_eq!(response.error.expect("error").message, "image exceeds file export size limit");
|
||||
assert_eq!(
|
||||
response.error.expect("error").message,
|
||||
"image exceeds file export size limit"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -936,7 +1029,10 @@ mod tests {
|
||||
.expect("write image file");
|
||||
|
||||
assert_eq!(bytes, 4);
|
||||
assert_eq!(fs::read(&path).expect("read image file"), vec![0x89, b'P', b'N', b'G']);
|
||||
assert_eq!(
|
||||
fs::read(&path).expect("read image file"),
|
||||
vec![0x89, b'P', b'N', b'G']
|
||||
);
|
||||
fs::remove_file(path).expect("remove image file");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user