cj-tauri 2.1.0 → 2.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +203 -115
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +1 -1
- package/cli/src/manifest.cj +13 -2
- package/cli/src/project.cj +1 -1
- package/cli/src/sync.cj +213 -4
- package/native/core/bridge_core.c +26 -0
- package/native/core/bridge_core.h +22 -0
- package/native/platforms/linux/bridge_linux.c +247 -5
- package/native/platforms/windows/bridge_win.c +405 -2
- package/native/tests/test_bridge_core.c +49 -1
- package/package.json +4 -4
- package/src/app.cj +10 -0
- package/src/cookies_bridge.cj +42 -0
- package/src/host.cj +14 -0
- package/src/host_webkit.cj +25 -0
- package/src/host_webview2.cj +25 -0
- package/src/ipc_hub.cj +66 -2
- package/src/tests/app_spec_test.cj +5 -1
- package/src/tests/fake_host.cj +8 -0
- package/src/tests/ipc_hub_test.cj +76 -0
- package/src/tests/platform_contract_test.cj +15 -2
- package/src/version.cj +1 -1
- package/prebuilt/linux-x64/cj-tauri +0 -0
package/src/ipc_hub.cj
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
package cjTauri
|
|
2
2
|
|
|
3
3
|
import std.collection.*
|
|
4
|
+
import std.sync.*
|
|
4
5
|
import stdx.encoding.json.*
|
|
5
6
|
|
|
6
7
|
/**
|
|
@@ -114,6 +115,10 @@ public class IpcHub {
|
|
|
114
115
|
// 只在前端 emit 时被调用;后端自己 emit 给前端的事件**不**回流到这里(否则「后端广播 → 监听器再广播」会自激)。
|
|
115
116
|
private var eventListeners: HashMap<String, ArrayList<(JsonValue) -> Unit>> =
|
|
116
117
|
HashMap<String, ArrayList<(JsonValue) -> Unit>>()
|
|
118
|
+
// 串行命令组(issue #6-④):组名 → 组状态;命令名 → 组名。
|
|
119
|
+
// 同组命令严格按到达序执行(见 registerSerial 与 handleInvoke 的分流注释)。
|
|
120
|
+
private var serialGroups: HashMap<String, SerialGroup> = HashMap<String, SerialGroup>()
|
|
121
|
+
private var serialCmdToGroup: HashMap<String, String> = HashMap<String, String>()
|
|
117
122
|
|
|
118
123
|
public init() {}
|
|
119
124
|
|
|
@@ -139,6 +144,21 @@ public class IpcHub {
|
|
|
139
144
|
this.commands.add(cmd, handler)
|
|
140
145
|
}
|
|
141
146
|
|
|
147
|
+
/**
|
|
148
|
+
* 注册进串行组(issue #6-④):同 group 的命令严格按**到达序**执行,
|
|
149
|
+
* 不同组 / 普通命令的并发语义不变。适用于共享一份可变宿主状态的命令族——
|
|
150
|
+
* webtab 的 show/hide/close/bounds 就是「页面快速连点」时乱序会让原生视图
|
|
151
|
+
* 与 DOM 状态错位的形状(ai-chat 实测,前端只能用 promise 队列自救)。
|
|
152
|
+
* 覆盖语义与 register 一致:同命令重复注册 = 替换。
|
|
153
|
+
*/
|
|
154
|
+
public func registerSerial(cmd: String, handler: CommandHandler, group: String): Unit {
|
|
155
|
+
this.commands.add(cmd, handler)
|
|
156
|
+
if (!this.serialGroups.contains(group)) {
|
|
157
|
+
this.serialGroups.add(group, SerialGroup())
|
|
158
|
+
}
|
|
159
|
+
this.serialCmdToGroup.add(cmd, group)
|
|
160
|
+
}
|
|
161
|
+
|
|
142
162
|
public func hasCommand(cmd: String): Bool {
|
|
143
163
|
return this.commands.contains(cmd)
|
|
144
164
|
}
|
|
@@ -232,8 +252,41 @@ public class IpcHub {
|
|
|
232
252
|
this.reject(req.id, "command not registered: ${req.cmd}", req.window)
|
|
233
253
|
return
|
|
234
254
|
}
|
|
235
|
-
// 3. 交给 worker 线程执行:调用线程立刻返回,UI
|
|
236
|
-
|
|
255
|
+
// 3. 交给 worker 线程执行:调用线程立刻返回,UI 不被命令阻塞。
|
|
256
|
+
// 串行组的命令走入队(handleInvoke 跑在桥的消息回调线程上,入队顺序即到达顺序),
|
|
257
|
+
// 组 worker 单条消费——执行序严格等于到达序(issue #6-④)。
|
|
258
|
+
match (this.serialCmdToGroup.get(req.cmd)) {
|
|
259
|
+
case Some(group) => this.enqueueSerial(group, req)
|
|
260
|
+
case None => let _ = spawn { => this.runCommand(req) }
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
/** 串行组入队:锁内置 busy 检查——组闲则置忙并拉起组 worker,忙则只排队 */
|
|
265
|
+
private func enqueueSerial(group: String, req: InvokeRequest): Unit {
|
|
266
|
+
let g = this.serialGroups.get(group).getOrThrow()
|
|
267
|
+
g.lock.lock()
|
|
268
|
+
g.queue.add(req)
|
|
269
|
+
let needWorker = !g.busy
|
|
270
|
+
g.busy = true
|
|
271
|
+
g.lock.unlock()
|
|
272
|
+
if (needWorker) {
|
|
273
|
+
let _ = spawn { => this.drainSerial(g) }
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
/** 组 worker:取空为止;取与清 busy 在同一临界区,保证「空队」与「忙」不同时被观测到 */
|
|
278
|
+
private func drainSerial(g: SerialGroup): Unit {
|
|
279
|
+
while (true) {
|
|
280
|
+
g.lock.lock()
|
|
281
|
+
if (g.queue.size == 0) {
|
|
282
|
+
g.busy = false
|
|
283
|
+
g.lock.unlock()
|
|
284
|
+
return
|
|
285
|
+
}
|
|
286
|
+
let req = g.queue.remove(at: 0)
|
|
287
|
+
g.lock.unlock()
|
|
288
|
+
this.runCommand(req)
|
|
289
|
+
}
|
|
237
290
|
}
|
|
238
291
|
|
|
239
292
|
/** worker 线程上的实际执行:跑完(或抛错)就把 resolve / reject 回投给前端 */
|
|
@@ -335,3 +388,14 @@ public class IpcHub {
|
|
|
335
388
|
this.jsSink(IpcMessage.event(event, payload, window), window)
|
|
336
389
|
}
|
|
337
390
|
}
|
|
391
|
+
|
|
392
|
+
/**
|
|
393
|
+
* 串行命令组的状态(issue #6-④):队列 + busy 标志 + 一把锁。
|
|
394
|
+
* 入队只在桥的消息回调线程上发生(单线程),顺序即到达顺序;
|
|
395
|
+
* busy 与取队在锁内闭环——「空队」与「忙」不会同时被观测到,worker 不会漏拉也不会重复拉。
|
|
396
|
+
*/
|
|
397
|
+
internal class SerialGroup {
|
|
398
|
+
let lock: Mutex = Mutex()
|
|
399
|
+
var queue: ArrayList<InvokeRequest> = ArrayList<InvokeRequest>()
|
|
400
|
+
var busy: Bool = false
|
|
401
|
+
}
|
|
@@ -40,10 +40,12 @@ class AppSpecProbeProvider <: HostProvider {
|
|
|
40
40
|
public var last: FakeHost = FakeHost("seed")
|
|
41
41
|
|
|
42
42
|
public func priority(target: TargetInfo): Int64 {
|
|
43
|
+
let _ = target
|
|
43
44
|
return 100
|
|
44
45
|
}
|
|
45
46
|
|
|
46
47
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
48
|
+
let _ = target
|
|
47
49
|
this.last = FakeHost(label)
|
|
48
50
|
return this.last
|
|
49
51
|
}
|
|
@@ -58,7 +60,7 @@ func appSpecAssembleWiresApp(): Unit {
|
|
|
58
60
|
.page(PageSource.Inline("<p/>"))
|
|
59
61
|
.window(WindowConfig("spec窗", 640, 480))
|
|
60
62
|
.plugin(StorePlugin())
|
|
61
|
-
.wire({
|
|
63
|
+
.wire({ _ =>
|
|
62
64
|
box.on = true
|
|
63
65
|
})
|
|
64
66
|
let app = assemble(spec)
|
|
@@ -88,10 +90,12 @@ class RunProbeProvider <: HostProvider {
|
|
|
88
90
|
public var last: FakeHost = FakeHost("seed")
|
|
89
91
|
|
|
90
92
|
public func priority(target: TargetInfo): Int64 {
|
|
93
|
+
let _ = target
|
|
91
94
|
return 200
|
|
92
95
|
}
|
|
93
96
|
|
|
94
97
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
98
|
+
let _ = target
|
|
95
99
|
this.last = FakeHost(label)
|
|
96
100
|
return this.last
|
|
97
101
|
}
|
package/src/tests/fake_host.cj
CHANGED
|
@@ -167,6 +167,14 @@ class FakeHost <: WebViewHost {
|
|
|
167
167
|
return true
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
+
/** cookie 桥回包:测试直接塞一段 JSON(默认空仓库);filter 由调用方自己过滤,这里不模拟 */
|
|
171
|
+
public var cookieJson: String = "{\"ok\":true,\"count\":0,\"cookies\":[]}"
|
|
172
|
+
|
|
173
|
+
public func cookiesJson(filter: String): String {
|
|
174
|
+
let _ = filter
|
|
175
|
+
return this.cookieJson
|
|
176
|
+
}
|
|
177
|
+
|
|
170
178
|
public func clipboardReadText(): Option<String> {
|
|
171
179
|
return this.clipboardReadValue
|
|
172
180
|
}
|
|
@@ -485,3 +485,79 @@ func testPlainEmitHasNoCoalesceField(): Unit {
|
|
|
485
485
|
@Expect(JsonValue.fromStr(out[1]).asObject().get("coalesce").isNone(), true)
|
|
486
486
|
@Expect(strField(out[1], "window"), "main")
|
|
487
487
|
}
|
|
488
|
+
|
|
489
|
+
/* ---- 串行组(issue #6-④):同组命令严格按到达序执行 ---- */
|
|
490
|
+
|
|
491
|
+
/** 慢处理器:先睡 delayMs 再回 "slow"——用它把「到达序」与「完成序」拉开 */
|
|
492
|
+
class SleepyHandler <: CommandHandler {
|
|
493
|
+
let delayMs: Int64
|
|
494
|
+
public init(delayMs: Int64) {
|
|
495
|
+
this.delayMs = delayMs
|
|
496
|
+
}
|
|
497
|
+
public func handle(cmd: String, args: JsonObject, ipc: IpcContext): JsonValue {
|
|
498
|
+
let _ = cmd
|
|
499
|
+
let _ = args
|
|
500
|
+
let _ = ipc
|
|
501
|
+
sleep(Duration.millisecond * this.delayMs)
|
|
502
|
+
return JsonString("slow")
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
class InstantHandler <: CommandHandler {
|
|
507
|
+
public func handle(cmd: String, args: JsonObject, ipc: IpcContext): JsonValue {
|
|
508
|
+
let _ = cmd
|
|
509
|
+
let _ = args
|
|
510
|
+
let _ = ipc
|
|
511
|
+
return JsonString("instant")
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
|
|
515
|
+
/** sink 里 data="slow" / data="instant" 两条 resolve 的下标(找不到回 -1) */
|
|
516
|
+
func dataPos(sink: ArrayList<String>, value: String): Int64 {
|
|
517
|
+
var pos = -1
|
|
518
|
+
synchronized(TEST_SINK_LOCK) {
|
|
519
|
+
for (i in 0..sink.size) {
|
|
520
|
+
if (strField(sink.get(i).getOrThrow(), "data") == value) {
|
|
521
|
+
pos = i
|
|
522
|
+
break
|
|
523
|
+
}
|
|
524
|
+
}
|
|
525
|
+
}
|
|
526
|
+
return pos
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
@Test
|
|
530
|
+
func testSerialGroupPreservesArrivalOrder(): Unit {
|
|
531
|
+
let sink = ArrayList<String>()
|
|
532
|
+
let hub = hubWith(["slowA", "fastA"], [], sink)
|
|
533
|
+
// 同组:慢的先到、快的后到。串行组必须让完成序 == 到达序——
|
|
534
|
+
// 若实现退回并发分发,fast(立即完成)几乎必然排在 slow(睡 200ms)前面
|
|
535
|
+
hub.registerSerial("slowA", SleepyHandler(200), "grp")
|
|
536
|
+
hub.registerSerial("fastA", InstantHandler(), "grp")
|
|
537
|
+
hub.handleRawMessage("{\"type\":\"invoke\",\"id\":1,\"cmd\":\"slowA\"}")
|
|
538
|
+
hub.handleRawMessage("{\"type\":\"invoke\",\"id\":2,\"cmd\":\"fastA\"}")
|
|
539
|
+
waitSink(sink, 2)
|
|
540
|
+
let slowPos = dataPos(sink, "slow")
|
|
541
|
+
let fastPos = dataPos(sink, "instant")
|
|
542
|
+
@Expect(slowPos >= 0, true)
|
|
543
|
+
@Expect(fastPos >= 0, true)
|
|
544
|
+
@Expect(slowPos < fastPos, true)
|
|
545
|
+
}
|
|
546
|
+
|
|
547
|
+
@Test
|
|
548
|
+
func testNonSerialCommandsFinishOutOfOrder(): Unit {
|
|
549
|
+
let sink = ArrayList<String>()
|
|
550
|
+
let hub = hubWith(["slowB", "fastB"], [], sink)
|
|
551
|
+
// 反证(锚定「串行组确实改变了语义」):同样的两条,普通 register 并发分发,
|
|
552
|
+
// 快的先完成。sleep 的 200ms 余量在 CI 上足够宽,不怕调度抖动造成假红。
|
|
553
|
+
hub.register("slowB", SleepyHandler(200))
|
|
554
|
+
hub.register("fastB", InstantHandler())
|
|
555
|
+
hub.handleRawMessage("{\"type\":\"invoke\",\"id\":1,\"cmd\":\"slowB\"}")
|
|
556
|
+
hub.handleRawMessage("{\"type\":\"invoke\",\"id\":2,\"cmd\":\"fastB\"}")
|
|
557
|
+
waitSink(sink, 2)
|
|
558
|
+
let slowPos = dataPos(sink, "slow")
|
|
559
|
+
let fastPos = dataPos(sink, "instant")
|
|
560
|
+
@Expect(slowPos >= 0, true)
|
|
561
|
+
@Expect(fastPos >= 0, true)
|
|
562
|
+
@Expect(fastPos < slowPos, true)
|
|
563
|
+
}
|
|
@@ -32,12 +32,17 @@ func appContextFeatureProbe(): Unit {
|
|
|
32
32
|
@Expect(ctx.dev, false)
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
/** 经函数返回:调用点看到的是 PageSource 全类型,match 的穷尽性检查才不会与流分析打架 */
|
|
36
|
+
func assetPageSource(name: String): PageSource {
|
|
37
|
+
return PageSource.Asset(name)
|
|
38
|
+
}
|
|
39
|
+
|
|
35
40
|
@Test
|
|
36
41
|
func pageSourceMatch(): Unit {
|
|
37
|
-
let src =
|
|
42
|
+
let src = assetPageSource("ui/index.html")
|
|
38
43
|
match (src) {
|
|
39
44
|
case Asset(name) => @Expect(name, "ui/index.html")
|
|
40
|
-
case _ => @Expect(false, true) //
|
|
45
|
+
case _ => @Expect(false, true) // 不应到达:工厂只造 Asset
|
|
41
46
|
}
|
|
42
47
|
}
|
|
43
48
|
|
|
@@ -61,27 +66,33 @@ func mobileDiscoverSandbox(): Unit {
|
|
|
61
66
|
/** 优先级最高者胜;create 返回假宿主(pickHost 会真实调用它) */
|
|
62
67
|
class HighPrioProvider <: HostProvider {
|
|
63
68
|
public func priority(target: TargetInfo): Int64 {
|
|
69
|
+
let _ = target
|
|
64
70
|
return 10
|
|
65
71
|
}
|
|
66
72
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
73
|
+
let _ = target
|
|
67
74
|
return FakeHost(label)
|
|
68
75
|
}
|
|
69
76
|
}
|
|
70
77
|
|
|
71
78
|
class LowPrioProvider <: HostProvider {
|
|
72
79
|
public func priority(target: TargetInfo): Int64 {
|
|
80
|
+
let _ = target
|
|
73
81
|
return 1
|
|
74
82
|
}
|
|
75
83
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
84
|
+
let _ = target
|
|
76
85
|
return FakeHost(label)
|
|
77
86
|
}
|
|
78
87
|
}
|
|
79
88
|
|
|
80
89
|
class NullProvider <: HostProvider {
|
|
81
90
|
public func priority(target: TargetInfo): Int64 {
|
|
91
|
+
let _ = target
|
|
82
92
|
return 0
|
|
83
93
|
}
|
|
84
94
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
95
|
+
let _ = target
|
|
85
96
|
return FakeHost(label)
|
|
86
97
|
}
|
|
87
98
|
}
|
|
@@ -236,9 +247,11 @@ func expectedDesktopOs(): String {
|
|
|
236
247
|
/** 注册表有匹配时,resolveHost 必须取注册表而不是内置宿主 */
|
|
237
248
|
class WinProvider <: HostProvider {
|
|
238
249
|
public func priority(target: TargetInfo): Int64 {
|
|
250
|
+
let _ = target
|
|
239
251
|
return 5
|
|
240
252
|
}
|
|
241
253
|
public func create(label: String, target: TargetInfo): WebViewHost {
|
|
254
|
+
let _ = target
|
|
242
255
|
return FakeHost(label)
|
|
243
256
|
}
|
|
244
257
|
}
|
package/src/version.cj
CHANGED
|
Binary file
|