Skip to content

Commit c809fc3

Browse files
authored
fix: 发布聊天互通与平台工作区更新 (#121)
* chore: prepare pnpm stable release workflow * feat: Enhance QQ message handling and improve database interactions - Refactor message routing in db-server to support QQ message forwarding. - Introduce new interfaces for better type safety in message handling. - Implement logic to filter channels accepting QQ messages. - Update transaction runner to support after-commit hooks for message inserts. - Modify QQ bridge to remove deprecated channelId usage and improve message forwarding logic. - Update changelog and documentation to reflect changes in resource pack handling. - Improve error handling and logging for message forwarding failures. - Refactor command handlers to clarify functionality related to QQ messages. * chore: preserve workspace changes for release * fix: finalize stable workspace release integration
1 parent 4566993 commit c809fc3

44 files changed

Lines changed: 731 additions & 191 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@sfmc-bds/sdk": patch
3+
"@sfmc-bds/cli": patch
4+
"@sfmc-bds/bds-tools": patch
5+
"@sfmc-bds/db-server": patch
6+
"@sfmc-bds/qq-bridge": patch
7+
---
8+
9+
完善聊天频道来源与 QQ 消息转发、提交后事件通知和模块伴生服务加载;改进命令菜单与资源包展示,并支持安全注销系统消息处理器。

‎_test_archive/cli/command-palette.test.mjs‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
resolvePaletteView,
1616
} from "../../packages/cli/dist/command-palette.js";
1717
import { visibleWidth } from "../../packages/cli/dist/logs.js";
18-
import { listPaletteRoots } from "../../packages/cli/dist/command-surface.js";
18+
import { listNextPaletteTokens, listPaletteRoots } from "../../packages/cli/dist/command-surface.js";
1919

