cj-tauri 2.3.6 → 2.4.0
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/cjpm.toml +1 -1
- package/cli/cjpm.toml +1 -1
- package/cli/src/main.cj +11 -0
- package/cli/src/manifest.cj +9 -1
- package/cli/src/manifest_test.cj +5 -5
- package/cli/src/project.cj +15 -1
- package/cli/src/scaffold.cj +6 -1
- package/cli/src/util.cj +15 -0
- package/native/platforms/linux/bridge_linux.c +26 -0
- package/package.json +1 -1
- package/src/app.cj +38 -0
- package/src/app_spec.cj +9 -0
- package/src/launch.cj +13 -0
- package/src/platform/platform_assets.cj +9 -0
- package/src/platform/platform_env.cj +2 -0
- package/src/tests/app_spec_test.cj +42 -0
- package/src/tests/platform_contract_test.cj +6 -0
- package/src/version.cj +1 -1
package/cjpm.toml
CHANGED
package/cli/cjpm.toml
CHANGED
package/cli/src/main.cj
CHANGED
|
@@ -87,6 +87,17 @@ main(args: Array<String>): Int64 {
|
|
|
87
87
|
i = i + 2
|
|
88
88
|
continue
|
|
89
89
|
}
|
|
90
|
+
if (a.startsWith("-")) {
|
|
91
|
+
// issue #11-④:`create --help` 此前把 `--help` 当项目名、真的建了目录(副作用)。
|
|
92
|
+
// 以 `-` 开头的词一律不收作项目名:--help / -h 打用法退出,其余当场报错。
|
|
93
|
+
if (a == "--help" || a == "-h") {
|
|
94
|
+
usage()
|
|
95
|
+
return 0
|
|
96
|
+
}
|
|
97
|
+
eprintln("未知参数:${a}")
|
|
98
|
+
eprintln("用法: cj-tauri create <项目名> [--template app|vue|react|ohos]")
|
|
99
|
+
return 1
|
|
100
|
+
}
|
|
90
101
|
if (name.size == 0) {
|
|
91
102
|
name = a
|
|
92
103
|
}
|
package/cli/src/manifest.cj
CHANGED
|
@@ -351,7 +351,7 @@ public class Manifest {
|
|
|
351
351
|
"\n[target.x86_64-unknown-linux-gnu.bin-dependencies]\n" +
|
|
352
352
|
" path-option = [\"" + "$" + "{CANGJIE_STDX}\"]\n" +
|
|
353
353
|
"\n[target.x86_64-w64-mingw32]\n" +
|
|
354
|
-
" link-option = \"" + appendLink("-L" + native + " -lcjtbridge --subsystem=windows", this.linkDesktopWindows) + "\"\n" +
|
|
354
|
+
" link-option = \"" + appendLink("-L" + native + " -lcjtbridge --subsystem=windows -lcrypt32", this.linkDesktopWindows) + "\"\n" +
|
|
355
355
|
"\n[target.x86_64-w64-mingw32.bin-dependencies]\n" +
|
|
356
356
|
" path-option = [\"" + "$" + "{CANGJIE_STDX}\"]\n"
|
|
357
357
|
}
|
|
@@ -540,6 +540,14 @@ public class Manifest {
|
|
|
540
540
|
" }\n" +
|
|
541
541
|
" }\n" +
|
|
542
542
|
"\n" +
|
|
543
|
+
" public func readBytes(name: String): Option<Array<Byte>> {\n" +
|
|
544
|
+
" try {\n" +
|
|
545
|
+
" return Some(this.rm.getRawFileContent(name))\n" +
|
|
546
|
+
" } catch (e: Exception) {\n" +
|
|
547
|
+
" return None\n" +
|
|
548
|
+
" }\n" +
|
|
549
|
+
" }\n" +
|
|
550
|
+
"\n" +
|
|
543
551
|
" public func exists(name: String): Bool {\n" +
|
|
544
552
|
" return readText(name).isSome()\n" +
|
|
545
553
|
" }\n" +
|
package/cli/src/manifest_test.cj
CHANGED
|
@@ -39,8 +39,8 @@ func linksAbsentKeepsFrameworkDefault(): Unit {
|
|
|
39
39
|
@Expect(m.linkDesktopLinux == "")
|
|
40
40
|
@Expect(m.linkDesktopWindows == "")
|
|
41
41
|
let toml = m.renderOhosEntryToml("/fw", "2.0.0")
|
|
42
|
-
//
|
|
43
|
-
@Expect(toml.contains("-lpasteboard -ludmf\""))
|
|
42
|
+
// 框架默认值原样收尾,没有多出空格或空项(ohos 段含 https / hilog 两个平台库)
|
|
43
|
+
@Expect(toml.contains("-lpasteboard -ludmf -lohos.net.http -lhilog_ndk.z\""))
|
|
44
44
|
@Expect(!toml.contains("lohbattery"))
|
|
45
45
|
}
|
|
46
46
|
|
|
@@ -50,7 +50,7 @@ func linksAppendedAfterDefault(): Unit {
|
|
|
50
50
|
let m = Manifest.fromToml(LINKS_APP_BASE + "[links]\n ohos = \"-lohbattery_info\"\n", "test")
|
|
51
51
|
@Expect(m.linkOhos == "-lohbattery_info")
|
|
52
52
|
let toml = m.renderOhosEntryToml("/fw", "2.0.0")
|
|
53
|
-
@Expect(toml.contains("-lpasteboard -ludmf -lohbattery_info\""))
|
|
53
|
+
@Expect(toml.contains("-lpasteboard -ludmf -lohos.net.http -lhilog_ndk.z -lohbattery_info\""))
|
|
54
54
|
@Expect(m.validate().size == 0)
|
|
55
55
|
}
|
|
56
56
|
|
|
@@ -60,9 +60,9 @@ func linksAreScopedPerTarget(): Unit {
|
|
|
60
60
|
let m = Manifest.fromToml(LINKS_APP_BASE + "[links]\n desktop-linux = \"-lcamera\"\n", "test")
|
|
61
61
|
@Expect(m.linkDesktopWindows == "")
|
|
62
62
|
let toml = m.renderDesktopToml("/fw", "2.0.0")
|
|
63
|
-
// linux 段带上用户库,windows
|
|
63
|
+
// linux 段带上用户库,windows 段仍是默认收尾(含 crypt32:https 应用的证书库符号,issue #15)
|
|
64
64
|
@Expect(toml.contains("-lcamera\""))
|
|
65
|
-
@Expect(toml.contains("-lcjtbridge --subsystem=windows\""))
|
|
65
|
+
@Expect(toml.contains("-lcjtbridge --subsystem=windows -lcrypt32\""))
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
/** 非法值(双引号)必须被 validate 拦下:拼进生成 toml 会造出坏文件 */
|
package/cli/src/project.cj
CHANGED
|
@@ -10,7 +10,7 @@ import std.collection.*
|
|
|
10
10
|
|
|
11
11
|
/** CLI 版本:须与 cli/cjpm.toml 的 version、CHANGELOG 顶部版本一致(scripts/check-version.sh 校验) */
|
|
12
12
|
func cliVersion(): String {
|
|
13
|
-
return "2.
|
|
13
|
+
return "2.4.0"
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
/** 一次命令所需的路径上下文 */
|
|
@@ -611,6 +611,20 @@ func cmdInfo(asJson: Bool): Int64 {
|
|
|
611
611
|
println(" 项目根目录 : ${proj}${if (newForm) { "(新形态:cj-tauri.toml)" } else { "" }}")
|
|
612
612
|
if (let Some(bin) <- findAppBinary(proj, newForm)) {
|
|
613
613
|
println(" 可执行产物 : ${bin}")
|
|
614
|
+
if (hostIsWindows()) {
|
|
615
|
+
// issue #11-②:WebView2Loader.dll 按「名字 LoadLibrary」加载(不在 PE 导入表里),
|
|
616
|
+
// 缺它的表象是桥打一行 not found 后静默退窗,而 info 此前报一切就绪、零线索。
|
|
617
|
+
let exeDir = dirNameOf(bin)
|
|
618
|
+
let beside = exists(joinPath(exeDir, "WebView2Loader.dll"))
|
|
619
|
+
var line = " WebView2Loader.dll : ${if (beside) { "产物旁 [有]" } else { "产物旁 [无]" }}"
|
|
620
|
+
if (!beside) {
|
|
621
|
+
if (let Some(fwRoot) <- resolveFrameworkRoot()) {
|
|
622
|
+
let inFw = exists(joinPath(joinPath(fwRoot, "native"), joinPath("webview2", "WebView2Loader.dll")))
|
|
623
|
+
line = line + ";框架内 ${if (inFw) { "[有]——拷一份到产物目录即可" } else { "[无]——先跑 cj-tauri build 同步 loader" }}"
|
|
624
|
+
}
|
|
625
|
+
}
|
|
626
|
+
println(line)
|
|
627
|
+
}
|
|
614
628
|
} else {
|
|
615
629
|
println(" 可执行产物 : 未构建(cj-tauri sync + cj-tauri build)")
|
|
616
630
|
}
|
package/cli/src/scaffold.cj
CHANGED
|
@@ -44,9 +44,14 @@ func buildTargetSection(nativeDir: String, stdxDir: String): String {
|
|
|
44
44
|
if (hostIsWindows()) {
|
|
45
45
|
// GUI 子系统:不写这个开关,产物是 console 程序,双击时会多出一个控制台黑窗口(AGENTS §4)。
|
|
46
46
|
// 取值只能用链接器那套——cjc 把 --link-options 直通 ld.lld,gcc 的 -mwindows 会被拒。
|
|
47
|
+
// -lcrypt32:应用 import stdx.net.tls(https)后,stdx.crypto.x509 的 SystemRootCerts
|
|
48
|
+
// 读 Windows 系统证书存储,CertOpenSystemStoreA / CertEnumCertificatesInStore /
|
|
49
|
+
// CertCloseStore 三个符号都在 crypt32.dll(issue #15,交叉探针 A/B 实证:不带即
|
|
50
|
+
// 链接失败、带即 success)。不碰 https 的应用多链一个系统库无副作用(判据看导入表),
|
|
51
|
+
// mingw 自带 libcrypt32.a,无外部依赖。
|
|
47
52
|
// 注意别在这儿写「行内 `#` 注释」:Cangjie 里 `#` 是 raw string 前缀、不是注释符,
|
|
48
53
|
// 生成出来的 toml 那行也就只放开关、不放尾注(保证与文档里的行数表格一致)。
|
|
49
|
-
linkOpt = linkOpt + " --subsystem=windows"
|
|
54
|
+
linkOpt = linkOpt + " --subsystem=windows -lcrypt32"
|
|
50
55
|
} else {
|
|
51
56
|
linkOpt = linkOpt + " -lwebkit2gtk-4.1 -lgtk-3 -lgdk-3 -lglib-2.0 -lgio-2.0 -lsoup-3.0" +
|
|
52
57
|
" -ljavascriptcoregtk-4.1 -lgobject-2.0"
|
package/cli/src/util.cj
CHANGED
|
@@ -154,6 +154,21 @@ func listDir(p: String): Array<FileInfo> {
|
|
|
154
154
|
return Directory.readFrom(p)
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
+
/** 取路径的目录部分(截掉最后一个 / 或 \ 及其后内容);无分隔符返回原串的空串兜底 */
|
|
158
|
+
func dirNameOf(p: String): String {
|
|
159
|
+
let b = p.toArray()
|
|
160
|
+
var cut = -1
|
|
161
|
+
for (i in 0..b.size) {
|
|
162
|
+
if (b[i] == 47 || b[i] == 92) { // '/' 或 '\'(Windows 路径两种都认)
|
|
163
|
+
cut = i
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
if (cut <= 0) {
|
|
167
|
+
return ""
|
|
168
|
+
}
|
|
169
|
+
return String.fromUtf8(b[0..cut].toArray())
|
|
170
|
+
}
|
|
171
|
+
|
|
157
172
|
/** TOML 基本字符串转义:反斜杠与双引号 */
|
|
158
173
|
func escapeTomlString(p: String): String {
|
|
159
174
|
return p.replace("\\", "\\\\").replace("\"", "\\\"")
|
|
@@ -645,6 +645,30 @@ static void on_destroy(GtkWidget *w, gpointer ud) {
|
|
|
645
645
|
|
|
646
646
|
static const char *BRIDGE_JS = CJ_BRIDGE_JS(CJ_POST_STMT, CJ_RELOAD_STMT);
|
|
647
647
|
|
|
648
|
+
/* ---- SIGUSR1 处理器保护(issue #4)----
|
|
649
|
+
* WebKit 的 JSC 用 SIGUSR1 做自身 GC 的 stop-the-world,初始化时直接 sigaction
|
|
650
|
+
* 覆盖已有处理器;而 SIGUSR1 正是仓颉运行时线程挂起/恢复机制所用的信号——被抢后
|
|
651
|
+
* 运行时的线程停摆流程永远等不到唤醒,全部 cj 线程永久挂起,表象是真实屏上整页
|
|
652
|
+
* 冻结(gdb 栈停在 CJ_ProcessorStopWithLastCheck,Xvfb 下因 GC 时序不同反而难复现)。
|
|
653
|
+
* 做法:WebKit 初始化前保存运行时的处理器,之后恢复——两个 GC 各用各的信号通道。
|
|
654
|
+
* 一次性保存/恢复:JSC 覆盖只发生在初始化窗口,恢复后不再需要;重复进入
|
|
655
|
+
* gtk_thread_main(多窗口)时 save 保存的已是恢复后的运行时处理器,无害。 */
|
|
656
|
+
static struct sigaction cj_sigusr1_saved;
|
|
657
|
+
static int cj_sigusr1_saved_ok = 0;
|
|
658
|
+
|
|
659
|
+
static void cj_sigusr1_save(void) {
|
|
660
|
+
if (sigaction(SIGUSR1, NULL, &cj_sigusr1_saved) == 0) {
|
|
661
|
+
cj_sigusr1_saved_ok = 1;
|
|
662
|
+
}
|
|
663
|
+
}
|
|
664
|
+
|
|
665
|
+
static void cj_sigusr1_restore(void) {
|
|
666
|
+
if (cj_sigusr1_saved_ok && sigaction(SIGUSR1, &cj_sigusr1_saved, NULL) == 0) {
|
|
667
|
+
cj_sigusr1_saved_ok = 0;
|
|
668
|
+
fprintf(stderr, "[cj-bridge] SIGUSR1 handler restored (JSC overrode it during WebKit init, issue #4)\n");
|
|
669
|
+
}
|
|
670
|
+
}
|
|
671
|
+
|
|
648
672
|
static void *gtk_thread_main(void *arg) {
|
|
649
673
|
cj_host *h = (cj_host *)arg;
|
|
650
674
|
plat_host *p = h ? (plat_host *)h->plat : NULL;
|
|
@@ -655,6 +679,7 @@ static void *gtk_thread_main(void *arg) {
|
|
|
655
679
|
/* 先记下 GTK 线程身份:对话框要靠它判断「调用方是不是已经在本线程上」 */
|
|
656
680
|
p->thread = pthread_self();
|
|
657
681
|
p->thread_set = 1;
|
|
682
|
+
cj_sigusr1_save(); /* WebKit 初始化会覆盖 SIGUSR1(issue #4),先存运行时的处理器 */
|
|
658
683
|
gtk_init(NULL, NULL);
|
|
659
684
|
|
|
660
685
|
p->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
|
@@ -698,6 +723,7 @@ static void *gtk_thread_main(void *arg) {
|
|
|
698
723
|
G_CALLBACK(on_script_message), h);
|
|
699
724
|
|
|
700
725
|
p->view = webkit_web_view_new_with_user_content_manager(mgr);
|
|
726
|
+
cj_sigusr1_restore(); /* JSC 在 WebKit 初始化窗口里覆盖了 SIGUSR1,这里还给运行时(issue #4) */
|
|
701
727
|
{
|
|
702
728
|
/* 开发者工具开关:settings 交由视图持有(单实例、随窗口存续,不再额外 unref) */
|
|
703
729
|
WebKitSettings *settings = webkit_settings_new();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cj-tauri",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"description": "Tauri for the Cangjie language: a scaffold CLI for hybrid desktop apps — Cangjie backend (statically compiled) plus a system WebView frontend (HTML/CSS/JS), with a bidirectional IPC bridge and a capability-based security model. Windows, Linux and HarmonyOS PC.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cangjie",
|
package/src/app.cj
CHANGED
|
@@ -68,6 +68,8 @@ public class TauriApp <: AppHost {
|
|
|
68
68
|
var plugins: ArrayList<Plugin> = ArrayList<Plugin>()
|
|
69
69
|
// 各插件 jsShim() 收集成的「预执行脚本」列表,prepare() 时定稿,run / runUrl 时交给宿主
|
|
70
70
|
var pluginScripts: ArrayList<String> = ArrayList<String>()
|
|
71
|
+
// 应用上下文路径(issue #13,launchWith 在 run 前注入):业务命令经 dataDir() 取数据目录
|
|
72
|
+
var appPaths: Option<AppPaths> = None
|
|
71
73
|
|
|
72
74
|
public init() {}
|
|
73
75
|
|
|
@@ -104,6 +106,42 @@ public class TauriApp <: AppHost {
|
|
|
104
106
|
}
|
|
105
107
|
}
|
|
106
108
|
|
|
109
|
+
/**
|
|
110
|
+
* 按逻辑名读一份资产**字节**(issue #13):mp3 / 图片等二进制资产——
|
|
111
|
+
* `readAsset` 只能装文本,二进制经 UTF-8 会当场损坏。契约与 readAsset 一致:
|
|
112
|
+
* 未登记解析器或读不到都回 None,调用方按「没有 = 降级」处理。
|
|
113
|
+
*/
|
|
114
|
+
public func readAssetBytes(name: String): Option<Array<Byte>> {
|
|
115
|
+
match (this.assetResolver) {
|
|
116
|
+
case Some(r) => return r.readBytes(name)
|
|
117
|
+
case None => return None
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* 注入应用路径(launchWith 在 run 前调用,装配期的内部窄口)
|
|
123
|
+
*
|
|
124
|
+
* 桌面 = `Platform.discover` 的 XDG / AppData 按应用 id 的目录;
|
|
125
|
+
* 鸿蒙 = Ability 的 filesDir(`Platform.mobile(filesDir)`,与 `ArkWebRuntime.configure` 同源)。
|
|
126
|
+
*/
|
|
127
|
+
public func setAppPaths(paths: AppPaths): TauriApp {
|
|
128
|
+
this.appPaths = Some(paths)
|
|
129
|
+
return this
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/**
|
|
133
|
+
* 应用数据目录(issue #13):业务命令落存档 / 状态的推荐基准。
|
|
134
|
+
* 尚未注入(launch 之前)返回空串,调用方按「空 = 降级」处理——
|
|
135
|
+
* 命令分发发生在 run() 之后,命令 handler 里取值恒可用;
|
|
136
|
+
* `wire` 装配点里**拿不到**(注入在 assemble 之后),别在 wire 里读它。
|
|
137
|
+
*/
|
|
138
|
+
public func dataDir(): String {
|
|
139
|
+
match (this.appPaths) {
|
|
140
|
+
case Some(p) => return p.dataDir
|
|
141
|
+
case None => return ""
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
|
|
107
145
|
/**
|
|
108
146
|
* 登记一个附加窗口(**试验性**:批次 3「多窗口 UI」的最小切片,先给出可验证的通路)
|
|
109
147
|
*
|
package/src/app_spec.cj
CHANGED
|
@@ -33,6 +33,9 @@ public class AppSpec {
|
|
|
33
33
|
public var capabilitiesDir: String = ""
|
|
34
34
|
/** 能力清单 JSON 原文列表(批次 3-PR3):给没有目录概念的端(鸿蒙 rawfile);与目录可并存 */
|
|
35
35
|
public var capabilityJsons: ArrayList<String> = ArrayList<String>()
|
|
36
|
+
/** 数据目录覆盖(issue #13):空 = 平台默认(桌面 XDG/AppData 按应用 id、鸿蒙 filesDir)。
|
|
37
|
+
* 鸿蒙上只改 `app.dataDir()` 的返回值,**不**改页面落盘的沙箱目录(那由 configure(filesDir) 定)。 */
|
|
38
|
+
public var dataDirOverride: String = ""
|
|
36
39
|
/** 命令装配点:拿到装配中的 TauriApp 后 register(字段名带 Fn:仓颉字段与方法同命名空间,不能与构造器 wire() 重名) */
|
|
37
40
|
public var wireFn: Option<(TauriApp) -> Unit> = None
|
|
38
41
|
|
|
@@ -73,4 +76,10 @@ public class AppSpec {
|
|
|
73
76
|
this.wireFn = Some(f)
|
|
74
77
|
return this
|
|
75
78
|
}
|
|
79
|
+
|
|
80
|
+
/** 覆盖应用数据目录(桌面自定位置;鸿蒙不改页面沙箱目录,见字段注释) */
|
|
81
|
+
public func dataDir(path: String): AppSpec {
|
|
82
|
+
this.dataDirOverride = path
|
|
83
|
+
return this
|
|
84
|
+
}
|
|
76
85
|
}
|
package/src/launch.cj
CHANGED
|
@@ -31,9 +31,22 @@ public func launch(spec: AppSpec): Unit {
|
|
|
31
31
|
public func launchWith(spec: AppSpec, context: AppContext): Unit {
|
|
32
32
|
logd("[cj-tauri] launch:${spec.name}(os=${context.target.os} display=${context.target.display})")
|
|
33
33
|
let app = assemble(spec)
|
|
34
|
+
// paths 注入要在 wire 装配之后、run 之前(issue #13):业务命令经 app.dataDir() 取数据目录
|
|
35
|
+
app.setAppPaths(resolveAppPaths(spec, context))
|
|
34
36
|
app.run(spec.pageSource)
|
|
35
37
|
}
|
|
36
38
|
|
|
39
|
+
/**
|
|
40
|
+
* 覆盖后的应用路径(纯函数,单测共用):`spec.dataDir(...)` 非空时替换 dataDir,
|
|
41
|
+
* cache / temp 沿用平台发现值;空 = 平台默认原样返回。
|
|
42
|
+
*/
|
|
43
|
+
public func resolveAppPaths(spec: AppSpec, context: AppContext): AppPaths {
|
|
44
|
+
if (spec.dataDirOverride.size > 0) {
|
|
45
|
+
return AppPaths(spec.dataDirOverride, context.paths.cacheDir, context.paths.tempDir)
|
|
46
|
+
}
|
|
47
|
+
return context.paths
|
|
48
|
+
}
|
|
49
|
+
|
|
37
50
|
/**
|
|
38
51
|
* spec → TauriApp(纯装配、不 run):launch 与单测共用
|
|
39
52
|
*
|
|
@@ -23,6 +23,15 @@ public class DirectoryAssetResolver <: AssetResolver {
|
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
+
/** 字节读取:mp3 / 图片等二进制资产(File.readFrom 本就返回 Array<Byte>,不经 UTF-8) */
|
|
27
|
+
public func readBytes(name: String): Option<Array<Byte>> {
|
|
28
|
+
try {
|
|
29
|
+
return Some(File.readFrom(root + "/" + name))
|
|
30
|
+
} catch (e: Exception) {
|
|
31
|
+
return None
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
26
35
|
/** 以「能否读到」为准(批次 2 只服务文本资产;图标等二进制走各端资源目录,不进常量表) */
|
|
27
36
|
public func exists(name: String): Bool {
|
|
28
37
|
match (readText(name)) {
|
|
@@ -12,6 +12,8 @@ import std.collection.ArrayList
|
|
|
12
12
|
/** 资产读取:按逻辑名取内容(读盘 / 内嵌常量 / rawfile 由实现决定) */
|
|
13
13
|
public interface AssetResolver {
|
|
14
14
|
func readText(name: String): Option<String>
|
|
15
|
+
/** 按字节取内容:图标 / 音频这类二进制资产(issue #13——readText 只能装文本,二进制没法走) */
|
|
16
|
+
func readBytes(name: String): Option<Array<Byte>>
|
|
15
17
|
func exists(name: String): Bool
|
|
16
18
|
}
|
|
17
19
|
|
|
@@ -128,3 +128,45 @@ func runHandsResolverAndSourceToHost(): Unit {
|
|
|
128
128
|
// 探针宿主清出全局注册表,免得压过后续用例自己的桩
|
|
129
129
|
unregisterHost(provIdx)
|
|
130
130
|
}
|
|
131
|
+
|
|
132
|
+
// ---- issue #13:应用数据目录(AppSpec.dataDir 覆盖 + TauriApp.dataDir)与二进制资产 ----
|
|
133
|
+
|
|
134
|
+
@Test
|
|
135
|
+
func appSpecDataDirChainAndDefault(): Unit {
|
|
136
|
+
@Expect(AppSpec().dataDirOverride, "")
|
|
137
|
+
@Expect(AppSpec().dataDir("/custom/data").dataDirOverride, "/custom/data")
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
@Test
|
|
141
|
+
func resolveAppPathsHonorsOverrideOnlyForData(): Unit {
|
|
142
|
+
let base = AppPaths("/base/data", "/base/cache", "/base/tmp")
|
|
143
|
+
let fs = ArrayList<PlatformFeature>()
|
|
144
|
+
let ctx = AppContext(base, TargetInfo("Linux", "x86_64", "webkit", "desktop"), false, fs)
|
|
145
|
+
// 空覆盖 = 平台默认原样
|
|
146
|
+
@Expect(resolveAppPaths(AppSpec(), ctx).dataDir, "/base/data")
|
|
147
|
+
// 覆盖只动 dataDir:cache / temp 沿用平台发现值
|
|
148
|
+
let p = resolveAppPaths(AppSpec().dataDir("/custom/data"), ctx)
|
|
149
|
+
@Expect(p.dataDir, "/custom/data")
|
|
150
|
+
@Expect(p.cacheDir, "/base/cache")
|
|
151
|
+
@Expect(p.tempDir, "/base/tmp")
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
@Test
|
|
155
|
+
func appDataDirInjectedAndReadable(): Unit {
|
|
156
|
+
@Expect(TauriApp().dataDir(), "")
|
|
157
|
+
@Expect(TauriApp().setAppPaths(AppPaths("/base/data", "/c", "/t")).dataDir(), "/base/data")
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
@Test
|
|
161
|
+
func readAssetBytesViaResolver(): Unit {
|
|
162
|
+
var t = HashMap<String, String>()
|
|
163
|
+
t.add("bin/x.mp3", "ABC")
|
|
164
|
+
let app = TauriApp().assets(StubResolver(t))
|
|
165
|
+
match (app.readAssetBytes("bin/x.mp3")) {
|
|
166
|
+
case Some(bytes) => @Expect(bytes.size, 3)
|
|
167
|
+
case None => @Expect(false, true)
|
|
168
|
+
}
|
|
169
|
+
@Expect(app.readAssetBytes("no/such.bin").isSome(), false)
|
|
170
|
+
// 未登记解析器 = None(与 readAsset 同契约)
|
|
171
|
+
@Expect(TauriApp().readAssetBytes("bin/x.mp3").isSome(), false)
|
|
172
|
+
}
|
|
@@ -139,6 +139,12 @@ class StubResolver <: AssetResolver {
|
|
|
139
139
|
public func readText(name: String): Option<String> {
|
|
140
140
|
return table.get(name)
|
|
141
141
|
}
|
|
142
|
+
public func readBytes(name: String): Option<Array<Byte>> {
|
|
143
|
+
match (table.get(name)) {
|
|
144
|
+
case Some(s) => return Some(s.toArray())
|
|
145
|
+
case None => return None
|
|
146
|
+
}
|
|
147
|
+
}
|
|
142
148
|
public func exists(name: String): Bool {
|
|
143
149
|
return table.contains(name)
|
|
144
150
|
}
|
package/src/version.cj
CHANGED