cj-tauri 2.1.3 → 2.3.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/bin/cj-tauri.js +87 -0
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +1 -1
- package/cli/src/doctor.cj +1 -1
- package/cli/src/manifest.cj +5 -2
- package/cli/src/project.cj +1 -1
- package/cli/templates/ohos-skeleton/entry/cjpm.toml +7 -1
- package/native/core/bridge_core.c +8 -5
- package/native/core/bridge_core.h +5 -2
- package/native/platforms/linux/bridge_linux.c +6 -3
- package/native/platforms/windows/bridge_win.c +44 -9
- package/native/tests/test_bridge_core.c +27 -3
- package/package.json +1 -1
- package/src/app.cj +1 -1
- package/src/app_events.cj +5 -5
- package/src/app_host_ops.cj +8 -8
- package/src/app_run.cj +8 -8
- package/src/capability.cj +3 -3
- package/src/capability_loader.cj +8 -8
- package/src/embedded_assets.cj +5 -5
- package/src/host.cj +6 -6
- package/src/host_arkweb.cj +31 -31
- package/src/host_webkit.cj +31 -10
- package/src/host_webview2.cj +31 -9
- package/src/ipc_hub.cj +8 -8
- package/src/launch.cj +1 -1
- package/src/log_bridge.cj +141 -13
- package/src/logging.cj +2 -2
- package/src/menu.cj +1 -1
- package/src/plugin.cj +6 -6
- package/src/plugins/http/http_ohos.cj +2 -2
- package/src/plugins/http/plugin_http.cj +2 -2
- package/src/plugins/mqtt/plugin_mqtt.cj +4 -4
- package/src/plugins/redis/plugin_redis.cj +20 -20
- package/src/plugins/sqlite/sqlite_ffi.cj +3 -3
- package/src/plugins/store/plugin_store.cj +3 -3
- package/src/plugins/ws/plugin_ws.cj +7 -7
- package/src/process_hidden.cj +5 -5
- package/src/tests/logging_test.cj +66 -0
- package/src/tests/plugin_store_test.cj +1 -1
- package/src/tests/scope_test.cj +2 -2
- package/src/tray.cj +2 -2
- package/src/version.cj +1 -1
package/bin/cj-tauri.js
CHANGED
|
@@ -107,6 +107,73 @@ function resolveCjpm(home) {
|
|
|
107
107
|
return null;
|
|
108
108
|
}
|
|
109
109
|
|
|
110
|
+
/**
|
|
111
|
+
* 解析 stdx 动态库目录(${CANGJIE_STDX} 要的值)。
|
|
112
|
+
* cli/cjpm.toml 的两个 target 段都写 `path-option = ["${CANGJIE_STDX}"]`,cjpm 按进程环境变量
|
|
113
|
+
* 展开它——PowerShell / cmd 里没设这个变量时展开成空串,报的是
|
|
114
|
+
* `root package 'cli' imports package 'stdx.encoding.json' ... not added as a dependency`
|
|
115
|
+
* (看着像 toml 漏配,其实是变量没落地),首次构建当场就死。这里按顺序探测:
|
|
116
|
+
* 1. 用户已设的 CANGJIE_STDX(存在才用,指错了会拿到假的「已配置」);
|
|
117
|
+
* 2. ~/.cangjie/stdx/<包>/dynamic/stdx(CI / 教程的落位);
|
|
118
|
+
* 3. SDK 根的兄弟目录 cangjie-stdx-<版本>/<三元组>/dynamic/stdx(解压在 SDK 旁边的习惯)。
|
|
119
|
+
* 要求目录里有 stdx.* 的库文件,防止指到 stdx 包根(那是「create 成功、build 才炸」的另一种指错)。
|
|
120
|
+
*/
|
|
121
|
+
function resolveStdx(home) {
|
|
122
|
+
const looksRight = (p) => {
|
|
123
|
+
try {
|
|
124
|
+
return fs.readdirSync(p).some((n) => n.startsWith('stdx.'));
|
|
125
|
+
} catch (e) {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
const candidates = [];
|
|
130
|
+
if (process.env.CANGJIE_STDX && fs.existsSync(process.env.CANGJIE_STDX)) {
|
|
131
|
+
candidates.push(process.env.CANGJIE_STDX);
|
|
132
|
+
}
|
|
133
|
+
const cjStdxBase = path.join(os.homedir(), '.cangjie', 'stdx');
|
|
134
|
+
try {
|
|
135
|
+
for (const pkg of fs.readdirSync(cjStdxBase)) {
|
|
136
|
+
candidates.push(path.join(cjStdxBase, pkg, 'dynamic', 'stdx'));
|
|
137
|
+
}
|
|
138
|
+
} catch (e) {
|
|
139
|
+
// 目录不存在 = 没按这个布局装过,忽略
|
|
140
|
+
}
|
|
141
|
+
const sdkParent = path.dirname(home);
|
|
142
|
+
try {
|
|
143
|
+
for (const pkg of fs.readdirSync(sdkParent)) {
|
|
144
|
+
if (!pkg.startsWith('cangjie-stdx-')) {
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
const triple = IS_WIN ? 'windows_x86_64_cjnative' : 'linux_x86_64_cjnative';
|
|
148
|
+
candidates.push(path.join(sdkParent, pkg, triple, 'dynamic', 'stdx'));
|
|
149
|
+
}
|
|
150
|
+
} catch (e) {
|
|
151
|
+
// 同上
|
|
152
|
+
}
|
|
153
|
+
return candidates.find(looksRight) || null;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/** CANGJIE_STDX 解析不到时的提示:给下载入口与 setx 落法,别让 cjpm 的报错背锅 */
|
|
157
|
+
function printMissingStdxHint() {
|
|
158
|
+
const lines = [
|
|
159
|
+
'错误: 没找到 stdx 扩展标准库(CANGJIE_STDX 未设置,常见安装位置也没探测到)。',
|
|
160
|
+
'CLI 与生成的工程都 import stdx.encoding.json,cjpm.toml 按 ${CANGJIE_STDX} 引用它,',
|
|
161
|
+
'这个变量没进进程时 cjpm 报「imports package stdx... not added as a dependency」,极易误判成 toml 漏配。',
|
|
162
|
+
'请下载 stdx(与 SDK 版本配套,1.2.0 ↔ 1.2.0.1,混配会「编译全过、真机启动即崩」):',
|
|
163
|
+
' https://atomgit.com/Cangjie/cangjie_stdx/releases(匿名可下)',
|
|
164
|
+
IS_WIN
|
|
165
|
+
? '解压后把 CANGJIE_STDX 指到 <解压目录>\\windows_x86_64_cjnative\\dynamic\\stdx(动态库目录,不是包根),'
|
|
166
|
+
: '解压后把 CANGJIE_STDX 指到 <解压目录>/linux_x86_64_cjnative/dynamic/stdx(动态库目录,不是包根),',
|
|
167
|
+
IS_WIN
|
|
168
|
+
? '并 setx CANGJIE_STDX <路径> 持久化(重开终端生效);然后重跑本命令。'
|
|
169
|
+
: '并 export CANGJIE_STDX=<路径> 持久化(写进 ~/.bashrc / ~/.zshrc);然后重跑本命令。',
|
|
170
|
+
'详见: https://atomgit.com/qq8864/cj-tauri/blob/main/docs/使用文档.md',
|
|
171
|
+
];
|
|
172
|
+
for (const line of lines) {
|
|
173
|
+
note(line);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
|
|
110
177
|
/**
|
|
111
178
|
* 拼装子进程环境。
|
|
112
179
|
* PATH = 运行时库目录 + bin + tools/bin + tools/lib + ~/.cjpm/bin + 原 PATH
|
|
@@ -140,6 +207,19 @@ function buildEnv(home, runtimeDir) {
|
|
|
140
207
|
if (!env.CJ_TAURI_ROOT) {
|
|
141
208
|
env.CJ_TAURI_ROOT = PKG_ROOT;
|
|
142
209
|
}
|
|
210
|
+
|
|
211
|
+
// ${CANGJIE_STDX} 是 cjpm.toml 里的字面引用,cjpm 按进程环境变量展开:
|
|
212
|
+
// 这里解析到了就补进 env(用户已设且有效时不覆盖),CLI 自己 spawn cjpm 时会继承下去,
|
|
213
|
+
// 生成工程之后的 cj-tauri build / run 同样受益。
|
|
214
|
+
const stdx = resolveStdx(home);
|
|
215
|
+
if (stdx) {
|
|
216
|
+
if (stdx !== process.env.CANGJIE_STDX) {
|
|
217
|
+
verbose(`CANGJIE_STDX 未设置或无效,探测到: ${stdx}`);
|
|
218
|
+
}
|
|
219
|
+
env.CANGJIE_STDX = stdx;
|
|
220
|
+
} else if (!process.env.CANGJIE_STDX) {
|
|
221
|
+
verbose('CANGJIE_STDX 未设置且未探测到(首次构建 CLI 时会失败,含安装提示)');
|
|
222
|
+
}
|
|
143
223
|
return env;
|
|
144
224
|
}
|
|
145
225
|
|
|
@@ -204,6 +284,13 @@ function copyDir(from, to, skipNames) {
|
|
|
204
284
|
* 而全局安装的包目录可能是只读的(系统 node_modules 尤其如此)。
|
|
205
285
|
*/
|
|
206
286
|
function buildCli(env, cjpm) {
|
|
287
|
+
// 硬前置:cli/cjpm.toml 的 path-option 是 ${CANGJIE_STDX},变量为空时 cjpm 把它读成
|
|
288
|
+
// 「stdx 没声明成依赖」。提前拦下并给安装提示,比甩一段 cjpm 报错给人强。
|
|
289
|
+
if (!env.CANGJIE_STDX) {
|
|
290
|
+
note('错误: 构建需要 stdx 扩展标准库,但没有找到可用的 CANGJIE_STDX。');
|
|
291
|
+
printMissingStdxHint();
|
|
292
|
+
return null;
|
|
293
|
+
}
|
|
207
294
|
const buildDir = path.join(cacheRoot(), VERSION, 'build', 'cli');
|
|
208
295
|
note(`首次运行:正在构建 CLI 本体(${cjpm} build)...`);
|
|
209
296
|
fs.rmSync(buildDir, { recursive: true, force: true });
|
package/cjpm.toml
CHANGED
package/cli/cjpm.toml
CHANGED
package/cli/src/doctor.cj
CHANGED
|
@@ -100,7 +100,7 @@ func cmdDoctor(): Int64 {
|
|
|
100
100
|
case None =>
|
|
101
101
|
doctorLine(rep, CheckLevel.Fail, "CANGJIE_HOME", "未找到",
|
|
102
102
|
"设置 CANGJIE_HOME,或把 SDK 的 bin 加进 PATH(doctor 从 cjc 反推);" +
|
|
103
|
-
"下载:https://cangjie-lang.cn/download
|
|
103
|
+
"下载:https://cangjie-lang.cn/download(匿名可下,不用登录),本项目要求 SDK 1.2.0 + stdx 1.2.0.1,两者必须配套")
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
let (cjcCode, cjcVer) = doctorProbe("cjc", ["-v"])
|
package/cli/src/manifest.cj
CHANGED
|
@@ -468,7 +468,10 @@ public class Manifest {
|
|
|
468
468
|
// 2026-10-25 起 http 插件的鸿蒙支(http_ohos.cj)走系统网络栈 ohos.net.http,
|
|
469
469
|
// 模块符号(ohos.net.http:*_ti)在 libohos.net.http.so——缺了应用启动即
|
|
470
470
|
// 「relocating failed: symbol not found」(真机实测),所以进默认链接。
|
|
471
|
-
|
|
471
|
+
// 2026-11-12 起框架的诊断出口也进默认链接:src/log_bridge.cj 的鸿蒙段直接调 hilog 的
|
|
472
|
+
// NDK C 接口 `OH_LOG_Print`(tag = cj-tauri),符号在 libhilog_ndk.z.so。缺了它同样是
|
|
473
|
+
// 模块加载期解析不到符号——而这条的代价最贵:**日志通道坏了,报错也看不见**。
|
|
474
|
+
" link-option = \"" + appendLink("-lpasteboard -ludmf -lohos.net.http -lhilog_ndk.z", this.linkOhos) + "\"\n" +
|
|
472
475
|
"[target.aarch64-linux-ohos.bin-dependencies]\n" +
|
|
473
476
|
" # 鸿蒙版 stdx:相对路径指向骨架根上的 `stdx` 联接(build-hap.sh 用 CANGJIE_STDX_OHOS\n" +
|
|
474
477
|
" # 建,不入库)。hvigor 只替换它自己的模板变量,写别的 " + "$" + "{...}" + " 会变空串、整条\n" +
|
|
@@ -477,7 +480,7 @@ public class Manifest {
|
|
|
477
480
|
" package-option = {}\n" +
|
|
478
481
|
"\n[target.x86_64-linux-ohos]\n" +
|
|
479
482
|
" compile-option = \"-B \\\"" + dc + "/build-tools/third_party/llvm/bin\\\" -B \\\"" + dn + "/sysroot/usr/lib/x86_64-linux-ohos\\\" -L \\\"" + dn + "/sysroot/usr/lib/x86_64-linux-ohos\\\" -L \\\"" + dn + "/llvm/lib/clang/15.0.4/lib/x86_64-linux-ohos\\\" -L \\\"" + dn + "/llvm/lib/x86_64-linux-ohos\\\" --sysroot \\\"" + dn + "/sysroot\\\"\"\n" +
|
|
480
|
-
" link-option = \"" + appendLink("-lpasteboard -ludmf -lohos.net.http", this.linkOhos) + "\"\n" +
|
|
483
|
+
" link-option = \"" + appendLink("-lpasteboard -ludmf -lohos.net.http -lhilog_ndk.z", this.linkOhos) + "\"\n" +
|
|
481
484
|
"[target.x86_64-linux-ohos.bin-dependencies]\n" +
|
|
482
485
|
" path-option = [\"" + x1 + "\", \"" + x2 + "\", \"" + x3 + "\", \"../stdx\"]\n" +
|
|
483
486
|
" package-option = {}\n"
|
package/cli/src/project.cj
CHANGED
|
@@ -32,7 +32,13 @@
|
|
|
32
32
|
# 只写在框架自己的 cjpm.toml 里不生效,缺了模块里就留一堆 `U OH_Pasteboard_*`,
|
|
33
33
|
# 表现是应用启动即 SIGSEGV(模块加载期解析不到符号)。
|
|
34
34
|
# 库在同 sysroot 的 `usr/lib/aarch64-linux-ohos`,上面 compile-option 的 `-L` 已指着它。
|
|
35
|
-
|
|
35
|
+
# -lohos.net.http:http 插件的鸿蒙支走系统网络栈(仓颉运行时装不了 OpenSSL,见 AGENTS §4),
|
|
36
|
+
# 模块符号在 libohos.net.http.so。
|
|
37
|
+
# -lhilog_ndk.z:框架的诊断出口(`src/log_bridge.cj` 鸿蒙段的 `OH_LOG_Print`,tag = cj-tauri)。
|
|
38
|
+
# 这条尤其别漏——日志通道自己因为缺符号起不来,就没有任何地方能报出原因。
|
|
39
|
+
# 注意:`cj-tauri sync` 会用 `cli/src/manifest.cj` 的 `renderOhosEntryToml` **重新生成本文件**,
|
|
40
|
+
# 这里写的 link-option 会被覆盖,真源在生成器那一份(三处要一起改)。
|
|
41
|
+
link-option = "-lpasteboard -ludmf -lohos.net.http -lhilog_ndk.z"
|
|
36
42
|
[target.aarch64-linux-ohos.bin-dependencies]
|
|
37
43
|
# 鸿蒙版 stdx:这里写**相对路径**,指向工程根上的 `stdx` 联接(build-hap.sh 用
|
|
38
44
|
# CANGJIE_STDX_OHOS 建,不入库)。两条实测依据:
|
|
@@ -97,14 +97,16 @@ cj_host *cj_bridge_create(void) {
|
|
|
97
97
|
return h;
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
-
|
|
100
|
+
int cj_bridge_destroy(cj_host *h) {
|
|
101
101
|
int i;
|
|
102
|
-
if (!h) return;
|
|
102
|
+
if (!h) return 1;
|
|
103
103
|
/* 平台资源先走:COM 环境引用 / 模块句柄等(幂等)。返回 0=宿主线程还在收尾,
|
|
104
|
-
它可能仍在用 h(GTK/WebView2 回调的 user_data 就是它)——这时连句柄一起留着不释放。
|
|
104
|
+
它可能仍在用 h(GTK/WebView2 回调的 user_data 就是它)——这时连句柄一起留着不释放。
|
|
105
|
+
回报 0 是**如实**:调用方(仓颉 dispose)据此保留句柄并可再试,别当成「已经释放」
|
|
106
|
+
把字段置空——那正是 issue #8 里「窗口还在屏幕上、页面 IPC 全哑」被静默放过去的地方。 */
|
|
105
107
|
if (!cj_plat_fini(h)) {
|
|
106
|
-
cj_logf("[cj-bridge] destroy: host thread still running, handle kept\n");
|
|
107
|
-
return;
|
|
108
|
+
cj_logf("[cj-bridge] destroy: host thread still running, handle kept (retryable)\n");
|
|
109
|
+
return 0;
|
|
108
110
|
}
|
|
109
111
|
if (h->js_lock) cj_plat_sync_destroy(h->js_lock);
|
|
110
112
|
if (h->dlg_lock) cj_plat_sync_destroy(h->dlg_lock);
|
|
@@ -124,6 +126,7 @@ void cj_bridge_destroy(cj_host *h) {
|
|
|
124
126
|
free(h->pending_url);
|
|
125
127
|
cj_logf("[cj-bridge] host destroyed: %p\n", (void *)h);
|
|
126
128
|
free(h);
|
|
129
|
+
return 1;
|
|
127
130
|
}
|
|
128
131
|
|
|
129
132
|
void cj_bridge_init(cj_host *h, cj_on_message_fn m, cj_on_destroy_fn d) {
|
|
@@ -401,8 +401,11 @@ void cj_core_drop_files(cj_host *h, const char *uri_list);
|
|
|
401
401
|
CJ_BRIDGE_API cj_host *cj_bridge_create(void);
|
|
402
402
|
|
|
403
403
|
/* 释放宿主编:先 cj_plat_fini,再回收公共状态。对 NULL 安全。
|
|
404
|
-
|
|
405
|
-
|
|
404
|
+
返回值:1 = 已回收(句柄随即失效,调用方必须把字段置空);
|
|
405
|
+
0 = 平台宿主线程还没收工,**平台状态与句柄一起留着**,调用方可以稍后再调一次重试。
|
|
406
|
+
契约(issue #8):这是可重试的操作,不是「调过就算数」——早退时不能把句柄丢掉,
|
|
407
|
+
否则「没回收」这件事既看不见也再没有第二次机会(表象是窗口留在屏幕上、页面 IPC 全哑)。 */
|
|
408
|
+
CJ_BRIDGE_API int cj_bridge_destroy(cj_host *h);
|
|
406
409
|
|
|
407
410
|
/* 注入回调(JS 消息到达 / 窗口销毁)+ 平台一次性初始化 */
|
|
408
411
|
CJ_BRIDGE_API void cj_bridge_init(cj_host *h, cj_on_message_fn m, cj_on_destroy_fn d);
|
|
@@ -337,16 +337,19 @@ int cj_plat_fini(cj_host *h) {
|
|
|
337
337
|
/* 收尾顺序同样要命:窗口销毁是 GTK/WebKit 一整串多线程拆解,若它与仓颉运行时的收尾
|
|
338
338
|
并发(run() 返回 → 运行时关停),实测几乎必然以 SIGABRT 收尾(`schd-worker` unhandled
|
|
339
339
|
SIGABRT from runtime frame)。所以给宿主线程一个有界的等待窗口——纯 usleep 轮询标记,
|
|
340
|
-
不碰 join(join 会与运行时握手互等,见上);等不到也不阻塞进程退出,照旧留着状态。
|
|
340
|
+
不碰 join(join 会与运行时握手互等,见上);等不到也不阻塞进程退出,照旧留着状态。
|
|
341
|
+
预算与 Windows 侧同一口径(5s):GTK/WebKit 的拆解是整串多线程收尾,2s 实测不够宽。
|
|
342
|
+
早退时**保留 p 与 thread_done 标记**,调用方(仓颉 dispose)可以再调一次重试——
|
|
343
|
+
issue #8 里那次「窗口还在、IPC 全哑」就是早退之后句柄被置空、再没有第二次机会。 */
|
|
341
344
|
if (!p->thread_done) {
|
|
342
345
|
int spin = 0;
|
|
343
|
-
while (!p->thread_done && spin <
|
|
346
|
+
while (!p->thread_done && spin < 5000) { /* 最多约 5s */
|
|
344
347
|
usleep(1000);
|
|
345
348
|
spin++;
|
|
346
349
|
}
|
|
347
350
|
}
|
|
348
351
|
if (!p->thread_done) {
|
|
349
|
-
fprintf(stderr, "[cj-bridge] fini: host thread still running, platform state kept\n");
|
|
352
|
+
fprintf(stderr, "[cj-bridge] fini: host thread still running, platform state kept (retryable)\n");
|
|
350
353
|
return 0;
|
|
351
354
|
}
|
|
352
355
|
h->plat = NULL;
|
|
@@ -2284,12 +2284,41 @@ static DWORD WINAPI host_thread_main(LPVOID param) {
|
|
|
2284
2284
|
create_env(NULL, udf_arg, NULL, &p->env.iface));
|
|
2285
2285
|
}
|
|
2286
2286
|
|
|
2287
|
-
|
|
2288
|
-
|
|
2289
|
-
|
|
2287
|
+
/* 消息循环(issue #8):**不能**只等消息。should_quit 可以来自任何线程(命令 worker 里的
|
|
2288
|
+
app.quit()),而窗口已经不在(还没建出来 / 已被销毁 / 环境创建失败)时没人能给它
|
|
2289
|
+
PostMessage——纯 GetMessageW 会永久阻塞:宿主线程永不退出 → thread_done 恒 0 →
|
|
2290
|
+
cj_plat_fini 每次都报「host thread still running」并把平台状态永久留着。所以改成
|
|
2291
|
+
有界唤醒 + 每轮复核退出意图,两条都不依赖别人替我们投消息。 */
|
|
2292
|
+
for (;;) {
|
|
2293
|
+
DWORD wr = MsgWaitForMultipleObjectsEx(0, NULL, 50, QS_ALLINPUT, MWMO_INPUTAVAILABLE);
|
|
2294
|
+
if (wr == WAIT_OBJECT_0) {
|
|
2295
|
+
while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
|
|
2296
|
+
if (msg.message == WM_QUIT) goto done;
|
|
2297
|
+
TranslateMessage(&msg);
|
|
2298
|
+
DispatchMessageW(&msg);
|
|
2299
|
+
}
|
|
2300
|
+
}
|
|
2301
|
+
/* 退出意图复核:窗口还活着就本线程自己销毁(DestroyWindow 只能建窗线程调),
|
|
2302
|
+
窗口已经没了就直接收工。 */
|
|
2303
|
+
if (h->should_quit) {
|
|
2304
|
+
if (p->hwnd) {
|
|
2305
|
+
DestroyWindow(p->hwnd); /* WM_DESTROY → PostQuitMessage,下一轮取到 WM_QUIT 退出 */
|
|
2306
|
+
} else {
|
|
2307
|
+
break;
|
|
2308
|
+
}
|
|
2309
|
+
}
|
|
2290
2310
|
}
|
|
2291
2311
|
|
|
2292
2312
|
done:
|
|
2313
|
+
/* 窗口必收(issue #8):消息循环退出 ≠ 窗口没了。WM_QUIT 可能来自别处(嵌套模态循环、
|
|
2314
|
+
别的线程 PostQuitMessage),那时窗口仍留在屏幕上而消息循环已经不再服务它——表象正是
|
|
2315
|
+
「界面看着正常,但点什么都回不来、ExecuteScript 一条都不再发」(js -> native 还在走,
|
|
2316
|
+
因为消息接收是 WebView2 自己的通道;回投却全靠本循环,于是前端 promise 永不 settle)。
|
|
2317
|
+
这里补最后一道:本线程直接销毁,保证「循环退出时屏幕上不留窗」。 */
|
|
2318
|
+
if (p->hwnd) {
|
|
2319
|
+
DestroyWindow(p->hwnd); /* WM_DESTROY 里自己会置 p->hwnd = NULL 并 PostQuitMessage */
|
|
2320
|
+
p->hwnd = NULL;
|
|
2321
|
+
}
|
|
2293
2322
|
if (title_w) free(title_w);
|
|
2294
2323
|
if (icon_w) free(icon_w);
|
|
2295
2324
|
if (p->menu) { /* 窗口没了,菜单栏也要回收(HMENU 归本线程建、也归本线程销毁)*/
|
|
@@ -2352,15 +2381,21 @@ int cj_plat_fini(cj_host *h) {
|
|
|
2352
2381
|
if (!p) return 1;
|
|
2353
2382
|
/* 宿主线程还活着(事件循环没退出):不能在这里 free 平台状态——它正被那条线程用着。
|
|
2354
2383
|
等待必须有界:宿主线程收尾时要进入仓颉运行时(onDestroy),无限等会与运行时的线程
|
|
2355
|
-
退出握手互等(Linux 侧实测过,见 bridge_linux.c
|
|
2384
|
+
退出握手互等(Linux 侧实测过,见 bridge_linux.c 同名函数)。
|
|
2385
|
+
等不到时**保留线程句柄与平台状态**并以 0 返回:调用方(仓颉 dispose)可以再调一次,
|
|
2386
|
+
这里绝不提前 CloseHandle——句柄一丢,下次连「它还活着吗」都问不出来(issue #8)。 */
|
|
2356
2387
|
if (p->thread_started && p->thread) {
|
|
2357
|
-
WaitForSingleObject(p->thread, 5000)
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
|
|
2388
|
+
if (WaitForSingleObject(p->thread, 5000) == WAIT_OBJECT_0) {
|
|
2389
|
+
CloseHandle(p->thread);
|
|
2390
|
+
p->thread = NULL;
|
|
2391
|
+
p->thread_started = 0;
|
|
2392
|
+
}
|
|
2361
2393
|
}
|
|
2362
2394
|
if (!p->thread_done) {
|
|
2363
|
-
|
|
2395
|
+
/* 它可能正停在 WM_DESTROY 的同步 COM 清理里(view_close / controller Close 都可能慢)。
|
|
2396
|
+
再投一次退出让存活窗口走销毁路径,然后如实报告没回收,等调用方重试。 */
|
|
2397
|
+
if (p->hwnd) PostMessageW(p->hwnd, WM_CJT_QUIT, 0, 0);
|
|
2398
|
+
fprintf(stderr, "[cj-bridge] fini: host thread still running, platform state kept (retryable)\n");
|
|
2364
2399
|
return 0;
|
|
2365
2400
|
}
|
|
2366
2401
|
h->plat = NULL;
|
|
@@ -105,6 +105,9 @@ static int g_wake_calls;
|
|
|
105
105
|
static int g_quit_calls;
|
|
106
106
|
static int g_start_calls;
|
|
107
107
|
static int g_fini_calls;
|
|
108
|
+
/* cj_plat_fini 的返回值:1 = 宿主线程已收工(平台状态可回收),0 = 还没收工(要留着等重试)。
|
|
109
|
+
issue #8:核心必须把这个 0 如实传出去并保留句柄,不能当成功。 */
|
|
110
|
+
static int g_fini_result = 1;
|
|
108
111
|
static int g_run_dialog_calls;
|
|
109
112
|
static int g_post_dialog_calls;
|
|
110
113
|
static int g_load_url_calls;
|
|
@@ -181,7 +184,7 @@ void cj_plat_sync_wait(cj_sync *s, int *ready) {
|
|
|
181
184
|
void cj_plat_sync_signal(cj_sync *s) { if (s) pthread_cond_signal(&s->c); }
|
|
182
185
|
|
|
183
186
|
void cj_plat_init(cj_host *h) { (void)h; }
|
|
184
|
-
int cj_plat_fini(cj_host *h) { (void)h; g_fini_calls++; return
|
|
187
|
+
int cj_plat_fini(cj_host *h) { (void)h; g_fini_calls++; return g_fini_result; }
|
|
185
188
|
void cj_plat_start(cj_host *h) { (void)h; g_start_calls++; }
|
|
186
189
|
void cj_plat_quit(cj_host *h) { (void)h; g_quit_calls++; }
|
|
187
190
|
void cj_plat_wake_ui(cj_host *h) { (void)h; g_wake_calls++; }
|
|
@@ -1053,10 +1056,31 @@ int main(void) {
|
|
|
1053
1056
|
/* --- 18. 销毁:先走平台 fini,再回收句柄 --- */
|
|
1054
1057
|
case_begin("destroy 先走 cj_plat_fini 再回收");
|
|
1055
1058
|
reset_counters();
|
|
1056
|
-
cj_bridge_destroy(h2);
|
|
1057
|
-
cj_bridge_destroy(h);
|
|
1059
|
+
CHECK(cj_bridge_destroy(h2) == 1, "宿主线程已收工时 destroy 回 1");
|
|
1060
|
+
CHECK(cj_bridge_destroy(h) == 1, "同上(第二个宿主)");
|
|
1058
1061
|
CHECK(g_fini_calls == 2, "两个宿主各自走一次平台 fini");
|
|
1059
1062
|
|
|
1063
|
+
/* --- 18b. 销毁可重试(issue #8):宿主线程没收工就如实回 0,句柄留着等下一次 ---
|
|
1064
|
+
早退那一轮的真实后果是「窗口留在屏幕上、消息循环不再服务它、页面 promise 永不 settle」,
|
|
1065
|
+
所以核心这条边界必须有断言盯着:回 0 时平台状态不许被提前回收(句柄仍可访问),
|
|
1066
|
+
而且同一个句柄重试一次必须能成功回收——否则应用侧既看不见失败、也没有第二次机会。 */
|
|
1067
|
+
case_begin("destroy 可重试:fini 未收工不假装成功");
|
|
1068
|
+
{
|
|
1069
|
+
cj_host *hr = cj_bridge_create();
|
|
1070
|
+
CHECK(hr != NULL, "为可重试用例新建宿主");
|
|
1071
|
+
if (hr) {
|
|
1072
|
+
reset_counters();
|
|
1073
|
+
g_fini_result = 0;
|
|
1074
|
+
CHECK(cj_bridge_destroy(hr) == 0, "宿主线程未收工时 destroy 回 0(不是成功)");
|
|
1075
|
+
CHECK(g_fini_calls == 1, "那次仍走了平台 fini(只是它回 0)");
|
|
1076
|
+
CHECK(cj_bridge_should_quit(hr) == 0,
|
|
1077
|
+
"句柄仍可安全访问(平台状态没被提前回收,没有 UAF)");
|
|
1078
|
+
g_fini_result = 1;
|
|
1079
|
+
CHECK(cj_bridge_destroy(hr) == 1, "同一句柄重试即可回收(回 1)");
|
|
1080
|
+
CHECK(g_fini_calls == 2, "重试又走了一次平台 fini");
|
|
1081
|
+
}
|
|
1082
|
+
}
|
|
1083
|
+
|
|
1060
1084
|
/* --- 19. 串口:白名单是安全边界,导出只做校验 + 转发 --- */
|
|
1061
1085
|
case_begin("serial 白名单与导出转发");
|
|
1062
1086
|
CHECK(cj_serial_path_allowed("/dev/ttyUSB0"), "放行 /dev/ttyUSB0");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cj-tauri",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.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
|
@@ -277,7 +277,7 @@ public class TauriApp <: AppHost {
|
|
|
277
277
|
*/
|
|
278
278
|
public func loadCapabilities(dir: String): TauriApp {
|
|
279
279
|
let n = loadCapabilitiesFromDir(dir, this.capabilities)
|
|
280
|
-
|
|
280
|
+
logd("[cj-tauri] 已从 ${dir} 加载 ${n} 个 capability 清单")
|
|
281
281
|
return this
|
|
282
282
|
}
|
|
283
283
|
|
package/src/app_events.cj
CHANGED
|
@@ -100,18 +100,18 @@ extend TauriApp {
|
|
|
100
100
|
try {
|
|
101
101
|
hook(json, label)
|
|
102
102
|
} catch (e: Exception) {
|
|
103
|
-
|
|
103
|
+
logd("[cj-tauri] shell hook 抛出异常(已忽略):${e}")
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
match (parseShellEnvelope(json)) {
|
|
107
|
-
case None =>
|
|
107
|
+
case None => logd("[cj-tauri] shell event 信封解析失败(已丢弃):${json}")
|
|
108
108
|
case Some(obj) =>
|
|
109
109
|
var kind = ""
|
|
110
110
|
if (let Some(k) <- shellString(obj, "kind")) {
|
|
111
111
|
kind = k
|
|
112
112
|
}
|
|
113
113
|
match (shellEventNameFor(kind)) {
|
|
114
|
-
case None =>
|
|
114
|
+
case None => logd("[cj-tauri] shell event: 未知 kind \"${kind}\"(未投递):${json}")
|
|
115
115
|
case Some(event) =>
|
|
116
116
|
if (kind == "menu") {
|
|
117
117
|
this.syncMenuStateFromShellObj(label, obj)
|
|
@@ -119,7 +119,7 @@ extend TauriApp {
|
|
|
119
119
|
try {
|
|
120
120
|
this.hub.emitToWindow(event, obj, label)
|
|
121
121
|
} catch (e: Exception) {
|
|
122
|
-
|
|
122
|
+
logd("[cj-tauri] shell event 投递失败(已忽略):${e}")
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -156,7 +156,7 @@ extend TauriApp {
|
|
|
156
156
|
let js = "window.__CJ_TAURI__._dispatch(${json});"
|
|
157
157
|
let targets = this.windows.targets(window)
|
|
158
158
|
if (targets.size == 0 && window.size > 0) {
|
|
159
|
-
|
|
159
|
+
logd("[cj-tauri] 未注册的窗口 label:\"${window}\"(回执 / 事件未投递)")
|
|
160
160
|
return
|
|
161
161
|
}
|
|
162
162
|
for (rec in targets) {
|
package/src/app_host_ops.cj
CHANGED
|
@@ -41,7 +41,7 @@ extend TauriApp {
|
|
|
41
41
|
this.menus.add(label, menu)
|
|
42
42
|
host.setMenu(menu.toWire())
|
|
43
43
|
case None =>
|
|
44
|
-
|
|
44
|
+
logd("[cj-tauri] setMenu: 未注册的窗口 label \"${label}\"(菜单未设置)")
|
|
45
45
|
}
|
|
46
46
|
return this
|
|
47
47
|
}
|
|
@@ -126,13 +126,13 @@ extend TauriApp {
|
|
|
126
126
|
case Some(item) =>
|
|
127
127
|
item.enabled = enabled
|
|
128
128
|
item.checked = checked
|
|
129
|
-
case None =>
|
|
129
|
+
case None => logd("[cj-tauri] setMenuItemState: 模型里没有 \"${id}\"(只改平台侧)")
|
|
130
130
|
}
|
|
131
|
-
case None =>
|
|
131
|
+
case None => logd("[cj-tauri] setMenuItemState: 窗口 \"${label}\" 无应用层菜单模型(只改平台侧)")
|
|
132
132
|
}
|
|
133
133
|
match (this.hostOf(label)) {
|
|
134
134
|
case Some(host) => host.setMenuItemState(id, enabled, checked)
|
|
135
|
-
case None =>
|
|
135
|
+
case None => logd("[cj-tauri] setMenuItemState: 未注册的窗口 label \"${label}\"(未生效)")
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
|
|
@@ -182,7 +182,7 @@ extend TauriApp {
|
|
|
182
182
|
case Some(host) =>
|
|
183
183
|
host.setDragDropPolicy(policy.enabled, policy.files)
|
|
184
184
|
case None =>
|
|
185
|
-
|
|
185
|
+
logd("[cj-tauri] setDragDrop: 未注册的窗口 label \"${label}\"(策略未设置)")
|
|
186
186
|
}
|
|
187
187
|
return this
|
|
188
188
|
}
|
|
@@ -204,7 +204,7 @@ extend TauriApp {
|
|
|
204
204
|
case Some(host) =>
|
|
205
205
|
host.setGlobalHotkeys(keys.toWire())
|
|
206
206
|
case None =>
|
|
207
|
-
|
|
207
|
+
logd("[cj-tauri] setGlobalHotkeys: 未注册的窗口 label \"${label}\"(快捷键未设置)")
|
|
208
208
|
}
|
|
209
209
|
return this
|
|
210
210
|
}
|
|
@@ -221,7 +221,7 @@ extend TauriApp {
|
|
|
221
221
|
case Some(host) =>
|
|
222
222
|
host.setTray(tray.toWire())
|
|
223
223
|
case None =>
|
|
224
|
-
|
|
224
|
+
logd("[cj-tauri] setTray: 默认窗口未注册(托盘未设置)")
|
|
225
225
|
}
|
|
226
226
|
return this
|
|
227
227
|
}
|
|
@@ -280,7 +280,7 @@ extend TauriApp {
|
|
|
280
280
|
case Some(host) =>
|
|
281
281
|
host.setWindowVisible(visible)
|
|
282
282
|
case None =>
|
|
283
|
-
|
|
283
|
+
logd("[cj-tauri] setWindowVisible: 未注册的窗口 label \"${label}\"(窗口未改可见性)")
|
|
284
284
|
}
|
|
285
285
|
return this
|
|
286
286
|
}
|
package/src/app_run.cj
CHANGED
|
@@ -80,7 +80,7 @@ extend TauriApp {
|
|
|
80
80
|
case Some(mode) =>
|
|
81
81
|
// flush 显式给:CLI 用管道抓 stdout,不能指望进程退出时的缓冲冲刷
|
|
82
82
|
print(renderPluginManifest(this.plugins, mode), flush: true)
|
|
83
|
-
|
|
83
|
+
logd("[cj-tauri] 已导出插件清单(mode=${mode}):本轮未创建窗口")
|
|
84
84
|
return true
|
|
85
85
|
case None => return false
|
|
86
86
|
}
|
|
@@ -99,7 +99,7 @@ extend TauriApp {
|
|
|
99
99
|
this.host.addInitScript(js)
|
|
100
100
|
}
|
|
101
101
|
if (this.pluginScripts.size > 0) {
|
|
102
|
-
|
|
102
|
+
logd("[cj-tauri] 插件 JS 已注册为预执行脚本:${this.pluginScripts.size} 段")
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
|
|
@@ -143,12 +143,12 @@ extend TauriApp {
|
|
|
143
143
|
}
|
|
144
144
|
this.pluginScripts = pluginInitScripts(this.plugins)
|
|
145
145
|
if (this.plugins.size > 0) {
|
|
146
|
-
|
|
147
|
-
|
|
146
|
+
logd("[cj-tauri] 已装配 ${this.plugins.size} 个插件:")
|
|
147
|
+
logd(describePlugins(this.plugins))
|
|
148
148
|
let sets = describePermissionSets(this.plugins)
|
|
149
149
|
if (sets.size > 0) {
|
|
150
|
-
|
|
151
|
-
|
|
150
|
+
logd("[cj-tauri] 命名权限集(在 capabilities 的 permissions 里按集名引用):")
|
|
151
|
+
logd(sets)
|
|
152
152
|
}
|
|
153
153
|
warnUnauthorizedPlugins(this.plugins, this.capabilities)
|
|
154
154
|
}
|
|
@@ -184,7 +184,7 @@ extend TauriApp {
|
|
|
184
184
|
match (this.hostOf(label)) {
|
|
185
185
|
case Some(h) => return h.hostCapabilities()
|
|
186
186
|
case None =>
|
|
187
|
-
|
|
187
|
+
logd("[cj-tauri] system:host: 未注册的窗口 label \"${label}\"(能力位按 0 返回)")
|
|
188
188
|
return 0
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -219,7 +219,7 @@ extend TauriApp {
|
|
|
219
219
|
// shell 事件分发要在 load 之前装(菜单点击随时可能来,装晚了就漏)
|
|
220
220
|
this.wireShellEvents(w.host, w.label)
|
|
221
221
|
w.host.load(PageSource.Inline(w.html))
|
|
222
|
-
|
|
222
|
+
logd("[cj-tauri] 附加窗口已启动:label=\"${w.label}\"")
|
|
223
223
|
}
|
|
224
224
|
}
|
|
225
225
|
|
package/src/capability.cj
CHANGED
|
@@ -322,7 +322,7 @@ public class CapabilityRegistry {
|
|
|
322
322
|
*/
|
|
323
323
|
public func addRuntimeScopeAllow(plugin: String, pattern: String): Bool {
|
|
324
324
|
if (!isConcreteScopeValue(pattern)) {
|
|
325
|
-
|
|
325
|
+
logd("[cj-tauri] runtime scope allow refused (${plugin}): pattern must be a concrete value, got '${pattern}'")
|
|
326
326
|
return false
|
|
327
327
|
}
|
|
328
328
|
synchronized(this.scopeLock) {
|
|
@@ -402,8 +402,8 @@ public class CapabilityRegistry {
|
|
|
402
402
|
public func warnUnknownPermissionSets(reg: CapabilityRegistry): Unit {
|
|
403
403
|
for (name in reg.declaredPermissionSets()) {
|
|
404
404
|
if (!reg.hasPermissionSet(name)) {
|
|
405
|
-
|
|
406
|
-
|
|
405
|
+
logd("[cj-tauri] 未知的命名权限集 \"${name}\":没有插件提供它,这一条不生效")
|
|
406
|
+
logd("[cj-tauri] 检查拼写;若它来自插件,确认提供它的插件已 .plugin(...) 装配")
|
|
407
407
|
}
|
|
408
408
|
}
|
|
409
409
|
}
|
package/src/capability_loader.cj
CHANGED
|
@@ -22,7 +22,7 @@ func loadCapabilitiesFromDir(dir: String, reg: CapabilityRegistry): Int64 {
|
|
|
22
22
|
try {
|
|
23
23
|
entries = Directory.readFrom(dir)
|
|
24
24
|
} catch (e: Exception) {
|
|
25
|
-
|
|
25
|
+
logd("[cj-tauri] 读取 capability 目录失败 ${dir}: ${e}")
|
|
26
26
|
return loaded
|
|
27
27
|
}
|
|
28
28
|
for (info in entries) {
|
|
@@ -37,17 +37,17 @@ func loadCapabilitiesFromDir(dir: String, reg: CapabilityRegistry): Int64 {
|
|
|
37
37
|
try {
|
|
38
38
|
text = String.fromUtf8(File.readFrom(path))
|
|
39
39
|
} catch (e: Exception) {
|
|
40
|
-
|
|
40
|
+
logd("[cj-tauri] 读取 capability 失败 ${path}: ${e}")
|
|
41
41
|
continue
|
|
42
42
|
}
|
|
43
43
|
try {
|
|
44
44
|
if (reg.addFromJson(JsonValue.fromStr(text))) {
|
|
45
45
|
loaded += 1
|
|
46
46
|
} else {
|
|
47
|
-
|
|
47
|
+
logd("[cj-tauri] capability 缺少 identifier,已跳过: ${path}")
|
|
48
48
|
}
|
|
49
49
|
} catch (e: Exception) {
|
|
50
|
-
|
|
50
|
+
logd("[cj-tauri] capability JSON 解析失败 ${path}: ${e}")
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
return loaded
|
|
@@ -63,14 +63,14 @@ func autoLoadCapabilities(reg: CapabilityRegistry): Unit {
|
|
|
63
63
|
}
|
|
64
64
|
let dir = "capabilities"
|
|
65
65
|
if (!exists(dir)) {
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
logd("[cj-tauri] 未挂载任何 capability,且没有 capabilities/ 目录")
|
|
67
|
+
logd("[cj-tauri] 默认最小权限:未声明的命令与事件一律拒绝(见 docs/使用文档.md)")
|
|
68
68
|
return
|
|
69
69
|
}
|
|
70
70
|
let n = loadCapabilitiesFromDir(dir, reg)
|
|
71
71
|
if (n > 0) {
|
|
72
|
-
|
|
72
|
+
logd("[cj-tauri] 已自动加载 capabilities/:${n} 个清单")
|
|
73
73
|
} else {
|
|
74
|
-
|
|
74
|
+
logd("[cj-tauri] capabilities/ 目录下没有可用的 *.json 清单")
|
|
75
75
|
}
|
|
76
76
|
}
|