Compare commits

...
Author SHA1 Message Date
AxTps 6f77f13a04 chore: 发布 1.0.1-beta4 公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- catalog.ts 增量新增 1.0.1-beta4 公告(修复 beta3 的构建错误);
- 网站 catalog.json 重新生成。
2026-09-30 23:47:22 +08:00
AxTps b1f4431767 fix: 修复 DashMap 取值编译错误
hosted.rs 的 has_game_account_in 对 DashMap 使用了不存在的
.values(),导致 theseus 编译失败(E0599)。改为 .iter() 并通过
.value() 取账户值。
2026-09-30 23:43:30 +08:00
AxTps 15b6575824 chore: 发布 1.0.1-beta3 公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- catalog.ts 增量新增 1.0.1-beta3 公告(界面缩放、首次启动公告、
  浏览页与链接修复);
- 网站 catalog.json 重新生成。
2026-09-30 23:13:34 +08:00
AxTps 5bd785d780 chore(i18n): 补充界面缩放设置的中英文文案并清理多余键
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- en-US / zh-CN 新增 app.appearance-settings.ui-scale.title 与
  .description;
- 移除未使用的 ui-scale.custom / ui-scale.percent 文案键。
2026-09-30 22:55:34 +08:00
AxTps 94cbcef324 feat: 新增启动器界面缩放设置
在高缩放/小屏下,内嵌网页(如皮肤站)顶栏会被裁掉。新增“界面
与外观”中的“启动器缩放”设置,可整体缩放启动器界面。

- 新增 helpers/ui-scale.ts:用 localStorage 保存缩放值(纯本地
  显示偏好,无需后端),并通过 CSS zoom 应用缩放(含内嵌网页)。
- App.vue 启动时调用 installUiScale() 应用已保存的缩放。
- AppearanceSettings.vue 新增缩放设置项:100/110/125/150 预设
  加 50–200 滑条自定义。
2026-09-30 22:40:24 +08:00
AxTps d8a6d44890 fix: 关于页许可证与更新日志链接指向 GitHub 仓库
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- config.ts:repositoryUrl 修正为启动器仓库
  (github.com/ApTx2012/Starlight_Lancher),此前误指向服务端仓库;
  新增 releasesUrl。
- 关于页“项目许可证”“第三方许可证”随之指向正确的 GitHub 路径。
- 更新页“查看完整更新日志”:当前版本回退到 releasesUrl;历史版本
  回退到对应 tag 的 release 页面。
2026-09-30 21:53:16 +08:00
AxTps 9b75ca4f3f fix: 未配置 CurseForge API Key 时浏览页仍显示导航栏
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
此前在世界地图浏览(projectType=world)且未配置 CurseForge API Key
时,整个 BrowsePageLayout 被 v-if 隐藏,导致选择栏(整合包/模组/
资源包/…/服务器/收藏夹)与搜索栏全部空白。

