cj-tauri 2.0.0 → 2.1.0

package/src/tests/plugin_notification_test.cj

@@ -1,205 +1,205 @@
-package cjTauri.tests
-
-import cjTauri.*
-import cjTauri.plugins.notification.*
-import std.collection.*
-import stdx.encoding.json.*
-import std.unittest.*
-import std.unittest.testmacro.*
-
-/*
- * notification 插件单元测试：命令面 / shim / 命名权限集闸门 / 参数校验 / 未装配宿主的可读错误
- * + 「宿主已装配」时的转交（FakeHost 记痕）。
- *
- * 真通知落在 C 桥（Linux 走 freedesktop Notifications，Windows 桩阶段未实现），
- * 归实机验证；这里只锁入口逻辑。body 可省是契约的一部分，单独覆盖。
- */
-
-/** 取一条「已装配宿主」的命令处理器 */
-func notifCmdWithHost(host: FakeHost): CommandHandler {
-    let c = NotificationCommands()
-    c.attachHost(host)
-    return c
-}
-
-func notifErrOf(handler: CommandHandler, cmd: String, args: JsonObject): String {
-    try {
-        handler.handle(cmd, args, IpcContext("main", IpcHub()))
-        return ""
-    } catch (e: CommandException) {
-        return e.message
-    }
-}
-
-/** 造 { title, body } */
-func notifArgs(title: String, body: JsonValue): JsonObject {
-    var o = JsonObject()
-    o.put("title", JsonString(title))
-    o.put("body", body)
-    return o
-}
-
-@Test
-func testNotificationPluginSurface(): Unit {
-    let p = NotificationPlugin()
-    @Expect(p.name(), "notification")
-    let names = pluginCommandNames(p)
-    @Expect(names.size, 1)
-    @Expect(names[0], "notification:notify")
-}
-
-@Test
-func testNotificationPluginShimTargetsItsOwnNamespace(): Unit {
-    let js = NotificationPlugin().jsShim()
-    @Expect(js.contains("t.notification"), true)
-    @Expect(js.contains("'notification:notify'"), true)
-}
-
-@Test
-func testNotificationPluginDeclaresPermissionSets(): Unit {
-    let sets = pluginPermissionSets(NotificationPlugin())
-    @Expect(sets.size, 1)
-    let d = sets.get("notification:default").getOrThrow()
-    @Expect(d.size, 1)
-    @Expect(d[0], "notification:notify")
-}
-
-@Test
-func testNotificationPermissionSetGatesCommand(): Unit {
-    let out = ArrayList<String>()
-    let reg = CapabilityRegistry()
-    reg.addFromJson(JsonValue.fromStr("{\"identifier\":\"n\",\"permissions\":[\"notification:default\"]}"))
-    let hub = hubWithRegistry(reg, out)
-    registerPluginCommands(hub, NotificationPlugin())
-    registerPluginPermissionSets(reg, NotificationPlugin())
-
-    // 集内命令放行：走到「宿主未装配」的业务错误，而不是「未授权」
-    hub.handleRawMessage(
-        "{\"type\":\"invoke\",\"id\":51,\"cmd\":\"notification:notify\",\"args\":{\"title\":\"t\"}}")
-    waitSink(out, 1)
-    @Expect(out.size, 1)
-    @Expect(strField(out[0], "error").contains("command not allowed"), false)
-}
-
-@Test
-func testNotificationWithoutPermissionIsDenied(): Unit {
-    let out = ArrayList<String>()
-    let reg = CapabilityRegistry()
-    reg.addFromJson(JsonValue.fromStr("{\"identifier\":\"empty\",\"permissions\":[]}"))
-    let hub = hubWithRegistry(reg, out)
-    registerPluginCommands(hub, NotificationPlugin())
-    registerPluginPermissionSets(reg, NotificationPlugin())
-
-    hub.handleRawMessage(
-        "{\"type\":\"invoke\",\"id\":52,\"cmd\":\"notification:notify\",\"args\":{\"title\":\"t\"}}")
-    waitSink(out, 1)
-    @Expect(strField(out[0], "error"), "command not allowed: notification:notify")
-}
-
-@Test
-func testNotificationRequiresTitle(): Unit {
-    let cmd = NotificationPlugin().commands().get("notify").getOrThrow()
-    let ctx = IpcContext("main", IpcHub())
-    var threw = false
-    try {
-        cmd.handle("notification:notify", JsonObject(), ctx)
-    } catch (e: CommandException) {
-        threw = true
-        @Expect(e.message.contains("missing argument \"title\""), true)
-    }
-    @Expect(threw, true)
-}
-
-@Test
-func testNotificationRejectsNonStringTitle(): Unit {
-    var args = JsonObject()
-    args.put("title", JsonBool(true))
-    let cmd = NotificationPlugin().commands().get("notify").getOrThrow()
-    var threw = false
-    try {
-        cmd.handle("notification:notify", args, IpcContext("main", IpcHub()))
-    } catch (e: CommandException) {
-        threw = true
-        @Expect(e.message.contains("must be a string"), true)
-    }
-    @Expect(threw, true)
-}
-
-@Test
-func testNotificationWithoutHostIsReadableError(): Unit {
-    @Expect(notifErrOf(NotificationPlugin().commands().get("notify").getOrThrow(), "notification:notify",
-        notifArgs("hi", JsonString("body"))).contains("宿主未装配"), true)
-}
-
-@Test
-func testNotificationRejectsUnknownCommand(): Unit {
-    @Expect(notifErrOf(NotificationPlugin().commands().get("notify").getOrThrow(), "notification:nope",
-        JsonObject()).contains("unknown notification command"), true)
-}
-
-@Test
-func testNotificationBodyIsOptional(): Unit {
-    let host = FakeHost("main")
-    let cmd = notifCmdWithHost(host)
-
-    // 只给 title：body 按空串
-    var onlyTitle = JsonObject()
-    onlyTitle.put("title", JsonString("标题"))
-    let r1 = cmd.handle("notification:notify", onlyTitle, IpcContext("main", IpcHub()))
-    match (r1.kind()) {
-        case JsonKind.JsNull => ()
-        case _ => @Expect(false, true)
-    }
-    @Expect(host.notifiedArgs, "标题|")
-
-    // body 显式 null：同样按空串（前端 o.body 传 undefined 时序列化可能落成 null）
-    cmd.handle("notification:notify", notifArgs("标题2", JsonNull()), IpcContext("main", IpcHub()))
-    @Expect(host.notifiedArgs, "标题2|")
-
-    // body 有值：原样转交
-    cmd.handle("notification:notify", notifArgs("标题3", JsonString("正文")), IpcContext("main", IpcHub()))
-    @Expect(host.notifiedArgs, "标题3|正文")
-}
-
-/** 桩侧「label → 宿主」解析器见 plugin_dialog_test.cj 的 routeProbeHost（同包可见） */
-@Test
-func testNotificationRoutesToTheWindowThatAsked(): Unit {
-    // 与 dialog / clipboard 同一条契约：报文里的 window 决定交给哪个宿主
-    let mainHost = FakeHost("main")
-    let secondHost = FakeHost("second")
-    let cmds = NotificationCommands()
-    cmds.attachHost(mainHost)
-    cmds.attachHostResolver({ label => routeProbeHost(label, mainHost, secondHost) })
-
-    cmds.handle("notification:notify", notifArgs("second 的通知", JsonString("正文")),
-        IpcContext("second", IpcHub()))
-    @Expect(secondHost.notifiedArgs, "second 的通知|正文")
-    // 关键断言：另一扇窗的宿主一点都没被碰到
-    @Expect(mainHost.notifiedArgs, "")
-
-    // 反向也成立
-    cmds.handle("notification:notify", notifArgs("main 的通知", JsonNull()), IpcContext("main", IpcHub()))
-    @Expect(mainHost.notifiedArgs, "main 的通知|")
-    @Expect(secondHost.notifiedArgs, "second 的通知|正文")
-}
-
-@Test
-func testNotificationReportsUnknownWindowInsteadOfFallingBack(): Unit {
-    let mainHost = FakeHost("main")
-    let secondHost = FakeHost("second")
-    let cmds = NotificationCommands()
-    cmds.attachHost(mainHost)
-    cmds.attachHostResolver({ label => routeProbeHost(label, mainHost, secondHost) })
-
-    var threw = false
-    try {
-        cmds.handle("notification:notify", notifArgs("谁的", JsonNull()), IpcContext("ghost", IpcHub()))
-    } catch (e: CommandException) {
-        threw = true
-        @Expect(e.message.contains("ghost"), true)
-    }
-    @Expect(threw, true)
-    // 报错之后两个宿主都没被写过：不回落单槽
-    @Expect(mainHost.notifiedArgs, "")
-    @Expect(secondHost.notifiedArgs, "")
-}
+package cjTauri.tests
+
+import cjTauri.*
+import cjTauri.plugins.notification.*
+import std.collection.*
+import stdx.encoding.json.*
+import std.unittest.*
+import std.unittest.testmacro.*
+
+/*
+ * notification 插件单元测试：命令面 / shim / 命名权限集闸门 / 参数校验 / 未装配宿主的可读错误
+ * + 「宿主已装配」时的转交（FakeHost 记痕）。
+ *
+ * 真通知落在 C 桥（Linux 走 freedesktop Notifications，Windows 桩阶段未实现），
+ * 归实机验证；这里只锁入口逻辑。body 可省是契约的一部分，单独覆盖。
+ */
+
+/** 取一条「已装配宿主」的命令处理器 */
+func notifCmdWithHost(host: FakeHost): CommandHandler {
+    let c = NotificationCommands()
+    c.attachHost(host)
+    return c
+}
+
+func notifErrOf(handler: CommandHandler, cmd: String, args: JsonObject): String {
+    try {
+        handler.handle(cmd, args, IpcContext("main", IpcHub()))
+        return ""
+    } catch (e: CommandException) {
+        return e.message
+    }
+}
+
+/** 造 { title, body } */
+func notifArgs(title: String, body: JsonValue): JsonObject {
+    var o = JsonObject()
+    o.put("title", JsonString(title))
+    o.put("body", body)
+    return o
+}
+
+@Test
+func testNotificationPluginSurface(): Unit {
+    let p = NotificationPlugin()
+    @Expect(p.name(), "notification")
+    let names = pluginCommandNames(p)
+    @Expect(names.size, 1)
+    @Expect(names[0], "notification:notify")
+}
+
+@Test
+func testNotificationPluginShimTargetsItsOwnNamespace(): Unit {
+    let js = NotificationPlugin().jsShim()
+    @Expect(js.contains("t.notification"), true)
+    @Expect(js.contains("'notification:notify'"), true)
+}
+
+@Test
+func testNotificationPluginDeclaresPermissionSets(): Unit {
+    let sets = pluginPermissionSets(NotificationPlugin())
+    @Expect(sets.size, 1)
+    let d = sets.get("notification:default").getOrThrow()
+    @Expect(d.size, 1)
+    @Expect(d[0], "notification:notify")
+}
+
+@Test
+func testNotificationPermissionSetGatesCommand(): Unit {
+    let out = ArrayList<String>()
+    let reg = CapabilityRegistry()
+    reg.addFromJson(JsonValue.fromStr("{\"identifier\":\"n\",\"permissions\":[\"notification:default\"]}"))
+    let hub = hubWithRegistry(reg, out)
+    registerPluginCommands(hub, NotificationPlugin())
+    registerPluginPermissionSets(reg, NotificationPlugin())
+
+    // 集内命令放行：走到「宿主未装配」的业务错误，而不是「未授权」
+    hub.handleRawMessage(
+        "{\"type\":\"invoke\",\"id\":51,\"cmd\":\"notification:notify\",\"args\":{\"title\":\"t\"}}")
+    waitSink(out, 1)
+    @Expect(out.size, 1)
+    @Expect(strField(out[0], "error").contains("command not allowed"), false)
+}
+
+@Test
+func testNotificationWithoutPermissionIsDenied(): Unit {
+    let out = ArrayList<String>()
+    let reg = CapabilityRegistry()
+    reg.addFromJson(JsonValue.fromStr("{\"identifier\":\"empty\",\"permissions\":[]}"))
+    let hub = hubWithRegistry(reg, out)
+    registerPluginCommands(hub, NotificationPlugin())
+    registerPluginPermissionSets(reg, NotificationPlugin())
+
+    hub.handleRawMessage(
+        "{\"type\":\"invoke\",\"id\":52,\"cmd\":\"notification:notify\",\"args\":{\"title\":\"t\"}}")
+    waitSink(out, 1)
+    @Expect(strField(out[0], "error"), "command not allowed: notification:notify")
+}
+
+@Test
+func testNotificationRequiresTitle(): Unit {
+    let cmd = NotificationPlugin().commands().get("notify").getOrThrow()
+    let ctx = IpcContext("main", IpcHub())
+    var threw = false
+    try {
+        cmd.handle("notification:notify", JsonObject(), ctx)
+    } catch (e: CommandException) {
+        threw = true
+        @Expect(e.message.contains("missing argument \"title\""), true)
+    }
+    @Expect(threw, true)
+}
+
+@Test
+func testNotificationRejectsNonStringTitle(): Unit {
+    var args = JsonObject()
+    args.put("title", JsonBool(true))
+    let cmd = NotificationPlugin().commands().get("notify").getOrThrow()
+    var threw = false
+    try {
+        cmd.handle("notification:notify", args, IpcContext("main", IpcHub()))
+    } catch (e: CommandException) {
+        threw = true
+        @Expect(e.message.contains("must be a string"), true)
+    }
+    @Expect(threw, true)
+}
+
+@Test
+func testNotificationWithoutHostIsReadableError(): Unit {
+    @Expect(notifErrOf(NotificationPlugin().commands().get("notify").getOrThrow(), "notification:notify",
+        notifArgs("hi", JsonString("body"))).contains("宿主未装配"), true)
+}
+
+@Test
+func testNotificationRejectsUnknownCommand(): Unit {
+    @Expect(notifErrOf(NotificationPlugin().commands().get("notify").getOrThrow(), "notification:nope",
+        JsonObject()).contains("unknown notification command"), true)
+}
+
+@Test
+func testNotificationBodyIsOptional(): Unit {
+    let host = FakeHost("main")
+    let cmd = notifCmdWithHost(host)
+
+    // 只给 title：body 按空串
+    var onlyTitle = JsonObject()
+    onlyTitle.put("title", JsonString("标题"))
+    let r1 = cmd.handle("notification:notify", onlyTitle, IpcContext("main", IpcHub()))
+    match (r1.kind()) {
+        case JsonKind.JsNull => ()
+        case _ => @Expect(false, true)
+    }
+    @Expect(host.notifiedArgs, "标题|")
+
+    // body 显式 null：同样按空串（前端 o.body 传 undefined 时序列化可能落成 null）
+    cmd.handle("notification:notify", notifArgs("标题2", JsonNull()), IpcContext("main", IpcHub()))
+    @Expect(host.notifiedArgs, "标题2|")
+
+    // body 有值：原样转交
+    cmd.handle("notification:notify", notifArgs("标题3", JsonString("正文")), IpcContext("main", IpcHub()))
+    @Expect(host.notifiedArgs, "标题3|正文")
+}
+
+/** 桩侧「label → 宿主」解析器见 plugin_dialog_test.cj 的 routeProbeHost（同包可见） */
+@Test
+func testNotificationRoutesToTheWindowThatAsked(): Unit {
+    // 与 dialog / clipboard 同一条契约：报文里的 window 决定交给哪个宿主
+    let mainHost = FakeHost("main")
+    let secondHost = FakeHost("second")
+    let cmds = NotificationCommands()
+    cmds.attachHost(mainHost)
+    cmds.attachHostResolver({ label => routeProbeHost(label, mainHost, secondHost) })
+
+    cmds.handle("notification:notify", notifArgs("second 的通知", JsonString("正文")),
+        IpcContext("second", IpcHub()))
+    @Expect(secondHost.notifiedArgs, "second 的通知|正文")
+    // 关键断言：另一扇窗的宿主一点都没被碰到
+    @Expect(mainHost.notifiedArgs, "")
+
+    // 反向也成立
+    cmds.handle("notification:notify", notifArgs("main 的通知", JsonNull()), IpcContext("main", IpcHub()))
+    @Expect(mainHost.notifiedArgs, "main 的通知|")
+    @Expect(secondHost.notifiedArgs, "second 的通知|正文")
+}
+
+@Test
+func testNotificationReportsUnknownWindowInsteadOfFallingBack(): Unit {
+    let mainHost = FakeHost("main")
+    let secondHost = FakeHost("second")
+    let cmds = NotificationCommands()
+    cmds.attachHost(mainHost)
+    cmds.attachHostResolver({ label => routeProbeHost(label, mainHost, secondHost) })
+
+    var threw = false
+    try {
+        cmds.handle("notification:notify", notifArgs("谁的", JsonNull()), IpcContext("ghost", IpcHub()))
+    } catch (e: CommandException) {
+        threw = true
+        @Expect(e.message.contains("ghost"), true)
+    }
+    @Expect(threw, true)
+    // 报错之后两个宿主都没被写过：不回落单槽
+    @Expect(mainHost.notifiedArgs, "")
+    @Expect(secondHost.notifiedArgs, "")
+}