2020
describe("clipPad 等宽", () => {
2121
it("垫到 PANEL_WIDTH", () => {
@@ -80,6 +80,46 @@ describe("resolvePaletteView", () => {
8080
it("叶命令 /start bds 到末尾立即关闭", () => {
8181
assert.equal(resolvePaletteView("/start bds", [0], [0]).hidden, true);
8282
});
83+
it("/ui 展开 studio 与 stop", () => {
84+
const v = resolvePaletteView("/ui ", [0], [0]);
85+
assert.equal(v.hidden, false);
86+
const tokens = v.columns.at(-1).items.map((n) => n.token);
87+
assert.deepEqual(tokens, ["studio", "stop"]);
88+
});
89+
it("/packs doctor 展开实验性开关", () => {
90+
const v = resolvePaletteView("/packs doctor ", [0], [0]);
91+
assert.equal(v.hidden, false);
92+
const tokens = v.columns.at(-1).items.map((n) => n.token);
93+
assert.ok(tokens.includes("--fix"));
94+
assert.ok(tokens.includes("--all-experiments"));
95+
assert.ok(tokens.includes("--experiments="));
96+
assert.ok(tokens.includes(""));
97+
});
98+
it("doctor 直接运行提交无参命令", () => {
99+
const v = resolvePaletteView("/packs doctor ", [0], [0]);
100+
const col = v.columns.at(-1);
101+
const idx = col.items.findIndex((n) => n.token === "");
102+
const view = resolvePaletteView("/packs doctor ", [0, 0, idx], [0, 0, 0]);
103+
const acc = commitSelection("/packs doctor ", view);
104+
assert.equal(acc.line, "/packs doctor");
105+
assert.equal(acc.submit, true);
106+
});
107+
it("--experiments= 粘在同一 token 上且随后收起面板", () => {
108+
const v0 = resolvePaletteView("/packs doctor ", [0], [0]);
109+
const idx = v0.columns.at(-1).items.findIndex((n) => n.token === "--experiments=");
110+
const view = resolvePaletteView("/packs doctor ", [0, 0, idx], [0, 0, 0]);
111+
const acc = commitSelection("/packs doctor ", view);
112+
assert.equal(acc.line, "/packs doctor --experiments=");
113+
assert.equal(acc.submit, false);
114+
assert.equal(resolvePaletteView("/packs doctor --experiments=beta,upcoming", [0], [0]).hidden, true);
115+
});
116+
it("灰字补全与面板共用 ui / doctor 的下一参", () => {
117+
assert.deepEqual(listNextPaletteTokens(["ui"]), ["studio", "stop"]);
118+
const doctor = listNextPaletteTokens(["packs", "doctor"]);
119+
assert.ok(doctor?.includes("--all-experiments"));
120+
assert.ok(doctor?.includes("--fix"));
121+
assert.equal(doctor?.includes(""), false);
122+
});
83123
it("未到末尾 /start 仍显示", () => {
84124
assert.equal(resolvePaletteView("/start", [0], [0]).hidden, false);
85125
assert.ok(resolvePaletteView("/start", [0], [0]).columns.length >= 1);

‎modules/sdk/@sfmc-sdk/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
- efa6e73: 将 Minecraft Script API 类型与新模块模板更新到 BDS 1.26.51 使用的 server 2.11.0-beta、server-ui 2.3.0-beta,并同步 vanilla-data 版本。
165165
- aadd2de: 将官方 QQ Webhook 的 SSH 反向隧道纳入 SFMC CLI 服务编排,提供配置、启停、断线重试、状态和日志。
166166
- efa6e73: 官方 QQ 机器人可选择 Webhook 接收事件;官方与 LLBot 配置改为分组对象。Webhook 模式自动跳过游戏机的桥进程,并安全同步共享配置到云端。群全量事件中的 `<@…>` 机器人提及也能正确触发指令面板命令。官方回复不再附带 LLBot 风格的编号和“发送:”列表。
167-
- 3465c7e: 更新 QQ 账号和服务器信息面板、频道来源控制及模块和世界包查询;移除 QQ 踢人指令,完善 CLI 服务窗口提示与模块配置行为。
167+
- 3465c7e: 更新 QQ 账号和服务器信息面板、频道来源控制及模块和资源包查询;移除 QQ 踢人指令,完善 CLI 服务窗口提示与模块配置行为。
168168
- efa6e73: 为 QQ 管理菜单增加可即时生效的服务器事件推送开关,并补充 BDS 正常停服通知。
169169
- 1a4ddda: dropdown 的 options 支持从 load 数据源注入(source/as/label/value),与 each 对齐。
170170
- 1a4ddda: 声明式 UI 危险确认支持可选校验文本 challenge(固定字或 {{path}}),未匹配前确认按钮禁用。

‎modules/sdk/@sfmc-sdk/schemas/pack_sources.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://json-schema.org/draft/2020-12/schema",
33
"$id": "https://github.com/DogeLakeDev/ScriptsForMinecraftServer/schemas/pack_sources.schema.json",
44
"title": "SFMC pack-sources",
5-
"description": "世界包远端源绑定清单,位于 packs/pack-sources.json(非 configs/)。键为行为包 UUID(小写);由探测安装 / `packs bind` / 更新流程写入。",
5+
"description": "资源包远端源绑定清单,位于 packs/pack-sources.json(非 configs/)。键为行为包 UUID(小写);由探测安装 / `packs bind` / 更新流程写入。",
66
"type": "object",
77
"additionalProperties": false,
88
"properties": {

‎modules/sdk/@sfmc-sdk/schemas/pack_update.schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://json-schema.org/draft/2020-12/schema",
33
"$id": "https://github.com/DogeLakeDev/ScriptsForMinecraftServer/schemas/pack_update.schema.json",
44
"title": "SFMC pack-update",
5-
"description": "世界包(addons)自动检查/更新。apiKey 来自 https://console.curseforge.com/(x-api-key);也可用环境变量 CURSEFORGE_API_KEY。Bedrock gameId=78022,Addons classId=4984。官方 /mods/search 若 403 会改用 searchBaseUrl。match 为源无关策略,置于顶层。defaultBindingEnabled=false 时新建绑定默认关闭。",
5+
"description": "资源包(addons)自动检查/更新。apiKey 来自 https://console.curseforge.com/(x-api-key);也可用环境变量 CURSEFORGE_API_KEY。Bedrock gameId=78022,Addons classId=4984。官方 /mods/search 若 403 会改用 searchBaseUrl。match 为源无关策略,置于顶层。defaultBindingEnabled=false 时新建绑定默认关闭。",
66
"type": "object",
77
"additionalProperties": false,
88
"properties": {
@@ -28,7 +28,7 @@
2828
},
2929
"probeSourceAfterInstall": {
3030
"type": "boolean",
31-
"description": "安装世界包成功后是否探测 CurseForge 等远端源并尝试绑定"
31+
"description": "安装资源包成功后是否探测 CurseForge 等远端源并尝试绑定"
3232
},
3333
"defaultBindingEnabled": {
3434
"type": "boolean",
@@ -160,7 +160,7 @@
160160
"properties": {
161161
"recycleBin": {
162162
"type": "boolean",
163-
"description": "true=移入 trashRelativeDir;false=直接删除世界包目录。可用 CLI --purge 强制删除"
163+
"description": "true=移入 trashRelativeDir;false=直接删除资源包目录。可用 CLI --purge 强制删除"
164164
},
165165
"trashRelativeDir": {
166166
"type": "string",

‎modules/sdk/@sfmc-sdk/src/sapi/runtime/menu-navigator.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ export class MenuNavigator {
136136
private player: Player;
137137
private form: CustomForm | null = null;
138138
private titleObs: ObservableString | null = null;
139-
private backVis: ObservableBoolean | null = null;
140139
/** 跨页面共享的状态对象。 */
141140
state: Record<string, any> = {};
142141
private _confirmIdx = 0;
@@ -146,9 +145,8 @@ export class MenuNavigator {
146145

147146
constructor(player: Player) {
148147
this.player = player;
149-
if (ObservableStringCtor && ObservableBooleanCtor) {
148+
if (ObservableStringCtor) {
150149
this.titleObs = new ObservableStringCtor("");
151-
this.backVis = new ObservableBooleanCtor(false);
152150
}
153151
}
154152

@@ -157,7 +155,7 @@ export class MenuNavigator {
157155
return this.history;
158156
}
159157

160-
/** 原生「回到上一级」弹栈后回调,供声明式运行时同步 session。 */
158+
/** `back()` 弹栈后回调,供声明式运行时同步 session。 */
161159
setOnBack(handler: () => void): this {
162160
this.onBack = handler;
163161
return this;
@@ -177,7 +175,6 @@ export class MenuNavigator {
177175
const token = ++this.sessionToken;
178176
this.history = [sectionId];
179177
this.applySection(sectionId);
180-
this.backVis?.setData(false);
181178
await this.buildAndShow(token);
182179
}
183180

@@ -367,11 +364,10 @@ export class MenuNavigator {
367364
private async buildAndShow(token = this.sessionToken): Promise<void> {
368365
if (token !== this.sessionToken) return;
369366
if (this.form?.isShowing()) this.form.close();
370-
if (!CustomFormCtor || !this.titleObs || !this.backVis) {
367+
if (!CustomFormCtor || !this.titleObs || !ObservableBooleanCtor) {
371368
throw new Error("当前环境下的 @minecraft/server-ui 不支持 CustomForm (DDUI),请在支持 DDUI 的 BDS 版本运行");
372369
}
373370
this.form = new CustomFormCtor(this.player, this.titleObs);
374-
this.form.button("← 回到上一级", () => this.back(), { visible: this.backVis });
375371
for (const [id, def] of this.sections) {
376372
if (token !== this.sessionToken) return;
377373
const vis = this.sectionVis.get(id);
@@ -408,7 +404,6 @@ export class MenuNavigator {
408404

409405
private applySection(sectionId: string): void {
410406
for (const [id, vis] of this.sectionVis) vis.setData(id === sectionId);
411-
this.backVis?.setData(this.history.length > 1);
412407
this.updateTitle();
413408
}
414409

‎modules/sdk/@sfmc-sdk/src/sapi/runtime/msg.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ let _systemMsgHandler: ((player: Player, text: string) => void) | null = null;
1212
*
1313
* @param handler 接收目标玩家与消息文本的转发回调函数。
1414
*/
15-
export function registerSystemMsgHandler(handler: (player: Player, text: string) => void): void {
15+
export function registerSystemMsgHandler(handler: (player: Player, text: string) => void): () => void {
1616
_systemMsgHandler = handler;
17+
const registered = handler;
18+
return () => {
19+
if (_systemMsgHandler === registered) _systemMsgHandler = null;
20+
};
1721
}
1822

1923
/**
@@ -82,4 +86,3 @@ export const Msg = {
8286
_systemMsgHandler?.(player, msg);
8387
},
8488
};
85-

‎packages/bds-tools/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338

339339
### Patch Changes
340340

341-
- 3714053: 发版:build-publishable 拓扑 + listPublishableBuildDeps(npm-publish 应急补发不再硬编码只 build SDK);push 缺失态 DRY 对齐 listUnpushedExistingVersionTags。世界包:readPackDirOccupancy DRY,去掉死不变式,occupancy 保留真实 kind(LSP)。
341+
- 3714053: 发版:build-publishable 拓扑 + listPublishableBuildDeps(npm-publish 应急补发不再硬编码只 build SDK);push 缺失态 DRY 对齐 listUnpushedExistingVersionTags。资源包:readPackDirOccupancy DRY,去掉死不变式,occupancy 保留真实 kind(LSP)。
342342
- 5ada90e: 修复 #80/#81 合并后 `scanDestOccupancy` 未赋值 `facts`、引用未声明标识符导致 tsc 构建失败;恢复经 `readPackDirOccupancy` 的 DRY 占用扫描。
343343

344344
## 0.2.0-beta.1

‎packages/bds-tools/src/pack-update/bindings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* packs/pack-sources.json — 世界包远程源绑定
2+
* packs/pack-sources.json — 资源包远程源绑定
33
*/
44
import { withConfigSchema } from "@sfmc-bds/sdk/node/config";
55
import fs from "node:fs";

‎packages/bds-tools/src/pack-update/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export interface StartupUpdateConfig {
5050
failMode: "continue" | "abort";
5151
}
5252

53-
/** 世界包卸载策略(与 CF 更新同属 packs 生命周期配置) */
53+
/** 资源包卸载策略(与 CF 更新同属 packs 生命周期配置) */
5454
export interface PackUninstallConfig {
5555
/** true:移入回收站;false:直接删除目录 */
5656
recycleBin: boolean;

0 commit comments

Comments
 (0)