cj-tauri 2.4.0 → 2.4.1
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 +32 -1
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +1 -1
- package/cli/src/project.cj +1 -1
- package/cli/src/sign_gcm.cj +10 -1
- package/cli/src/sign_login.cj +21 -0
- package/cli/src/sign_offline.cj +34 -1
- package/package.json +1 -1
- package/src/version.cj +1 -1
package/bin/cj-tauri.js
CHANGED
|
@@ -350,14 +350,45 @@ function resolveCli(env, cjpm) {
|
|
|
350
350
|
const prebuilt = prebuiltCliPath();
|
|
351
351
|
if (fs.existsSync(prebuilt)) {
|
|
352
352
|
verbose(`使用包内预编译 CLI: ${prebuilt}`);
|
|
353
|
+
stageTlsDlls(prebuilt);
|
|
353
354
|
return prebuilt;
|
|
354
355
|
}
|
|
355
356
|
const cached = cachedCliPath();
|
|
356
357
|
if (fs.existsSync(cached)) {
|
|
357
358
|
verbose(`使用缓存 CLI: ${cached}`);
|
|
359
|
+
stageTlsDlls(cached);
|
|
358
360
|
return cached;
|
|
359
361
|
}
|
|
360
|
-
|
|
362
|
+
const built = buildCli(env, cjpm);
|
|
363
|
+
if (built) {
|
|
364
|
+
stageTlsDlls(built);
|
|
365
|
+
}
|
|
366
|
+
return built;
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
/**
|
|
370
|
+
* Windows TLS 依赖(issue #16-③):仓颉 stdx 的 TLS 按名字加载 libcrypto/libssl-3-x64.dll,
|
|
371
|
+
* SDK 与 stdx 都不带。包里若有 vendor/openssl(npm-pack.sh 打进去的),把它们落到 CLI
|
|
372
|
+
* 可执行文件旁边——没有它们,`sign --login` 换 JWT 时必挂且报错不指向缺什么。
|
|
373
|
+
* 幂等:目标已存在就不覆盖(用户手工换的新版本不被动回去)。
|
|
374
|
+
*/
|
|
375
|
+
function stageTlsDlls(cliPath) {
|
|
376
|
+
if (!IS_WIN) {
|
|
377
|
+
return;
|
|
378
|
+
}
|
|
379
|
+
const srcDir = path.join(PKG_ROOT, 'vendor', 'openssl');
|
|
380
|
+
for (const name of ['libcrypto-3-x64.dll', 'libssl-3-x64.dll']) {
|
|
381
|
+
const src = path.join(srcDir, name);
|
|
382
|
+
const dst = path.join(path.dirname(cliPath), name);
|
|
383
|
+
try {
|
|
384
|
+
if (fs.existsSync(src) && !fs.existsSync(dst)) {
|
|
385
|
+
fs.copyFileSync(src, dst);
|
|
386
|
+
verbose(`已落 TLS 依赖: ${dst}`);
|
|
387
|
+
}
|
|
388
|
+
} catch (e) {
|
|
389
|
+
// 非致命:sign 流程里还有依赖预检给可行动提示
|
|
390
|
+
}
|
|
391
|
+
}
|
|
361
392
|
}
|
|
362
393
|
|
|
363
394
|
function main() {
|
package/cjpm.toml
CHANGED
package/cli/cjpm.toml
CHANGED
package/cli/src/project.cj
CHANGED
package/cli/src/sign_gcm.cj
CHANGED
|
@@ -450,9 +450,18 @@ public func signRandomBytes(n: Int64): Array<Byte> {
|
|
|
450
450
|
} catch (e: Exception) {
|
|
451
451
|
let _ = e
|
|
452
452
|
let out = Array<Byte>(n, repeat: 0)
|
|
453
|
+
/* 降级 PRNG 用 xorshift64(issue #16-①):旧实现是 LCG 乘法
|
|
454
|
+
(seed * 6364136223846793005),Int64 下必然溢出——仓颉对乘法做溢出检查、
|
|
455
|
+
直接抛 OverflowException,降级路径第一次跑就崩(C 里靠回绕所以从未暴露)。
|
|
456
|
+
xorshift 只有移位与异或,不触发溢出检查。 */
|
|
453
457
|
var seed = Int64(DateTime.now().toUnixTimeStamp().toNanoseconds()) & 0x7FFFFFFFFFFFFFFF
|
|
458
|
+
if (seed == 0) { seed = 88172645463325252 }
|
|
454
459
|
for (i in 0..n) {
|
|
455
|
-
seed =
|
|
460
|
+
seed = seed ^ (seed << 13)
|
|
461
|
+
seed = seed & 0x7FFFFFFFFFFFFFFF
|
|
462
|
+
seed = seed ^ (seed >> 7)
|
|
463
|
+
seed = seed ^ (seed << 17)
|
|
464
|
+
seed = seed & 0x7FFFFFFFFFFFFFFF
|
|
456
465
|
out[i] = UInt8((seed >> 33) & 0xFF)
|
|
457
466
|
}
|
|
458
467
|
return out
|
package/cli/src/sign_login.cj
CHANGED
|
@@ -277,8 +277,29 @@ public func signOpenUrlInBrowser(url: String): String {
|
|
|
277
277
|
}
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
+
/** Windows 上 TLS 依赖预检(issue #16-③):stdx 的 TLS 按名字加载 OpenSSL 3 的两个 DLL,
|
|
281
|
+
SDK 与 stdx 都不带——缺了报错只说 "Can not load openssl library",不给文件名与位置。
|
|
282
|
+
这里提前给可行动提示(只打 stderr、不阻断:DLL 也可能在 PATH 等别处)。 */
|
|
283
|
+
public func checkTlsDllsOnWindows(): Unit {
|
|
284
|
+
if (!hostIsWindows()) {
|
|
285
|
+
return
|
|
286
|
+
}
|
|
287
|
+
var dir = ""
|
|
288
|
+
if (let Some(p) <- currentExePath()) {
|
|
289
|
+
dir = dirNameOf(p)
|
|
290
|
+
}
|
|
291
|
+
for (n in ["libcrypto-3-x64.dll", "libssl-3-x64.dll"]) {
|
|
292
|
+
if (dir == "" || !exists(joinPath(dir, n))) {
|
|
293
|
+
eprintln("[cj-tauri] 提示: CLI 目录(${dir})里没有 ${n}——stdx 的 TLS 按名字加载它,")
|
|
294
|
+
eprintln("[cj-tauri] 缺了稍后会报 \"Can not load openssl library\"。把框架仓")
|
|
295
|
+
eprintln("[cj-tauri] vendor/openssl/ 下的两个 DLL 拷到 CLI 同目录即可修复。")
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
|
|
280
300
|
/** 阻塞式登录:起回调服务 → 打印/打开登录页 → 等回调 → 换 JWT → 校验 → 拉团队 */
|
|
281
301
|
public func agcLogin(timeoutSec: Int64, openBrowser: Bool): AgcLoginOutcome {
|
|
302
|
+
checkTlsDllsOnWindows() // TLS 依赖预检(issue #16-③):缺 DLL 时先给可行动提示
|
|
282
303
|
let out = AgcLoginOutcome()
|
|
283
304
|
let state = SignCallbackState()
|
|
284
305
|
// 允许外部指定回调 code(自动化/自测用)
|
package/cli/src/sign_offline.cj
CHANGED
|
@@ -278,12 +278,45 @@ public func parseUdid(out: String): String {
|
|
|
278
278
|
}
|
|
279
279
|
|
|
280
280
|
/** 调 hdc 取本机设备 UDID(拿不到返回空串) */
|
|
281
|
+
/** 从 `hdc list targets` 挑第一个 host:port 形态的目标(网络设备;UART 串口是 COM*,排除) */
|
|
282
|
+
func pickNetworkHdcTarget(hdcPath: String): String {
|
|
283
|
+
try {
|
|
284
|
+
let (code, out, _) = executeWithOutput(hdcPath, ["list", "targets"])
|
|
285
|
+
if (code != 0) {
|
|
286
|
+
return ""
|
|
287
|
+
}
|
|
288
|
+
for (line0 in lenientUtf8(out).split("\n")) {
|
|
289
|
+
let line = trimAscii(line0)
|
|
290
|
+
// host:port 形态(如 192.168.3.105:46163);COM* 是 UART 串口,跳过
|
|
291
|
+
if (line.size > 0 && line.contains(":") && !line.startsWith("COM")) {
|
|
292
|
+
return line
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
return ""
|
|
296
|
+
} catch (e: Exception) {
|
|
297
|
+
let _ = e
|
|
298
|
+
return ""
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
|
|
281
302
|
public func deviceUdidViaHdc(hdcPath: String): String {
|
|
282
303
|
if (hdcPath == "") {
|
|
283
304
|
return ""
|
|
284
305
|
}
|
|
285
306
|
try {
|
|
286
|
-
|
|
307
|
+
/* 多设备环境下 `hdc shell` 会落到 hdc 自己选的第一台——实测 UART 串口
|
|
308
|
+
(COM1/COM2)排在网络设备之前,命令落串口、输出里没有 UDID(issue #16-②)。
|
|
309
|
+
优先级:显式 CJ_HDC_DEVICE > list targets 里的 host:port 形态(网络设备)>
|
|
310
|
+
不带 -t 的旧行为。 */
|
|
311
|
+
var dev = getVariable("CJ_HDC_DEVICE") ?? ""
|
|
312
|
+
if (dev == "") {
|
|
313
|
+
dev = pickNetworkHdcTarget(hdcPath)
|
|
314
|
+
}
|
|
315
|
+
var cmdArgs: Array<String> = ["shell", "bm", "get", "--udid"]
|
|
316
|
+
if (dev != "") {
|
|
317
|
+
cmdArgs = ["-t", dev, "shell", "bm", "get", "--udid"]
|
|
318
|
+
}
|
|
319
|
+
let (code, out, _) = executeWithOutput(hdcPath, cmdArgs)
|
|
287
320
|
if (code != 0) {
|
|
288
321
|
return ""
|
|
289
322
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cj-tauri",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.1",
|
|
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/version.cj
CHANGED