package/src/tests/plugin_serial_test.cj

@@ -267,3 +267,51 @@ func testSerialPortListIsSortedAndWhitelisted(): Unit {
         i++
     }
 }
+
+/* ===== ohos 分支的可桌面验证面（serial_ohos.cj） =====
+ * 真正的 open/read/write 走 ohos 专属 FFI（@When 门禁），桌面上编译不到——那部分归真机取证
+ * （issue #5：USB 转串口接 OTG、DDK 权限）。下面锁的是 ohos 与桌面**共用同一份代码**的纯函数：
+ * 波特率 → termios 常量映射（不带门禁，专为可测升 public）与设备白名单的 /dev/bus 路径。
+ */
+
+@Test
+func testSerialOhosBaudConstMatchesDesktopTiers(): Unit {
+    // 与 SERIAL_BAUDS 同一套档位：桌面允许的每一档，ohos 侧都必须有对应的 termios 常量
+    let tiers: Array<Int32> = [300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200,
+        230400, 460800, 500000, 921600, 1000000]
+    for (b in tiers) {
+        @Expect(serialOhosBaudConst(b).isSome(), true)
+    }
+    // 关键取值抽查（asm-generic：B38400 以下连续，往上 0x1000+n）
+    @Expect(serialOhosBaudConst(115200).getOrThrow(), 0x1002)
+    @Expect(serialOhosBaudConst(9600).getOrThrow(), 0xd)
+    @Expect(serialOhosBaudConst(1000000).getOrThrow(), 0x1008)
+    // 桌面已拒的档位，ohos 侧同样不收（两层拦同一套名单，不会出现桌面放行、ohos 拒）
+    @Expect(serialOhosBaudConst(14400).isNone(), true)
+    @Expect(serialOhosBaudConst(4000000).isNone(), true)
+}
+
+@Test
+func testSerialPathLooksAllowedCoversOhosDevicePaths(): Unit {
+    // 鸿蒙特有的 USB 串口落点必须过白名单（ohos 侧 open 的边界就靠它）
+    @Expect(serialPathLooksAllowed("/dev/bus/ttyUSB0"), true)
+    @Expect(serialPathLooksAllowed("/dev/bus/ttyACM0"), true)
+    @Expect(serialPathLooksAllowed("/dev/bus/ttyS1"), true)
+    // 穿越与任意路径照旧拒
+    @Expect(serialPathLooksAllowed("/dev/bus/../ttyUSB0"), false)
+    @Expect(serialPathLooksAllowed("/data/local/ttyUSB0"), false)
+}
+
+@Test
+func testSerialPluginDescribesAllThreeHosts(): Unit {
+    let d = SerialPlugin().describe()
+    let hosts = d.supportedHosts
+    @Expect(hosts.size, 3)
+    var hasArkweb = false
+    for (h in hosts) {
+        if (h == "arkweb") {
+            hasArkweb = true
+        }
+    }
+    @Expect(hasArkweb, true)
+}