现在始终渲染 BrowsePageLayout,仅在其结果区上方(#above-results)
于该场景下显示“地图不可用 / 请配置 CurseForge API Key”的提示,导航
与搜索栏保持可见。
2026-09-30 21:31:07 +08:00
AxTps 913e0071dd fix: 修复首次启动公告未弹出并添加侧栏公告入口
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
首次启动公告未弹出,原因有二:
- StartupAnnouncementModal 未 defineExpose({ show }),父组件调用
  show() 静默失败;
- 展示逻辑在调用 show() 之前就写入了 localStorage 的"已读"标记,
  一旦 show 失败便永久不再弹出。

修复:
- 组件补上 defineExpose({ show });
- 展示逻辑改为"确认能拿到组件实例并 show() 成功后再写标记",
  组件尚未挂载时于 nextTick 重试。

同时把首页侧栏的"每日小挑战"替换为可点击的"公告"入口
(HomeAnnouncementEntry),点击通过 provide/inject 的
showStartupAnnouncement 打开公告弹窗。
2026-09-30 21:11:40 +08:00
Disy bb6b8cb8d2 fix: 未登录时阻止下载StarLight实例
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Sync LobeHub models / sync (push) Has been cancelled
2026-09-29 17:36:10 +08:00
Disy efbf998ebb feat: GitHub 发布生成皮肤站完整更新包
Axolotl desktop CI / guardrails (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Sync LobeHub models / sync (push) Has been cancelled
2026-09-28 15:27:14 +08:00
Disy ce0f41c973 fix: 修复实时日志与数据库切换可靠性
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Sync LobeHub models / sync (push) Has been cancelled
2026-09-27 14:18:25 +08:00
AxTps 2efaa4fb35 chore: 发布 1.0.1-beta1 公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Sync LobeHub models / sync (push) Has been cancelled
- catalog.ts 增量新增 1.0.1-beta1 公告(首次启动欢迎弹窗);
- 网站 catalog.json 重新生成。
2026-09-27 08:39:49 +08:00
AxTps 2d52d16933 feat: 添加了首次启动器时弹出的公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
2026-09-27 08:24:13 +08:00
Axolotl Release Bot bbb9e5c054 chore(website): update download metadata to v1.0.0 [skip ci] 2026-09-26 07:26:43 +00:00
AxTps 15c375bca5 chore: 发布 1.0.0 正式版公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- catalog.ts 增量新增 1.0.0 公告(启用内置自动更新、修复启动崩溃);
- 网站 catalog.json 重新生成。
2026-09-26 14:25:28 +08:00
Disy d2a319a4d5 fix: 启用启动器更新并修复初始化竞态
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
2026-09-26 13:06:51 +08:00
Disy 2359b80250 fix: 修复自选目录实例的模组同步路径
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Sync LobeHub models / sync (push) Has been cancelled
2026-09-26 11:00:01 +08:00
AxTps c273734aec fix: 临时回退内置自动更新以修复启动崩溃
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
1.0.0-beta14 启用内置更新后,Windows 上一打开即崩溃(c0000409 栈
溢出)。暂时将 are_updates_enabled 改回 false,待定位并修复崩溃后
再重新启用。

- main.rs: are_updates_enabled 恢复返回 false;
- catalog.ts: 增量新增 1.0.0-beta15 公告;
- 网站 catalog.json 重新生成。
2026-09-26 09:56:52 +08:00
AxTps f89cbff37e docs: README 链接改指向 GitHub
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
将仓库、Releases、Stars 及最新版下载等链接从自建 git.starlight.cool
改为 GitHub (github.com/ApTx2012/Starlight_Lancher)。
2026-09-26 08:19:01 +08:00
AxTps f92aee9b4c feat: 启用内置自动更新
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
- are_updates_enabled 由硬编码 false 改为 true,正式启用内置更新器
  (更新端点与签名公钥由 tauri-release.conf.json 配置)。
- catalog.ts 新增 1.0.0-beta14 公告(增量追加,保留历史版本)。
- 网站 catalog.json 由 catalog.ts 重新生成。
2026-09-26 07:52:06 +08:00
AxTps 2192a19d50 chore: 移除 1.0.0-beta1 之前的版本公告
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
清理上游遗留的旧版本公告(1.9.6-beta.3 ~ 1.4.0),只保留本项目
自己的版本记录(1.0.0-beta1 及之后的 1.0.0-beta13)。

- catalog.ts 删除 49 条旧公告;
- 网站 catalog.json 由 create-website-release-catalog.mjs 从
  catalog.ts 重新生成,现仅含 1.0.0-beta13 与 1.0.0-beta1。
2026-09-26 07:35:49 +08:00
AxTps 9411d0945a fix(release): 修正 updater 清单的下载 URL 与发布顺序
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Starlight release / Release preflight (push) Has been cancelled
Prepare pnpm cache / prepare (push) Has been cancelled
Starlight release / Build (Windows x64) (push) Has been cancelled
Starlight release / Build (Linux arm64) (push) Has been cancelled
Starlight release / Build (Linux x64) (push) Has been cancelled
Starlight release / Build (macOS universal) (push) Has been cancelled
Starlight release / Verify and publish (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
发布时 verify update manifest 失败:draft release 的资产 URL 为
`.../releases/download/untagged-<hash>/...`,而校验要求 URL 含 tag 名。

- create-update-manifest.mjs 不再依赖 draft release 的
  browser_download_url,改为按 tag 与资产名自行拼接稳定的
  `.../releases/download/<tag>/<name>` 地址。
- build-on-tag.yml 将 Publish release 提前到生成/校验清单之前,
  使清单在 release 已发布后生成;并移除多余的
  “Refresh published GitHub release metadata” 步骤。
- catalog.ts 版本公告更新为 1.0.0-beta13。
2026-09-26 06:04:02 +08:00
96 changed files with 2083 additions and 6815 deletions

No files matched your search

+37 -25
View File
@@ -303,6 +303,20 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release download "${GITHUB_REF_NAME}" --pattern '*.sig' --dir release-check/signatures
# Publish the draft release before generating the updater manifest. While
# the release is a draft GitHub reports asset URLs as
# `.../releases/download/untagged-<hash>/...`; only after publishing does
# the manifest point at the stable `.../releases/download/<tag>/...` path.
- name: Publish release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
if [[ "${GITHUB_REF_NAME}" == *-* ]]; then
gh release edit "${GITHUB_REF_NAME}" --draft=false --prerelease
else
gh release edit "${GITHUB_REF_NAME}" --draft=false --latest
fi
- name: Download release metadata
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -329,31 +343,6 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload "${GITHUB_REF_NAME}" release-check/latest.json --clobber
- name: Publish release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
if [[ "${GITHUB_REF_NAME}" == *-* ]]; then
gh release edit "${GITHUB_REF_NAME}" --draft=false --prerelease
else
gh release edit "${GITHUB_REF_NAME}" --draft=false --latest
fi
- name: Refresh published GitHub release metadata
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
release_id="$(
gh api "repos/${GITHUB_REPOSITORY}/releases" \
--paginate \
--jq ".[] | select(.tag_name == \"${GITHUB_REF_NAME}\") | .id"
)"
if [[ -z "$release_id" ]]; then
echo "Published release ${GITHUB_REF_NAME} was not found"
exit 1
fi
gh api "repos/${GITHUB_REPOSITORY}/releases/${release_id}" > release-check/release.json
- name: Build Update Server artifact catalog
run: |
node scripts/axolotl/create-update-server-catalog.mjs \
@@ -362,6 +351,29 @@ jobs:
release-check/update-server-catalog.json
node scripts/axolotl/create-update-server-catalog.test.mjs
- name: Build complete skin-site update package
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
version="${GITHUB_REF_NAME#v}"
bundle_root="release-check/skin-site-update"
bundle_name="Starlight_Launcher_${version}_skin-site-update.zip"
mkdir -p "${bundle_root}/files"
gh release download "${GITHUB_REF_NAME}" --dir "${bundle_root}/files"
find "${bundle_root}/files" -maxdepth 1 -type f \
\( -name 'latest.json' -o -name '*_skin-site-update.zip' \) -delete
cp release-check/latest.json "${bundle_root}/latest.json"
cp release-check/update-server-catalog.json "${bundle_root}/update-server-catalog.json"
cp release-check/release.json "${bundle_root}/release.json"
(
cd "${bundle_root}"
zip -r -9 "../${bundle_name}" latest.json update-server-catalog.json release.json files
)
gh release upload "${GITHUB_REF_NAME}" "release-check/${bundle_name}" --clobber
- name: Notify Update Server to publish release assets
if: ${{ env.UPDATE_SERVER_URL != '' && env.UPDATE_SERVER_WEBHOOK_SECRET != '' }}
env:
Generated
+2 -2
View File
@@ -6795,7 +6795,7 @@ dependencies = [
[[package]]
name = "theseus"
version = "1.0.0-beta12"
version = "1.0.0-beta15"
dependencies = [
"ariadne",
"async-minecraft-ping",
@@ -6899,7 +6899,7 @@ dependencies = [
[[package]]
name = "theseus_gui"
version = "1.0.0-beta12"
version = "1.0.0-beta15"
dependencies = [
"ashpd",
"async_zip",
+6 -6
View File
@@ -5,13 +5,13 @@
<p><strong>次世代 Minecraft 桌面客户端,全能、美观、全平台覆盖。</strong></p>
<p>
<a href="https://git.starlight.cool/AxTps/Starlight_Lancher/actions">
<img src="https://img.shields.io/badge/Repo-git.starlight.cool-blue?style=for-the-badge&logo=git" alt="Repository" />
<a href="https://github.com/ApTx2012/Starlight_Lancher/actions">
<img src="https://img.shields.io/badge/Repo-GitHub-black?style=for-the-badge&logo=github" alt="Repository" />
</a>
<a href="https://git.starlight.cool/AxTps/Starlight_Lancher/releases">
<a href="https://github.com/ApTx2012/Starlight_Lancher/releases">
<img src="https://img.shields.io/badge/Releases-Download-green?style=for-the-badge&logo=github" alt="Releases" />
</a>
<a href="https://git.starlight.cool/AxTps/Starlight_Lancher/stargazers">
<a href="https://github.com/ApTx2012/Starlight_Lancher/stargazers">
<img src="https://img.shields.io/badge/Stars-★-ffb800?style=for-the-badge&logo=github" alt="Stars" />
</a>
<a href="COPYING.md">
@@ -21,7 +21,7 @@
<p>
<a href="https://skin.starlight.cool/">官方网站</a> |
<a href="https://git.starlight.cool/AxTps/Starlight_Lancher/releases/latest">下载最新版</a> |
<a href="https://github.com/ApTx2012/Starlight_Lancher/releases/latest">下载最新版</a> |
<a href="CONTRIBUTING.md">参与贡献</a>
| <a href="CODE_OF_CONDUCT.md">行为准则</a>
</p>
@@ -57,7 +57,7 @@ _(注:本项目是调用 Modrinth 公开 API 的独立客户端,与 Rinth, I
## 下载与安装
请前往 [Releases](https://git.starlight.cool/AxTps/Starlight_Lancher/releases/latest) 下载适合你操作系统的最新安装包。
请前往 [Releases](https://github.com/ApTx2012/Starlight_Lancher/releases/latest) 下载适合你操作系统的最新安装包。
已安装的用户每次均可通过内置的 Tauri 签名校验机制,自动在后台完成更新,无需手动下载安装更新。
| 系统平台 | 推荐下载文件 |
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@modrinth/app-frontend",
"private": true,
"version": "1.0.0-beta12",
"version": "1.0.0-beta15",
"type": "module",
"scripts": {
"dev": "vite",
+52 -8
View File
@@ -66,6 +66,8 @@ import { hideAllPoppers } from 'floating-vue'
import { computed, nextTick, onMounted, onUnmounted, provide, ref, watch } from 'vue'
import { type RouteLocationNormalizedLoaded, RouterView, useRoute, useRouter } from 'vue-router'
import InstancePlayerModal from '@/components/instance/InstancePlayerModal.vue'
import TaggedModDownloadsModal from '@/components/instance/TaggedModDownloadsModal.vue'
import InstanceExportModal from '@/components/lab/recipe-generator/InstanceExportModal.vue'
import AccountsCard from '@/components/ui/AccountsCard.vue'
import AppActionBar from '@/components/ui/AppActionBar.vue'
@@ -79,7 +81,6 @@ import MinecraftAuthErrorModal from '@/components/ui/minecraft-auth-error-modal/
import MinecraftCrashModal from '@/components/ui/MinecraftCrashModal.vue'
import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue'
import CurseForgeManualDownloadsModal from '@/components/ui/modal/CurseForgeManualDownloadsModal.vue'
import TaggedModDownloadsModal from '@/components/instance/TaggedModDownloadsModal.vue'
import InstallToPlayModal from '@/components/ui/modal/InstallToPlayModal.vue'
import InstanceIconPickerModal from '@/components/ui/modal/InstanceIconPickerModal.vue'
import JavaDownloadConfirmationModal from '@/components/ui/modal/JavaDownloadConfirmationModal.vue'
@@ -90,9 +91,9 @@ import NavButton from '@/components/ui/NavButton.vue'
import NavRail from '@/components/ui/NavRail.vue'
import OnboardingOverlay from '@/components/ui/onboarding/OnboardingOverlay.vue'
import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
import SplashScreen from '@/components/ui/SplashScreen.vue'
import SkinSiteSessionFrame from '@/components/ui/SkinSiteSessionFrame.vue'
import InstancePlayerModal from '@/components/instance/InstancePlayerModal.vue'
import StartupAnnouncementModal from '@/components/ui/StartupAnnouncementModal.vue'
import SplashScreen from '@/components/ui/SplashScreen.vue'
import WindowControls from '@/components/ui/WindowControls.vue'
import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
import { useDropImport } from '@/composables/useDropImport'
@@ -138,9 +139,9 @@ import {
isDev,
isElevated,
isNetworkMetered,
restartApp,
setRestartAfterPendingUpdate,
} from '@/helpers/utils.js'
import { installUiScale } from '@/helpers/ui-scale'
import { start_join_server, start_join_singleplayer_world } from '@/helpers/worlds.ts'
import i18n, { resolveInitialLocale } from '@/i18n.config'
import {
@@ -490,9 +491,16 @@ onMounted(async () => {
document.querySelector('body').addEventListener('auxclick', handleAuxClick)
window.addEventListener(DIRECT_LINKS_SYNCED_EVENT, handleDirectLinkSyncReport)
try {
await stateInitialization
} catch {
return
}
checkUpdates()
void warnIfRunningElevated()
startDirectLinkSync()
maybeShowStartupAnnouncement()
})
let directLinkSync: (() => Promise<void>) | undefined
@@ -1264,6 +1272,9 @@ provide(
)
provide('previewMinecraftCrashModal', () => minecraftCrashModal.value?.showPreview())
provide('showLauncherPopup', (_request: unknown) => {})
provide('showStartupAnnouncement', () => startupAnnouncementModal.value?.show())
installUiScale()
const stateFailed = ref(false)
stateInitialization
@@ -1533,6 +1544,33 @@ const updateToPlayModal = ref()
const modrinthLoginFlowWaitModal = ref()
const startupAnnouncementModal = ref<InstanceType<typeof StartupAnnouncementModal> | null>(null)
const STARTUP_ANNOUNCEMENT_KEY = 'starlight-startup-announcement-seen-v1'
function maybeShowStartupAnnouncement() {
let alreadySeen = false
try {
alreadySeen = localStorage.getItem(STARTUP_ANNOUNCEMENT_KEY) !== null
} catch (error) {
console.warn('Failed to read startup announcement flag', error)
}
if (alreadySeen) return
const modal = startupAnnouncementModal.value
if (!modal) {
// The modal component has not mounted yet; try again on the next tick.
void nextTick(maybeShowStartupAnnouncement)
return
}
modal.show()
try {
localStorage.setItem(STARTUP_ANNOUNCEMENT_KEY, '1')
} catch (error) {
console.warn('Failed to write startup announcement flag', error)
}
}
// ── Drop import system ──────────────────────────────────────────────────
const dropImport = useDropImport({
notificationManager,
@@ -1701,6 +1739,7 @@ onMounted(() => {
setServerUpdateToPlayModal(updateToPlayModal.value)
void (async () => {
try {
await stateInitialization
const ready = await invoke<{
pending_crashes: { instance_id: string; uuid: string }[]
pending_commands: Parameters<typeof handleCommand>[0][]
@@ -2161,6 +2200,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
<SkinSiteSessionFrame v-if="stateInitialized" />
<InstancePlayerModal v-if="stateInitialized" />
<StartupAnnouncementModal ref="startupAnnouncementModal" />
<div id="teleports"></div>
<div
v-if="stateInitialized && themeStore.customBackgroundPath && !themeStore.transparentBackground"
@@ -2423,9 +2463,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
{{ formatMessage(messages.authUnreachableBody) }}
</Admonition>
<div class="page-transition-grid grid min-h-full">
<RouterView v-slot="{ Component, route }">
<RouterView v-slot="{ Component, route: currentRoute }">
<Transition name="page-slide" :css="themeStore.getFeatureFlag('page_transitions')">
<div v-if="Component" :key="getPageTransitionKey(route)" class="page-transition-layer">
<div
v-if="Component"
:key="getPageTransitionKey(currentRoute)"
class="page-transition-layer"
>
<Suspense @pending="onSuspensePending" @resolve="onSuspenseResolve">
<component :is="Component"></component>
</Suspense>
@@ -2489,7 +2533,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
:on-error-action="exportNotificationErrorLogs"
:error-action-label="formatMessage(messages.exportErrorLogs)"
/>
<MinecraftCrashModal ref="minecraftCrashModal" @error="handleError" />
<MinecraftCrashModal v-if="stateInitialized" ref="minecraftCrashModal" @error="handleError" />
<JavaDownloadConfirmationModal ref="javaDownloadConfirmationModal" />
<NewModal
ref="closeChoiceModal"
@@ -2577,7 +2621,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@install="handleContentInstallModpackInstall"
@cancel="handleContentInstallModpackInstallCancel"
/>
<TaggedModDownloadsModal />
<TaggedModDownloadsModal v-if="stateInitialized" />
<CurseForgeManualDownloadsModal
ref="contentInstallCurseForgeManualDownloadsModal"
@view-instance="handleContentInstallModpackDuplicateGoToInstance"
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,32 @@
<script setup lang="ts">
import { NewspaperIcon, RightArrowIcon } from '@modrinth/assets'
import { inject } from 'vue'
const showAnnouncement = inject<(() => void) | undefined>('showStartupAnnouncement')
function open() {
showAnnouncement?.()
}
</script>
<template>
<section
class="flex min-w-0 flex-col gap-3 border-0 border-b-[1px] border-solid border-[--brand-gradient-border] p-4"
>
<button
type="button"
class="group flex w-full cursor-pointer flex-col gap-2 border-0 bg-transparent p-0 text-left"
@click="open"
>
<div class="flex items-center gap-2">
<NewspaperIcon class="size-4 shrink-0 text-secondary" aria-hidden="true" />
<h2 class="m-0 truncate text-lg">公告</h2>
<RightArrowIcon
class="ml-auto size-4 shrink-0 text-secondary transition-transform group-hover:translate-x-0.5"
aria-hidden="true"
/>
</div>
<p class="m-0 text-sm leading-relaxed text-secondary">点击查看最新公告</p>
</button>
</section>
</template>
@@ -28,8 +28,8 @@ import { useNetworkStatus } from '@/composables/useNetworkStatus'
import { process_listener } from '@/helpers/events'
import { install_existing_instance, install_pack_to_existing_instance } from '@/helpers/install'
import { kill, run } from '@/helpers/instance'
import { get_by_instance_id } from '@/helpers/process'
import { isInstanceLaunching } from '@/helpers/instance-launch-state'
import { get_by_instance_id } from '@/helpers/process'
import type { GameInstance } from '@/helpers/types'
import { handleSevereError } from '@/store/error'
@@ -36,6 +36,7 @@ const props = withDefaults(
limit?: HomeRecentLimit
}>(),
{
dashboardSize: null,
limit: HOME_RECENT_DEFAULT_LIMIT,
},
)
@@ -146,11 +147,17 @@ async function stopInstance(instance: GameInstance) {
</script>
<template>
<section class="home-recent-worlds flex min-w-0 min-h-0 h-full flex-col gap-3" :data-size="dashboardSize">
<section
class="home-recent-worlds flex min-w-0 min-h-0 h-full flex-col gap-3"
:data-size="dashboardSize"
>
<div class="home-widget-heading flex min-w-0 h-8 flex-none items-center gap-2">
<h2>{{ formatMessage(messages.recentTitle) }}</h2>
</div>
<div v-if="recentItems.length > 0" class="home-recent-list flex min-w-0 min-h-0 flex-1 flex-col gap-1 overflow-x-hidden overflow-y-auto pr-1">
<div
v-if="recentItems.length > 0"
class="home-recent-list flex min-w-0 min-h-0 flex-1 flex-col gap-1 overflow-x-hidden overflow-y-auto pr-1"
>
<template
v-for="item in recentItems"
:key="item.type === 'world' ? worldKey(item.world) : `${item.instance.id}:instance`"
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { ProgressBar, defineMessages, useVIntl } from '@modrinth/ui'
import { defineMessages, ProgressBar, useVIntl } from '@modrinth/ui'
import { computed } from 'vue'
import { injectDownloadManager } from '@/providers/download-manager'
const props = defineProps<{ instanceId?: string; active?: boolean }>()
@@ -14,13 +14,14 @@ import {
import { users } from '@/helpers/auth'
import { getInstanceMode } from '@/helpers/hosted-packs'
import {
type InstancePlayer,
type PlayerChoice,
PlayerSelectionNavigatedAwayError,
registerInstancePlayerPicker,
saveInstancePlayer,
waitForSkinSiteSession,
type InstancePlayer,
type PlayerChoice,
} from '@/helpers/instance-player'
import { playerMessages as messages } from './instance-player-messages'
const { formatMessage } = useVIntl()
@@ -1,12 +1,14 @@
<script setup lang="ts">
import { ButtonStyled, useVIntl } from '@modrinth/ui'
import { onUnmounted, ref, watch } from 'vue'
import {
chooseInstancePlayer,
getInstancePlayer,
onInstancePlayerChanged,
type InstancePlayer,
onInstancePlayerChanged,
} from '@/helpers/instance-player'
import { playerMessages as messages } from './instance-player-messages'
const { formatMessage } = useVIntl()
@@ -1,10 +1,11 @@
<script setup lang="ts">
import { NewModal, ProgressBar, ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
import { onMounted, onUnmounted, nextTick, ref, shallowRef } from 'vue'
import { ButtonStyled, defineMessages, NewModal, ProgressBar, useVIntl } from '@modrinth/ui'
import { nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue'
import { useRouter } from 'vue-router'
import { loading_listener } from '@/helpers/events'
import { progress_bars_list } from '@/helpers/state'
import { onHostedPackAttemptStarted } from '@/helpers/hosted-packs'
import { progress_bars_list } from '@/helpers/state'
import {
createTaggedModProgress,
type TaggedProgressEvent,
@@ -12,10 +12,14 @@
>
{{ formatMessage(messages.score, { score }) }}
</span>
<span class="shrink-0 whitespace-nowrap rounded-full bg-surface-3 px-2 py-0.5 tabular-nums text-secondary">
<span
class="shrink-0 whitespace-nowrap rounded-full bg-surface-3 px-2 py-0.5 tabular-nums text-secondary"
>
{{ formatMessage(messages.highestLevel, { level: highestLevel + 1 }) }}
</span>
<span class="shrink-0 whitespace-nowrap rounded-full bg-surface-3 px-2 py-0.5 tabular-nums text-secondary">
<span
class="shrink-0 whitespace-nowrap rounded-full bg-surface-3 px-2 py-0.5 tabular-nums text-secondary"
>
{{ formatMessage(messages.best, { score: bestScore }) }}
</span>
<NewButton type="base" size="sm" class="shrink-0" @click="settleGame">
@@ -80,7 +84,10 @@
</div>
</div>
</Transition>
<div v-if="gameOver && !endedManually" class="tide-drain pointer-events-none absolute inset-0 z-20" />
<div
v-if="gameOver && !endedManually"
class="tide-drain pointer-events-none absolute inset-0 z-20"
/>
<Transition name="panel">
<div
v-if="gameOver"
@@ -115,16 +122,26 @@
</div>
<div class="grid w-full min-w-0 grid-cols-3 gap-1.5">
<div class="flex min-w-0 flex-col items-center rounded-lg bg-surface-3 px-1 py-1">
<span class="text-[9px] text-secondary">{{ formatMessage(messages.levelLabel) }}</span>
<span class="text-sm font-bold tabular-nums text-contrast">{{ highestLevel + 1 }}</span>
<span class="text-[9px] text-secondary">{{
formatMessage(messages.levelLabel)
}}</span>
<span class="text-sm font-bold tabular-nums text-contrast">{{
highestLevel + 1
}}</span>
</div>
<div class="flex min-w-0 flex-col items-center rounded-lg bg-surface-3 px-1 py-1">
<span class="text-[9px] text-secondary">{{ formatMessage(messages.bestLabel) }}</span>
<span class="text-[9px] text-secondary">{{
formatMessage(messages.bestLabel)
}}</span>
<span class="text-sm font-bold tabular-nums text-contrast">{{ bestScore }}</span>
</div>
<div class="flex min-w-0 flex-col items-center rounded-lg bg-surface-3 px-1 py-1">
<span class="text-[9px] text-secondary">{{ formatMessage(messages.overtimesLabel) }}</span>
<span class="text-sm font-bold tabular-nums text-contrast">{{ overtimeCount }}</span>
<span class="text-[9px] text-secondary">{{
formatMessage(messages.overtimesLabel)
}}</span>
<span class="text-sm font-bold tabular-nums text-contrast">{{
overtimeCount
}}</span>
</div>
</div>
<div class="flex flex-wrap justify-center gap-2">
@@ -150,8 +167,8 @@ import blueStar from '@/assets/stars/blue.png'
import greenStar from '@/assets/stars/green.png'
import pinkStar from '@/assets/stars/pink.png'
import redStar from '@/assets/stars/red.png'
import yellowStar from '@/assets/stars/yellow.png'
import superStar from '@/assets/stars/super.png'
import yellowStar from '@/assets/stars/yellow.png'
interface Piece {
id: number
@@ -396,7 +413,14 @@ function mergePieces(a: Piece, b: Piece) {
score.value += points[level]
highestLevel.value = Math.max(highestLevel.value, level)
const isRainbow = level === colors.length - 1
spawnBurst(x, y, isRainbow ? rainbowColors : [colors[level]], 10 + level * 3, 130 + level * 20, 3.4)
spawnBurst(
x,
y,
isRainbow ? rainbowColors : [colors[level]],
10 + level * 3,
130 + level * 20,
3.4,
)
spawnShockwave(x, y, 46 + level * 26, 'rgba(255, 255, 255, 0.9)', Math.min(3, 1.4 + level * 0.3))
shakePower = Math.max(shakePower, Math.min(2 + level * 1.2, 7))
spawnFloater(x, y, `+${points[level]}`, 15 + level * 3, colors[level])
@@ -423,7 +447,14 @@ function easeOutBack(t: number) {
return 1 + c3 * Math.pow(t - 1, 3) + c1 * Math.pow(t - 1, 2)
}
function spawnBurst(x: number, y: number, palette: string[], count: number, speed: number, size: number) {
function spawnBurst(
x: number,
y: number,
palette: string[],
count: number,
speed: number,
size: number,
) {
for (let i = 0; i < count; i++) {
if (particles.length >= 260) return
const angle = Math.random() * Math.PI * 2
@@ -508,7 +539,8 @@ function update(delta: number) {
if (overtimeStartAt >= 0) {
const overtimeElapsed = elapsed - overtimeStartAt
if (overtimeElapsed < 0.8) {
surfaceRatio = overtimeFromRatio + (0.05 - overtimeFromRatio) * easeInOutCubic(overtimeElapsed / 0.8)
surfaceRatio =
overtimeFromRatio + (0.05 - overtimeFromRatio) * easeInOutCubic(overtimeElapsed / 0.8)
} else {
overtimeStartAt = -1
}
@@ -670,17 +702,7 @@ function prepareBallSprite(src: string, level: number) {
sprite.height = Math.max(1, Math.round(bounds.h * scale))
const ctx = sprite.getContext('2d')
if (!ctx) return
ctx.drawImage(
image,
bounds.x,
bounds.y,
bounds.w,
bounds.h,
0,
0,
sprite.width,
sprite.height,
)
ctx.drawImage(image, bounds.x, bounds.y, bounds.w, bounds.h, 0, 0, sprite.width, sprite.height)
ballSprites[level] = sprite
}
image.src = src
@@ -692,9 +714,7 @@ function drawMergePiece(piece: Piece) {
const spawnProgress = Math.min(1, (elapsed - piece.spawnAt) / 0.22)
const spawnScale = spawnProgress >= 1 ? 1 : easeOutBack(spawnProgress)
const radius =
piece.radius *
spawnScale *
(isRainbow ? 1 + 0.05 * Math.sin(elapsed * 3.2 + piece.id) : 1)
piece.radius * spawnScale * (isRainbow ? 1 + 0.05 * Math.sin(elapsed * 3.2 + piece.id) : 1)
context.save()
context.translate(piece.x, piece.y)
const hue = (elapsed * 55) % 360
@@ -792,9 +812,7 @@ function draw() {
context.beginPath()
for (let x = 0; x <= width; x += 8) {
const waveY =
surfaceY +
Math.sin(x * 0.045 + elapsed * 1.8) * 2.5 +
Math.sin(x * 0.013 + elapsed * 0.9) * 2
surfaceY + Math.sin(x * 0.045 + elapsed * 1.8) * 2.5 + Math.sin(x * 0.013 + elapsed * 0.9) * 2
if (x === 0) context.moveTo(x, waveY)
else context.lineTo(x, waveY)
}
@@ -807,7 +825,12 @@ function draw() {
const progress = Math.min(1, (elapsed - waveStart) / 0.8)
const waveY = height * (1 - progress)
const bandHeight = Math.max(22, height * 0.1)
const gradient = context.createLinearGradient(0, waveY - bandHeight, 0, waveY + bandHeight * 0.5)
const gradient = context.createLinearGradient(
0,
waveY - bandHeight,
0,
waveY + bandHeight * 0.5,
)
gradient.addColorStop(0, 'rgba(255, 255, 255, 0)')
gradient.addColorStop(0.55, 'rgba(96, 178, 255, 0.5)')
gradient.addColorStop(1, 'rgba(255, 255, 255, 0)')
@@ -11,8 +11,8 @@ import {
StyledInput,
useVIntl,
} from '@modrinth/ui'
import { save } from '@tauri-apps/plugin-dialog'
import { join } from '@tauri-apps/api/path'
import { save } from '@tauri-apps/plugin-dialog'
import { readDir, stat } from '@tauri-apps/plugin-fs'
import { ref } from 'vue'
@@ -20,8 +20,8 @@ import { process_listener } from '@/helpers/events'
import { install_existing_instance, install_pack_to_existing_instance } from '@/helpers/install'
import { kill, run } from '@/helpers/instance'
import { getDisplayInstanceIcon } from '@/helpers/instance-icons'
import { get_by_instance_id } from '@/helpers/process'
import { isInstanceLaunching } from '@/helpers/instance-launch-state'
import { get_by_instance_id } from '@/helpers/process'
import { showInstanceInFolder } from '@/helpers/utils.js'
import { handleSevereError } from '@/store/error.js'
@@ -98,7 +98,7 @@ const checkProcess = async () => {
if (Array.isArray(runningProcesses)) internalPlaying.value = runningProcesses.length > 0
}
const play = async (e, context) => {
const play = async (e) => {
e?.stopPropagation()
if (loading.value) return
await run(props.instance.id).catch(async (err) => {
@@ -111,7 +111,7 @@ const play = async (e, context) => {
await checkProcess()
}
const stop = async (e, context) => {
const stop = async (e) => {
e?.stopPropagation()
await kill(props.instance.id).catch(handleError)
await checkProcess()
@@ -205,7 +205,7 @@ onUnmounted(() => unlisten())
: formatMessage(isPlaying ? messages.launchAnother : commonMessages.playButton)
"
:disabled="offline && !installed"
@click="(e) => play(e, 'InstanceCard')"
@click="play"
@mousehover="checkProcess"
>
<!-- Translate for optical centering -->
@@ -295,7 +295,7 @@ onUnmounted(() => unlisten())
'scale-75 opacity-0 transition-all group-hover:scale-100 group-hover:opacity-100':
!disabled,
}"
@click="(e) => play(e, 'InstanceCard')"
@click="play"
@mousehover="checkProcess"
>
<PlayIcon class="translate-x-[1px]" />
@@ -522,7 +522,7 @@ async function copyShareUrl(): Promise<void> {
}
}
function _openAIAnalysis(): void {
function openAIAnalysis(): void {
if (!lastAnalysis?.combined_log) {
notifyNoLogContent()
return
@@ -603,7 +603,7 @@ onUnmounted(() => {
unlistenProcess?.()
})
defineExpose({ handleLaunchError, handleWarning, isLaunchFailure, showPreview, openAIAnalysis: _openAIAnalysis })
defineExpose({ handleLaunchError, handleWarning, isLaunchFailure, showPreview, openAIAnalysis })
</script>
<template>
@@ -1,6 +1,5 @@
<script setup lang="ts">
import { onMounted, onUnmounted, ref, watch } from 'vue'
import { clearHostedSession } from '@/helpers/hosted-packs'
import {
receiveSkinSiteMessage,
@@ -10,6 +9,7 @@ import {
skinSiteStatus,
skinSiteUser,
} from '@/composables/skin-site-session'
import { clearHostedSession } from '@/helpers/hosted-packs'
const frame = ref<HTMLIFrameElement>()
let lastMessage = 0
@@ -0,0 +1,134 @@
<script setup lang="ts">
import { ExternalIcon, UsersIcon, XIcon } from '@modrinth/assets'
import { Avatar, ButtonStyled, NewModal } from '@modrinth/ui'
import { openUrl } from '@tauri-apps/plugin-opener'
import { ref } from 'vue'
import { teamMembers } from '@/data/about'
const modal = ref<InstanceType<typeof NewModal>>()
const SERVER_IPS: { label: string; host: string }[] = [
{ label: '直连 IPv4', host: 'slv4.starlight.cool' },
{ label: '直连 IPv6', host: 'slv6.starlight.cool' },
{ label: '北方代理 IPv4', host: 'north.starlight.cool' },
{ label: '南方代理 IPv4', host: 'south.starlight.cool' },
{ label: '美国代理 IPv4', host: 'usa.starlight.cool' },
]
const RULES_URL = 'https://kdocs.cn/l/cmT6lVdryHJu'
const QQ_GROUP = '535392227'
function show() {
modal.value?.show()
}
function hide() {
modal.value?.hide()
}
function openLink(url: string) {
void openUrl(url)
}
defineExpose({ show })
</script>
<template>
<NewModal ref="modal" header="欢迎使用 Starlight Launcher" width="640px" max-width="640px">
<div class="flex min-w-0 flex-col gap-5">
<!-- 1. 开发组 -->
<section class="flex flex-col gap-2">
<h3 class="m-0 flex items-center gap-2 text-sm font-semibold text-contrast">
<UsersIcon class="size-4 text-secondary" />
开发团队
</h3>
<p class="m-0 text-sm text-secondary">
本启动器由
<span class="font-semibold text-contrast">Ax_Tps</span>
和
<span class="font-semibold text-contrast">Disy920</span>
基于 Axolotl 开发。
</p>
<div class="grid gap-3 sm:grid-cols-2">
<a
v-for="member in teamMembers"
:key="member.name"
:href="member.url ?? undefined"
target="_blank"
rel="noopener noreferrer"
class="flex min-w-0 items-center gap-3 rounded-xl bg-surface-4 p-3 transition-colors hover:bg-surface-5"
@click.prevent="member.url && openLink(member.url)"
>
<Avatar :src="member.avatarUrl" :alt="member.name" size="2.5rem" circle no-shadow />
<span class="min-w-0 flex-1 truncate font-semibold text-contrast">{{ member.name }}</span>
<ExternalIcon v-if="member.url" class="size-4 shrink-0 text-secondary" />
</a>
</div>
</section>
<!-- 2. SLS 专属 -->
<section class="flex flex-col gap-2">
<h3 class="m-0 text-sm font-semibold text-contrast">Starlight 专用启动器</h3>
<p class="m-0 text-sm text-secondary">
该启动器为 Starlight 专用。如果您还未加入 StarLight,请前往我们的 QQ 审核群
<button
type="button"
class="cursor-pointer border-0 bg-transparent p-0 font-semibold text-brand underline"
@click="openLink(`https://qm.qq.com/q/${QQ_GROUP}`)"
>
{{ QQ_GROUP }}
</button>
。
</p>
</section>
<!-- 3. 服规更新 -->
<section class="flex flex-col gap-2">
<h3 class="m-0 text-sm font-semibold text-contrast">StarLight 总则章程更新</h3>
<p class="m-0 text-sm text-secondary">
StarLight 总则章程(即“服规”)更新至第 15 版。该版服规进一步完善与严格了聚落建立、改组、招新与运营的全链条要求,请大家注意阅读并遵守!本版服规自
2026 年 9 月 27 日 0 点起开始试行。
</p>
<button
type="button"
class="flex w-fit cursor-pointer items-center gap-1 border-0 bg-transparent p-0 text-sm font-semibold text-brand underline"
@click="openLink(RULES_URL)"
>
查看服规链接
<ExternalIcon class="size-3.5" />
</button>
</section>
<!-- 4. 服务器连接 -->
<section class="flex flex-col gap-2">
<h3 class="m-0 text-sm font-semibold text-contrast">服务器连接</h3>
<p class="m-0 text-sm text-secondary">服务器目前下列几项 IP 可用:</p>
<ul class="m-0 flex flex-col gap-1 pl-5 text-sm text-secondary">
<li v-for="ip in SERVER_IPS" :key="ip.host">
<span class="text-contrast">{{ ip.label }}</span>
:<code class="text-brand">{{ ip.host }}</code>
</li>
</ul>
<p class="m-0 text-sm text-secondary">
请注意,我们优先推荐您尝试直连 IP(包括 v4 和 v6,哪个可用用哪个)。若没有出现高延迟或延迟波动严重的问题,尽量避免使用代理
IP(代理 IP 是流量计费的,使用会给服务器带来更大的经济压力)。
</p>
<p class="m-0 text-sm text-secondary">
若必须使用代理 IP,按以往经验,河北(含)以北的我国省份,在选用代理 IP 时建议优先选用北方代理,否则请使用南方代理。
</p>
</section>
</div>
<template #actions>
<div class="flex justify-end">
<ButtonStyled color="brand">
<button @click="hide">
<XIcon />
我知道了
</button>
</ButtonStyled>
</div>
</template>
</NewModal>
</template>
@@ -61,7 +61,7 @@ const historyAnnouncements = computed(() =>
<UpdateAnnouncementContent
:announcement="currentAnnouncement"
:version="currentVersion"
:external-url="currentAnnouncement?.externalUrl ?? AxolotlBrandConfig.website"
:external-url="currentAnnouncement?.externalUrl ?? AxolotlBrandConfig.releasesUrl"
/>
</div>
@@ -102,7 +102,7 @@ const historyAnnouncements = computed(() =>
<UpdateAnnouncementContent
:announcement="announcement"
:show-header="false"
:external-url="announcement.externalUrl"
:external-url="announcement.externalUrl ?? `${AxolotlBrandConfig.releasesUrl}/tag/v${announcement.version}`"
/>
</div>
</Accordion>
@@ -67,6 +67,7 @@ withDefaults(
}>(),
{
count: 1,
symlinkTarget: null,
},
)
@@ -127,7 +127,7 @@ interface IconBackground {
style: Record<string, string>
}
function background(
function makeBackground(
id: string,
name: MessageDescriptor,
top: string,
@@ -171,16 +171,16 @@ const backgrounds = [
backgroundSize: '16px 16px',
},
} satisfies IconBackground,
background('grass', backgroundNames.grass, '#7fc95b', '#2f7d32'),
background('ocean', backgroundNames.ocean, '#55b7ff', '#3157c8'),
background('amethyst', backgroundNames.amethyst, '#c084fc', '#6d28d9'),
background('sunset', backgroundNames.sunset, '#ffba52', '#e94b64'),
background('cherry', backgroundNames.cherry, '#ff9ec4', '#b93670'),
background('nether', backgroundNames.nether, '#ef5a46', '#6d1717'),
background('slime', backgroundNames.slime, '#b6ee55', '#44972f'),
background('deep-dark', backgroundNames.deepDark, '#245369', '#0c1f2b'),
background('stone', backgroundNames.stone, '#aeb5bd', '#525b66'),
background('midnight', backgroundNames.midnight, '#4d5f8f', '#171b2d'),
makeBackground('grass', backgroundNames.grass, '#7fc95b', '#2f7d32'),
makeBackground('ocean', backgroundNames.ocean, '#55b7ff', '#3157c8'),
makeBackground('amethyst', backgroundNames.amethyst, '#c084fc', '#6d28d9'),
makeBackground('sunset', backgroundNames.sunset, '#ffba52', '#e94b64'),
makeBackground('cherry', backgroundNames.cherry, '#ff9ec4', '#b93670'),
makeBackground('nether', backgroundNames.nether, '#ef5a46', '#6d1717'),
makeBackground('slime', backgroundNames.slime, '#b6ee55', '#44972f'),
makeBackground('deep-dark', backgroundNames.deepDark, '#245369', '#0c1f2b'),
makeBackground('stone', backgroundNames.stone, '#aeb5bd', '#525b66'),
makeBackground('midnight', backgroundNames.midnight, '#4d5f8f', '#171b2d'),
]
const { formatMessage } = useVIntl()
@@ -26,6 +26,7 @@ import { computed, ref, watch } from 'vue'
import { get, set } from '@/helpers/settings.ts'
import { getOS } from '@/helpers/utils'
import { setUiScale, uiScale } from '@/helpers/ui-scale'
import { useTheming } from '@/store/state'
import {
type AccentColor,
@@ -209,6 +210,15 @@ const messages = defineMessages({
defaultMessage:
'Enables advanced rendering such as blur effects that may cause performance issues without hardware-accelerated rendering.',
},
uiScaleTitle: {
id: 'app.appearance-settings.ui-scale.title',
defaultMessage: 'Launcher scale',
},
uiScaleDescription: {
id: 'app.appearance-settings.ui-scale.description',
defaultMessage:
'Scale the whole launcher interface. A smaller scale fits more content, which helps when embedded pages are cut off.',
},
pageTransitionsTitle: {
id: 'app.appearance-settings.page-transitions.title',
defaultMessage: 'Page transition animations',
@@ -1020,6 +1030,43 @@ watch(
/>
</template>
</SettingsRow>
<SettingsRow stacked>
<template #label>
<span id="settings-target-appearance-ui-scale" tabindex="-1">
{{ formatMessage(messages.uiScaleTitle) }}
</span>
</template>
<template #description>{{ formatMessage(messages.uiScaleDescription) }}</template>
<template #control>
<div class="flex w-full flex-col gap-3">
<div class="flex flex-wrap gap-2">
<button
v-for="preset in [100, 110, 125, 150]"
:key="preset"
type="button"
class="min-w-16 rounded-lg border border-solid px-3 py-1.5 text-sm font-semibold transition-colors"
:class="
uiScale === preset
? 'border-brand bg-brand-highlight text-brand'
: 'border-surface-4 bg-surface-3 text-secondary hover:border-surface-5 hover:text-contrast'
"
@click="setUiScale(preset)"
>
{{ preset }}%
</button>
</div>
<Slider
id="ui-scale"
:model-value="uiScale"
:min="50"
:max="200"
:step="5"
unit="%"
@update:model-value="(value) => setUiScale(Number(value))"
/>
</div>
</template>
</SettingsRow>
<SettingsRow>
<template #label>
<span id="settings-target-appearance-page-transitions" tabindex="-1">
@@ -12,13 +12,13 @@ import {
import { getVersion } from '@tauri-apps/api/app'
import { invoke } from '@tauri-apps/api/core'
import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
import { inject, nextTick, ref, watch } from 'vue'
import { nextTick, ref, watch } from 'vue'
import UpdateAnnouncementHistory from '@/components/ui/announcement/UpdateAnnouncementHistory.vue'
import {
betaDatabaseExists,
copyReleaseDatabaseToBeta,
copyDatabaseBetweenChannels,
copyReleaseDatabaseToBeta,
getCurrentAppDatabasePath,
getUpdateChannel,
getUpdatePreferences,
@@ -446,11 +446,14 @@ async function confirmDatabaseOperation() {
}),
})
} catch (error) {
const detail = error instanceof Error ? error.message : String(error)
handleError(
new Error(
targetChannel === activeChannel
? formatMessage(messages.databaseOperationActiveTarget)
: formatMessage(messages.databaseOperationFailed),
`${
targetChannel === activeChannel
? formatMessage(messages.databaseOperationActiveTarget)
: formatMessage(messages.databaseOperationFailed)
}: ${detail}`,
),
)
} finally {
@@ -468,7 +471,7 @@ function cancelDatabaseOperation() {
<div class="flex flex-col gap-6">
<SettingsSection :title="formatMessage(messages.title)">
<div class="update-channel-panel">
<p id="settings-target-updates-channel" class="m-0 text-sm leading-[1.45] text-secondary">
<p id="settings-target-updates-source" class="m-0 text-sm leading-[1.45] text-secondary">
{{ formatMessage(messages.description) }}
</p>
<div
@@ -1,4 +1,4 @@
import { defineMessage, type MessageDescriptor } from '@modrinth/ui'
import type { MessageDescriptor } from '@modrinth/ui'
export type SettingsCategoryId =
| 'interface'
@@ -28,100 +28,100 @@ export interface SettingsCategoryDefinition {
export const settingsCategoryDefinitions: SettingsCategoryDefinition[] = [
{
id: 'interface',
name: defineMessage({
name: {
id: 'app.settings.tabs.interface',
defaultMessage: 'Interface & appearance',
}),
},
group: 'launcher',
onboardingId: 'settings-tab-interface',
},
{
id: 'home-navigation',
name: defineMessage({
name: {
id: 'app.settings.tabs.home-navigation',
defaultMessage: 'Home & navigation',
}),
},
group: 'launcher',
onboardingId: 'settings-tab-home-navigation',
},
{
id: 'language-translation',
name: defineMessage({
name: {
id: 'app.settings.tabs.language-translation',
defaultMessage: 'Language & translation',
}),
},
group: 'launcher',
onboardingId: 'settings-tab-language-translation',
},
{
id: 'ai',
name: defineMessage({ id: 'app.settings.tabs.ai', defaultMessage: 'AI' }),
name: { id: 'app.settings.tabs.ai', defaultMessage: 'AI' },
group: 'launcher',
flushContent: true,
onboardingId: 'settings-tab-ai',
},
{
id: 'java-performance',
name: defineMessage({
name: {
id: 'app.settings.tabs.java-performance',
defaultMessage: 'Java & performance',
}),
},
group: 'game',
onboardingId: 'settings-tab-java-performance',
},
{
id: 'launch-defaults',
name: defineMessage({
name: {
id: 'app.settings.tabs.launch-defaults',
defaultMessage: 'Launch & instance defaults',
}),
},
group: 'game',
onboardingId: 'settings-tab-launch-defaults',
},
{
id: 'content-downloads',
name: defineMessage({
name: {
id: 'app.settings.tabs.content-downloads',
defaultMessage: 'Content & downloads',
}),
},
group: 'game',
onboardingId: 'settings-tab-content-downloads',
},
{
id: 'network-multiplayer',
name: defineMessage({
name: {
id: 'app.settings.tabs.network-multiplayer',
defaultMessage: 'Network & multiplayer',
}),
},
group: 'game',
onboardingId: 'settings-tab-network-multiplayer',
},
{
id: 'storage-backups',
name: defineMessage({
name: {
id: 'app.settings.tabs.storage-backups',
defaultMessage: 'Storage & backups',
}),
},
group: 'data-privacy',
onboardingId: 'settings-tab-storage-backups',
},
{
id: 'updates',
name: defineMessage({ id: 'app.settings.tabs.updates', defaultMessage: 'Updates' }),
name: { id: 'app.settings.tabs.updates', defaultMessage: 'Updates' },
group: 'support',
onboardingId: 'settings-tab-updates',
},
{
id: 'about',
name: defineMessage({ id: 'app.settings.tabs.about', defaultMessage: 'About' }),
name: { id: 'app.settings.tabs.about', defaultMessage: 'About' },
group: 'support',
},
{
id: 'feature-flags',
name: defineMessage({
name: {
id: 'settings.feature-flags.title',
defaultMessage: 'Feature flags',
}),
},
group: 'developer',
developerOnly: true,
},
@@ -15,7 +15,8 @@ import {
UsersIcon,
} from '@modrinth/assets'
import { commonMessages, defineMessages, type MessageDescriptor } from '@modrinth/ui'
import { defineAsyncComponent, type Component } from 'vue'
import { type Component, defineAsyncComponent } from 'vue'
import {
getVisibleSettingsCategoryDefinitions,
type SettingsCategoryDefinition,
@@ -29,8 +29,8 @@ import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
import { get_project } from '@/helpers/cache'
import { process_listener } from '@/helpers/events'
import { kill, run } from '@/helpers/instance'
import { get_by_instance_id } from '@/helpers/process'
import { isInstanceLaunching } from '@/helpers/instance-launch-state'
import { get_by_instance_id } from '@/helpers/process'
import type { GameInstance } from '@/helpers/types'
import { showInstanceInFolder } from '@/helpers/utils'
import { handleSevereError } from '@/store/error'
@@ -1,120 +0,0 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { createLatestLogReader } from './latest-log-reader.ts'
test('follows file-only output after startup, re-entry, clear and file rotation', async () => {
let file = ''
let displayed = 'stdout startup'
const reader = createLatestLogReader(
async (cursor) => ({
cursor: file.length,
output: file.slice(cursor > file.length ? 0 : cursor),
new_file: cursor > file.length,
}),
(output, replace) => {
displayed = (replace ? '' : displayed) + output
},
)
await reader.refresh()
assert.equal(reader.active, false)
file = 'Startup complete\n'
await reader.refresh()
assert.equal(reader.active, true)
assert.equal(displayed, file) // Replaces stdout, not appended a second time.
file += 'Joined world\nDisconnected\n'
await reader.refresh()
await reader.refresh() // Re-entering the view must not replay history.
assert.equal(displayed, file)
reader.clear()
displayed = ''
file += 'After clear\n'
await reader.refresh()
assert.equal(displayed, 'After clear\n')
file = 'Rotated\n'
await reader.refresh()
assert.equal(displayed, file)
file = ''
await reader.refresh()
assert.equal(displayed, '')
assert.equal(reader.active, false)
file = 'File recreated\n'
await reader.refresh()
assert.equal(displayed, file)
reader.reset()
assert.equal(reader.active, false)
file = 'New session with a longer file\n'
await reader.refresh()
assert.equal(displayed, file)
})
test('serializes reads, ignores pre-restart responses, consumes pre-clear responses', async () => {
const resolvers: ((value: { cursor: number; output: string; new_file: boolean }) => void)[] = []
const cursors: number[] = []
const output: string[] = []
const reader = createLatestLogReader(
(cursor) => {
cursors.push(cursor)
return new Promise((resolve) => resolvers.push(resolve))
},
(text) => output.push(text),
)
const old = reader.refresh()
const concurrent = reader.refresh()
assert.deepEqual(cursors, [0])
reader.reset()
const fresh = reader.refresh()
resolvers[0]({ cursor: 100, output: 'old session', new_file: false })
await Promise.all([old, concurrent])
assert.deepEqual(output, [])
reader.clear()
resolvers[1]({ cursor: 20, output: 'before clear', new_file: false })
await fresh
assert.deepEqual(output, [])
const next = reader.refresh()
assert.deepEqual(cursors, [0, 0, 20])
resolvers[2]({ cursor: 40, output: 'after clear\n', new_file: false })
await next
assert.deepEqual(output, ['after clear\n'])
})
test('a temporary read failure keeps the cursor and retries without duplicating output', async () => {
let failed = true
const output: string[] = []
const reader = createLatestLogReader(
async (cursor) => {
assert.equal(cursor, 0)
if (failed) throw new Error('file temporarily unavailable')
return { cursor: 6, output: 'ready\n', new_file: false }
},
(text) => output.push(text),
)
await assert.rejects(reader.refresh())
assert.equal(reader.active, false)
failed = false
await reader.refresh()
assert.deepEqual(output, ['ready\n'])
})
test('joins split lines and flushes the final unterminated line on exit', async () => {
let chunk = 'Startup\n[Render thread/INFO] Join'
let cursor = 0
let displayed = ''
const reader = createLatestLogReader(
async () => ({
cursor: (cursor += chunk.length),
output: chunk,
new_file: false,
}),
(text, replace) => {
displayed = (replace ? '' : displayed) + text
},
)
await reader.refresh()
assert.equal(displayed, 'Startup\n')
chunk = 'ed world\nLast line'
await reader.refresh()
assert.equal(displayed, 'Startup\n[Render thread/INFO] Joined world\n')
reader.flush()
assert.equal(displayed, 'Startup\n[Render thread/INFO] Joined world\nLast line')
})
@@ -1,88 +0,0 @@
interface LogCursor {
cursor: number
output: string
new_file: boolean
}
/** One authoritative stream: use process events until latest.log becomes available. */
export function createLatestLogReader(
read: (cursor: number) => Promise<LogCursor>,
append: (output: string, replace: boolean) => void,
) {
let cursor = 0
let active = false
let session = 0
let cleared = 0
let partialLine = ''
let replaceOnAppend = false
let pending: Promise<void> | null = null
function refresh(): Promise<void> {
if (pending) return pending
const requestSession = session
const requestClear = cleared
const request = (async () => {
const result = await read(cursor)
if (requestSession !== session) return
const rotated = result.new_file || result.cursor < cursor
const replace = !active || rotated
cursor = result.cursor
if (result.cursor === 0 && !result.output) {
if (rotated) {
active = false
partialLine = ''
replaceOnAppend = false
if (requestClear === cleared) append('', true)
}
return
}
active = true
// Clearing during a read consumes its bytes without restoring cleared text.
if (requestClear === cleared && (result.output || result.new_file)) {
if (replace) {
partialLine = ''
replaceOnAppend = true
}
partialLine += result.output
// File writes can end mid-line. Do not turn the next chunk into a
// separate log entry; bound unterminated output just like the console.
const end =
partialLine.length > 64 * 1024 ? partialLine.length : partialLine.lastIndexOf('\n') + 1
if (end > 0) {
append(partialLine.slice(0, end), replaceOnAppend)
partialLine = partialLine.slice(end)
replaceOnAppend = false
}
}
})()
pending = request
return request.finally(() => {
if (pending === request) pending = null
})
}
return {
refresh,
get active() {
return active
},
clear() {
cleared++
partialLine = ''
replaceOnAppend = false
},
flush() {
if (partialLine) append(partialLine, replaceOnAppend)
partialLine = ''
replaceOnAppend = false
},
reset() {
session++
cursor = 0
active = false
partialLine = ''
replaceOnAppend = false
pending = null
},
}
}
@@ -0,0 +1,70 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import {
createLiveLogReconciler,
type LiveLogSnapshot,
} from './live-log-reconciler.ts'
test('merges the authoritative snapshot with queued events without gaps or duplicates', async () => {
let resolveSnapshot!: (snapshot: LiveLogSnapshot) => void
const displayed: number[] = []
const reconciler = createLiveLogReconciler(
() =>
new Promise((resolve) => {
resolveSnapshot = resolve
}),
(snapshot) => {
displayed.splice(
0,
displayed.length,
...snapshot.lines.map((line) => line.sequence),
)
},
(event) => displayed.push(event.last_sequence),
)
const syncing = reconciler.sync()
reconciler.accept({ first_sequence: 3, last_sequence: 3 })
resolveSnapshot({
lines: [
{ sequence: 1, message: 'one' },
{ sequence: 2, message: 'two' },
],
last_sequence: 2,
})
await syncing
assert.deepEqual(displayed, [1, 2, 3])
await reconciler.accept({ first_sequence: 3, last_sequence: 3 })
assert.deepEqual(displayed, [1, 2, 3])
})
test('resynchronizes when an event sequence reveals a missed batch', async () => {
const displayed: number[] = []
let loads = 0
const reconciler = createLiveLogReconciler(
async () => {
loads++
return {
lines: [1, 2, 3, 4].map((sequence) => ({
sequence,
message: String(sequence),
})),
last_sequence: 4,
}
},
(snapshot) => {
displayed.splice(
0,
displayed.length,
...snapshot.lines.map((line) => line.sequence),
)
},
(event) => displayed.push(event.last_sequence),
)
await reconciler.accept({ first_sequence: 4, last_sequence: 4 })
assert.equal(loads, 1)
assert.deepEqual(displayed, [1, 2, 3, 4])
})
@@ -0,0 +1,81 @@
export interface LiveLogSnapshot {
lines: Array<{ sequence: number; message: string }>
last_sequence: number
}
export interface SequencedLogEvent {
first_sequence: number
last_sequence: number
}
export function createLiveLogReconciler<T extends SequencedLogEvent>(
loadSnapshot: () => Promise<LiveLogSnapshot>,
replace: (snapshot: LiveLogSnapshot) => void,
append: (event: T) => void,
) {
let lastSequence = 0
let queued: T[] = []
let syncing: Promise<void> | null = null
let disposed = false
function drainQueued(): boolean {
const events = queued
queued = []
for (let index = 0; index < events.length; index++) {
const event = events[index]!
if (event.last_sequence <= lastSequence) continue
if (event.first_sequence > lastSequence + 1) {
queued.push(...events.slice(index))
return false
}
append(event)
lastSequence = event.last_sequence
}
return true
}
function sync(): Promise<void> {
if (syncing) return syncing
const request = (async () => {
do {
const snapshot = await loadSnapshot()
if (disposed) return
replace(snapshot)
lastSequence = snapshot.last_sequence
} while (!drainQueued())
})()
const completion = request.finally(() => {
if (syncing === completion) syncing = null
})
syncing = completion
return completion
}
function resync(): Promise<void> {
return syncing ? syncing.then(sync) : sync()
}
function accept(event: T): Promise<void> | undefined {
if (disposed || event.last_sequence <= lastSequence) return
if (syncing) {
queued.push(event)
return syncing
}
if (event.first_sequence > lastSequence + 1) {
queued.push(event)
return sync()
}
append(event)
lastSequence = event.last_sequence
}
return {
accept,
resync,
sync,
dispose() {
disposed = true
queued = []
},
}
}
@@ -1,21 +1,20 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { useHostedSync } from './useHostedSync.ts'
import { useHostedCreation, forgetHostedCreation } from './useHostedCreation.ts'
import {
clearHostedSession,
HOSTED_ACCOUNT_REQUIRED_MESSAGE,
hostedCreate,
hostedDefault,
hostedSync,
onHostedPackAttemptStarted,
setInstanceMode,
} from '../helpers/hosted-packs.ts'
import {
openSkinSiteLogin,
receiveSkinSiteMessage,
requestSkinSiteLuck,
requestSkinSiteDownloadToken,
requestSkinSiteLuck,
requestSkinSitePlayers,
requestSkinSiteSkinUpdate,
resetSkinSiteSession,
@@ -27,6 +26,8 @@ import {
skinSiteStatus,
skinSiteUser,
} from './skin-site-session.ts'
import { forgetHostedCreation, useHostedCreation } from './useHostedCreation.ts'
import { useHostedSync } from './useHostedSync.ts'
test('reconnecting the same skin site frame waits for verification instead of reporting signed out', () => {
const frame = { postMessage() {} } as unknown as Window
@@ -46,6 +47,10 @@ test('hosted installation sends the JWT to native commands while Local needs no
let createdId = 'instance'
let instanceExists = false
let tokenRequests = 0
let accounts: Array<{
account_type: string
yggdrasil?: { api_root: string }
}> = [{ account_type: 'microsoft' }]
const frame = {
postMessage(data: { type: string; requestId: string }) {
if (data.type !== 'starlight-pack-token-request') return
@@ -70,6 +75,14 @@ test('hosted installation sends the JWT to native commands while Local needs no
__TAURI_INTERNALS__: {
async invoke(command: string, args: Record<string, unknown>) {
calls.push({ command, args })
if (command === 'plugin:install|hosted_has_game_account')
return accounts.some(
(account) =>
account.account_type === 'microsoft' ||
(account.account_type === 'yggdrasil' &&
account.yggdrasil?.api_root.replace(/\/+$/, '') ===
'https://skin.starlight.cool/yggdrasil'),
)
if (command === 'plugin:install|hosted_sync' && syncResponse) return syncResponse()
if (command === 'plugin:instance|instance_get')
return instanceExists ? { id: args.instanceId } : null
@@ -99,7 +112,13 @@ test('hosted installation sends the JWT to native commands while Local needs no
await setInstanceMode('instance', 'starlight')
assert.equal(tokenRequests, 4)
assert.deepEqual(
calls.map(({ command }) => command),
calls
.map(({ command }) => command)
.filter(
(command) =>
command.startsWith('plugin:install|') &&
command !== 'plugin:install|hosted_has_game_account',
),
[
'hosted_set_session',
'hosted_default',
@@ -210,9 +229,35 @@ test('hosted installation sends the JWT to native commands while Local needs no
assert.equal(tokenRequests, requestsBeforeLogout)
const attempts: string[] = []
const stopListening = onHostedPackAttemptStarted((id) => attempts.push(id))
accounts = []
const installCallsBeforeAccountFailure = calls.filter(
({ command }) =>
command.startsWith('plugin:install|') &&
command !== 'plugin:install|hosted_has_game_account',
).length
await assert.rejects(hostedSync('failed-instance'), {
message: HOSTED_ACCOUNT_REQUIRED_MESSAGE,
})
await assert.rejects(hostedCreate(), {
message: HOSTED_ACCOUNT_REQUIRED_MESSAGE,
})
assert.deepEqual(attempts, [])
assert.equal(
calls.filter(
({ command }) =>
command.startsWith('plugin:install|') &&
command !== 'plugin:install|hosted_has_game_account',
).length,
installCallsBeforeAccountFailure,
)
const unauthenticatedCreation = useHostedCreation()
await unauthenticatedCreation.install()
assert.equal(unauthenticatedCreation.installError.value, HOSTED_ACCOUNT_REQUIRED_MESSAGE)
assert.equal(unauthenticatedCreation.createdInstance.value, undefined)
accounts = [{ account_type: 'microsoft' }]
const unauthenticatedRetry = hostedSync('failed-instance')
assert.deepEqual(attempts, ['failed-instance'])
await assert.rejects(unauthenticatedRetry)
assert.deepEqual(attempts, ['failed-instance'])
stopListening()
await assert.rejects(hostedSync('failed-instance'))
assert.equal(attempts.length, 1)
@@ -13,9 +13,9 @@ import type {
SymlinkMethodChoice,
} from '@modrinth/ui'
import { useDebugLogger, useGlobalDrop, useInstanceContext, useVIntl } from '@modrinth/ui'
import { join } from '@tauri-apps/api/path'
import { computed, type ComputedRef, nextTick, ref } from 'vue'
import type { Router } from 'vue-router'
import { join } from '@tauri-apps/api/path'
import {
classifyDroppedItem,
@@ -1412,10 +1412,7 @@ export function useDropImport(options: DropImportOptions) {
cleanupLauncherZipTemp()
}
function resolvedInstancePath(
inst: SelectedInstance,
ctx: ImportContext | null,
): string | undefined {
function resolvedInstancePath(inst: SelectedInstance): string | undefined {
if (inst.compatibleMode) return inst.versionPath
return inst.path
}
@@ -10,6 +10,10 @@ const createdInstance = ref<string>()
const completed = ref(false)
let generation = 0
function errorMessage(cause: unknown) {
return cause instanceof Error ? cause.message : String(cause)
}
export function forgetHostedCreation(instanceId: string) {
if (createdInstance.value !== instanceId) return
generation++
@@ -27,7 +31,7 @@ export function markHostedCreationCompleted(instanceId: string) {
export function markHostedCreationFailed(instanceId: string, cause: unknown) {
if (createdInstance.value !== instanceId) return
completed.value = false
installError.value = String(cause)
installError.value = errorMessage(cause)
}
export function useHostedCreation() {
@@ -63,7 +67,7 @@ export function useHostedCreation() {
} catch (cause) {
if (attempt === generation) {
if (createdInstance.value) markHostedCreationFailed(createdInstance.value, cause)
else installError.value = String(cause)
else installError.value = errorMessage(cause)
}
} finally {
installing.value = false
@@ -2,12 +2,14 @@ import { createConsoleState } from '@modrinth/ui'
import {
clear_log_buffer,
get_live_log_buffer,
get_live_log_snapshot,
get_logs,
get_minecraft_latest_log_cursor,
} from '@/helpers/logs'
import { createLatestLogReader } from './latest-log-reader'
import {
createLiveLogReconciler,
type SequencedLogEvent,
} from './live-log-reconciler'
type ConsoleState = ReturnType<typeof createConsoleState>
@@ -25,8 +27,17 @@ interface InstanceConsoleEntry {
historicalConsole: ConsoleState
historicalCache: Map<string, string>
logList: LogEntry[] | null
liveHistoryHydration: Promise<void> | null
latestLog: ReturnType<typeof createLatestLogReader>
liveLog: ReturnType<typeof createLiveLogReconciler<ProcessLogPayload>>
}
interface ProcessLogPayload extends SequencedLogEvent {
type: 'log4j' | 'legacy'
message?: string
logger_name?: string
level?: string
thread_name?: string
timestamp_millis?: number
throwable?: string
}
const instances = new Map<string, InstanceConsoleEntry>()
@@ -36,19 +47,28 @@ function getOrCreate(instanceId: string): InstanceConsoleEntry {
if (entry) return entry
const liveConsole = createConsoleState()
const liveLog = createLiveLogReconciler<ProcessLogPayload>(
() => get_live_log_snapshot(instanceId),
(snapshot) => {
liveConsole.clear()
void liveConsole.addLegacyLog(
snapshot.lines.map((line) => line.message).join('\n'),
)
},
(payload) => {
if (payload.type === 'log4j') {
liveConsole.addLog4jEvent(payload)
} else if (payload.message !== undefined) {
void liveConsole.addLegacyLog(payload.message)
}
},
)
entry = {
liveConsole,
historicalConsole: createConsoleState(),
historicalCache: new Map(),
logList: null,
liveHistoryHydration: null,
latestLog: createLatestLogReader(
(cursor) => get_minecraft_latest_log_cursor(instanceId, cursor),
(output, replace) => {
if (replace) liveConsole.clear()
void liveConsole.addLegacyLog(output)
},
),
liveLog,
}
instances.set(instanceId, entry)
return entry
@@ -56,28 +76,7 @@ function getOrCreate(instanceId: string): InstanceConsoleEntry {
async function hydrate(instanceId: string): Promise<void> {
const entry = getOrCreate(instanceId)
if (entry.liveHistoryHydration) {
return entry.liveHistoryHydration
}
const hydration = (async () => {
await entry.latestLog.refresh().catch(console.warn)
if (!entry.latestLog.active && entry.liveConsole.output.value.length === 0) {
const buffer = await get_live_log_buffer(instanceId)
if (!entry.latestLog.active && entry.liveConsole.output.value.length === 0) {
await entry.liveConsole.addLegacyLog(buffer)
}
}
})()
entry.liveHistoryHydration = hydration
try {
await hydration
} finally {
if (entry.liveHistoryHydration === hydration) {
entry.liveHistoryHydration = null
}
}
await entry.liveLog.sync()
}
async function getHistoricalLogs(instanceId: string): Promise<LogEntry[]> {
@@ -109,15 +108,13 @@ function invalidate(instanceId: string): void {
async function clearLive(instanceId: string): Promise<void> {
const entry = getOrCreate(instanceId)
entry.latestLog.clear()
entry.liveConsole.clear()
await clear_log_buffer(instanceId).catch(() => {})
await clear_log_buffer(instanceId)
await entry.liveLog.resync()
}
async function destroy(instanceId: string): Promise<void> {
instances.get(instanceId)?.latestLog.reset()
function destroy(instanceId: string): void {
instances.get(instanceId)?.liveLog.dispose()
instances.delete(instanceId)
await clear_log_buffer(instanceId).catch(() => {})
}
export function useInstanceConsole(instanceId: string) {
@@ -130,13 +127,8 @@ export function useInstanceConsole(instanceId: string) {
getHistoricalContent: (filename: string) => getHistoricalContent(instanceId, filename),
invalidate: () => invalidate(instanceId),
clearLive: () => clearLive(instanceId),
refreshLive: () => entry.latestLog.refresh(),
flushLive: () => entry.latestLog.flush(),
acceptsProcessLogs: () => !entry.latestLog.active,
resetLive: () => {
entry.latestLog.reset()
entry.liveConsole.clear()
},
appendLive: (payload: ProcessLogPayload) => entry.liveLog.accept(payload),
resyncLive: () => entry.liveLog.resync(),
destroy: () => destroy(instanceId),
}
}
+2 -1
View File
@@ -4,7 +4,8 @@ export const AxolotlBrandConfig = Object.freeze({
productName: 'Starlight Launcher',
shortProductName: 'Starlight',
website: 'https://skin.starlight.cool/',
repositoryUrl: 'https://git.starlight.cool/Disy/StarLight-Yggdrasil-Server',
repositoryUrl: 'https://github.com/ApTx2012/Starlight_Lancher',
releasesUrl: 'https://github.com/ApTx2012/Starlight_Lancher/releases',
supportUrl: 'https://skin.starlight.cool/',
qqGroupNumber: '000000000',
qqChannelUrl: 'https://skin.starlight.cool/',
@@ -1,5 +1,6 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { createHostedDownloadFailures } from './hosted-download-failures.ts'
test('retry clears only its own failure before progress arrives and ignores late old events', () => {
+16 -3
View File
@@ -1,4 +1,5 @@
import { invoke } from '@tauri-apps/api/core'
import {
requestSkinSiteDownloadToken,
skinSiteStatus,
@@ -6,6 +7,8 @@ import {
waitForSkinSiteSession,
} from '../composables/skin-site-session.ts'
export const HOSTED_ACCOUNT_REQUIRED_MESSAGE = '您需要登录正版或皮肤站账号后才能操作'
let sessionUpdate: Promise<void> = Promise.resolve()
const attemptListeners = new Set<(instanceId: string) => void>()
@@ -20,6 +23,13 @@ function startHostedPackAttempt(instanceId: string) {
for (const listener of attemptListeners) listener(instanceId)
}
export async function requireHostedGameAccount(): Promise<void> {
const available = await invokeHosted<boolean>('plugin:install|hosted_has_game_account')
if (!available) {
throw new Error(HOSTED_ACCOUNT_REQUIRED_MESSAGE)
}
}
export function clearHostedSession(): Promise<void> {
const update = sessionUpdate
.catch(() => {})
@@ -99,13 +109,16 @@ export interface HostedSyncResult {
}
export const hostedDefault = () =>
invokeWithSession<HostedPublication>('plugin:install|hosted_default')
export const hostedCreate = (gameDirRoot?: string | null) =>
invokeWithSession<string>('plugin:install|hosted_create', {
export const hostedCreate = async (gameDirRoot?: string | null) => {
await requireHostedGameAccount()
return invokeWithSession<string>('plugin:install|hosted_create', {
gameDirRoot: gameDirRoot ?? null,
})
}
export const hostedBinding = (instanceId: string) =>
invokeHosted<HostedBinding | null>('plugin:install|hosted_binding', { instanceId })
export const hostedSync = (instanceId: string) => {
export const hostedSync = async (instanceId: string) => {
await requireHostedGameAccount()
startHostedPackAttempt(instanceId)
return invokeWithSession<HostedSyncResult>('plugin:install|hosted_sync', { instanceId })
}
@@ -1,5 +1,6 @@
import assert from 'node:assert/strict'
import { test } from 'node:test'
import { isInstanceLaunching, launchOnce } from './instance-launch-state.ts'
test('launches different instances concurrently and coalesces repeated pending clicks', async () => {
@@ -1,18 +1,19 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { useNetworkStatus } from '../composables/useNetworkStatus.ts'
import {
setSkinSiteFrame,
resetSkinSiteSession,
receiveSkinSiteMessage,
resetSkinSiteSession,
setSkinSiteFrame,
SKIN_SITE_ORIGIN,
} from '../composables/skin-site-session.ts'
import { useNetworkStatus } from '../composables/useNetworkStatus.ts'
import {
type InstancePlayer,
onInstancePlayerChanged,
prepareInstancePlayer,
registerInstancePlayerPicker,
saveInstancePlayer,
onInstancePlayerChanged,
type InstancePlayer,
} from './instance-player.ts'
test('instance player selection persists independently from the globally selected account', async () => {
+1 -1
View File
@@ -18,8 +18,8 @@ import { detectGcStrategy, GC_STRATEGY_DEFINITIONS } from '@/helpers/gc/strategi
import type { GcContext, ResolvedGcStrategyId } from '@/helpers/gc/types'
import { setLastGcLaunchReport } from '@/helpers/gc-notice'
import { getInstanceMode, prepareHostedSession } from '@/helpers/hosted-packs'
import { prepareInstancePlayer } from '@/helpers/instance-player'
import { launchOnce } from '@/helpers/instance-launch-state'
import { prepareInstancePlayer } from '@/helpers/instance-player'
import { AUTO_GC_PRESET_ARG } from '@/helpers/java-arguments'
import { get_jre, get_memory_status } from '@/helpers/jre.js'
import { get as getSettings } from '@/helpers/settings'
+3 -8
View File
@@ -64,14 +64,9 @@ export async function get_latest_log_cursor(instanceId, cursor) {
return await invoke('plugin:logs|logs_get_latest_log_cursor', { instanceId, cursor })
}
/// Read Minecraft's logs/latest.log from a cursor.
export async function get_minecraft_latest_log_cursor(instanceId, cursor) {
return await invoke('plugin:logs|logs_get_minecraft_latest_log_cursor', { instanceId, cursor })
}
/// Get all buffered live log lines for an instance from the Rust ring buffer
export async function get_live_log_buffer(instanceId) {
return await invoke('plugin:logs|logs_get_live_log_buffer', { instanceId })
/// Get the authoritative sequenced live-log snapshot from the Rust ring buffer.
export async function get_live_log_snapshot(instanceId) {
return await invoke('plugin:logs|logs_get_live_log_snapshot', { instanceId })
}
/// Clear the live log buffer for an instance on the Rust side
@@ -82,20 +82,20 @@ test('notice query uses the target instance value and registered Tauri command',
assert.match(tauriSource, /tauri::generate_handler!\[[\s\S]*instance_get_post_upgrade_notice/)
})
test('result uses Modrinth Card and Accordion for collapsed compatibility warnings', () => {
test('result collections use Modrinth Card and Accordion for collapsed compatibility warnings', () => {
const source = readFileSync(
new URL('../pages/instance/upgrade/UpgradeResultDetails.vue', import.meta.url),
new URL('../pages/instance/upgrade/UpgradeResultCollections.vue', import.meta.url),
'utf8',
)
assert.match(source, /<Card v-if="warningRows\.length"/)
assert.match(source, /<Accordion[\s\S]*:open-by-default="warningsExpandedByDefault"/)
assert.match(source, /<Card v-if="warnings\.length"/)
assert.match(source, /<Accordion[\s\S]*:open-by-default="warningsDefaultOpen"/)
assert.match(source, /<TriangleAlertIcon/)
})
test('runtime icon references use names exported by the assets package', () => {
const downloadsSource = readFileSync(new URL('../pages/Downloads.vue', import.meta.url), 'utf8')
const resultSource = readFileSync(
new URL('../pages/instance/upgrade/UpgradeResultDetails.vue', import.meta.url),
new URL('../pages/instance/upgrade/UpgradeResultCollections.vue', import.meta.url),
'utf8',
)
const assetsSource = readFileSync(
@@ -1,5 +1,6 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { createTaggedModProgress } from './tagged-mod-progress.ts'
const parent = (id = 'parent', fraction: number | null = 0, error = '') => ({
+60
View File
@@ -0,0 +1,60 @@
import { ref, watch } from 'vue'
/**
* 启动器界面缩放(百分比)。
* 这是纯本地的显示偏好,用 localStorage 保存即可,无需写入后端设置数据库。
*/
const UI_SCALE_STORAGE_KEY = 'starlight-ui-scale'
const MIN_UI_SCALE = 50
const MAX_UI_SCALE = 200
const DEFAULT_UI_SCALE = 100
/** 把缩放值限制在允许范围内。 */
function clampUiScale(value: number): number {
if (!Number.isFinite(value)) return DEFAULT_UI_SCALE
return Math.min(MAX_UI_SCALE, Math.max(MIN_UI_SCALE, Math.round(value)))
}
/** 从 localStorage 读取已保存的缩放值。 */
function readStoredUiScale(): number {
try {
const raw = localStorage.getItem(UI_SCALE_STORAGE_KEY)
if (raw === null) return DEFAULT_UI_SCALE
return clampUiScale(Number(raw))
} catch {
return DEFAULT_UI_SCALE
}
}
export const uiScale = ref(readStoredUiScale())
export function setUiScale(value: number): void {
uiScale.value = clampUiScale(value)
}
export function resetUiScale(): void {
setUiScale(DEFAULT_UI_SCALE)
}
export { DEFAULT_UI_SCALE, MAX_UI_SCALE, MIN_UI_SCALE }
/** 把缩放应用到文档根节点,并在变化时持久化。 */
export function installUiScale(): void {
const apply = (value: number) => {
const factor = String(value / 100)
const root = document.documentElement
root.style.setProperty('--ui-scale', factor)
// 用 CSS zoom 整体缩放界面(含内嵌网页),在 WebView2/WebKit 上最可靠。
root.style.setProperty('zoom', factor)
}
apply(uiScale.value)
watch(uiScale, (value) => {
apply(value)
try {
localStorage.setItem(UI_SCALE_STORAGE_KEY, String(value))
} catch (error) {
console.warn('保存界面缩放失败', error)
}
})
}
+3 -4
View File
@@ -4,9 +4,9 @@ import { invoke } from '@tauri-apps/api/core'
import dayjs from 'dayjs'
import { isOfflineMode } from '@/composables/useNetworkStatus'
import { prepareInstancePlayer } from '@/helpers/instance-player'
import { getInstanceMode, prepareHostedSession } from '@/helpers/hosted-packs'
import { get_full_path, resolveGcLaunchIntent } from '@/helpers/instance'
import { prepareInstancePlayer } from '@/helpers/instance-player'
import { openPath } from '@/helpers/utils'
type BaseWorld = {
@@ -20,7 +20,6 @@ type BaseWorld = {
export type WorldType = 'singleplayer' | 'server'
export type DisplayStatus = 'normal' | 'hidden' | 'favorite'
export type SingleplayerWorld = BaseWorld & {
type: 'singleplayer'
path: string
@@ -251,7 +250,7 @@ export async function start_join_singleplayer_world(
world: string,
): Promise<unknown> {
await prepareInstancePlayer(instanceId)
if (await getInstanceMode(instanceId) === 'starlight') await prepareHostedSession()
if ((await getInstanceMode(instanceId)) === 'starlight') await prepareHostedSession()
const { args, gcIntent } = await resolveGcLaunchIntent(instanceId)
return await invoke('plugin:worlds|start_join_singleplayer_world', {
instanceId,
@@ -264,7 +263,7 @@ export async function start_join_singleplayer_world(
export async function start_join_server(instanceId: string, address: string): Promise<unknown> {
await prepareInstancePlayer(instanceId)
if (await getInstanceMode(instanceId) === 'starlight') await prepareHostedSession()
if ((await getInstanceMode(instanceId)) === 'starlight') await prepareHostedSession()
const { args, gcIntent } = await resolveGcLaunchIntent(instanceId)
return await invoke('plugin:worlds|start_join_server', {
instanceId,
@@ -773,6 +773,12 @@
"app.appearance-settings.transparent-background.title": {
"message": "Transparent background"
},
"app.appearance-settings.ui-scale.title": {
"message": "Launcher scale"
},
"app.appearance-settings.ui-scale.description": {
"message": "Scale the whole launcher interface. A smaller scale fits more content, which helps when embedded pages are cut off."
},
"app.appearance-settings.unknown-pack-warning.description": {
"message": "If you attempt to install a Modrinth Pack file (.mrpack) that isn't hosted on Modrinth, we'll make sure you understand the risks before installing it."
},
@@ -805,6 +805,12 @@
"app.appearance-settings.transparent-background.title": {
"message": "透明背景"
},
"app.appearance-settings.ui-scale.title": {
"message": "启动器缩放"
},
"app.appearance-settings.ui-scale.description": {
"message": "缩放整个启动器界面。缩小后能显示更多内容,适合内嵌网页被裁切的情况。"
},
"app.appearance-settings.unknown-pack-warning.description": {
"message": "如果你尝试安装一个未托管在 Modrinth 上的 Modrinth 整合包文件(.mrpack),我们会确保你在安装之前了解相关风险。"
},
+7 -7
View File
@@ -3093,7 +3093,7 @@ provideBrowseManager({
<template>
<div data-onboarding-id="browse-content" class="flex flex-col gap-3 p-6">
<BrowsePageLayout v-if="!isWorldMapBrowse || curseForgeCapability.configured">
<BrowsePageLayout>
<template #nav-tabs-actions>
<ButtonStyled size="large" type="transparent">
<button :disabled="translationLoading" @click="toggleTranslation">
@@ -3193,14 +3193,14 @@ provideBrowseManager({
{{ formatMessage(messages.fuzzySearchSuffix) }}
</p>
</div>
<EmptyState
v-if="isWorldMapBrowse && !curseForgeCapability.configured"
type="empty-inbox"
:heading="formatMessage(messages.mapsUnavailable)"
:description="formatMessage(messages.mapsUnavailableDescription)"
/>
</template>
</BrowsePageLayout>
<EmptyState
v-else
type="empty-inbox"
:heading="formatMessage(messages.mapsUnavailable)"
:description="formatMessage(messages.mapsUnavailableDescription)"
/>
<CreationFlowModal
v-if="isServerContext && projectType === 'modpack'"
ref="serverSetupModalRef"
+5 -7
View File
@@ -3,11 +3,12 @@ import { FolderOpenIcon, LeftArrowIcon, SparklesIcon } from '@modrinth/assets'
import { BigOptionButton, Button, defineMessages, useVIntl } from '@modrinth/ui'
import { inject, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import InstanceModeOptions from '@/components/instance/InstanceModeOptions.vue'
import HostedGameDirModal from '@/components/instance/HostedGameDirModal.vue'
import HostedPackProgress from '@/components/instance/HostedPackProgress.vue'
import type { InstanceMode } from '@/helpers/hosted-packs'
import InstanceModeOptions from '@/components/instance/InstanceModeOptions.vue'
import { useHostedCreation } from '@/composables/useHostedCreation'
import type { InstanceMode } from '@/helpers/hosted-packs'
const { formatMessage } = useVIntl()
const router = useRouter()
@@ -187,8 +188,8 @@ function handleImportExisting() {
/>
<BigOptionButton
data-onboarding-id="creation-method-import"
v-if="instanceMode === 'local'"
data-onboarding-id="creation-method-import"
:icon="FolderOpenIcon"
:title="formatMessage(messages.importTitle)"
:description="formatMessage(messages.importDescription)"
@@ -197,10 +198,7 @@ function handleImportExisting() {
/>
</div>
<HostedGameDirModal
ref="hostedGameDirModal"
@confirm="installHostedWithGameDir"
/>
<HostedGameDirModal ref="hostedGameDirModal" @confirm="installHostedWithGameDir" />
<HostedPackProgress :instance-id="createdInstance" :active="installing" />
<p v-if="installError" class="m-0 text-red" role="alert">{{ installError }}</p>
<p v-if="instanceMode === 'local'" class="m-0 text-sm text-secondary">
+2 -2
View File
@@ -10,7 +10,7 @@ import { computed, onUnmounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { getActivePlayerName } from '@/components/home/home-utils'
import HomeDailyChallenge from '@/components/home/HomeDailyChallenge.vue'
import HomeAnnouncementEntry from '@/components/home/HomeAnnouncementEntry.vue'
import HomeInstancePickerModal from '@/components/home/HomeInstancePickerModal.vue'
import HomeLaunchProgress from '@/components/home/HomeLaunchProgress.vue'
import HomeMinecraftNews from '@/components/home/HomeMinecraftNews.vue'
@@ -202,7 +202,7 @@ onUnmounted(() => {
>
<HomeLaunchProgress />
<HomePlayInsights />
<HomeDailyChallenge />
<HomeAnnouncementEntry />
<HomeMinecraftNews />
</div>
</Teleport>
@@ -259,7 +259,7 @@ onMounted(() => {
/>
<div class="flex flex-col gap-1.5">
<ButtonStyled color="brand">
<button class="start-button" @click="startTranslation" :disabled="!canStart">
<button class="start-button" :disabled="!canStart" @click="startTranslation">
<PlayIcon />{{ formatMessage(messages.start) }}
</button>
</ButtonStyled>
+1 -1
View File
@@ -33,11 +33,11 @@ import {
defineMessages,
DropdownSelect,
injectNotificationManager,
type MessageDescriptor,
PopoutMenu,
Slider,
StyledInput,
Toggle,
type MessageDescriptor,
useRelativeTime,
useVIntl,
} from '@modrinth/ui'
+1 -3
View File
@@ -2,10 +2,9 @@
import { UsersIcon } from '@modrinth/assets'
import { defineMessages, NavTabs, useVIntl } from '@modrinth/ui'
import { computed } from 'vue'
import { RouterView, useRoute, useRouter } from 'vue-router'
import { RouterView, useRouter } from 'vue-router'
const { formatMessage } = useVIntl()
const route = useRoute()
const router = useRouter()
const messages = defineMessages({
@@ -13,7 +12,6 @@ const messages = defineMessages({
roomsTab: { id: 'app.multiplayer.tab.rooms', defaultMessage: 'Rooms' },
})
const activeTab = computed(() => (route.path.startsWith('/multiplayer/rooms') ? 'rooms' : 'rooms'))
const tabLinks = computed(() => [
{ label: formatMessage(messages.roomsTab), href: '/multiplayer/rooms', icon: UsersIcon },
])
+10 -10
View File
@@ -163,7 +163,7 @@
</button>
</ButtonStyled>
<ButtonStyled v-else-if="!isServerInstance" color="brand" size="large">
<button @click="startInstance('InstancePage')">
<button @click="startInstance">
<PlayIcon />
{{ formatMessage(playing ? messages.launchAnother : commonMessages.playButton) }}
</button>
@@ -184,7 +184,7 @@
},
{
id: 'launch_instance',
action: () => startInstance('InstancePage'),
action: startInstance,
},
]"
>
@@ -204,7 +204,7 @@
</ButtonStyled>
</div>
<ButtonStyled v-if="playing" color="red" size="large">
<button :disabled="stopping || loading" @click="stopInstance('InstancePage')">
<button :disabled="stopping || loading" @click="stopInstance">
<StopCircleIcon />
{{ formatMessage(stopping ? messages.stopping : messages.stopAll) }}
</button>
@@ -294,7 +294,7 @@
:is-server-instance="isServerInstance"
:open-settings="() => settingsModal?.show(1)"
@play="updatePlayState"
@stop="() => stopInstance('InstanceSubpage')"
@stop="stopInstance"
></component>
</Suspense>
</template>
@@ -400,9 +400,9 @@ import {
getFreshCachedServerStatus,
} from '@/composables/instances/use-server-status-query'
import { useInstanceConsole } from '@/composables/useInstanceConsole'
import { useInstanceMode } from '@/composables/useInstanceMode'
import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
import { useNetworkStatus } from '@/composables/useNetworkStatus'
import { useInstanceMode } from '@/composables/useInstanceMode'
import { postUpgradeNoticeQueryKey, usePostUpgradeNotice } from '@/composables/usePostUpgradeNotice'
import { useSymlinkWarningDismiss } from '@/composables/useSymlinkWarningDismiss'
import { get_project_v3 } from '@/helpers/cache.js'
@@ -421,8 +421,8 @@ import {
run,
} from '@/helpers/instance'
import { getDisplayInstanceIcon } from '@/helpers/instance-icons'
import { get_by_instance_id } from '@/helpers/process'
import { isInstanceLaunching } from '@/helpers/instance-launch-state'
import { get_by_instance_id } from '@/helpers/process'
import type { GameInstance } from '@/helpers/types'
import { createInstanceShortcut, showInstanceInFolder } from '@/helpers/utils.js'
import { refreshWorlds, type ServerStatus } from '@/helpers/worlds'
@@ -733,7 +733,7 @@ watch(
const options = ref<InstanceType<typeof ContextMenu> | null>(null)
const startInstance = async (context: string) => {
const startInstance = async () => {
if (!instance.value || loading.value) return
const id = props.id
const name = instance.value.name
@@ -780,7 +780,7 @@ watch(
{ immediate: true },
)
const stopInstance = async (context: string) => {
const stopInstance = async () => {
stopping.value = true
await kill(props.id).catch(handleError)
stopping.value = false
@@ -882,10 +882,10 @@ const handleRightClick = (event: MouseEvent) => {
const handleOptionsClick = async (args: { option: string; item: unknown }) => {
switch (args.option) {
case 'play':
await startInstance('InstancePageContextMenu')
await startInstance()
break
case 'stop':
await stopInstance('InstancePageContextMenu')
await stopInstance()
break
case 'add_content':
await router.push({
+10 -32
View File
@@ -86,13 +86,16 @@ const {
getHistoricalContent,
invalidate,
clearLive,
refreshLive,
flushLive,
acceptsProcessLogs,
resetLive,
appendLive,
resyncLive,
} = useInstanceConsole(instanceId.value)
await hydrate()
const unlistenLog = await log_listener((payload) => {
if (payload.instance_id !== instanceId.value) return
void appendLive(payload)?.catch(console.warn)
})
await hydrate().catch(handleError)
function buildLogList(rawLogs) {
return [
@@ -219,28 +222,16 @@ if (!props.playing) {
void analyseForCrash()
}
const unlistenLog = await log_listener((payload) => {
if (payload.instance_id !== instanceId.value) return
if (!acceptsProcessLogs()) return
if (payload.type === 'log4j') {
liveConsole.addLog4jEvent(payload)
} else if (payload.type === 'legacy') {
void liveConsole.addLegacyLog(payload.message)
}
})
const unlistenProcesses = await process_listener(async (e) => {
if (e.instance_id !== instanceId.value) return
if (e.event === 'launched') {
resetLive()
await resyncLive().catch(console.warn)
clearCrashAnalysis()
invalidate()
selectedLogIndex.value = 0
}
if (e.event === 'finished') {
await refreshLive().catch(console.warn)
flushLive()
await resyncLive().catch(console.warn)
invalidate()
const freshLogs = await getHistoricalLogs()
logs.value = buildLogList(freshLogs)
@@ -248,20 +239,7 @@ const unlistenProcesses = await process_listener(async (e) => {
}
})
// Keep following the file even when a mod stops writing to stdout after startup.
// Schedule after each read so slow disk/IPC cannot pile up concurrent requests.
let disposed = false
let refreshTimer
async function followLatestLog() {
await refreshLive().catch(console.warn)
if (!props.playing) flushLive()
if (!disposed) refreshTimer = setTimeout(followLatestLog, 1000)
}
void followLatestLog()
onUnmounted(() => {
disposed = true
clearTimeout(refreshTimer)
unlistenLog()
unlistenProcesses()
})
@@ -1408,7 +1408,8 @@ async function getUpdaterProjectVersions(
if (!versions) {
versions = (await get_project_versions(projectId).catch(() => null)) as
Labrinth.Versions.v2.Version[] | null
| Labrinth.Versions.v2.Version[]
| null
}
if (!versions && fetchError) {
@@ -1719,9 +1720,6 @@ async function applyToggleDisableBatch(items: ContentItem[], enabled: boolean) {
resultById,
false,
)
for (const operation of operations) {
}
} catch (error) {
for (const operation of operations) {
operation.optimisticPath = operation.originalFilePath
@@ -845,7 +845,7 @@ async function installSelected(fileId: string | null) {
}
if (isWorldMap.value) {
installing.value = true
await installCurseForgeWorld(project.value.id, fileId, instanceId.value, 'ProjectPage', () => {
await installCurseForgeWorld(project.value.id, fileId, instanceId.value, () => {
installing.value = false
}).catch((error) => {
installing.value = false
@@ -414,8 +414,8 @@ import {
ProjectSidebarServerInfo,
ProjectSidebarTags,
requestInstall,
SelectedProjectsFloatingBar,
ScrollToTopButton,
SelectedProjectsFloatingBar,
usesTargetGameVersion,
useVIntl,
} from '@modrinth/ui'
@@ -567,7 +567,7 @@ const messages = defineMessages({
favoritesLoading: {
id: 'app.content-favorites.loading',
defaultMessage: 'Updating favorites…',
},
},
viewDependents: {
id: 'project.actions.view-dependents',
defaultMessage: 'View dependents',
@@ -72,12 +72,7 @@
</template>
<script setup>
import {
CheckIcon,
DownloadIcon,
ExternalIcon,
MoreVerticalIcon,
} from '@modrinth/assets'
import { CheckIcon, DownloadIcon, ExternalIcon, MoreVerticalIcon } from '@modrinth/assets'
import {
ButtonStyled,
commonMessages,
@@ -108,7 +103,7 @@ const messages = defineMessages({
},
})
const props = defineProps({
defineProps({
project: {
type: Object,
default: () => {},
@@ -517,7 +517,6 @@ export interface ContentInstallContext {
projectId: string | number,
fileId?: string | number | null,
instanceId?: string | null,
source?: string,
callback?: ContentInstallCallback,
) => Promise<void>
installingItems: Ref<Map<string, ContentItem[]>>
@@ -1884,7 +1883,6 @@ export function createContentInstall(opts: {
markInstanceContentChanged(instance.id)
incompatibilityWarningModalRef?.hide()
removeInstallingItems(instance.id, [project.id])
}
function handleIncompatibilityWarningCancel() {
@@ -2056,7 +2054,6 @@ export function createContentInstall(opts: {
: `/instance/${encodeURIComponent(id)}`,
)
settleCurrentCallback(version.id, installedProjectIds)
modalRef?.hide()
} catch (err) {
@@ -2116,10 +2113,14 @@ export function createContentInstall(opts: {
if (project.project_type === 'modpack') {
if (shouldShowInstallTargetModal) hideContentInstallModal()
const [versions, packs] = await Promise.all([
get_version_many(project.versions, 'must_revalidate') as Promise<Labrinth.Versions.v2.Version[]>,
get_version_many(project.versions, 'must_revalidate') as Promise<
Labrinth.Versions.v2.Version[]
>,
list(),
])
const sortedVersions = versions.sort((a, b) => dayjs(b.date_published).valueOf() - dayjs(a.date_published).valueOf())
const sortedVersions = versions.sort(
(a, b) => dayjs(b.date_published).valueOf() - dayjs(a.date_published).valueOf(),
)
pendingModpackInstall = {
project,
version: versionId ?? sortedVersions[0]?.id ?? '',
@@ -2132,7 +2133,10 @@ export function createContentInstall(opts: {
sortedVersions.map((version) => [
version.id,
packs
.filter((pack) => pack.link?.project_id === project.id && pack.link?.version_id === version.id)
.filter(
(pack) =>
pack.link?.project_id === project.id && pack.link?.version_id === version.id,
)
.map((pack) => ({ id: pack.id, name: pack.name })),
]),
)
@@ -2391,7 +2395,6 @@ export function createContentInstall(opts: {
projectId: string | number,
fileId?: string | number | null,
instanceId?: string | null,
source: string = 'unknown',
callback: ContentInstallCallback = () => {},
) {
const modalSessionId = instanceId ? null : beginInstallSession(callback)
@@ -2486,11 +2489,10 @@ export function createContentInstall(opts: {
projectId: string | number,
fileId?: string | number | null,
instanceId?: string | null,
source: string = 'unknown',
callback: ContentInstallCallback = () => {},
) {
return guardInstallRequest(
() => installCurseForgeWorldInternal(projectId, fileId, instanceId, source, callback),
() => installCurseForgeWorldInternal(projectId, fileId, instanceId, callback),
callback,
)
}
@@ -2532,8 +2534,7 @@ export function createContentInstall(opts: {
handleCurseForgeManualDownloadsImported,
async handleModpackInstall(versionId: string, name: string) {
if (!pendingModpackInstall) return
const { project, source, callback, createInstanceCallback, provider } =
pendingModpackInstall
const { project, source, callback, createInstanceCallback, provider } = pendingModpackInstall
pendingModpackInstall = null
if (provider === 'curseforge') {
const numericProjectId = Number(project.id.replace(/^curseforge:/, ''))
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "theseus_gui"
# The actual version is set by the theseus-build workflow on tagging
version = "1.0.0-beta12"
version = "1.0.0-beta15"
edition.workspace = true
description = "Axolotl Launcher is a cross-platform Minecraft launcher"
homepage = "https://www.ghs.red"
+1 -2
View File
@@ -292,8 +292,7 @@ fn main() {
"logs_delete_logs",
"logs_delete_logs_by_filename",
"logs_get_latest_log_cursor",
"logs_get_minecraft_latest_log_cursor",
"logs_get_live_log_buffer",
"logs_get_live_log_snapshot",
"logs_clear_live_log_buffer",
"logs_analyze_crash",
"logs_get_crash_analysis_ai_settings",
+1
View File
@@ -547,6 +547,7 @@ fn keyring_error(
.into()
}
#[cfg(test)]
fn parse_custom_uuid(uuid: Option<String>) -> Result<Option<uuid::Uuid>> {
let Some(uuid) = uuid else {
return Ok(None);
+6
View File
@@ -16,6 +16,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
.invoke_handler(tauri::generate_handler![
hosted_default,
hosted_set_session,
hosted_has_game_account,
hosted_create,
hosted_binding,
hosted_sync,
@@ -65,6 +66,11 @@ pub async fn hosted_default() -> Result<theseus::pack::hosted::Publication> {
Ok(theseus::pack::hosted::default_publication().await?)
}
#[tauri::command]
pub async fn hosted_has_game_account() -> Result<bool> {
Ok(theseus::pack::hosted::has_game_account().await?)
}
#[tauri::command]
pub async fn hosted_create(game_dir_root: Option<String>) -> Result<String> {
Ok(theseus::pack::hosted::create(game_dir_root).await?)
+5 -18
View File
@@ -4,7 +4,7 @@ use std::path::PathBuf;
use theseus::logs::LogType;
use theseus::logs::{
self, CensoredString, CrashAnalysis, CrashAnalysisAiExplanation,
CrashAnalysisAiSettings, LatestLogCursor, Logs,
CrashAnalysisAiSettings, LatestLogCursor, LiveLogSnapshot, Logs,
};
/*
@@ -26,8 +26,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
logs_delete_logs,
logs_delete_logs_by_filename,
logs_get_latest_log_cursor,
logs_get_minecraft_latest_log_cursor,
logs_get_live_log_buffer,
logs_get_live_log_snapshot,
logs_clear_live_log_buffer,
logs_analyze_crash,
logs_get_crash_analysis_ai_settings,
@@ -95,24 +94,12 @@ pub async fn logs_get_latest_log_cursor(
Ok(logs::get_latest_log_cursor(instance_id, cursor).await?)
}
/// Get Minecraft's logs/latest.log from a cursor.
#[tauri::command]
pub async fn logs_get_minecraft_latest_log_cursor(
instance_id: &str,
cursor: u64, // 0 to start at beginning of file
) -> Result<LatestLogCursor> {
Ok(
logs::get_generic_live_log_cursor(instance_id, "latest.log", cursor)
.await?,
)
}
/// Get all buffered live log lines for an instance.
#[tauri::command]
pub async fn logs_get_live_log_buffer(
pub async fn logs_get_live_log_snapshot(
instance_id: &str,
) -> Result<CensoredString> {
Ok(logs::get_live_log_buffer(instance_id).await?)
) -> Result<LiveLogSnapshot> {
Ok(logs::get_live_log_snapshot(instance_id).await?)
}
/// Clear the live log buffer for an instance.
+4 -1
View File
@@ -548,6 +548,10 @@ fn schedule_tray_menu_update(app: &AppHandle) {
});
}
pub fn state_initialized(app: &AppHandle) {
schedule_tray_menu_update(app);
}
async fn rebuild_tray_menu(
app: &AppHandle,
active: bool,
@@ -708,7 +712,6 @@ pub fn init(app: &AppHandle) {
.build(app)
.expect("failed to create system tray");
let _tray = tray;
schedule_tray_menu_update(app);
let app_handle = app.clone();
app.listen("process", move |event| {
let Ok(payload) =
+10 -4
View File
@@ -315,6 +315,8 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
app.fs_scope()
.allow_directory(state.directories.servers_dir(), true)?;
lightweight_mode::state_initialized(&app);
Ok(())
}
@@ -569,10 +571,9 @@ fn is_dev() -> bool {
#[tauri::command]
fn are_updates_enabled() -> bool {
// StarLight launcher ships without the built-in update checker.
// Keep the backend interface in place for a future user-supplied
// update URL to be wired in by replacing this no-op gate later.
false
// The frontend waits for launcher state initialization before starting
// the built-in updater.
true
}
#[cfg(feature = "updater")]
@@ -910,6 +911,11 @@ fn main() {
Ok(())
});
#[cfg(feature = "updater")]
{
builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
}
builder = builder
.plugin(api::ai::init())
.plugin(api::auth::init())
+7
View File
@@ -71,6 +71,13 @@
"schemes": ["starlight"]
},
"mobile": []
},
"updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQ0NDhERTUxN0E3MERBNDYKUldSRzJuQjZVZDVJMUpKSUJ6blVpVzJQSTgvSjlyeVRGK0ozRzcwVWtpbTJjbUl0V0NRcC9OQVoK",
"endpoints": ["https://skin.starlight.cool/starlight/launcher/latest"],
"windows": {
"installMode": "quiet"
}
}
},
"app": {
File diff suppressed because it is too large. Load diff
+29 -30
View File
@@ -1,34 +1,33 @@
{
"tag_name": "v1.9.5",
"tag_name": "v1.0.0",
"assets": [
"Axolotl.Launcher-1.9.5-1.aarch64.rpm",
"Axolotl.Launcher-1.9.5-1.aarch64.rpm.sig",
"Axolotl.Launcher-1.9.5-1.x86_64.rpm",
"Axolotl.Launcher-1.9.5-1.x86_64.rpm.sig",
"Axolotl.Launcher_1.9.5_aarch64.AppImage",
"Axolotl.Launcher_1.9.5_aarch64.AppImage.sig",
"Axolotl.Launcher_1.9.5_aarch64.AppImage.tar.gz",
"Axolotl.Launcher_1.9.5_aarch64.AppImage.tar.gz.sig",
"Axolotl.Launcher_1.9.5_amd64.AppImage",
"Axolotl.Launcher_1.9.5_amd64.AppImage.sig",
"Axolotl.Launcher_1.9.5_amd64.AppImage.tar.gz",
"Axolotl.Launcher_1.9.5_amd64.AppImage.tar.gz.sig",
"Axolotl.Launcher_1.9.5_amd64.deb",
"Axolotl.Launcher_1.9.5_amd64.deb.sig",
"Axolotl.Launcher_1.9.5_arm64.deb",
"Axolotl.Launcher_1.9.5_arm64.deb.sig",
"Axolotl.Launcher_1.9.5_universal.dmg",
"Axolotl.Launcher_1.9.5_x64-setup.exe",
"Axolotl.Launcher_1.9.5_x64-setup.exe.sig",
"Axolotl.Launcher_1.9.5_x64-setup.nsis.zip",
"Axolotl.Launcher_1.9.5_x64-setup.nsis.zip.sig",
"Axolotl.Launcher_universal.app.tar.gz",
"Axolotl.Launcher_universal.app.tar.gz.sig",
"Axolotl_Launcher_1.9.5_x64_modern-setup.exe",
"Axolotl_Launcher_1.9.5_x64_modern-setup.exe.sig",
"Axolotl_Launcher_1.9.5_x64_nsis-setup.exe",
"Axolotl_Launcher_1.9.5_x64_nsis-setup.exe.sig",
"Axolotl_Launcher_1.9.5_x64_portable.zip",
"latest.json"
"Axolotl_Launcher_1.0.0_x64_modern-setup.exe",
"Axolotl_Launcher_1.0.0_x64_modern-setup.exe.sig",
"Axolotl_Launcher_1.0.0_x64_nsis-setup.exe",
"Axolotl_Launcher_1.0.0_x64_nsis-setup.exe.sig",
"Axolotl_Launcher_1.0.0_x64_portable.zip",
"Starlight.Launcher-1.0.0-1.aarch64.rpm",
"Starlight.Launcher-1.0.0-1.aarch64.rpm.sig",
"Starlight.Launcher-1.0.0-1.x86_64.rpm",
"Starlight.Launcher-1.0.0-1.x86_64.rpm.sig",
"Starlight.Launcher_1.0.0_aarch64.AppImage",
"Starlight.Launcher_1.0.0_aarch64.AppImage.sig",
"Starlight.Launcher_1.0.0_aarch64.AppImage.tar.gz",
"Starlight.Launcher_1.0.0_aarch64.AppImage.tar.gz.sig",
"Starlight.Launcher_1.0.0_amd64.AppImage",
"Starlight.Launcher_1.0.0_amd64.AppImage.sig",
"Starlight.Launcher_1.0.0_amd64.AppImage.tar.gz",
"Starlight.Launcher_1.0.0_amd64.AppImage.tar.gz.sig",
"Starlight.Launcher_1.0.0_amd64.deb",
"Starlight.Launcher_1.0.0_amd64.deb.sig",
"Starlight.Launcher_1.0.0_arm64.deb",
"Starlight.Launcher_1.0.0_arm64.deb.sig",
"Starlight.Launcher_1.0.0_universal.dmg",
"Starlight.Launcher_1.0.0_x64-setup.exe",
"Starlight.Launcher_1.0.0_x64-setup.exe.sig",
"Starlight.Launcher_1.0.0_x64-setup.nsis.zip",
"Starlight.Launcher_1.0.0_x64-setup.nsis.zip.sig",
"Starlight.Launcher_universal.app.tar.gz",
"Starlight.Launcher_universal.app.tar.gz.sig"
]
}
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "theseus"
# The actual version is set by the theseus-build workflow on tagging
version = "1.0.0-beta12"
version = "1.0.0-beta15"
edition.workspace = true
[dependencies]
+8 -7
View File
@@ -441,13 +441,14 @@ impl ZipEntrySet {
let mut seen: std::collections::HashSet<&str> =
std::collections::HashSet::new();
for dir in &self.dirs {
if let Some(rest) = dir.strip_prefix(base)
&& let Some((first, _)) = rest.split_once('/')
&& !first.is_empty()
&& !is_noise_entry(first)
&& seen.insert(first)
{
children.push(first.to_string());
if let Some(rest) = dir.strip_prefix(base) {
let first = rest.split('/').next().unwrap_or_default();
if !first.is_empty()
&& !is_noise_entry(first)
&& seen.insert(first)
{
children.push(first.to_string());
}
}
}
for path in &self.files {
@@ -7,7 +7,6 @@ use crate::state::{
};
use crate::util::{fetch::write_cached_icon, io};
use std::path::Path;
use std::path::PathBuf;
#[tracing::instrument]
#[allow(clippy::too_many_arguments)]
+27 -15
View File
@@ -54,6 +54,18 @@ pub struct LatestLogCursor {
pub new_file: bool,
}
#[derive(Serialize, Debug)]
pub struct LiveLogLine {
pub sequence: u64,
pub message: CensoredString,
}
#[derive(Serialize, Debug)]
pub struct LiveLogSnapshot {
pub lines: Vec<LiveLogLine>,
pub last_sequence: u64,
}
#[derive(Serialize, Debug)] // Not deserialize
#[serde(transparent)]
pub struct CensoredString(String);
@@ -651,31 +663,31 @@ pub async fn delete_logs_by_filename(
}
#[tracing::instrument]
pub async fn get_live_log_buffer(
pub async fn get_live_log_snapshot(
instance_id: &str,
) -> crate::Result<CensoredString> {
) -> crate::Result<LiveLogSnapshot> {
let state = State::get().await?;
let lines = crate::state::get_log_buffer(instance_id);
let joined = lines.join("\n");
let compacted =
cap_log_for_display(compact_duplicate_lines(&joined), false);
let credentials = Credentials::get_all(&state.pool)
.await?
.into_iter()
.map(|x| x.1)
.collect::<Vec<_>>();
maybe_emit_log_compaction_warning("live log", compacted.stats).await;
maybe_emit_log_display_truncation_warning(
"live log",
compacted.display_truncated,
)
.await;
Ok(CensoredString::censor(compacted.output, &credentials))
let snapshot = crate::state::get_live_log_snapshot(instance_id);
Ok(LiveLogSnapshot {
lines: snapshot
.lines
.into_iter()
.map(|line| LiveLogLine {
sequence: line.sequence,
message: CensoredString::censor(line.message, &credentials),
})
.collect(),
last_sequence: snapshot.last_sequence,
})
}
pub fn clear_live_log_buffer(instance_id: &str) {
crate::state::remove_log_buffer(instance_id);
crate::state::clear_log_buffer(instance_id);
}
#[tracing::instrument]
+67 -3
View File
@@ -5,8 +5,9 @@ mod transport;
use crate::{
State,
state::{
AppliedContentSetPatch, EditInstance, InstanceInstallStage,
InstanceLaunchOverridesPatch, InstanceMode, ModLoader,
AppliedContentSetPatch, Credentials, EditInstance,
InstanceInstallStage, InstanceLaunchOverridesPatch, InstanceMode,
MinecraftAccountType, ModLoader,
},
util::fetch::{
DownloadRequest, Integrity, ResourceClass, configured_client,
@@ -31,6 +32,9 @@ use tokio::{
};
const API: &str = "https://skin.starlight.cool/starlight/mod/packs";
const STARLIGHT_YGGDRASIL_API_ROOT: &str =
"https://skin.starlight.cool/yggdrasil";
const ACCOUNT_REQUIRED_MESSAGE: &str = "您需要登录正版或皮肤站账号后才能操作";
const BINDING: &str = ".starlight-pack.json";
const JOURNAL: &str = ".starlight-pack-pending.json";
const MAX_HOSTED_CONCURRENT_FILES: usize = 8;
@@ -426,10 +430,47 @@ pub async fn default_publication() -> crate::Result<Publication> {
})
}
fn is_supported_game_account(
account_type: MinecraftAccountType,
yggdrasil_api_root: Option<&str>,
) -> bool {
account_type == MinecraftAccountType::Microsoft
|| (account_type == MinecraftAccountType::Yggdrasil
&& yggdrasil_api_root.map(|value| value.trim_end_matches('/'))
== Some(STARLIGHT_YGGDRASIL_API_ROOT))
}
async fn has_game_account_in(state: &State) -> crate::Result<bool> {
let accounts = Credentials::get_all_without_refresh(&state.pool).await?;
Ok(accounts.iter().any(|account| {
let account = account.value();
is_supported_game_account(
account.account_type,
account
.yggdrasil
.as_ref()
.map(|value| value.api_root.as_str()),
)
}))
}
pub async fn has_game_account() -> crate::Result<bool> {
let state = State::get().await?;
has_game_account_in(&state).await
}
async fn require_game_account(state: &State) -> crate::Result<()> {
if !has_game_account_in(state).await? {
return Err(invalid(ACCOUNT_REQUIRED_MESSAGE));
}
Ok(())
}
pub async fn create(game_dir_root: Option<String>) -> crate::Result<String> {
let state = State::get().await?;
require_game_account(&state).await?;
let publication = default_publication().await?;
let runtime = &publication.manifest.runtime;
let state = State::get().await?;
// The pack's game files live in their own folder under the chosen root,
// e.g. `<root>/<pack name>`. Avoid a `versions/<name>` layout: that shape
// is reserved for externally linked launcher instances and would make the
@@ -728,6 +769,8 @@ async fn recover(instance_id: &str) -> crate::Result<()> {
}
pub async fn synchronize(instance_id: &str) -> crate::Result<SyncResult> {
let state = State::get().await?;
require_game_account(&state).await?;
let _guard = instance_gate(instance_id).lock_owned().await;
if instance_mode(instance_id).await? != InstanceMode::StarLight {
return Err(invalid(
@@ -1492,6 +1535,27 @@ async fn synchronize_with_progress(
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn hosted_operations_accept_only_microsoft_or_starlight_accounts() {
assert!(is_supported_game_account(
MinecraftAccountType::Microsoft,
None
));
assert!(is_supported_game_account(
MinecraftAccountType::Yggdrasil,
Some("https://skin.starlight.cool/yggdrasil/")
));
assert!(!is_supported_game_account(
MinecraftAccountType::Yggdrasil,
Some("https://auth.example.com/yggdrasil")
));
assert!(!is_supported_game_account(
MinecraftAccountType::Offline,
None
));
}
#[tokio::test]
async fn running_pack_checks_tag_changes_without_writing_live_files() {
let root = tempfile::tempdir().unwrap();
+2
View File
@@ -409,6 +409,8 @@ mod log_types {
#[derive(Serialize, Clone)]
pub struct LogPayload {
pub instance_id: String,
pub first_sequence: u64,
pub last_sequence: u64,
#[serde(flatten)]
pub event: LogEvent,
}
+20 -12
View File
@@ -1590,6 +1590,15 @@ mod tests {
#[cfg(not(feature = "tauri"))]
#[tokio::test]
async fn import_api_trusts_persisted_job_context_and_keeps_other_missing_files_waiting()
{
Box::pin(
run_import_api_trusts_persisted_job_context_and_keeps_other_missing_files_waiting(),
)
.await;
}
#[cfg(not(feature = "tauri"))]
async fn run_import_api_trusts_persisted_job_context_and_keeps_other_missing_files_waiting()
{
crate::event::EventState::init().await.unwrap();
let root = tempfile::tempdir().unwrap().keep();
@@ -1788,18 +1797,17 @@ mod tests {
.await
.unwrap();
assert_eq!(observed.pending, 1);
let (scan_result, manual_result) = tokio::join!(
scan_missing_modpack_files_in_at(
job_id,
&race_downloads,
first_seen + DOWNLOAD_STABILITY_WINDOW,
),
import_missing_modpack_file(
job_id,
first.item_id.clone(),
selected,
)
);
let scan = Box::pin(scan_missing_modpack_files_in_at(
job_id,
&race_downloads,
first_seen + DOWNLOAD_STABILITY_WINDOW,
));
let manual = Box::pin(import_missing_modpack_file(
job_id,
first.item_id.clone(),
selected,
));
let (scan_result, manual_result) = tokio::join!(scan, manual);
let scan_result = scan_result.unwrap();
assert!(manual_result.is_ok());
assert!(
+16 -6
View File
@@ -13,7 +13,10 @@ use crate::state::{
use chrono::{DateTime, Utc};
use modrinth_content_management::{ContentType, ResolutionPreferences};
use serde::{Deserialize, Serialize};
use std::{collections::HashMap, path::PathBuf};
use std::{
collections::{HashMap, HashSet},
path::PathBuf,
};
use uuid::Uuid;
pub type InstallModpackPreview = CreatePackInstance;
@@ -483,7 +486,7 @@ mod tests {
assert_eq!(summary.bytes_total, Some(300));
let items = job.download_items();
assert_eq!(items.len(), 3);
assert_eq!(items[0].status, DownloadItemStatus::Verifying);
assert_eq!(items[0].status, DownloadItemStatus::Completed);
assert_eq!(items[0].attempt, Some(1));
assert_eq!(items[0].max_attempts, Some(4));
assert_eq!(
@@ -2395,6 +2398,7 @@ impl InstallJobState {
fn download_items_from_events(&self) -> Vec<DownloadItemSnapshot> {
let mut items = Vec::<DownloadItemSnapshot>::new();
let mut indices = HashMap::<String, usize>::new();
let mut content_items = HashSet::<String>::new();
for event in &self.events {
match &event.kind {
InstallJobEventKind::ContentFileQueued {
@@ -2402,6 +2406,7 @@ impl InstallJobState {
bytes_total,
max_attempts,
} => {
content_items.insert(path.clone());
if let Some(item) = indices
.get(path)
.and_then(|&index| items.get_mut(index))
@@ -2482,6 +2487,7 @@ impl InstallJobState {
attempt,
max_attempts,
} => {
content_items.insert(path.clone());
if let Some(item) = indices
.get(path)
.and_then(|&index| items.get_mut(index))
@@ -2562,10 +2568,14 @@ impl InstallJobState {
.get(path)
.and_then(|&index| items.get_mut(index))
{
// Network transfer completion is not content
// finalization. `ContentFileCompleted` is the event
// that confirms verification and DB registration.
item.status = DownloadItemStatus::Verifying;
// Content downloads still need verification and DB
// registration. Standalone Java/Minecraft requests
// are final once the request itself finishes.
item.status = if content_items.contains(path) {
DownloadItemStatus::Verifying
} else {
DownloadItemStatus::Completed
};
item.bytes_downloaded = *bytes;
item.bytes_total = item.bytes_total.or(Some(*bytes));
}
+3 -4
View File
@@ -1361,12 +1361,11 @@ mod tests {
assert_eq!(persisted.status, InstallJobStatus::Canceled);
assert!(persisted.state.rollback.as_ref().unwrap().content.is_none());
assert!(persisted.state.rollback_error.is_none());
assert_eq!(
crate::state::list_instances(&state.pool)
assert!(
crate::state::get_instance(&instance_id, &state.pool)
.await
.unwrap()
.len(),
1
.is_some()
);
let new_instance = crate::api::instance::create(
+11 -6
View File
@@ -1107,12 +1107,17 @@ mod tests {
"org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209:{classifier}"
)
);
assert!(
plan.destination
.to_string_lossy()
.ends_with(format!("{classifier}.jar").as_str())
);
assert_eq!(plan.sha1.as_deref(), Some("aaa"));
let (declared_path, declared_sha1) = match classifier.as_str() {
"natives-linux" => (
"org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
"aaa",
),
"natives-osx" => ("x-osx.jar", "bbb"),
"natives-windows" => ("x-win.jar", "ccc"),
other => panic!("unexpected native classifier {other}"),
};
assert!(plan.destination.to_string_lossy().ends_with(declared_path));
assert_eq!(plan.sha1.as_deref(), Some(declared_sha1));
}
#[test]
+24 -6
View File
@@ -1940,13 +1940,16 @@ mod tests {
assert_eq!(
direct.version_json,
Some(
version_dir
.join("1.20.1-fabric.json")
.canonicalize()
.unwrap()
crate::util::io::canonicalize(
version_dir.join("1.20.1-fabric.json"),
)
.unwrap(),
)
);
assert_eq!(direct.dot_minecraft, root.path().canonicalize().unwrap());
assert_eq!(
direct.dot_minecraft,
crate::util::io::canonicalize(root.path()).unwrap()
);
}
#[test]
@@ -2002,6 +2005,15 @@ mod tests {
let root = tempfile::tempdir().unwrap();
let version = root.path().join("versions/demo");
std::fs::create_dir_all(&version).unwrap();
std::fs::write(
version.join("demo.json"),
serde_json::to_vec(&json!({
"id": "demo",
"mainClass": "net.minecraft.client.main.Main"
}))
.unwrap(),
)
.unwrap();
assert_eq!(
resolve_content_game_dir(root.path(), &version).unwrap(),
@@ -2469,7 +2481,13 @@ mod tests {
);
assert_eq!(
candidates,
vec![launcher.path().join("runtime/jdk17/bin/java")]
vec![
launcher
.path()
.join("runtime/jdk17")
.join("bin")
.join(PCL_JAVA_BIN)
]
);
// A relative path escaping the launcher directory degrades to the
+133 -24
View File
@@ -4,7 +4,7 @@ use sqlx::migrate::{Migration, Migrator};
use sqlx::sqlite::{
SqliteConnectOptions, SqliteJournalMode, SqlitePoolOptions,
};
use sqlx::{Pool, Sqlite};
use sqlx::{ConnectOptions, Connection, Pool, Sqlite};
use std::path::{Path, PathBuf};
use std::time::Duration;
@@ -126,17 +126,7 @@ pub async fn copy_release_database_to_beta(
.into());
}
let release_pool = open_app_db_pool(&release_path).await?;
let escaped_path = beta_path.to_string_lossy().replace('\'', "''");
sqlx::query(&format!("VACUUM INTO '{escaped_path}'"))
.execute(&release_pool)
.await?;
release_pool.close().await;
if let Err(error) = open_app_db_pool(&beta_path).await {
let _ = tokio::fs::remove_file(&beta_path).await;
return Err(error);
}
copy_app_database(&release_path, &beta_path).await?;
tracing::info!(
source = %release_path.display(),
@@ -207,16 +197,7 @@ pub async fn copy_database_between_channels(
}
crate::util::io::create_dir_all(&target_dir).await?;
let temporary_path = target_dir.join(format!("{LEGACY_APP_DB_FILE}.tmp"));
let source_pool = open_app_db_pool(&source_path).await?;
let escaped_path = temporary_path.to_string_lossy().replace('\'', "''");
let result = sqlx::query(&format!("VACUUM INTO '{escaped_path}'"))
.execute(&source_pool)
.await;
source_pool.close().await;
result?;
tokio::fs::rename(&temporary_path, &target_path).await?;
copy_app_database(&source_path, &target_path).await?;
tracing::info!(
source = %source_path.display(),
destination = %target_path.display(),
@@ -225,6 +206,87 @@ pub async fn copy_database_between_channels(
Ok(())
}
async fn copy_app_database(source: &Path, target: &Path) -> crate::Result<()> {
let temporary = sidecar_path(target, ".copying");
remove_database_files(&temporary).await?;
let source_pool = open_app_db_pool(source).await?;
let escaped_path = temporary.to_string_lossy().replace('\'', "''");
let snapshot_result = sqlx::query(&format!("VACUUM INTO '{escaped_path}'"))
.execute(&source_pool)
.await;
source_pool.close().await;
if let Err(error) = snapshot_result {
let _ = remove_database_files(&temporary).await;
return Err(error.into());
}
if let Err(error) = verify_database_file(&temporary).await {
let _ = remove_database_files(&temporary).await;
return Err(error);
}
let previous = sidecar_path(target, ".replacing");
remove_database_files(&previous).await?;
let had_target = target.try_exists()?;
if had_target {
super::db_backup::archive_database_files(target, &previous).await?;
} else {
super::db_backup::remove_database_sidecars(target).await?;
}
if let Err(error) = tokio::fs::rename(&temporary, target).await {
if had_target {
super::db_backup::restore_archived_database_files(
&previous, target,
)
.await?;
}
let _ = remove_database_files(&temporary).await;
return Err(error.into());
}
if let Err(error) = remove_database_files(&previous).await {
tracing::warn!(
database = %previous.display(),
error = %error,
"Copied channel database but could not remove the previous snapshot"
);
}
Ok(())
}
async fn verify_database_file(path: &Path) -> crate::Result<()> {
let options = SqliteConnectOptions::new()
.filename(path)
.busy_timeout(Duration::from_secs(30))
.read_only(true)
.create_if_missing(false);
let mut connection = options.connect().await?;
let rows = sqlx::query_scalar::<_, String>("PRAGMA quick_check(1)")
.fetch_all(&mut connection)
.await?;
connection.close().await?;
if rows.as_slice() != ["ok"] {
return Err(crate::ErrorKind::FSError(format!(
"Database snapshot {} failed its integrity check: {}",
path.display(),
rows.join("; ")
))
.into());
}
Ok(())
}
async fn remove_database_files(database: &Path) -> crate::Result<()> {
match tokio::fs::remove_file(database).await {
Ok(()) => {}
Err(error) if error.kind() == std::io::ErrorKind::NotFound => {}
Err(error) => return Err(error.into()),
}
super::db_backup::remove_database_sidecars(database).await
}
pub async fn backup_current_app_db_for_update(
app_identifier: &str,
target_version: &str,
@@ -1461,6 +1523,53 @@ mod tests {
const INSTANCE_POST_UPGRADE_NOTICES_MIGRATION_VERSION: i64 = 20260824000000;
const MCARCHIVE_PROVIDER_FILE_ID_MIGRATION_VERSION: i64 = 20260823020000;
#[tokio::test]
async fn channel_copy_replaces_database_and_removes_stale_sidecars() {
let temp = tempfile::tempdir().unwrap();
let source = temp.path().join("beta").join(LEGACY_APP_DB_FILE);
let target = temp.path().join("release").join(LEGACY_APP_DB_FILE);
tokio::fs::create_dir_all(source.parent().unwrap())
.await
.unwrap();
tokio::fs::create_dir_all(target.parent().unwrap())
.await
.unwrap();
for (path, marker) in [(&source, "beta"), (&target, "release")] {
let pool = open_app_db_pool(path).await.unwrap();
sqlx::query("CREATE TABLE marker (value TEXT NOT NULL)")
.execute(&pool)
.await
.unwrap();
sqlx::query("INSERT INTO marker (value) VALUES (?)")
.bind(marker)
.execute(&pool)
.await
.unwrap();
pool.close().await;
}
tokio::fs::write(sidecar_path(&target, "-wal"), b"stale wal")
.await
.unwrap();
tokio::fs::write(sidecar_path(&target, "-shm"), b"stale shm")
.await
.unwrap();
copy_app_database(&source, &target).await.unwrap();
assert!(!sidecar_path(&target, "-wal").exists());
assert!(!sidecar_path(&target, "-shm").exists());
let pool = open_app_db_pool(&target).await.unwrap();
let marker: String = sqlx::query_scalar("SELECT value FROM marker")
.fetch_one(&pool)
.await
.unwrap();
pool.close().await;
assert_eq!(marker, "beta");
assert!(!sidecar_path(&target, ".copying").exists());
assert!(!sidecar_path(&target, ".replacing").exists());
}
#[tokio::test]
async fn post_upgrade_notices_migrate_fresh_and_existing_databases() {
for previous_schema in [false, true] {
@@ -3956,7 +4065,7 @@ mod tests {
assert_eq!(
translation,
(
"microsoft".to_string(),
"google".to_string(),
String::new(),
String::new(),
String::new(),
@@ -4065,7 +4174,7 @@ mod tests {
assert_eq!(
translation,
(
"microsoft".to_string(),
"google".to_string(),
String::new(),
String::new(),
"https://api.openai.com/v1".to_string(),
+91 -3
View File
@@ -39,6 +39,10 @@ async fn restore_corrupt_app_db_from(
"App database integrity check failed"
);
if restore_app_db_without_corrupt_sidecars(db_path, backup_dir).await? {
return Ok(());
}
let Some(backup_path) = latest_healthy_app_db_backup(backup_dir).await?
else {
return Err(crate::ErrorKind::FSError(format!(
@@ -98,6 +102,49 @@ async fn restore_corrupt_app_db_from(
Ok(())
}
async fn restore_app_db_without_corrupt_sidecars(
db_path: &Path,
backup_dir: &Path,
) -> crate::Result<bool> {
let mut has_sidecars = false;
for suffix in ["-wal", "-shm"] {
has_sidecars |= sqlite_sidecar_path(db_path, suffix).try_exists()?;
}
if !has_sidecars {
return Ok(false);
}
let staging_path = next_restore_staging_path(db_path).await?;
tokio::fs::copy(db_path, &staging_path).await?;
let healthy_main = matches!(
check_database_integrity(&staging_path).await?,
IntegrityStatus::Healthy
) && is_app_database(&staging_path).await?;
if !healthy_main {
cleanup_staged_database(&staging_path).await;
return Ok(false);
}
crate::util::io::create_dir_all(backup_dir).await?;
let corrupt_path = next_corrupt_database_path(backup_dir).await?;
if let Err(error) = archive_database_files(db_path, &corrupt_path).await {
cleanup_staged_database(&staging_path).await;
return Err(error);
}
if let Err(error) = tokio::fs::rename(&staging_path, db_path).await {
restore_archived_database_files(&corrupt_path, db_path).await?;
cleanup_staged_database(&staging_path).await;
return Err(error.into());
}
tracing::warn!(
database = %db_path.display(),
corrupt_archive = %corrupt_path.display(),
"Recovered app database by removing corrupt SQLite sidecars"
);
Ok(true)
}
async fn check_database_integrity(
db_path: &Path,
) -> crate::Result<IntegrityStatus> {
@@ -200,7 +247,7 @@ async fn is_app_database(db_path: &Path) -> crate::Result<bool> {
Ok(table_count == REQUIRED_APP_DB_TABLES.len() as i64)
}
async fn archive_database_files(
pub(crate) async fn archive_database_files(
db_path: &Path,
archive_path: &Path,
) -> crate::Result<()> {
@@ -226,7 +273,7 @@ async fn archive_database_files(
Ok(())
}
async fn restore_archived_database_files(
pub(crate) async fn restore_archived_database_files(
archive_path: &Path,
db_path: &Path,
) -> crate::Result<()> {
@@ -285,7 +332,9 @@ fn sqlite_sidecar_path(db_path: &Path, suffix: &str) -> PathBuf {
PathBuf::from(path)
}
async fn remove_database_sidecars(db_path: &Path) -> crate::Result<()> {
pub(crate) async fn remove_database_sidecars(
db_path: &Path,
) -> crate::Result<()> {
for suffix in ["-wal", "-shm"] {
let path = sqlite_sidecar_path(db_path, suffix);
match tokio::fs::remove_file(path).await {
@@ -766,6 +815,45 @@ mod tests {
assert_eq!(tokio::fs::read(&db_path).await.unwrap(), corrupt_bytes);
}
#[tokio::test]
async fn corrupt_sidecars_recover_from_the_healthy_main_database() {
let temp = tempfile::tempdir().unwrap();
let db_path = temp.path().join("release").join("app.db");
let backup_dir =
temp.path().join("Backups").join("app-db").join("release");
tokio::fs::create_dir_all(db_path.parent().unwrap())
.await
.unwrap();
create_test_app_db(&db_path, "release").await;
tokio::fs::write(sqlite_sidecar_path(&db_path, "-wal"), b"bad wal")
.await
.unwrap();
tokio::fs::write(sqlite_sidecar_path(&db_path, "-shm"), b"bad shm")
.await
.unwrap();
assert!(
restore_app_db_without_corrupt_sidecars(&db_path, &backup_dir)
.await
.unwrap()
);
assert_eq!(read_marker(&db_path).await, "release");
assert!(!sqlite_sidecar_path(&db_path, "-wal").exists());
assert!(!sqlite_sidecar_path(&db_path, "-shm").exists());
let mut entries = tokio::fs::read_dir(&backup_dir).await.unwrap();
let mut archived_database = false;
let mut archived_wal = false;
let mut archived_shm = false;
while let Some(entry) = entries.next_entry().await.unwrap() {
let name = entry.file_name().to_string_lossy().into_owned();
archived_database |= name.ends_with(".db");
archived_wal |= name.ends_with(".db-wal");
archived_shm |= name.ends_with(".db-shm");
}
assert!(archived_database && archived_wal && archived_shm);
}
#[tokio::test]
async fn update_backup_creates_a_healthy_channel_snapshot() {
let temp = tempfile::tempdir().unwrap();
@@ -16,6 +16,12 @@ use chrono::{DateTime, TimeZone, Utc};
use sqlx::{Executor, Row, Sqlite, SqlitePool, Transaction};
use uuid::Uuid;
async fn begin_content_write(
pool: &SqlitePool,
) -> crate::Result<Transaction<'static, Sqlite>> {
Ok(pool.begin_with("BEGIN IMMEDIATE").await?)
}
/// Ensures the instance a content write is about to reference still exists.
///
/// Runs inside the write transaction so a concurrent instance deletion that
@@ -662,7 +668,7 @@ pub(crate) async fn upsert_instance_file_from_parts(
input: UpsertInstanceFile<'_>,
pool: &SqlitePool,
) -> crate::Result<InstanceFile> {
let mut tx = pool.begin().await?;
let mut tx = begin_content_write(pool).await?;
let file =
upsert_instance_file_from_parts_in_transaction(input, &mut tx).await?;
tx.commit().await?;
@@ -726,7 +732,7 @@ pub(crate) async fn rename_instance_file(
enabled: bool,
pool: &SqlitePool,
) -> crate::Result<Option<InstanceFile>> {
let mut tx = pool.begin().await?;
let mut tx = begin_content_write(pool).await?;
let file = rename_instance_file_in_transaction(
instance_id,
@@ -1106,7 +1112,7 @@ pub(crate) async fn upsert_content_entry_from_parts(
input: UpsertContentEntry<'_>,
pool: &SqlitePool,
) -> crate::Result<ContentEntry> {
let mut tx = pool.begin().await?;
let mut tx = begin_content_write(pool).await?;
let entry =
upsert_content_entry_from_parts_in_transaction(input, &mut tx).await?;
tx.commit().await?;
@@ -1230,7 +1236,7 @@ pub(crate) async fn upsert_content_provider_ref(
origin: bool,
pool: &SqlitePool,
) -> crate::Result<()> {
let mut tx = pool.begin().await?;
let mut tx = begin_content_write(pool).await?;
upsert_content_provider_ref_in_transaction(
content_entry_id,
provider_ref,
@@ -2583,6 +2589,7 @@ mod tests {
provider TEXT NOT NULL,
provider_project_id TEXT NOT NULL,
provider_release_id TEXT NULL,
provider_file_id TEXT NULL,
is_origin INTEGER NOT NULL DEFAULT 0
);
CREATE UNIQUE INDEX instance_content_provider_refs_identity
@@ -539,7 +539,7 @@ pub(crate) async fn persist_resolved_plan_dependency_edges(
.chain(plan.dependencies.iter())
.collect::<Vec<_>>();
let mut tx = state.pool.begin().await?;
let mut tx = begin_content_write(&state.pool).await?;
for (index, dependency) in plan.dependencies.iter().enumerate() {
let Some(parent) = dependency
.dependent_on_version_id
@@ -254,8 +254,8 @@ mod tests {
instance_rows::get_instance_by_id(&instance.id, &state.pool)
.await?
.expect("instance row");
let canonical_root = minecraft.path().canonicalize()?;
let canonical_json = json_path.canonicalize()?;
let canonical_root = crate::util::io::canonicalize(minecraft.path())?;
let canonical_json = crate::util::io::canonicalize(&json_path)?;
assert_eq!(stored.linked_launcher.as_deref(), Some("generic"));
assert_eq!(
stored.linked_launcher_root.as_deref(),
@@ -87,11 +87,6 @@ pub(crate) async fn sync_instance_content_files(
.as_deref()
.map(str::trim)
.is_some_and(|linked| !linked.is_empty());
let instance_files_root = if is_direct_linked {
content_root.clone()
} else {
state.directories.instances_dir().join(&instance.path)
};
let cache_key_path = if is_direct_linked {
content_root.to_string_lossy().into_owned()
} else {
@@ -168,8 +163,9 @@ pub(crate) async fn sync_instance_content_files(
let hash_key = file.hash_cache_key.trim_end_matches(".disabled");
let existing_file = existing_files_by_path.get(&file.relative_path);
let (scanned_sha1, scanned_size) = if existing_file.is_some() {
let path =
join_content_path(&instance_files_root, &file.relative_path);
// Read from the resolved game directory. Managed StarLight
// instances may keep their files outside the launcher data root.
let path = join_content_path(&content_root, &file.relative_path);
let (_, sha1) = fetch::sha1_file_async(&path).await?;
(sha1, file.size)
} else {
@@ -748,7 +744,9 @@ mod tests {
base_path: minecraft.path().to_path_buf(),
instance_folder: "versions/1.12.2-linked".to_string(),
instance_path: None,
game_dir_mode: None,
game_dir_mode: Some(
crate::launcher::ExternalGameDirMode::Shared,
),
},
&state,
)
@@ -875,6 +873,59 @@ mod tests {
);
}
#[tokio::test]
async fn refresh_reconciles_externally_replaced_profile_mods() {
let state = global_state().await;
let metadata = crate::api::instance::create(
format!("sync-external {}", uuid::Uuid::new_v4()),
"1.20.1".to_string(),
crate::state::ModLoader::Vanilla,
None,
None,
crate::state::InstanceLink::Unmanaged,
None,
None,
)
.await
.unwrap();
let instance = &metadata.instance;
let mods = state.directories.instance_game_dir(instance).join("mods");
fs::create_dir_all(&mods).unwrap();
fs::write(mods.join("old-version.jar"), "old").unwrap();
fs::write(mods.join("same-name.jar"), "old").unwrap();
let initial =
sync_instance_content_files(instance, &state).await.unwrap();
assert_eq!(initial.len(), 2);
fs::remove_file(mods.join("old-version.jar")).unwrap();
fs::write(mods.join("new-version.jar"), "new version").unwrap();
fs::write(mods.join("same-name.jar"), "new").unwrap();
let refreshed =
sync_instance_content_files(instance, &state).await.unwrap();
assert_eq!(refreshed.len(), 2);
assert!(
refreshed
.iter()
.any(|file| file.relative_path == "mods/new-version.jar")
);
assert!(
!refreshed
.iter()
.any(|file| file.relative_path == "mods/old-version.jar")
);
let before = initial
.iter()
.find(|file| file.relative_path == "mods/same-name.jar")
.unwrap();
let after = refreshed
.iter()
.find(|file| file.relative_path == "mods/same-name.jar")
.unwrap();
assert_eq!(before.id, after.id);
assert_ne!(before.sha1, after.sha1);
assert_eq!(before.size, after.size);
}
/// Regression probe: an instance whose `game_dir_override` points to an
/// external `.minecraft` root must have its content scanned from that root,
/// not from the (empty) managed instance folder. This is the split-brain
@@ -947,6 +998,48 @@ mod tests {
"expected the override-root mod to be scanned"
);
assert!(files[0].relative_path.ends_with("mods/my-mod.jar"));
let refreshed =
sync_instance_content_files(&instance, &state).await.expect(
"repeat refresh must hash files in the actual game directory",
);
assert_eq!(refreshed[0].sha1, files[0].sha1);
fs::write(mods_dir.join("my-mod.jar"), "new").unwrap();
fs::write(mods_dir.join("added.jar"), "added mod").unwrap();
let replaced = sync_instance_content_files(&instance, &state)
.await
.unwrap();
assert_eq!(replaced.len(), 2);
let updated = replaced
.iter()
.find(|file| file.relative_path == "mods/my-mod.jar")
.unwrap();
assert_eq!(updated.id, files[0].id);
assert_ne!(updated.sha1, files[0].sha1);
assert_eq!(updated.size, files[0].size);
fs::remove_file(mods_dir.join("my-mod.jar")).unwrap();
fs::rename(
mods_dir.join("added.jar"),
mods_dir.join("added.jar.disabled"),
)
.unwrap();
let removed = sync_instance_content_files(&instance, &state)
.await
.unwrap();
assert_eq!(removed.len(), 1);
assert_eq!(removed[0].relative_path, "mods/added.jar.disabled");
assert!(!removed[0].enabled);
let stored =
sqlite::content_rows::get_instance_files(&instance.id, &state.pool)
.await
.unwrap();
assert!(
stored
.iter()
.any(|file| file.id == files[0].id && file.missing)
);
}
#[test]
+119 -14
View File
@@ -117,8 +117,21 @@ async fn record_post_upgrade_launch_best_effort(
}
struct LogRingBuffer {
lines: VecDeque<String>,
lines: VecDeque<SequencedLogLine>,
byte_len: usize,
last_sequence: u64,
}
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct SequencedLogLine {
pub sequence: u64,
pub message: String,
}
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct LiveLogSnapshot {
pub lines: Vec<SequencedLogLine>,
pub last_sequence: u64,
}
impl LogRingBuffer {
@@ -126,25 +139,37 @@ impl LogRingBuffer {
Self {
lines: VecDeque::new(),
byte_len: 0,
last_sequence: 0,
}
}
fn push(&mut self, line: String) {
let line_len = line.len();
fn push(&mut self, message: String) -> u64 {
self.last_sequence = self.last_sequence.saturating_add(1);
let sequence = self.last_sequence;
let line = SequencedLogLine { sequence, message };
let line_len = line.message.len();
while self.lines.len() >= LOG_BUFFER_CAPACITY
|| self.byte_len.saturating_add(line_len) > LOG_BUFFER_BYTE_CAPACITY
{
let Some(removed) = self.lines.pop_front() else {
break;
};
self.byte_len = self.byte_len.saturating_sub(removed.len());
self.byte_len = self.byte_len.saturating_sub(removed.message.len());
}
self.byte_len += line_len;
self.lines.push_back(line);
sequence
}
fn get_all(&self) -> Vec<String> {
self.lines.iter().cloned().collect()
self.lines.iter().map(|line| line.message.clone()).collect()
}
fn snapshot(&self) -> LiveLogSnapshot {
LiveLogSnapshot {
lines: self.lines.iter().cloned().collect(),
last_sequence: self.last_sequence,
}
}
fn clear(&mut self) {
@@ -157,11 +182,24 @@ static LOG_BUFFERS: LazyLock<DashMap<String, LogRingBuffer>> =
LazyLock::new(DashMap::new);
pub fn push_log_line(instance_id: &str, line: String) {
let line = truncate_live_log_text(&line);
LOG_BUFFERS
push_log_lines(instance_id, std::iter::once(line));
}
fn push_log_lines(
instance_id: &str,
lines: impl IntoIterator<Item = String>,
) -> Option<(u64, u64)> {
let mut buffer = LOG_BUFFERS
.entry(instance_id.to_string())
.or_insert_with(LogRingBuffer::new)
.push(line);
.or_insert_with(LogRingBuffer::new);
let mut first_sequence = None;
let mut last_sequence = 0;
for line in lines {
let sequence = buffer.push(truncate_live_log_text(&line));
first_sequence.get_or_insert(sequence);
last_sequence = sequence;
}
first_sequence.map(|first| (first, last_sequence))
}
fn truncate_live_log_text(value: &str) -> String {
@@ -228,6 +266,16 @@ pub fn get_log_buffer(instance_id: &str) -> Vec<String> {
.unwrap_or_default()
}
pub fn get_live_log_snapshot(instance_id: &str) -> LiveLogSnapshot {
LOG_BUFFERS
.get(instance_id)
.map(|buffer| buffer.snapshot())
.unwrap_or(LiveLogSnapshot {
lines: Vec::new(),
last_sequence: 0,
})
}
pub fn clear_log_buffer(instance_id: &str) {
if let Some(mut buf) = LOG_BUFFERS.get_mut(instance_id) {
buf.clear();
@@ -920,14 +968,20 @@ impl Process {
event.throwable =
event.throwable.as_deref().map(truncate_live_log_text);
let mut lines = Vec::new();
if let Some(formatted) = Self::format_log4j_entry(&event) {
push_log_line(instance_id, formatted.trim_end().to_string());
lines.push(formatted.trim_end().to_string());
}
if let Some(ref throwable) = event.throwable {
for line in throwable.lines().filter(|l| !l.is_empty()) {
push_log_line(instance_id, line.to_string());
lines.push(line.to_string());
}
}
let Some((first_sequence, last_sequence)) =
push_log_lines(instance_id, lines)
else {
return;
};
#[cfg(feature = "tauri")]
{
@@ -936,6 +990,8 @@ impl Process {
"log",
LogPayload {
instance_id: instance_id.to_string(),
first_sequence,
last_sequence,
event: LogEvent::Log4j(event),
},
);
@@ -943,13 +999,17 @@ impl Process {
}
#[cfg(not(feature = "tauri"))]
{
let _ = (instance_id, event);
let _ = (instance_id, event, first_sequence, last_sequence);
}
}
fn emit_legacy_log(instance_id: &str, message: &str) {
let message = truncate_live_log_text(message);
push_log_line(instance_id, message.clone());
let Some((first_sequence, last_sequence)) =
push_log_lines(instance_id, std::iter::once(message.clone()))
else {
return;
};
#[cfg(feature = "tauri")]
{
@@ -958,6 +1018,8 @@ impl Process {
"log",
LogPayload {
instance_id: instance_id.to_string(),
first_sequence,
last_sequence,
event: LogEvent::Legacy { message },
},
);
@@ -965,7 +1027,7 @@ impl Process {
}
#[cfg(not(feature = "tauri"))]
{
let _ = (instance_id, message);
let _ = (instance_id, message, first_sequence, last_sequence);
}
}
@@ -1312,6 +1374,49 @@ fn take_next_log4j_frame(buffer: &mut String) -> Option<String> {
mod post_upgrade_tests {
use super::*;
#[test]
fn live_log_snapshot_sequences_batches_and_preserves_position_after_clear()
{
let instance_id = Uuid::new_v4().to_string();
assert_eq!(
push_log_lines(
&instance_id,
["first".to_string(), "second".to_string()]
),
Some((1, 2))
);
assert_eq!(
get_live_log_snapshot(&instance_id),
LiveLogSnapshot {
lines: vec![
SequencedLogLine {
sequence: 1,
message: "first".to_string(),
},
SequencedLogLine {
sequence: 2,
message: "second".to_string(),
},
],
last_sequence: 2,
}
);
clear_log_buffer(&instance_id);
push_log_line(&instance_id, "third".to_string());
assert_eq!(
get_live_log_snapshot(&instance_id),
LiveLogSnapshot {
lines: vec![SequencedLogLine {
sequence: 3,
message: "third".to_string(),
}],
last_sequence: 3,
}
);
remove_log_buffer(&instance_id);
}
#[cfg(windows)]
#[tokio::test]
async fn waiting_for_one_process_leaves_registry_available() {
+72 -25
View File
@@ -958,6 +958,34 @@ fn official_fallback_route(routes: &[DownloadRoute]) -> Option<DownloadRoute> {
.cloned()
}
fn integrity_fallback_route(
routes: &[DownloadRoute],
current_index: usize,
terminal_routes: &HashSet<String>,
) -> Option<DownloadRoute> {
let current = routes.get(current_index)?;
if !is_official_route(current)
&& let Some(official) = routes.iter().enumerate().find_map(
|(candidate_index, candidate)| {
(candidate_index != current_index
&& is_official_route(candidate)
&& !terminal_routes.contains(&candidate.url))
.then(|| candidate.clone())
},
)
{
return Some(official);
}
((current_index + 1)..routes.len())
.chain(0..current_index)
.find_map(|candidate_index| {
let candidate = &routes[candidate_index];
(!terminal_routes.contains(&candidate.url))
.then(|| candidate.clone())
})
}
fn url_with_base(original: &Url, base: &str, path: &str) -> Option<String> {
let mut target = Url::parse(base).ok()?;
target.set_path(path);
@@ -5855,7 +5883,7 @@ async fn download_to_path_inner(
can_switch_route,
retry_with_single_thread,
);
while attempts < file_attempt_budget {
if attempts < file_attempt_budget {
attempts += 1;
tracing::debug!(
path = %destination.display(),
@@ -6048,13 +6076,15 @@ async fn download_to_path_inner(
);
last_error = Some(error);
terminal_routes.insert(route.url.clone());
if !is_official_route(route)
&& let Some(official) =
official_fallback_route(&routes)
{
if let Some(fallback) = integrity_fallback_route(
&routes,
route_index,
&terminal_routes,
) {
remove_if_exists(&part_path).await?;
official_integrity_retry = true;
preferred_route = Some(official);
official_integrity_retry =
is_official_route(&fallback);
preferred_route = Some(fallback);
break;
}
if official_integrity_retry {
@@ -6210,6 +6240,9 @@ async fn download_to_path_inner(
"File download request failed; trying the next source or retry"
);
last_error = Some(error);
if can_switch_route {
continue;
}
break;
}
Err(_) => {
@@ -6244,6 +6277,9 @@ async fn download_to_path_inner(
"File download stalled before receiving a response"
);
last_error = Some(error);
if can_switch_route {
continue;
}
break;
}
};
@@ -6346,6 +6382,11 @@ async fn download_to_path_inner(
Some(http_version),
);
last_error = Some(error);
if (terminal_status || cooldown_and_switch)
&& can_switch_route
{
continue;
}
break;
}
@@ -6773,19 +6814,24 @@ async fn download_to_path_inner(
} else {
remove_if_exists(&part_path).await?;
}
let official = (!is_official_route(route))
.then(|| official_fallback_route(&routes))
.flatten();
let decision = if official.is_some() {
"fallback_official"
} else if attempts >= 2
|| (is_official_route(route)
&& official_integrity_retry)
{
"drop_route_after_clean_retry"
} else {
"clear_partial_and_retry"
};
let fallback = integrity_fallback_route(
&routes,
route_index,
&terminal_routes,
);
let decision =
if fallback.as_ref().is_some_and(is_official_route) {
"fallback_official"
} else if fallback.is_some() {
"switch_route"
} else if attempts >= 2
|| (is_official_route(route)
&& official_integrity_retry)
{
"drop_route_after_clean_retry"
} else {
"clear_partial_and_retry"
};
record_download_attempt_failure(
&mut attempt_history,
route,
@@ -6803,10 +6849,10 @@ async fn download_to_path_inner(
));
}
last_error = Some(error);
if let Some(official) = official {
if let Some(fallback) = fallback {
terminal_routes.insert(route.url.clone());
official_integrity_retry = true;
preferred_route = Some(official);
official_integrity_retry = is_official_route(&fallback);
preferred_route = Some(fallback);
} else if (is_official_route(route)
&& official_integrity_retry)
|| attempts >= 2
@@ -8121,7 +8167,7 @@ mod tests {
}
#[test]
fn h2_fallback_is_limited_to_one_second() {
fn h2_fallback_uses_the_configured_ttl() {
let _guard = H2_FALLBACK_TEST_LOCK.lock();
let authority = "h2-cooldown.example:443";
record_authority_h2_failure(authority);
@@ -8131,7 +8177,8 @@ mod tests {
.get(authority)
.map(|until| until.saturating_duration_since(Instant::now()))
.unwrap();
assert!(remaining <= MAX_FAILURE_COOLDOWN);
assert!(remaining <= H2_FALLBACK_TTL);
assert!(remaining > H2_FALLBACK_TTL - Duration::from_secs(1));
H2_FALLBACK_AUTHORITIES.lock().remove(authority);
}
+1 -1
View File
@@ -3,7 +3,7 @@ use crate::minecraft::{
};
use chrono::{DateTime, NaiveDateTime, Utc};
use serde::{Deserialize, Deserializer, Serialize};
use std::collections::{HashMap, HashSet};
use std::collections::HashMap;
/// The latest version of the format the fabric model structs deserialize to
pub const CURRENT_FABRIC_FORMAT_VERSION: usize = 1;
@@ -0,0 +1,21 @@
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import test from 'node:test'
const source = readFileSync(
new URL('./LogViewport.vue', import.meta.url),
'utf8',
)
test('log rows use content-driven grid height for wrapped lines', () => {
assert.match(source, /grid-template-columns:\s*52px minmax\(0, 1fr\)/)
assert.match(source, /\.log-line-content\s*\{[^}]*display:\s*block/s)
assert.match(
source,
/\.log-viewport-wrap \.log-line\s*\{[^}]*white-space:\s*pre-wrap/s,
)
assert.doesNotMatch(
source,
/content-visibility|contain-intrinsic-size|estimateHeight|heightPrefix/,
)
})
@@ -6,7 +6,10 @@
:style="{ fontSize: fontSize + 'px' }"
@scroll="handleScroll"
>
<div v-if="lines.length === 0" class="flex items-center justify-center h-full">
<div
v-if="lines.length === 0"
class="flex items-center justify-center h-full"
>
<EmptyState
v-if="emptyStateType === 'instance'"
:heading="formatMessage(consoleMessages.emptyInstanceTitle)"
@@ -26,22 +29,19 @@
v-for="item in lines"
:key="item.originalIndex"
:data-line="item.originalIndex + 1"
class="log-line flex items-stretch whitespace-pre"
class="log-line"
:class="entryClass(item.line)"
>
<span
class="flex shrink-0 w-[52px] items-center justify-end leading-none text-right text-secondary bg-surface-3 border-r border-solid border-surface-3 select-none overflow-hidden"
>{{ item.originalIndex + 1 }}</span
>
<span
class="log-line-content flex-1 px-2 break-all [overflow-wrap:anywhere]"
v-html="renderLine(item)"
></span>
<span class="log-line-number">{{ item.originalIndex + 1 }}</span>
<span class="log-line-content" v-html="renderLine(item)"></span>
</div>
</div>
<Transition name="scroll-to-bottom-fade">
<div v-if="lines.length > 0 && !stickToBottom" class="absolute bottom-4 right-4 z-10">
<div
v-if="lines.length > 0 && !stickToBottom"
class="absolute bottom-4 right-4 z-10"
>
<ButtonStyled circular type="highlight" size="large">
<button aria-label="Scroll to bottom" @click="scrollToBottom">
<ChevronDownIcon />
@@ -197,8 +197,35 @@ defineExpose({
white-space: pre-wrap;
}
.log-viewport-wrap .log-line-content {
.log-line {
display: grid;
grid-template-columns: 52px minmax(0, 1fr);
align-items: stretch;
min-height: 1.4em;
white-space: pre;
}
.log-line-number {
display: flex;
align-items: flex-start;
justify-content: flex-end;
overflow: hidden;
border-right: 1px solid var(--surface-3);
background: var(--surface-3);
color: var(--color-text-secondary);
line-height: inherit;
text-align: right;
user-select: none;
}
.log-line-content {
display: block;
min-width: 0;
padding: 0 0.5rem;
line-height: inherit;
white-space: inherit;
word-break: break-all;
overflow-wrap: anywhere;
}
.log-line.entry-error {
+12 -6
View File
@@ -1,6 +1,15 @@
import fs from 'node:fs'
import path from 'node:path'
// Build a stable release download URL from the tag and asset name instead of
// relying on `browser_download_url`. While the release is still a draft GitHub
// reports the asset URL as `.../releases/download/untagged-<hash>/...`, which
// would make the updater manifest point at a path that disappears once the
// release is published.
function buildDownloadUrl(assetName, versionTag) {
const repository = process.env.GITHUB_REPOSITORY || 'ApTx2012/Starlight_Lancher'
return `https://github.com/${repository}/releases/download/${versionTag}/${encodeURIComponent(assetName)}`
}
const [releasePath, signaturesPath, tag, outputPath] = process.argv.slice(2)
if (!releasePath || !signaturesPath || !tag || !outputPath) {
@@ -52,10 +61,7 @@ for (const target of targets) {
}
const signature = fs.readFileSync(signaturePath, 'utf8')
const url = asset.browser_download_url ?? asset.url
if (!url) {
throw new Error(`Release asset ${asset.name} does not contain a download URL`)
}
const url = buildDownloadUrl(asset.name, tag)
for (const platform of target.platforms) {
platforms[platform] = { signature, url }
@@ -81,8 +87,8 @@ for (const target of [
)
}
const asset = matches[0]
const url = asset.browser_download_url ?? asset.url
if (!url || !Number.isSafeInteger(asset.size) || asset.size <= 0) {
const url = buildDownloadUrl(asset.name, tag)
if (!Number.isSafeInteger(asset.size) || asset.size <= 0) {
throw new Error(`Release asset ${asset.name} has invalid download metadata`)
}
apt[target.platform] = {
@@ -21,6 +21,10 @@ function updaterTargets(filename) {
return null
}
function isSkinSiteUpdateBundle(filename) {
return filename.endsWith('_skin-site-update.zip')
}
function describe(filename) {
const targets = updaterTargets(filename)
if (targets) {
@@ -69,7 +73,7 @@ function digest(asset) {
}
const assets = release.assets
.filter((asset) => asset.name !== 'latest.json')
.filter((asset) => asset.name !== 'latest.json' && !isSkinSiteUpdateBundle(asset.name))
.map((asset) => ({
filename: asset.name,
size: asset.size,
@@ -37,6 +37,7 @@ const files = [
'Axolotl_Launcher_1.9.5-beta.1_x64_nsis-setup.exe',
'Axolotl_Launcher_1.9.5-beta.1_x64_nsis-setup.exe.sig',
'Axolotl_Launcher_1.9.5-beta.1_x64_portable.zip',
'Starlight_Launcher_1.9.5-beta.1_skin-site-update.zip',
]
try {
@@ -59,7 +60,11 @@ try {
assert.equal(result.status, 0, result.stderr)
const catalog = JSON.parse(fs.readFileSync(output, 'utf8'))
assert.equal(catalog.version, '1.9.5-beta.1')
assert.equal(catalog.files.length, files.length)
assert.equal(catalog.files.length, files.length - 1)
assert.equal(
catalog.files.some((artifact) => artifact.filename.endsWith('_skin-site-update.zip')),
false,
)
assert.deepEqual(
catalog.artifacts.find((artifact) => artifact.filename.endsWith('_amd64.AppImage.tar.gz'))
.targetPlatforms,