diff --git a/CHANGELOG.md b/CHANGELOG.md index 117ad8114..31894a798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ * Dockerfile 构建层优化:restore 前先分层 COPY 全部工程与属性文件(仅项目结构/版本清单变化才重新 restore,源码变更实测 restore 层命中 CACHED);删除 final 阶段重复的 publish COPY;热更 DLL 同步移除 `|| true` 吞错(glob 未匹配或复制失败改为构建期 fail fast);scripts/acceptance.sh 仓库根改为按脚本自身位置推导并修正解决方案为 Server.slnx(原硬编码个人绝对路径且引用已不存在的 Server.sln) +* 包结构收敛:Standard 12 包定格 + 五处倒挂修剪 + 分层规则分析器固化(C463,GFX-1199):①管理契约 13 型(`IAdminActionContributor`/`AdminActionRegistry`/`AdminApiRequest` 等)自 Hosting.AdminApi 上移 Hosting.Abstractions(命名空间保留),`Online.Abstractions` 拆除对 AdminApi 的反向依赖;②`Online.Social` 拆除对 Apps/DataBase 的引用(旧好友数据一次性迁移代码存档 `scripts/legacy/`,`MigrateLegacyFriendData` 配置键废止——能力配置绑定器对未知字段严格 fail-fast,老 JSON 须删除该键);③`Online.Match` 拆除对 Core.Session/Proto 的依赖——撮合成立推送改经出站契约 `IOnlineMatchAssignmentNotifier`(包内缺省空实现,Launcher 以 `OnlineMatchAssignmentSessionNotifier` 注入等价 best-effort 推送);④RPS 样例游戏三文件自 Online.Match 移入新验收夹具工程 `GameFrameX.Apps.Sample`(test-fixture),玩法经 `OnlineMatchOptions.AddGame` 由宿主注入(`IOnlineMatchGame` 增 `BuildBridgeView` 契约面,零玩法形态不发布对局桥);⑤排行榜自 Competition 拆独立包 `Online.Leaderboard`(新模块 online-leaderboard,`OnlineCompetitionOptions` 与 `query_leaderboard` 随迁,配置段改 `Online.Settings.online-leaderboard`),Competition 保留冻结的赛季/锦标赛(必选依赖 online-leaderboard);⑥LiveOps 运营面五文件拆离存档 `scripts/detached-liveops/`(移交 Admin 仓),Operations 分析面(游戏事件/总览/时间线)原地冻结标注;⑦新增分层分析器 GFX0023(层级单调+同层禁互引)/GFX0024(契约包零运行时引用)/GFX0025(能力包四禁引 Apps/Hotfix/Proto/Core),L0–L5+层内序注册表固化全部工程引用图;⑧slnx 分组 `/Capability/Standard|Frozen|Experimental` 与 `/Fixture/`,gfx-online 模板新增 Leaderboard 开关并显式引用 Hosting.AdminApi。admin 注册表业务 action 37→30;存量 `Online.Settings.online-competition.*` 配置段须迁移或删除(装配期严格 fail-fast)。 + ### Fixed * HTTP 请求管线正确性与响应一致性(C458,GFX-1180,GitHub #926):ProtoBuf 成功响应写出前更正 Content-Type 为 `application/x-protobuf`(原恒为 JSON,按媒体类型分派的客户端/网关解析二进制体失败);参数字典改 OrdinalIgnoreCase 并同步把 Query 提取改 TryAdd——大小写差异同名键(Query↔Body、Query↔Query)一律显式 `ParamErr` 拒绝,消除「被校验/被签名的 Query 值被 Body 静默覆盖」窗口;非 JSON 对象 Body(null 字面量/数组/标量/空体)以参数错误拒绝(新键 `Network.Http.RequestBodyNotJsonObject`),不再落入顶层 catch 记服务器错误日志;非 GET 缺 Content-Type 改统一 JSON envelope;DataAnnotations 校验失败业务码由字面量 400 统一为 `GameHttpStatusCode.ParamErr`;Swagger 路由匹配改末段精确比较(互为后缀命令不再错配文档,驼峰路由可匹配)且 GET 参数必填性跟随 `RequiredAttribute`;AOP 拒绝且未自行写响应时管线回写校验失败 envelope(契约写入 `IHttpAopHandler.Run`);`CheckSign` 缺 sign/timestamp 改本地化消息。对外破坏性:依赖 `code == 400` 判定校验失败的客户端改判 `code == 13`;`HttpStatusMessage.Success`/`NotFoundCommand`/`CheckFailedCommand` 及孤儿键 `Network.Http.NotFoundCommand`/`CheckFailedCommand` 删除(公共 API,下游如有引用需迁移)。 * Utility 安全修复:配置凭据脱敏、解压炸弹上限、冲突异常 Secret 脱敏与压缩失败显式抛出(C433,GFX-1173,GitHub #919):①`AppSetting.ToString/ToFormatString` 经浅拷贝掩码后序列化——`DataBasePassword`/`HttpSignSecret`/`InterNodeAuthSecret`/`HttpsCertPassword` 非空值输出 `***`(null/空串原样保留区分「未配置」),四个凭据不再随启动/停止日志明文外发;②`CompressionHelper.Decompress` 新增 `maxOutputLength` 上限重载(旧签名转发 const 默认 64MB),膨胀过程内超限即抛 `InvalidDataException`——Network `DefaultMessageDecompressHandler` 增构造参数上限、RemoteMessaging `IMessageCompressionAlgorithm.Decompress` 接口加参(const 默认值,源码兼容;`DefaultMessageCodec` 显式传 `_maxDecompressedSize`),事后长度检查降级为兜底防线,1MB 高压缩比帧不再可膨胀至 GB 级托管内存;③`SettingFieldConflict` 敏感字段判定扩展 Secret/Token 子串——多 Role 配置冲突异常不再明文携带 `HttpSignSecret`/`InterNodeAuthSecret`;④`RandomHelper` 类文档声明双随机源分级(基础接口 `Random.Shared` 非加密 PRNG 禁用于令牌/验证码/防作弊场景,安全场景用权重系列 CSPRNG 或 `RandomNumberGenerator`);⑤落地已归档 C349 既定方案:`Compress` 异常原样抛出、`Decompress` 对非法/损坏/截断数据统一抛 `InvalidDataException`(含 SharpZipLib 截断流死循环主动判定),删除「失败静默返回原始字节」回退与 `CompressFailed` 本地化键;⑥`FP.Sqrt/Acos` 越界异常构造器实参换序(本地化消息进 `Message`、`"x"` 进 `ParamName`,修复前 `ParamName == null`)。公共 API 行为变更经本条披露;解压炸弹/脱敏/截断/参数名均有回归用例锁定。 diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionException.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionException.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionException.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionException.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionHandler.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionHandler.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionHandler.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionHandler.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionRegistration.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionRegistration.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionRegistration.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionRegistration.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionRegistry.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionRegistry.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminActionRegistry.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminActionRegistry.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiClaimedScope.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiClaimedScope.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiClaimedScope.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiClaimedScope.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiErrorCode.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiErrorCode.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiErrorCode.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiErrorCode.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiErrorCodes.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiErrorCodes.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiErrorCodes.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiErrorCodes.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiRequest.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiRequest.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminApiRequest.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminApiRequest.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminIdempotencyOutcome.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminIdempotencyOutcome.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminIdempotencyOutcome.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminIdempotencyOutcome.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/AdminIdempotencyOutcomeKind.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/AdminIdempotencyOutcomeKind.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/AdminIdempotencyOutcomeKind.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/AdminIdempotencyOutcomeKind.cs diff --git a/Capability/GameFrameX.Capability.Hosting.Abstractions/GameFrameX.Capability.Hosting.Abstractions.csproj b/Capability/GameFrameX.Capability.Hosting.Abstractions/GameFrameX.Capability.Hosting.Abstractions.csproj index 2dc0f6caf..3de99c882 100644 --- a/Capability/GameFrameX.Capability.Hosting.Abstractions/GameFrameX.Capability.Hosting.Abstractions.csproj +++ b/Capability/GameFrameX.Capability.Hosting.Abstractions/GameFrameX.Capability.Hosting.Abstractions.csproj @@ -13,6 +13,7 @@ + diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminActionContributor.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminActionContributor.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminActionContributor.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminActionContributor.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminApiIdempotencyAdapter.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminApiIdempotencyAdapter.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminApiIdempotencyAdapter.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminApiIdempotencyAdapter.cs diff --git a/Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminApiScopeAdapter.cs b/Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminApiScopeAdapter.cs similarity index 100% rename from Capability/GameFrameX.Capability.Hosting.AdminApi/IAdminApiScopeAdapter.cs rename to Capability/GameFrameX.Capability.Hosting.Abstractions/IAdminApiScopeAdapter.cs diff --git a/Capability/GameFrameX.Capability.Online.Abstractions/GameFrameX.Capability.Online.Abstractions.csproj b/Capability/GameFrameX.Capability.Online.Abstractions/GameFrameX.Capability.Online.Abstractions.csproj index be89e0143..782111528 100644 --- a/Capability/GameFrameX.Capability.Online.Abstractions/GameFrameX.Capability.Online.Abstractions.csproj +++ b/Capability/GameFrameX.Capability.Online.Abstractions/GameFrameX.Capability.Online.Abstractions.csproj @@ -12,11 +12,8 @@ + - - - - diff --git a/Capability/GameFrameX.Capability.Online.Competition/GameFrameX.Capability.Online.Competition.csproj b/Capability/GameFrameX.Capability.Online.Competition/GameFrameX.Capability.Online.Competition.csproj index 4079ad48f..c2f08c7b3 100644 --- a/Capability/GameFrameX.Capability.Online.Competition/GameFrameX.Capability.Online.Competition.csproj +++ b/Capability/GameFrameX.Capability.Online.Competition/GameFrameX.Capability.Online.Competition.csproj @@ -2,18 +2,16 @@ - GameFrameX.Capability.Online.Competition,GFX Online 竞技能力包:排行榜/赛季/锦标赛/LiveOps 承载(InMemory 默认存储,懒默认描述符,族/宿主覆盖恒胜出)+ 自装配模块(OnlineCompetitionCapabilityModule,Options=OnlineCompetitionOptions)+ admin handlers(LiveOps 七 action). Competition capability package for the GFX Online family: leaderboards, seasons, tournaments and the LiveOps registry with in-memory default stores, the self-assembling capability module and admin handlers. Documentation: https://gameframex.doc.alianblank.com - GameFrameX,Capability,Online,Competition,Leaderboard,Season,Tournament,LiveOps,GameServer - + GameFrameX.Capability.Online.Competition,GFX Online 竞技能力包(冻结面:不删除、不演进):赛季/锦标赛承载(InMemory 默认存储,懒默认描述符,族/宿主覆盖恒胜出)+ 自装配模块(OnlineCompetitionCapabilityModule,必选依赖 online-leaderboard);榜单能力已拆至 GameFrameX.Capability.Online.Leaderboard 独立包,LiveOps 运营面移交 Admin 仓. Frozen competition capability package for the GFX Online family: seasons and tournaments with in-memory default stores and the self-assembling module requiring online-leaderboard; leaderboards moved to the dedicated leaderboard package and LiveOps handed over to the admin console. Documentation: https://gameframex.doc.alianblank.com + GameFrameX,Capability,Online,Competition,Season,Tournament,Frozen,GameServer + - - + diff --git a/Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionCapabilityModule.cs b/Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionCapabilityModule.cs index e68b61919..75ef289d1 100644 --- a/Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionCapabilityModule.cs +++ b/Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionCapabilityModule.cs @@ -1,101 +1,72 @@ -// ========================================================================================== +// ========================================================================================== // GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 // GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights // 均受中华人民共和国及相关国际法律法规保护。 -// are protected by the laws of the PRC and relevant international regulations. -// 使用本项目须严格遵守相关法律法规与开源许可证之规定。 -// Usage of this project must strictly comply with relevant laws, regulations, and open-source licenses. +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. // 本项目采用 Apache License 2.0 单协议分发, // This project is licensed solely under the Apache License 2.0, // 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 -// please refer to the LICENSE file at the root of the source code for the full license text. +// please see the LICENSE file in the root directory of the source code for the full license text. // 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 // It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, // 侵犯他人合法权益等法律法规所禁止的行为! -// or infringe upon the legal rights and interests of others, as prohibited by laws and regulations! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! // 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project // 本项目组织与贡献者概不承担。 // shall be borne solely by the developer; the project organization and contributors assume no responsibility. // GitHub 仓库:https://github.com/GameFrameX // GitHub Repository: https://github.com/GameFrameX // Gitee 仓库:https://gitee.com/GameFrameX // Gitee Repository: https://gitee.com/GameFrameX -// CNB 仓库:https://www.cnb.cool/GameFrameX -// CNB Repository: https://www.cnb.cool/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX // 官方文档:https://gameframex.doc.alianblank.com/ // Official documentation: https://gameframex.doc.alianblank.com/ // ========================================================================================== -using System; using System.Threading; using System.Threading.Tasks; using GameFrameX.Capability.Hosting.Abstractions; -using GameFrameX.Capability.Hosting.AdminApi; +using GameFrameX.Capability.Online.Abstractions.Events; using GameFrameX.Capability.Online.Assets; -using GameFrameX.Capability.Online.Competition.AdminApi; using GameFrameX.Capability.Online.Competition.Leaderboard; -using GameFrameX.Capability.Online.Competition.LiveOps; using GameFrameX.Capability.Online.Competition.Season; using GameFrameX.Capability.Online.Competition.Tournament; -using GameFrameX.Capability.Online.Abstractions.Contracts; -using GameFrameX.Capability.Online.Abstractions.Events; -using GameFrameX.Capability.Online.Abstractions.Idempotency; -using GameFrameX.Capability.Online.Abstractions.Scope; -using GameFrameX.Capability.Online.Match; +using GameFrameX.Localization; namespace GameFrameX.Capability.Online.Competition; /// -/// 竞技能力(榜单 / 赛季 / 锦标赛 / LiveOps 承载)的自装配模块(C294 迁入新机制三段生命周期)。 +/// 竞技能力(赛季 / 锦标赛)的自装配模块——冻结面:两部分均无消费方接线,按包结构收敛裁决标注 +/// frozen(不删除、不演进;榜单能力已拆至 online-leaderboard 独立包,LiveOps 运营面移交 Admin 仓)。 /// -/// 维护约束(服务共享协议):模块无参构造(扫描可发现);Register 自装配本域——榜单 / 赛季 / -/// 锦标赛三个 store 以懒默认描述符注册(族 / 宿主覆盖恒胜出,模块不感知);赛季 / 锦标赛对发放服务 -/// (,assets 域产物)的依赖经 manifest 可选声明 + GetOptionalService, -/// 缺席(assets 能力被过滤)时不装配两者;对外产物(榜单 / 赛季 / 锦标赛服务与 LiveOps 注册表)注册回 -/// 为唯一参数面(含榜单组件参数与 Match.Settled 投影配置, -/// 后者收编族级键 MatchBridgeLeaderboardId):投影榜 id 非空白(C460 起默认投影到默认榜 -/// ,显式空白可关闭)且对局结果存储 -/// (online-match 可选产物)在场时装配 Match.Settled 排行榜投影(机制总线订阅 + 失败重投 tick); -/// ActivateAsync 在投影榜 id 非空白时经榜单服务预建目标榜(查询-创建,见方法注释)。 +/// 维护约束(服务共享协议):模块无参构造(扫描可发现);Register 自装配本域——赛季 / 锦标赛两个 +/// store 以懒默认描述符注册(族 / 宿主覆盖恒胜出,模块不感知);对排行榜服务 +/// (,online-leaderboard 必选产物)与发放服务 +/// (,assets 域可选产物)的依赖经 manifest 声明 + Get 解析, +/// 任一缺席时不装配两者(必选缺席 = 装配失败 fail-fast);对外产物(赛季 / 锦标赛服务)注册回共享面。 /// /// -public sealed class OnlineCompetitionCapabilityModule : ICapabilityModule, IAdminActionContributor +public sealed class OnlineCompetitionCapabilityModule : ICapabilityModule { /// - /// 竞技能力清单(Id 冻结 = 终态包名;action 集合逐字迁移自壳过渡模块;可选依赖 online-assets / online-match - /// 经 声明,缺席时披露对应缺失功能名)。 + /// 竞技能力清单(Id 冻结 = 终态包名;必选依赖 online-leaderboard(赛季 / 锦标赛的榜单写路径), + /// 可选依赖 online-assets(奖励发放),缺席时披露对应缺失功能名;无 admin action—— + /// 榜单查询随榜单能力迁移,运营编排随 LiveOps 移交 Admin 仓)。 /// public static readonly CapabilityManifest ManifestInstance = new( "online-competition", "1.0.0", - new[] { "publishRemoteConfig", "syncDeviceGroup", "syncScheduledTask", "pushAnnouncement", "syncPlayerSegment", "publishConfigRollout", "rollbackConfigRollout", "query_leaderboard" }, null, + new[] { "online-leaderboard" }, new[] { - new CapabilityOptionalDependency("online-assets", Localization.Keys.Capability.OnlineModule.Competition.OptionalAssetsAbsent), - new CapabilityOptionalDependency("online-match", Localization.Keys.Capability.OnlineModule.Competition.OptionalMatchAbsent), + new CapabilityOptionalDependency("online-assets", Keys.Capability.OnlineModule.Competition.OptionalAssetsAbsent), }, - typeof(OnlineCompetitionOptions)); - - /// - /// LiveOps 注册表(Register 期构造;admin 面 handler 取用)。 - /// - private OnlineLiveOpsRegistry _liveOps; - - /// - /// 排行榜服务(Register 期构造;admin 面 handler、投影链与激活期榜单预建取用)。 - /// - private OnlineLeaderboardService _leaderboards; - - /// - /// Match.Settled 排行榜投影器(Register 期装配;投影配置空白或 online-match 缺席时为 null)。 - /// - private OnlineMatchSettledLeaderboardProjector _projectionProjector; - - /// - /// Match.Settled 投影目标榜单标识(Register 期从 Options 读出;空白 = 不投影不预建;ActivateAsync 预建判据)。 - /// - private string _projectionBoardId; + null); /// /// 获取竞技能力清单,固定返回静态实例 。 @@ -110,113 +81,54 @@ public CapabilityManifest Manifest } /// - /// 读取竞技能力选项,懒默认注册内存版排行榜、赛季、锦标赛存储并解析生效实例,构造并注册排行榜服务与活动运营注册表;发放服务在场时再注册赛季服务与锦标赛服务;投影榜单标识非空白且对局结果存储在场时,注册 Match.Settled 排行榜投影器、订阅对局结算事件并添加投影重试的 tick 任务。 + /// 懒默认注册内存版赛季、锦标赛存储并解析生效实例;排行榜服务与发放服务均在场时再注册赛季服务与锦标赛服务 + /// (必选 online-leaderboard 缺席 = 装配失败,不会进入本方法后的降级分支;可选 assets 缺席时静默跳过)。 /// /// - /// Reads , registers in-memory leaderboard / season / tournament stores as lazy - /// defaults and resolves the effective instances, then builds and registers the leaderboard service and the live-ops - /// registry. Season and tournament services are registered only when the optional grant service is present. When the - /// projection board id is not blank and the match result store is present, it registers the Match.Settled leaderboard - /// projector, subscribes it to the match-settled event and adds the leaderboard-projection-retry tick job; - /// otherwise the projection is silently skipped. + /// Registers in-memory season / tournament stores as lazy defaults and resolves the effective instances. + /// Season and tournament services are registered only when both the leaderboard service (required + /// online-leaderboard product) and the optional grant service are present. /// /// 能力注册上下文 / Capability registration context public void Register(CapabilityRegistrationContext context) { - var options = context.GetOptions(); - var eventPublisher = context.GetService(); - - // 三 store 懒默认描述符(族 / 宿主覆盖恒胜出;GetService 命中覆盖或本默认)。 - context.AddService(static _ => new InMemoryOnlineLeaderboardStore()); - var leaderboardStore = context.GetService(); + // 两 store 懒默认描述符(族 / 宿主覆盖恒胜出;GetService 命中覆盖或本默认)。 context.AddService(static _ => new InMemoryOnlineSeasonStore()); var seasonStore = context.GetService(); context.AddService(static _ => new InMemoryOnlineTournamentStore()); var tournamentStore = context.GetService(); - var leaderboards = new OnlineLeaderboardService(leaderboardStore, options.Leaderboard, eventPublisher); - _leaderboards = leaderboards; - context.AddService(leaderboards); - - _liveOps = new OnlineLiveOpsRegistry(); - context.AddService(_liveOps); - - // 发放服务(assets 域可选产物):在场才装配赛季 / 锦标赛(壳时代 Seasons / Tournaments 置 null 的模块化等价)。 + // 排行榜服务(online-leaderboard 必选产物)与发放服务(assets 域可选产物):双在场才装配 + // 赛季 / 锦标赛(壳时代 Seasons / Tournaments 置 null 的模块化等价)。 + var leaderboards = context.GetService(); var grantService = context.GetOptionalService(); if (grantService != null) { + var eventPublisher = context.GetService(); context.AddService(new OnlineSeasonService(seasonStore, leaderboards, grantService, eventPublisher)); context.AddService(new OnlineTournamentService(tournamentStore, leaderboards, grantService, eventPublisher)); } - - // Match.Settled → 排行榜投影:Options 投影榜 id 非空白(空白 = 不投影)且对局结果存储在场 - // (online-match 被过滤 → 不装配不报错)才装配;订阅走机制事件总线(Register 期声明, - // 单个订阅体异常由机制记日志后继续分发,业务侧不再自行吞异常),失败经 tick job 重投。 - _projectionBoardId = options.LeaderboardProjection.MatchSettledBoardId; - var projectionResultStore = context.GetOptionalService(); - if (!string.IsNullOrWhiteSpace(_projectionBoardId) && projectionResultStore != null) - { - var projectionIdempotency = context.GetService(); - var projector = new OnlineMatchSettledLeaderboardProjector(projectionResultStore, leaderboards, projectionIdempotency, _projectionBoardId); - _projectionProjector = projector; - context.AddService(projector); - context.Subscribe(OnlineMatchRuntimeEvents.MatchSettled, onlineEvent => _projectionProjector.HandleEventAsync(onlineEvent).GetAwaiter().GetResult()); - context.AddTickJob("leaderboard-projection-retry", cancellationToken => _projectionProjector.RetryPendingAsync(cancellationToken)); - } } /// - /// 投影榜单标识为空白时直接返回;否则以 Top 1 查询探测目标榜单,已存在则返回,返回资源不存在时按累加计分、降序排序创建该榜单。 + /// 激活阶段无需处理(榜单预建与投影随榜单能力迁移至 online-leaderboard 包),直接返回已完成任务。 /// /// - /// Returns immediately when the projection board id is blank. Otherwise probes the target board with a top-1 query; - /// if it already exists nothing else happens, and if the probe reports resource-not-found the board is created with - /// the sum score-update policy and descending sort order. Any other failure aborts activation so the host can roll back. + /// Nothing to do on activation: board pre-building and the settled projection moved to the online-leaderboard package. /// - /// 能力激活上下文,用于解析 Online 作用域 / Capability activation context used to resolve the Online scope + /// 能力激活上下文 / Capability activation context /// 取消令牌 / Cancellation token - /// 表示异步激活操作的任务 / Task representing the asynchronous activation - /// 探测返回资源不存在以外的失败码,或创建榜单失败 / The probe fails with a code other than resource-not-found, or creating the board fails - public async Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) + /// 已完成的任务 / Completed task + public Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) { - if (string.IsNullOrWhiteSpace(_projectionBoardId)) - { - return; - } - - // 榜单预建(迁自 Launcher OnlineMatchBridgeWiring.EnsureMatchLeaderboardBoardAsync):投影目标榜 - // 查询-创建——GetTop 探针命中即已存在;ResourceNotFound 视作首建,按 Sum / Descending 创建; - // 其余失败码或创建失败 = 激活失败(抛 InvalidOperationException 由机制逆序回滚)。 - var scope = context.Services.GetService(); - var probe = await _leaderboards.GetTopAsync(scope, new OnlineLeaderboardTopQuery { LeaderboardId = _projectionBoardId, Count = 1, }, cancellationToken).ConfigureAwait(false); - if (probe.IsSuccess) - { - return; - } - - if (probe.Code != OnlineErrorCode.ResourceNotFound) - { - throw new InvalidOperationException("Leaderboard pre-build probe failed for board '" + _projectionBoardId + "' (code: " + probe.Code + ")."); - } - - var created = await _leaderboards.CreateAsync(scope, new OnlineLeaderboardCreateRequest - { - LeaderboardId = _projectionBoardId, - SortOrder = OnlineLeaderboardSortOrder.Descending, - ScoreUpdatePolicy = OnlineLeaderboardScoreUpdatePolicy.Sum, - }, 0, cancellationToken).ConfigureAwait(false); - if (!created.IsSuccess) - { - throw new InvalidOperationException("Leaderboard pre-build create failed for board '" + _projectionBoardId + "' (code: " + created.Code + ")."); - } + return Task.CompletedTask; } /// - /// 停用阶段无需处理:事件订阅与 tick 任务由宿主机制在注册时托管,激活仅预建榜单而不持有运行资源,直接返回已完成任务。 + /// 停用阶段无需处理:本模块不持有需要释放的运行资源,直接返回已完成任务。 /// /// - /// Nothing to do on deactivation: the event subscription and tick job are declared to the host during registration, - /// and activation only pre-creates the board without holding runtime resources, so a completed task is returned. + /// Nothing to do on deactivation: the module holds no runtime resources. /// /// 取消令牌 / Cancellation token /// 已完成的任务 / Completed task @@ -224,18 +136,4 @@ public Task DeactivateAsync(CancellationToken cancellationToken) { return Task.CompletedTask; } - - /// - /// 基于注册阶段构造的活动运营注册表登记活动运营管理动作,并基于排行榜服务登记排行榜查询管理动作。 - /// - /// - /// Registers the live-ops admin actions backed by the live-ops registry and the leaderboard query admin actions backed - /// by the leaderboard service, both built during registration. - /// - /// 管理动作注册表 / Admin action registry - public void RegisterAdminActions(AdminActionRegistry registry) - { - OnlineAdminLiveOpsHandlers.RegisterLiveOps(registry, _liveOps); - OnlineAdminLeaderboardHandlers.RegisterLeaderboardQuery(registry, _leaderboards); - } } diff --git a/Capability/GameFrameX.Capability.Online.Competition/AdminApi/OnlineAdminLeaderboardHandlers.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/AdminApi/OnlineAdminLeaderboardHandlers.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/AdminApi/OnlineAdminLeaderboardHandlers.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/AdminApi/OnlineAdminLeaderboardHandlers.cs diff --git a/Capability/GameFrameX.Capability.Online.Leaderboard/GameFrameX.Capability.Online.Leaderboard.csproj b/Capability/GameFrameX.Capability.Online.Leaderboard/GameFrameX.Capability.Online.Leaderboard.csproj new file mode 100644 index 000000000..bd2e3e857 --- /dev/null +++ b/Capability/GameFrameX.Capability.Online.Leaderboard/GameFrameX.Capability.Online.Leaderboard.csproj @@ -0,0 +1,19 @@ + + + + + GameFrameX.Capability.Online.Leaderboard,GFX Online 排行榜能力包:榜单生命周期/分数提交与累加策略/周边与置顶查询/对局结算投影(Match.Settled 订阅+幂等+失败重投)+ admin handlers(query_leaderboard). Leaderboard capability package for the GFX Online family: board lifecycle, score submission with sum/best policies, around and top queries, the match-settled projection with idempotency and retry, and admin handlers. Documentation: https://gameframex.doc.alianblank.com + GameFrameX,Capability,Online,Leaderboard,Projection,GameServer + + + + + + + + + + + + + diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/IOnlineLeaderboardStore.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/IOnlineLeaderboardStore.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/IOnlineLeaderboardStore.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/IOnlineLeaderboardStore.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/InMemoryOnlineLeaderboardStore.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/InMemoryOnlineLeaderboardStore.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/InMemoryOnlineLeaderboardStore.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/InMemoryOnlineLeaderboardStore.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionOptions.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineCompetitionOptions.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionOptions.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineCompetitionOptions.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboard.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboard.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboard.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboard.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardApplyResult.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardApplyResult.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardApplyResult.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardApplyResult.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardAroundQuery.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardAroundQuery.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardAroundQuery.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardAroundQuery.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardAroundView.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardAroundView.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardAroundView.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardAroundView.cs diff --git a/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardCapabilityModule.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardCapabilityModule.cs new file mode 100644 index 000000000..08de76567 --- /dev/null +++ b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardCapabilityModule.cs @@ -0,0 +1,215 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System; +using System.Threading; +using System.Threading.Tasks; +using GameFrameX.Capability.Hosting.Abstractions; +using GameFrameX.Capability.Hosting.AdminApi; +using GameFrameX.Capability.Online.Abstractions.Contracts; +using GameFrameX.Capability.Online.Abstractions.Events; +using GameFrameX.Capability.Online.Abstractions.Idempotency; +using GameFrameX.Capability.Online.Abstractions.Scope; +using GameFrameX.Capability.Online.Competition; +using GameFrameX.Capability.Online.Competition.AdminApi; +using GameFrameX.Capability.Online.Competition.Leaderboard; +using GameFrameX.Capability.Online.Match; +using GameFrameX.Localization; + +namespace GameFrameX.Capability.Online.Leaderboard; + +/// +/// 排行榜能力(榜单生命周期 / 分数提交 / 查询 / 对局结算投影)的自装配模块(自竞技能力包拆出独立承载: +/// 按需引入 + Options 回调定制榜单参数)。 +/// +/// 维护约束(服务共享协议):模块无参构造(扫描可发现);Register 自装配本域——榜单 store 以懒默认 +/// 描述符注册(族 / 宿主覆盖恒胜出,模块不感知); 为唯一参数面 +/// (含榜单组件参数与 Match.Settled 投影配置):投影榜 id 非空白且对局结果存储(online-match 可选产物) +/// 在场时装配 Match.Settled 排行榜投影(机制总线订阅 + 失败重投 tick); +/// ActivateAsync 在投影榜 id 非空白时经榜单服务预建目标榜(查询-创建,见方法注释)。 +/// +/// +public sealed class OnlineLeaderboardCapabilityModule : ICapabilityModule, IAdminActionContributor +{ + /// + /// 排行榜能力清单(Id 冻结 = 终态包名;query_leaderboard 自竞技能力清单迁入;可选依赖 online-match + /// 经 声明,缺席时披露对应缺失功能名)。 + /// + public static readonly CapabilityManifest ManifestInstance = new( + "online-leaderboard", + "1.0.0", + new[] { "query_leaderboard" }, + null, + new[] + { + new CapabilityOptionalDependency("online-match", Keys.Capability.OnlineModule.Leaderboard.OptionalMatchAbsent), + }, + typeof(OnlineCompetitionOptions)); + + /// + /// 排行榜服务(Register 期构造;admin 面 handler、投影链与激活期榜单预建取用)。 + /// + private OnlineLeaderboardService _leaderboards; + + /// + /// Match.Settled 排行榜投影器(Register 期装配;投影配置空白或 online-match 缺席时为 null)。 + /// + private OnlineMatchSettledLeaderboardProjector _projectionProjector; + + /// + /// Match.Settled 投影目标榜单标识(Register 期从 Options 读出;空白 = 不投影不预建;ActivateAsync 预建判据)。 + /// + private string _projectionBoardId; + + /// + /// 获取排行榜能力清单,固定返回静态实例 。 + /// + /// + /// Gets the leaderboard capability manifest; always returns the static . + /// + /// 排行榜能力清单 / Leaderboard capability manifest + public CapabilityManifest Manifest + { + get { return ManifestInstance; } + } + + /// + /// 读取排行榜能力选项,懒默认注册内存版榜单存储并解析生效实例,构造并注册排行榜服务; + /// 投影榜单标识非空白且对局结果存储在场时,注册 Match.Settled 排行榜投影器、订阅对局结算事件并添加投影重试的 tick 任务。 + /// + /// + /// Reads , registers the in-memory leaderboard store as a lazy default and + /// resolves the effective instance, then builds and registers the leaderboard service. When the projection board id + /// is not blank and the match result store is present, it registers the Match.Settled leaderboard projector, + /// subscribes it to the match-settled event and adds the leaderboard-projection-retry tick job; + /// otherwise the projection is silently skipped. + /// + /// 能力注册上下文 / Capability registration context + public void Register(CapabilityRegistrationContext context) + { + var options = context.GetOptions(); + var eventPublisher = context.GetService(); + + // 榜单 store 懒默认描述符(族 / 宿主覆盖恒胜出;GetService 命中覆盖或本默认)。 + context.AddService(static _ => new InMemoryOnlineLeaderboardStore()); + var leaderboardStore = context.GetService(); + + var leaderboards = new OnlineLeaderboardService(leaderboardStore, options.Leaderboard, eventPublisher); + _leaderboards = leaderboards; + context.AddService(leaderboards); + + // Match.Settled → 排行榜投影:Options 投影榜 id 非空白(空白 = 不投影)且对局结果存储在场 + // (online-match 被过滤 → 不装配不报错)才装配;订阅走机制事件总线(Register 期声明, + // 单个订阅体异常由机制记日志后继续分发,业务侧不再自行吞异常),失败经 tick job 重投。 + _projectionBoardId = options.LeaderboardProjection.MatchSettledBoardId; + var projectionResultStore = context.GetOptionalService(); + if (!string.IsNullOrWhiteSpace(_projectionBoardId) && projectionResultStore != null) + { + var projectionIdempotency = context.GetService(); + var projector = new OnlineMatchSettledLeaderboardProjector(projectionResultStore, leaderboards, projectionIdempotency, _projectionBoardId); + _projectionProjector = projector; + context.AddService(projector); + context.Subscribe(OnlineMatchRuntimeEvents.MatchSettled, onlineEvent => _projectionProjector.HandleEventAsync(onlineEvent).GetAwaiter().GetResult()); + context.AddTickJob("leaderboard-projection-retry", cancellationToken => _projectionProjector.RetryPendingAsync(cancellationToken)); + } + } + + /// + /// 投影榜单标识为空白时直接返回;否则以 Top 1 查询探测目标榜单,已存在则返回,返回资源不存在时按累加计分、降序排序创建该榜单。 + /// + /// + /// Returns immediately when the projection board id is blank. Otherwise probes the target board with a top-1 query; + /// if it already exists nothing else happens, and if the probe reports resource-not-found the board is created with + /// the sum score-update policy and descending sort order. Any other failure aborts activation so the host can roll back. + /// + /// 能力激活上下文,用于解析 Online 作用域 / Capability activation context used to resolve the Online scope + /// 取消令牌 / Cancellation token + /// 表示异步激活操作的任务 / Task representing the asynchronous activation + /// 探测返回资源不存在以外的失败码,或创建榜单失败 / The probe fails with a code other than resource-not-found, or creating the board fails + public async Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) + { + if (string.IsNullOrWhiteSpace(_projectionBoardId)) + { + return; + } + + // 榜单预建(迁自竞技能力模块):投影目标榜查询-创建——GetTop 探针命中即已存在; + // ResourceNotFound 视作首建,按 Sum / Descending 创建;其余失败码或创建失败 = 激活失败 + // (抛 InvalidOperationException 由机制逆序回滚)。 + var scope = context.Services.GetService(); + var probe = await _leaderboards.GetTopAsync(scope, new OnlineLeaderboardTopQuery { LeaderboardId = _projectionBoardId, Count = 1, }, cancellationToken).ConfigureAwait(false); + if (probe.IsSuccess) + { + return; + } + + if (probe.Code != OnlineErrorCode.ResourceNotFound) + { + throw new InvalidOperationException("Leaderboard pre-build probe failed for board '" + _projectionBoardId + "' (code: " + probe.Code + ")."); + } + + var created = await _leaderboards.CreateAsync(scope, new OnlineLeaderboardCreateRequest + { + LeaderboardId = _projectionBoardId, + SortOrder = OnlineLeaderboardSortOrder.Descending, + ScoreUpdatePolicy = OnlineLeaderboardScoreUpdatePolicy.Sum, + }, 0, cancellationToken).ConfigureAwait(false); + if (!created.IsSuccess) + { + throw new InvalidOperationException("Leaderboard pre-build create failed for board '" + _projectionBoardId + "' (code: " + created.Code + ")."); + } + } + + /// + /// 停用阶段无需处理:事件订阅与 tick 任务由宿主机制在注册时托管,激活仅预建榜单而不持有运行资源,直接返回已完成任务。 + /// + /// + /// Nothing to do on deactivation: the event subscription and tick job are declared to the host during registration, + /// and activation only pre-creates the board without holding runtime resources, so a completed task is returned. + /// + /// 取消令牌 / Cancellation token + /// 已完成的任务 / Completed task + public Task DeactivateAsync(CancellationToken cancellationToken) + { + return Task.CompletedTask; + } + + /// + /// 基于注册阶段构造的排行榜服务登记排行榜查询管理动作。 + /// + /// + /// Registers the leaderboard query admin actions backed by the leaderboard service built during registration. + /// + /// 管理动作注册表 / Admin action registry + public void RegisterAdminActions(AdminActionRegistry registry) + { + OnlineAdminLeaderboardHandlers.RegisterLeaderboardQuery(registry, _leaderboards); + } +} diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardCreateRequest.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardCreateRequest.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardCreateRequest.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardCreateRequest.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEntry.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEntry.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEntry.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEntry.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEntryView.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEntryView.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEntryView.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEntryView.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEvents.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEvents.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardEvents.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardEvents.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardOptions.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardOptions.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardOptions.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardOptions.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardOrdering.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardOrdering.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardOrdering.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardOrdering.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardPage.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardPage.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardPage.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardPage.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionFailure.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionFailure.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionFailure.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionFailure.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionOptions.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionOptions.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionOptions.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionOptions.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionOutcome.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionOutcome.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionOutcome.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionOutcome.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionRetryStatus.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionRetryStatus.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardProjectionRetryStatus.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardProjectionRetryStatus.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardRateLimiter.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardRateLimiter.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardRateLimiter.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardRateLimiter.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardResultProjector.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardResultProjector.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardResultProjector.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardResultProjector.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreSource.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreSource.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreSource.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreSource.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreSubmission.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreSubmission.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreSubmission.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreSubmission.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreUpdatePolicy.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreUpdatePolicy.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardScoreUpdatePolicy.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardScoreUpdatePolicy.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardService.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardService.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardService.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardService.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardSortOrder.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardSortOrder.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardSortOrder.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardSortOrder.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardTopQuery.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardTopQuery.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardTopQuery.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardTopQuery.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardWriteOutcome.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardWriteOutcome.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineLeaderboardWriteOutcome.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineLeaderboardWriteOutcome.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineMatchSettledLeaderboardProjector.cs b/Capability/GameFrameX.Capability.Online.Leaderboard/OnlineMatchSettledLeaderboardProjector.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/Leaderboard/OnlineMatchSettledLeaderboardProjector.cs rename to Capability/GameFrameX.Capability.Online.Leaderboard/OnlineMatchSettledLeaderboardProjector.cs diff --git a/Capability/GameFrameX.Capability.Online.Match/GameFrameX.Capability.Online.Match.csproj b/Capability/GameFrameX.Capability.Online.Match/GameFrameX.Capability.Online.Match.csproj index 0b1b72c3e..f48d1bf1b 100644 --- a/Capability/GameFrameX.Capability.Online.Match/GameFrameX.Capability.Online.Match.csproj +++ b/Capability/GameFrameX.Capability.Online.Match/GameFrameX.Capability.Online.Match.csproj @@ -2,18 +2,15 @@ - GameFrameX.Capability.Online.Match,GFX Online 对局能力包:权威对局 Actor/同步协议/重连/幂等结算/样例玩法与撮合成功通知推送(InMemory 默认存储,描述符服务面 Override 替换)+ admin handlers(end_abnormal_match). Match capability package for the GFX Online family: authoritative match actor, sync protocol, reconnect, idempotent settlement, the sample game and the match-made notification push with in-memory default stores and admin handlers. Documentation: https://gameframex.doc.alianblank.com + GameFrameX.Capability.Online.Match,GFX Online 对局能力包:权威对局 Actor/同步协议/重连/幂等结算/样例玩法与撮合成立通知出站端口(InMemory 默认存储,描述符服务面 Override 替换)+ admin handlers(end_abnormal_match). Match capability package for the GFX Online family: authoritative match actor, sync protocol, reconnect, idempotent settlement, the sample game and the match-made notification outbound port with in-memory default stores and admin handlers. Documentation: https://gameframex.doc.alianblank.com GameFrameX,Capability,Online,Match,Authoritative,Settlement,Reconnect,GameServer - + - - diff --git a/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchAssignmentNotifier.cs b/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchAssignmentNotifier.cs new file mode 100644 index 000000000..9c1c72f12 --- /dev/null +++ b/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchAssignmentNotifier.cs @@ -0,0 +1,54 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Threading; +using System.Threading.Tasks; + +namespace GameFrameX.Capability.Online.Match; + +/// +/// 撮合成立通知的出站端口:把「撮合已成立、对局已就位」的事实交给宿主侧投递实现 +/// (会话通道与协议消息形态由宿主决定),能力包自身不依赖任何旧链会话设施与协议产物。 +/// +/// 维护约束:包内缺省为 (静默丢弃), +/// 宿主经运行时装配覆盖注入真实投递,覆盖恒胜出缺省;实现方对离线 / 无通道成员静默跳过 +/// (best-effort,等待方经状态轮询兜底),投递异常按调用方既有批次隔离路径外抛。 +/// +/// +public interface IOnlineMatchAssignmentNotifier +{ + /// + /// 向通知载荷内的全部成员投递撮合成立通知(best-effort;离线成员静默跳过)。 + /// + /// 撮合成立通知载荷(协议无关)。 + /// 停止取消令牌。 + /// 投递任务。 + Task NotifyAssignmentCreatedAsync(OnlineMatchAssignmentNotification notification, CancellationToken cancellationToken); +} diff --git a/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchGame.cs b/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchGame.cs index c2a7ad8ff..592839d93 100644 --- a/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchGame.cs +++ b/Capability/GameFrameX.Capability.Online.Match/IOnlineMatchGame.cs @@ -27,6 +27,8 @@ // Official documentation: https://gameframex.doc.alianblank.com/ // ========================================================================================== +using GameFrameX.Capability.Online.Abstractions.Contracts; + namespace GameFrameX.Capability.Online.Match; /// @@ -95,6 +97,16 @@ public interface IOnlineMatchGame /// 已分出结果返回 true。 bool IsCompleted(OnlineMatch match); + /// + /// 产出对局桥视图(保密投影:玩法私有字段由玩法自行裁剪,桥服务不拼装玩法字段; + /// 样例桥 IOnlineMatchGameBridge 的查询 / 提交 / 开局回执一律经本投影产出)。 + /// + /// 房间标识(对局标识派生源之一)。 + /// 对局快照。 + /// 增量事件(重连补发面)。 + /// 保密投影后的对局桥视图。 + OnlineMatchBridgeGameView BuildBridgeView(long roomId, OnlineMatchSnapshot snapshot, IReadOnlyList events); + /// /// 产出权威结算结果(仅在 为 true 时调用)。 /// diff --git a/Capability/GameFrameX.Capability.Online.Match/NullOnlineMatchAssignmentNotifier.cs b/Capability/GameFrameX.Capability.Online.Match/NullOnlineMatchAssignmentNotifier.cs new file mode 100644 index 000000000..230fad986 --- /dev/null +++ b/Capability/GameFrameX.Capability.Online.Match/NullOnlineMatchAssignmentNotifier.cs @@ -0,0 +1,64 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Threading; +using System.Threading.Tasks; + +namespace GameFrameX.Capability.Online.Match; + +/// +/// 撮合成立通知的空实现(包内缺省:不投递任何消息——等待方经状态轮询兜底; +/// 宿主经运行时装配覆盖注入真实投递实现,覆盖恒胜出本缺省)。 +/// +public sealed class NullOnlineMatchAssignmentNotifier : IOnlineMatchAssignmentNotifier +{ + /// + /// 静态缺省实例(无状态)。 + /// + public static readonly NullOnlineMatchAssignmentNotifier Instance = new NullOnlineMatchAssignmentNotifier(); + + /// + /// 私有构造(单例)。 + /// + private NullOnlineMatchAssignmentNotifier() + { + } + + /// + /// 静默丢弃撮合成立通知(不投递)。 + /// + /// 通知载荷(忽略)。 + /// 取消令牌(忽略)。 + /// 已完成的任务。 + public Task NotifyAssignmentCreatedAsync(OnlineMatchAssignmentNotification notification, CancellationToken cancellationToken) + { + return Task.CompletedTask; + } +} diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchAssignmentNotification.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchAssignmentNotification.cs new file mode 100644 index 000000000..a6b1daeb6 --- /dev/null +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchAssignmentNotification.cs @@ -0,0 +1,76 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + +using System; +using System.Collections.Generic; + +namespace GameFrameX.Capability.Online.Match; + +/// +/// 撮合成立通知的出站契约载荷(协议无关 DTO):对局数值标识、玩法模式与成员表。 +/// +/// 维护约束:本类型只承载能力包已裁决的事实(解析成功的撮合结果),不携带任何具体协议形态—— +/// 协议消息(如 NotifyMatchMade)由宿主实现方按自身协议产物组装,能力包不依赖协议工程。 +/// +/// +public sealed class OnlineMatchAssignmentNotification +{ + /// + /// 初始化撮合成立通知载荷。 + /// + /// 对局数值标识(域服务解析所得)。 + /// 玩法模式标识。 + /// 本局成员表(至少一人)。 + public OnlineMatchAssignmentNotification(long matchId, int mode, IReadOnlyList playerIds) + { + if (playerIds == null || playerIds.Count == 0) + { + throw new ArgumentException("撮合成立通知必须携带至少一名成员。", nameof(playerIds)); + } + + MatchId = matchId; + Mode = mode; + PlayerIds = playerIds; + } + + /// + /// 获取对局数值标识。 + /// + public long MatchId { get; } + + /// + /// 获取玩法模式标识。 + /// + public int Mode { get; } + + /// + /// 获取本局成员表。 + /// + public IReadOnlyList PlayerIds { get; } +} diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchCapabilityModule.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchCapabilityModule.cs index 103fe76af..87b97b56e 100644 --- a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchCapabilityModule.cs +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchCapabilityModule.cs @@ -34,14 +34,12 @@ using GameFrameX.Capability.Online.Abstractions.Events; using GameFrameX.Capability.Online.Assets; using GameFrameX.Capability.Online.Match.AdminApi; -using GameFrameX.Core.Session; using GameFrameX.Localization; -using GameFrameX.Proto.Proto; namespace GameFrameX.Capability.Online.Match; /// -/// 对局能力(权威对局 Actor / 重连 / 幂等结算 / 样例玩法)的自装配模块(C232 P4 迁入,C294 改写三段生命周期)。 +/// 对局能力(权威对局 Actor / 重连 / 幂等结算 / 玩法注册面)的自装配模块(C232 P4 迁入,C294 改写三段生命周期)。 /// /// 维护约束(服务共享协议):模块无参构造(扫描可发现);Register 自装配本域——对局 Actor / 结果 /// 两个 store 走「懒默认注册 + 解析」替换缝(族 / 宿主 Override 恒胜出);Options 经 @@ -51,6 +49,8 @@ namespace GameFrameX.Capability.Online.Match; /// 撮合成功通知订阅迁 Register 期机制事件总线(域服务在场才订阅并持有退订句柄): /// 订阅体只入队不做异步 I/O,通知由 match-assignment-notification-tick 任务异步推送(C407); /// 停用收口 = 关闭入队 + 退订 + 清空待处理 + 等待在途,返回后旧模块零通知。 +/// 玩法经 由宿主 Configure 回调注入(能力包零具体玩法; +/// 零玩法形态 = 运行时与结算管线照常、桥与域服务不装配——最小宿主语义)。 /// /// /// @@ -86,7 +86,7 @@ public sealed class OnlineMatchCapabilityModule : ICapabilityModule, IAdminActio typeof(OnlineMatchOptions)); /// - /// 对局运行时(Register 期构造;样例玩法随迁移注册,与壳时代装配语句逐语句等价)。 + /// 对局运行时(Register 期构造;Options 注册的玩法逐个注册进运行时玩法表)。 /// private OnlineMatchRuntime _matchRuntime; @@ -106,6 +106,11 @@ public sealed class OnlineMatchCapabilityModule : ICapabilityModule, IAdminActio /// private IOnlineMatchDomain _matchDomain; + /// + /// 撮合成立通知出站端口(Register 期解析;包内缺省空实现,宿主 Override 注入真实投递恒胜出)。 + /// + private IOnlineMatchAssignmentNotifier _assignmentNotifier; + /// /// 撮合通知收口闸(保护 / / )。 /// @@ -174,30 +179,46 @@ public void Register(CapabilityRegistrationContext context) context.AddService(_ => settlementStoreInstance); var matchSettlementStore = context.GetService(); - var rpsGame = new OnlineRockPaperScissorsGame(); + // 玩法来自宿主 Configure 回调(能力包零具体玩法;样例游戏在验收夹具层): + // 逐个注册进运行时;首个注册游戏承载样例桥 / 匹配域入场(单玩法样例期口径, + // 泛化随匹配域收敛另行裁决);零玩法 = 运行时与结算管线照常装配、桥与域服务不装配。 + IOnlineMatchGame primaryGame = null; _matchRuntime = new OnlineMatchRuntime(matchActorStore, eventPublisher, options.Runtime); - _matchRuntime.RegisterGame(rpsGame); + foreach (var game in options.GetGames()) + { + _matchRuntime.RegisterGame(game); + primaryGame ??= game; + } + context.AddService(_matchRuntime); context.AddTickJob("match-tick", ct => _matchRuntime.TickAllAsync(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), ct)); - // 结算编排:settlement + 可空 dispatcher(assets 缺席仅结算、不建待发奖记录)+ outbox tick 投递;桥服务注册回共享面。 + // 结算编排:settlement + 可空 dispatcher(assets 缺席仅结算、不建待发奖记录)+ outbox tick 投递。 var grantService = context.GetOptionalService(); var settlementService = new OnlineMatchSettlementService(_matchRuntime, matchSettlementStore, eventPublisher, grantService != null); var dispatcher = grantService == null ? null : new OnlineMatchResultDispatcher(grantService); _settlementPipeline = new OnlineMatchSettlementPipeline(_matchRuntime, settlementService, matchSettlementStore, dispatcher, options.Settlement); context.AddTickJob("match-settlement-tick", ct => _settlementPipeline.TickAsync(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), ct)); - _bridgeService = new OnlineMatchGameBridgeService(_matchRuntime, rpsGame); - context.AddService(_bridgeService); + if (primaryGame != null) + { + _bridgeService = new OnlineMatchGameBridgeService(_matchRuntime, primaryGame); + context.AddService(_bridgeService); + } + + // 撮合成立通知出站端口:懒默认空实现(宿主 Override 恒胜出)——能力包不依赖旧链会话 / 协议产物。 + // 与玩法 / 撮合装配解耦注册:通知链只在匹配域装配后消费本端口,注册恒置不引入条件分叉。 + context.AddService(static _ => NullOnlineMatchAssignmentNotifier.Instance); + _assignmentNotifier = context.GetService(); // 匹配域桥接票据入队 / 取消 / 状态与对局入场;撮合由匹配能力的定时任务统一驱动。 // 票据服务与票据存储按可选依赖语义解析(manifest 已声明 online-matchmaking 可选); // 在场才装配域服务并订阅撮合分配通知;缺席 = 不装配不报错——420 协议面经桥得显式失败。 var domainTickets = context.GetOptionalService(); var domainTicketStore = context.GetOptionalService(); - if (domainTickets != null && domainTicketStore != null) + if (domainTickets != null && domainTicketStore != null && primaryGame != null) { - _matchDomain = new OnlineMatchDomainService(domainTicketStore, domainTickets, _matchRuntime, rpsGame, options.Registry); + _matchDomain = new OnlineMatchDomainService(domainTicketStore, domainTickets, _matchRuntime, primaryGame, options.Registry); context.AddService(_matchDomain); _assignmentSubscription = context.Subscribe(OnlineMatchEvents.AssignmentCreated, OnAssignmentCreated); context.AddTickJob("match-assignment-notification-tick", cancellationToken => ProcessAssignmentNotificationsAsync(cancellationToken)); @@ -205,18 +226,24 @@ public void Register(CapabilityRegistrationContext context) } /// - /// 激活对局能力:始终发布对局桥;仅当匹配域服务已在注册期装配时才发布匹配域桥。 + /// 激活对局能力:玩法在场时发布对局桥(零玩法形态不发布,缺席态由桥显式失败承载); + /// 仅当匹配域服务已在注册期装配时才发布匹配域桥。 /// /// - /// Always publishes the match game bridge; publishes the match domain bridge only when the domain service was assembled during registration. + /// Publishes the match game bridge when a game is registered (the zero-game shape publishes nothing and the + /// bridge face fails explicitly); publishes the match domain bridge only when the domain service was assembled. /// /// 能力激活上下文 / Capability activation context /// 取消令牌 / Cancellation token /// 已完成的任务,激活过程为同步操作 / A completed task, as activation is synchronous public Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) { - // 桥发布迁 Activate 期(C294):对局桥恒发布;匹配域桥仅在场发布(缺席态由桥显式失败承载)。 - context.Bridges.Publish(_bridgeService); + // 桥发布迁 Activate 期(C294):对局桥仅玩法在场发布(零玩法最小宿主语义);匹配域桥仅在场发布。 + if (_bridgeService != null) + { + context.Bridges.Publish(_bridgeService); + } + if (_matchDomain != null) { context.Bridges.Publish(_matchDomain); @@ -314,7 +341,7 @@ private void OnAssignmentCreated(OnlineEvent onlineEvent) /// /// 撮合通知处理 tick 任务(C407):单轮最多取 条待处理事件, - /// 逐条经域服务解析数值对局标识并向双方在线会话 best-effort 推送 ; + /// 逐条经域服务解析数值对局标识并经出站端口交付宿主投递实现(best-effort,等待方经状态轮询兜底); /// 停用后队列已清空且入队已关闭,本轮直接返回。 /// /// 维护约束:本方法在调度器 tick 上下文执行——条目级异常记录后继续当轮剩余条目, @@ -394,8 +421,9 @@ private async Task ProcessNotificationBatchAsync(List batch, Cancel /// /// 单条撮合通知的分发(原 HandleMatchAssignmentEvent 主体,C294 迁入;C407 移除同步阻塞): - /// 域服务解析数值对局标识 → 向双方在线会话 best-effort 推送 ; - /// 过滤 / 校验失败即静默返回;离线方无会话跳过(等待方经状态轮询兜底)。 + /// 域服务解析数值对局标识 → 经出站端口 交付宿主投递实现 + /// (协议消息与会话通道由宿主决定,能力包不依赖旧链会话 / 协议产物); + /// 过滤 / 校验失败即静默返回;离线方由宿主实现 best-effort 跳过(等待方经状态轮询兜底)。 /// /// 机制事件载荷。 /// 停止取消令牌。 @@ -413,22 +441,12 @@ private async Task DispatchAssignmentNotificationAsync(OnlineEvent onlineEvent, return; } - if (resolved.Data.PlayerIds == null) + if (resolved.Data.PlayerIds == null || resolved.Data.PlayerIds.Count == 0) { return; } - var notify = new NotifyMatchMade { MatchId = resolved.Data.MatchId, Mode = resolved.Data.Mode }; - foreach (var playerId in resolved.Data.PlayerIds) - { - var session = PlayerSessionManager.Instance.GetByPlayerId(playerId); - if (session == null) - { - // 离线方静默跳过:best-effort 推送,等待方经状态轮询兜底。 - continue; - } - - await session.WriteAsync(notify).ConfigureAwait(false); - } + var notification = new OnlineMatchAssignmentNotification(resolved.Data.MatchId, resolved.Data.Mode, resolved.Data.PlayerIds); + await _assignmentNotifier.NotifyAssignmentCreatedAsync(notification, cancellationToken).ConfigureAwait(false); } } diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchDomainService.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchDomainService.cs index c4d93d462..c859c8df8 100644 --- a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchDomainService.cs +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchDomainService.cs @@ -568,12 +568,20 @@ private async Task> ResolveOrCreateActorAsync(Onl var actor = await _runtime.ResolveActorAsync(runtimeMatchId, cancellationToken).ConfigureAwait(false); if (actor == null) { + // 票据模式 → 承载玩法解析(精确命中优先;单玩法形态回落承载全部票据模式), + // 对局 Mode 取解析出玩法的注册键(与运行时玩法查表一致,多玩法下不再串写首个玩法的模式)。 + var game = _runtime.ResolveGameForTicketMode(registration.Mode); + if (game == null) + { + return OnlineResult.Fail(OnlineErrorCode.ParameterInvalid, "未注册该模式的玩法实现"); + } + var assignment = new OnlineMatchAssignment { ServerId = scope.ServerId, MatchId = runtimeMatchId, AssignmentId = registration.AssignmentId, - Mode = _game.Mode, + Mode = game.Mode, Region = registration.Region, CreatedAtTime = registration.CreatedAtTime, TicketIds = new List(registration.TicketIds), diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchGameBridgeService.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchGameBridgeService.cs index 79441b393..6c7c1dffd 100644 --- a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchGameBridgeService.cs +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchGameBridgeService.cs @@ -37,7 +37,7 @@ namespace GameFrameX.Capability.Online.Match; /// 维护约束(红线):① 对局标识确定性派生(rps-s{serverId}-r{roomId}-g{round})——同房间同局号 /// 重复开局幂等复用既有对局,重启 / 重开 = 新局号新对局,旧局终态不复活;② 请求者身份一律取 /// 作用域玩家位(会话主体),请求体字段不可影响;③ 出拳保密——视图只经 -/// 保密投影产出,本服务不拼装玩法字段; +/// 玩法 保密投影产出,本服务不拼装玩法字段; /// ④ Ack 拒绝一律映射为段化错误码返回,不抛未分类异常。 /// /// @@ -60,14 +60,14 @@ public sealed class OnlineMatchGameBridgeService : IOnlineMatchGameBridge private readonly OnlineMatchRuntime _runtime; /// 样例玩法(视图保密投影属主)。 - private readonly OnlineRockPaperScissorsGame _game; + private readonly IOnlineMatchGame _game; /// /// 初始化对局桥服务。 /// /// 对局运行时。 /// 样例玩法。 - public OnlineMatchGameBridgeService(OnlineMatchRuntime runtime, OnlineRockPaperScissorsGame game) + public OnlineMatchGameBridgeService(OnlineMatchRuntime runtime, IOnlineMatchGame game) { _runtime = runtime ?? throw new ArgumentNullException(nameof(runtime)); _game = game ?? throw new ArgumentNullException(nameof(game)); @@ -129,7 +129,7 @@ public async Task> StartRoomGameAsync(On } /// - /// 提交石头剪刀布出拳:作用域缺失或无玩家标识返回 ScopeMissing,出拳越界返回 ParameterInvalid,对局不存在返回 ResourceNotFound; + /// 提交出拳意图:作用域缺失或无玩家标识返回 ScopeMissing,非法出拳由玩法裁决拒绝(越界值经 ApplyInput 映射为段化拒绝码),对局不存在返回 ResourceNotFound; /// 客户端序号由服务端按快照中该成员的最后序号加一派生;提交失败透传失败码,未返回确认返回 InternalError,被拒绝时映射拒绝原因,成功返回对局视图。 /// /// @@ -149,11 +149,6 @@ public async Task> SubmitGestureAsync(On return Fail(OnlineErrorCode.ScopeMissing, "作用域缺失或缺少玩家标识"); } - if (gesture < (int)OnlineRockPaperScissorsMove.Rock || gesture > (int)OnlineRockPaperScissorsMove.Paper) - { - return Fail(OnlineErrorCode.ParameterInvalid, "非法出拳"); - } - var matchId = DeriveMatchId(scope.ServerId, roomId, round); var actor = await _runtime.ResolveActorAsync(matchId, cancellationToken).ConfigureAwait(false); if (actor == null) @@ -295,7 +290,7 @@ private async Task> ResolveOrCreateActorAsync(Onl ServerId = scope.ServerId, MatchId = matchId, AssignmentId = BuildAssignmentId(scope.ServerId, roomId), - Mode = OnlineRockPaperScissorsGame.MatchMode, + Mode = _game.Mode, Region = 1, CreatedAtTime = now, TicketIds = new List(), diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchOptions.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchOptions.cs index 793b4c9fe..fe41c860d 100644 --- a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchOptions.cs +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchOptions.cs @@ -28,6 +28,7 @@ // ========================================================================================== using GameFrameX.Capability.Hosting.Abstractions; +using System.Collections.Generic; namespace GameFrameX.Capability.Online.Match; @@ -63,6 +64,43 @@ public sealed class OnlineMatchOptions : ICapabilityOptions /// public OnlineMatchRegistryOptions Registry { get; set; } = new OnlineMatchRegistryOptions(); + /// + /// 已注册玩法表(宿主经 在 Configure 回调注入——能力包自身不携带任何具体玩法, + /// 样例游戏在验收夹具层)。私有字段 + 方法面暴露:玩法实例不参与配置合并,也不进入 + /// list_capability_settings 观测面(玩法不是可配置参数)。 + /// + private readonly List _games = new List(); + + /// + /// 注册一个玩法(Configure 回调入口)。每个 至多一个实现—— + /// 重复模式在注册期 fail-fast(装配期暴露配置错误,不留静默覆盖窗口); + /// 零注册 = 对局能力以零玩法形态装配(运行时与结算管线在场,但无对局可开——最小宿主语义)。 + /// + /// 玩法实现。 + public void AddGame(IOnlineMatchGame game) + { + if (game == null) + { + throw new System.ArgumentNullException(nameof(game)); + } + + if (_games.Exists(registered => registered.Mode == game.Mode)) + { + throw new System.ArgumentException("同一玩法模式已注册(Mode=" + game.Mode + "):每个模式至多一个实现。", nameof(game)); + } + + _games.Add(game); + } + + /// + /// 获取已注册玩法的只读快照(模块 Register 期取用)。 + /// + /// 玩法只读列表。 + public System.Collections.Generic.IReadOnlyList GetGames() + { + return _games; + } + /// /// 校验合并后的运行时与结算阈值与登记表清扫参数:等待超时、进行中超时、重连窗口、结束留存时长、单局服务端事件上限、 /// 发奖投递尝试上限、分配登记生命周期与清扫节流间隔均须为正数。 diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchRuntime.cs b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchRuntime.cs index 498248523..c3ada5dc1 100644 --- a/Capability/GameFrameX.Capability.Online.Match/OnlineMatchRuntime.cs +++ b/Capability/GameFrameX.Capability.Online.Match/OnlineMatchRuntime.cs @@ -148,6 +148,40 @@ public void RegisterGame(IOnlineMatchGame game) } } + /// + /// 按票据模式解析承载玩法:精确命中注册玩法时返回该玩法;未命中且全局仅注册单一玩法时回落该玩法 + /// (单玩法形态承载全部票据模式——票据模式为客户端撮合语义(如 1v1 / 2v2),与玩法注册键属两套取值空间); + /// 多玩法注册且未命中时返回 null(由调用方按未注册该模式处理)。 + /// + /// 票据匹配模式(客户端撮合语义)。 + /// 承载玩法;无法唯一定位时为 null。 + public IOnlineMatchGame ResolveGameForTicketMode(int ticketMode) + { + lock (_syncRoot) + { + if (_games.TryGetValue(ticketMode, out var game)) + { + return game; + } + + return _games.Count == 1 ? FirstRegisteredGame() : null; + } + } + + /// + /// 取唯一注册玩法(仅在 恰有一项时于锁内调用)。 + /// + /// 唯一注册玩法。 + private IOnlineMatchGame FirstRegisteredGame() + { + foreach (var game in _games.Values) + { + return game; + } + + return null; + } + /// /// 由匹配分配创建对局(上游匹配域的 assignment)。 /// 成员表按 assignment 的玩家集合预置(分配即成员已定),对局进入等待阶段。 diff --git a/Capability/GameFrameX.Capability.Online.Operations/GameFrameX.Capability.Online.Operations.csproj b/Capability/GameFrameX.Capability.Online.Operations/GameFrameX.Capability.Online.Operations.csproj index 574f4c246..c86409842 100644 --- a/Capability/GameFrameX.Capability.Online.Operations/GameFrameX.Capability.Online.Operations.csproj +++ b/Capability/GameFrameX.Capability.Online.Operations/GameFrameX.Capability.Online.Operations.csproj @@ -2,7 +2,7 @@ - GameFrameX.Capability.Online.Operations,GFX Online 运营聚合能力包:统一审计/游戏事件/Hotfix 回滚/在线总览/玩家时间线 + 事件桥与审计桥装配(机制事件总线逐主题订阅)+ 自装配模块(OnlineOperationsCapabilityModule,Options=OnlineOperationsOptions)+ admin handlers(Console 三 action). Operations aggregate capability package for the GFX Online family: unified audit, game events, hotfix rollback, overview and player timeline plus the event/audit bridge wiring over the mechanism event bus, the self-assembling capability module and admin handlers. Documentation: https://gameframex.doc.alianblank.com + GameFrameX.Capability.Online.Operations,GFX Online 运营聚合能力包(分析面冻结:游戏事件/总览/时间线不删除、不演进,数据面契约留服务端,查询 UI 归运营台;Hotfix 回滚为遗留活面):统一审计/Hotfix 回滚 + 事件桥与审计桥装配(机制事件总线逐主题订阅)+ 自装配模块(OnlineOperationsCapabilityModule,Options=OnlineOperationsOptions)+ admin handlers(Console 三 action). Operations aggregate capability package for the GFX Online family (frozen analysis face: game events, overview and timeline are neither removed nor evolved; hotfix rollback remains the active surface): unified audit, hotfix rollback and the event/audit bridge wiring over the mechanism event bus, the self-assembling capability module and admin handlers. Documentation: https://gameframex.doc.alianblank.com GameFrameX,Capability,Online,Operations,Audit,Timeline,Overview,HotfixRollback,GameEvents,GameServer + + + + + + - - diff --git a/Capability/GameFrameX.Capability.Online.Social/OnlineFriendOptions.cs b/Capability/GameFrameX.Capability.Online.Social/OnlineFriendOptions.cs index 207b542a7..82e38fd35 100644 --- a/Capability/GameFrameX.Capability.Online.Social/OnlineFriendOptions.cs +++ b/Capability/GameFrameX.Capability.Online.Social/OnlineFriendOptions.cs @@ -52,14 +52,4 @@ public sealed class OnlineFriendOptions /// 获取或设置好友列表返回条数上限(默认 200;同时也是好友上限裁决依据)。 /// public int FriendLimit { get; set; } = 200; - - /// - /// 获取或设置是否在模块激活期执行旧好友数据一次性迁移(默认 false;C294 收编原族级 - /// Online.MigrateLegacyFriendData 开关,配置路径 Online.Settings.online-social.Friend.MigrateLegacyFriendData)。 - /// - /// 维护约束:迁移只读单向复制旧表(域 120 FriendRelationState / 域 660 FriendState),旧数据零改动; - /// 幂等可重复执行;详见 。 - /// - /// - public bool MigrateLegacyFriendData { get; set; } } diff --git a/Capability/GameFrameX.Capability.Online.Social/OnlineSocialCapabilityModule.cs b/Capability/GameFrameX.Capability.Online.Social/OnlineSocialCapabilityModule.cs index c0783d35c..ad36e325d 100644 --- a/Capability/GameFrameX.Capability.Online.Social/OnlineSocialCapabilityModule.cs +++ b/Capability/GameFrameX.Capability.Online.Social/OnlineSocialCapabilityModule.cs @@ -55,8 +55,7 @@ namespace GameFrameX.Capability.Online.Social; /// /// ActivateAsync:发布 好友域桥契约面( /// 薄编排实现);枚举 扩展点注入聊天服务(群组探针以 "group" -/// 命名注册,兄弟域如 matchmaking 的 "party" 探针同面注入);按 -/// 触发旧好友数据一次性迁移()。 +/// 命名注册,兄弟域如 matchmaking 的 "party" 探针同面注入)。 /// /// /// 钩子声明: 聊天内容审核扩展点以默认放行策略声明 @@ -71,8 +70,8 @@ namespace GameFrameX.Capability.Online.Social; /// extension point via RequireHostService; the presence probe resolves through the required online-foundation /// dependency; outward products are registered back into the shared face; two expiry-sweep tick jobs anchor their /// tenant / app on the family infrastructure. ActivateAsync publishes the -/// bridge face, injects channel-membership probes into the chat service by -/// enumerating the extension point, and triggers the one-shot legacy friend-data migration when the option is on. +/// bridge face and injects channel-membership probes into the chat service by +/// enumerating the extension point. /// The chat moderation extension point is declared with the default allow-all strategy, replaced atomically by the /// hot-update side through CapabilityHook<T>.Attach. /// @@ -116,7 +115,7 @@ public sealed class OnlineSocialCapabilityModule : ICapabilityModule, IAdminActi private OnlineChatAuditProjection _chatAudit; /// - /// 好友服务(好友关系生命周期的唯一写者;激活期执行旧数据迁移的真实写路径)。 + /// 好友服务(好友关系生命周期的唯一写者)。 /// private OnlineFriendService _friends; @@ -136,12 +135,12 @@ public sealed class OnlineSocialCapabilityModule : ICapabilityModule, IAdminActi private OnlineSessionTokenService _tokens; /// - /// 合并校验后的社交 Options(Register 期取用;激活期迁移开关读取面)。 + /// 合并校验后的社交 Options(Register 期取用)。 /// private OnlineSocialOptions _options; /// - /// 族基建作用域(Register 期解析;迁移玩家作用域区服键来源)。 + /// 族基建作用域(Register 期解析)。 /// private OnlineScope _scope; @@ -222,7 +221,6 @@ public void Register(CapabilityRegistrationContext context) context.AddService(_chat); context.AddService(_socialDecisions); - var scope = _scope; context.AddTickJob("notification-expiry-sweep", async ct => { await _notifications.SweepExpiredAsync(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), ct).ConfigureAwait(false); @@ -234,17 +232,15 @@ public void Register(CapabilityRegistrationContext context) } /// - /// 激活社交能力:发布好友域桥,向聊天服务注入全部已注册的频道成员资格探针; - /// 仅当好友选项开启旧数据迁移时,执行一次旧好友数据迁移。 + /// 激活社交能力:发布好友域桥,向聊天服务注入全部已注册的频道成员资格探针。 /// /// - /// Publishes the friend domain bridge, attaches all registered channel membership probes to the chat service, - /// and runs the legacy friend data migration only when it is enabled in the friend options. + /// Publishes the friend domain bridge and attaches all registered channel membership probes to the chat service. /// /// 能力激活上下文 / Capability activation context /// 取消令牌 / Cancellation token /// 表示异步操作的任务 / A task representing the asynchronous operation - public async Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) + public Task ActivateAsync(CapabilityActivationContext context, CancellationToken cancellationToken) { // 好友域桥契约面发布(发布者身份 = 本能力;撤销由宿主停止期自动完成)。 context.Bridges.Publish(new OnlineFriendDomainFace(_friends)); @@ -252,11 +248,7 @@ public async Task ActivateAsync(CapabilityActivationContext context, Cancellatio // 频道成员资格探针注入(Activate 期才允许枚举扩展点;群组 "group" + 兄弟域 "party" 等一并注入)。 _chat.AttachChannelMembershipProbes(context.Services.GetServices()); - // 旧好友数据一次性迁移(显式开关,默认关闭;只读单向 + 幂等 + 逐条 containment + 汇总)。 - if (_options.Friend.MigrateLegacyFriendData) - { - await OnlineFriendLegacyMigration.MigrateAsync(_friends, _scope.ServerId, cancellationToken).ConfigureAwait(false); - } + return Task.CompletedTask; } /// diff --git a/Dockerfile b/Dockerfile index 05ca3bfcc..52da75095 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ COPY Capability/GameFrameX.Capability.Hosting.Core/GameFrameX.Capability.Hosting COPY Capability/GameFrameX.Capability.Online.Abstractions/GameFrameX.Capability.Online.Abstractions.csproj Capability/GameFrameX.Capability.Online.Abstractions/ COPY Capability/GameFrameX.Capability.Online.Assets/GameFrameX.Capability.Online.Assets.csproj Capability/GameFrameX.Capability.Online.Assets/ COPY Capability/GameFrameX.Capability.Online.Competition/GameFrameX.Capability.Online.Competition.csproj Capability/GameFrameX.Capability.Online.Competition/ +COPY Capability/GameFrameX.Capability.Online.Leaderboard/GameFrameX.Capability.Online.Leaderboard.csproj Capability/GameFrameX.Capability.Online.Leaderboard/ COPY Capability/GameFrameX.Capability.Online.Foundation/GameFrameX.Capability.Online.Foundation.csproj Capability/GameFrameX.Capability.Online.Foundation/ COPY Capability/GameFrameX.Capability.Online.Match/GameFrameX.Capability.Online.Match.csproj Capability/GameFrameX.Capability.Online.Match/ COPY Capability/GameFrameX.Capability.Online.Matchmaking/GameFrameX.Capability.Online.Matchmaking.csproj Capability/GameFrameX.Capability.Online.Matchmaking/ @@ -21,6 +22,7 @@ COPY Capability/GameFrameX.Capability.Online.Operations/GameFrameX.Capability.On COPY Capability/GameFrameX.Capability.Online.Persistence/GameFrameX.Capability.Online.Persistence.csproj Capability/GameFrameX.Capability.Online.Persistence/ COPY Capability/GameFrameX.Capability.Online.Social/GameFrameX.Capability.Online.Social.csproj Capability/GameFrameX.Capability.Online.Social/ COPY GameFrameX.Apps/GameFrameX.Apps.csproj GameFrameX.Apps/ +COPY GameFrameX.Apps.Sample/GameFrameX.Apps.Sample.csproj GameFrameX.Apps.Sample/ COPY GameFrameX.Architecture.Analyzers/GameFrameX.Architecture.Analyzers.csproj GameFrameX.Architecture.Analyzers/ COPY GameFrameX.Client/GameFrameX.Client.csproj GameFrameX.Client/ COPY GameFrameX.Config/GameFrameX.Config.csproj GameFrameX.Config/ diff --git a/GameFrameX.Apps.Sample/GameFrameX.Apps.Sample.csproj b/GameFrameX.Apps.Sample/GameFrameX.Apps.Sample.csproj new file mode 100644 index 000000000..747fdf17a --- /dev/null +++ b/GameFrameX.Apps.Sample/GameFrameX.Apps.Sample.csproj @@ -0,0 +1,15 @@ + + + + + false + GameFrameX.Apps.Sample,RPS(石头剪刀布)验收夹具玩法:对局能力的样例游戏实现(协议裁决/回合推进/保密投影),供宿主组合根与测试装配(test-fixture,非产品示例)。 The rock-paper-scissors acceptance-fixture game for the online match capability: server-side adjudication, round advancement and secrecy projection wired by host composition roots and tests. Documentation: https://gameframex.doc.alianblank.com + GameFrameX,Sample,Fixture,Match,Game,GameServer + + + + + + + diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsGame.cs b/GameFrameX.Apps.Sample/OnlineRockPaperScissorsGame.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsGame.cs rename to GameFrameX.Apps.Sample/OnlineRockPaperScissorsGame.cs diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsMove.cs b/GameFrameX.Apps.Sample/OnlineRockPaperScissorsMove.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsMove.cs rename to GameFrameX.Apps.Sample/OnlineRockPaperScissorsMove.cs diff --git a/Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsState.cs b/GameFrameX.Apps.Sample/OnlineRockPaperScissorsState.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Match/OnlineRockPaperScissorsState.cs rename to GameFrameX.Apps.Sample/OnlineRockPaperScissorsState.cs diff --git a/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityLayeringFacts.cs b/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityLayeringFacts.cs new file mode 100644 index 000000000..802ea00b9 --- /dev/null +++ b/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityLayeringFacts.cs @@ -0,0 +1,147 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Collections.Generic; + +namespace GameFrameX.Architecture.Analyzers; + +/// +/// 框架仓分层事实表(GFX0023/24/25 的单一事实源):程序集名 → 层级序(整数 = 主层 ×10 + 层内序)。 +/// +/// 层级语义:L0 原语 / L1 运行时基座 / L2 Hosting 机制 / L3 Online 能力族 / L4 玩法层(Apps 数据 → Hotfix 逻辑 → 夹具)/ +/// L5 组合根与工具。只准高层引低层(严格小于);层内序承载既有设计内的同层上下游(如 Hotfix→Apps、 +/// AdminApi→Hosting.Core、能力族内 Foundation→Abstractions),新增或调整包边界须同步本表。 +/// 测试程序集与模板打包工程不参与分层断言。 +/// +/// +internal static class CapabilityLayeringFacts +{ + /// L0 原语层(零框架语义,可独立发布)。 + internal const int Layer0 = 0; + + /// 能力契约包判定后缀。 + private const string ContractSuffix = ".Abstractions"; + + /// + /// 程序集名 → 层级序(严格递增才合法;未登记的程序集不参与分层断言)。 + /// + private static readonly Dictionary Ranks = new() + { + // L0 原语(层内:本地化键 → 数学/工具 → 网络契约) + ["GameFrameX.Localization"] = Layer0, + ["GameFrameX.ProtoBuf.Net"] = Layer0, + ["GameFrameX.Utility"] = 1, + ["GameFrameX.Network.Abstractions"] = 2, + // L1 运行时基座(层内:存储/网络抽象 → 各实现 → Core → 产物配置) + ["GameFrameX.DataBase"] = 10, + ["GameFrameX.Network"] = 10, + ["GameFrameX.Discovery"] = 10, + ["GameFrameX.DataBase.Mongo"] = 11, + ["GameFrameX.DataBase.PostgreSql"] = 11, + ["GameFrameX.DataBase.Sqlite"] = 11, + ["GameFrameX.Network.HTTP"] = 11, + ["GameFrameX.Core"] = 12, + ["GameFrameX.Network.RemoteMessaging"] = 12, + ["GameFrameX.StartUp"] = 13, + ["GameFrameX.Config"] = 13, + ["GameFrameX.Proto"] = 13, + // L2 Hosting 机制(契约 → 机制 → 管理运行面) + ["GameFrameX.Capability.Hosting.Abstractions"] = 20, + ["GameFrameX.Capability.Hosting.Core"] = 21, + ["GameFrameX.Capability.Hosting.AdminApi"] = 22, + // L3 Online 能力族(脊柱 → 基座域 → 玩法域 → 适配/冻结面) + ["GameFrameX.Capability.Online.Abstractions"] = 30, + ["GameFrameX.Capability.Online.Foundation"] = 31, + ["GameFrameX.Capability.Online.Assets"] = 32, + ["GameFrameX.Capability.Online.Matchmaking"] = 33, + ["GameFrameX.Capability.Online.Social"] = 33, + ["GameFrameX.Capability.Online.Match"] = 34, + ["GameFrameX.Capability.Online.Leaderboard"] = 35, + ["GameFrameX.Capability.Online.Persistence"] = 35, + ["GameFrameX.Capability.Online.Competition"] = 36, + ["GameFrameX.Capability.Online.Operations"] = 36, + // L4 玩法层(Apps 数据 → Hotfix 逻辑 / 验收夹具) + ["GameFrameX.Apps"] = 40, + ["GameFrameX.Hotfix"] = 41, + ["GameFrameX.Apps.Sample"] = 41, + // L5 组合根与工具 + ["GameFrameX.Launcher"] = 50, + ["GameFrameX.Client"] = 50, + }; + + /// 能力实现包禁引清单(GFX0025):玩法层两工程、协议产物与胖核心——会话经 Foundation.Session 契约、协议经契约 DTO、玩法经桥契约。 + private static readonly HashSet CapabilityBannedReferences = new() + { + "GameFrameX.Apps", + "GameFrameX.Hotfix", + "GameFrameX.Proto", + "GameFrameX.Core", + }; + + /// 契约包可引用的 L0 原语集合(GFX0024 白名单;外部 NuGet 与其他契约包另判)。 + private static readonly HashSet ContractPrimitiveWhitelist = new() + { + "GameFrameX.Utility", + "GameFrameX.ProtoBuf.Net", + "GameFrameX.Network.Abstractions", + "GameFrameX.Localization", + }; + + /// 尝试取程序集层级序;未登记返回 false(不参与断言)。 + internal static bool TryGetRank(string name, out int rank) + { + return Ranks.TryGetValue(name, out rank); + } + + /// 契约包判定:GameFrameX.Capability.* 命名空间的 *.Abstractions 工程。 + internal static bool IsContractPackage(string name) + { + return name.StartsWith("GameFrameX.Capability.", System.StringComparison.Ordinal) + && name.EndsWith(ContractSuffix, System.StringComparison.Ordinal); + } + + /// 契约包引用白名单判定:其他契约包或 L0 原语。 + internal static bool IsAllowedContractReference(string name) + { + return IsContractPackage(name) || ContractPrimitiveWhitelist.Contains(name); + } + + /// 能力实现包禁引判定(GFX0025)。 + internal static bool IsBannedCapabilityReference(string name) + { + return CapabilityBannedReferences.Contains(name); + } + + /// 层级序格式化为可读层级(如 34 → L3.4)。 + internal static string FormatRank(int rank) + { + return "L" + (rank / 10).ToString() + "." + (rank % 10).ToString(); + } +} diff --git a/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityPackageLayeringAnalyzer.cs b/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityPackageLayeringAnalyzer.cs new file mode 100644 index 000000000..f9f7d9de1 --- /dev/null +++ b/GameFrameX.Architecture.Analyzers/Analyzers/Architecture/CapabilityPackageLayeringAnalyzer.cs @@ -0,0 +1,159 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Collections.Generic; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +namespace GameFrameX.Architecture.Analyzers; + +/// +/// GFX0023/24/25:框架仓包分层规则(引用图断言,与 GFX0017/18 同族 compilation-end 检查)。 +/// +/// 三条规则:① 层级单调——只准高层引低层(严格小于),同层禁互引(GFX0023); +/// ② 契约包(*.Abstractions)零运行时引用——只准引用 L0 原语与其他契约包(GFX0024); +/// ③ 能力实现包四禁引——Apps / Hotfix / Proto / Core(GFX0025)。 +/// 数据来源为编译器引用图(含传递引用,无源码使用同样检查);未登记进 +/// 的程序集不参与断言。 +/// +/// +[DiagnosticAnalyzer(LanguageNames.CSharp)] +public sealed class CapabilityPackageLayeringAnalyzer : DiagnosticAnalyzer +{ + private static readonly DiagnosticDescriptor LayerMonotonicRule = new( + "GFX0023", + "包分层必须单调(同层禁互引)", + "程序集 '{0}'({1})引用了 '{2}'({3}):只准高层引低层(Ln→Lm, m SupportedDiagnostics + => ImmutableArray.Create(LayerMonotonicRule, ContractPurityRule, CapabilityBanRule); + + public override void Initialize(AnalysisContext context) + { + context.EnableConcurrentExecution(); + context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics); + context.RegisterCompilationAction(AnalyzeReferences); + } + + private static void AnalyzeReferences(CompilationAnalysisContext context) + { + var compilation = context.Compilation; + var tree = compilation.SyntaxTrees.FirstOrDefault(); + var location = tree == null ? Location.None : tree.GetRoot(context.CancellationToken).GetFirstToken().GetLocation(); + + // 引用闭包 BFS(与 GFX0017 同口径:含传递引用,不依赖源码使用); + // 编译自身为登记包时(分析器接线进业务工程的形态)其直接出边一并检查。 + var queue = new Queue(); + var visited = new HashSet(System.StringComparer.Ordinal); + var reported = new HashSet<(int Rule, string From, string To)>(); + var consumerName = compilation.AssemblyName; + var consumerRegistered = CapabilityLayeringFacts.TryGetRank(consumerName, out _); + foreach (var assembly in compilation.SourceModule.ReferencedAssemblySymbols) + { + queue.Enqueue(assembly); + if (consumerRegistered) + { + CheckEdge(context, location, reported, consumerName, assembly.Identity.Name); + } + } + + while (queue.Count > 0) + { + context.CancellationToken.ThrowIfCancellationRequested(); + var assembly = queue.Dequeue(); + if (!visited.Add(assembly.Identity.Name)) + { + continue; + } + + foreach (var dependency in assembly.Modules.SelectMany(module => module.ReferencedAssemblySymbols)) + { + queue.Enqueue(dependency); + CheckEdge(context, location, reported, assembly.Identity.Name, dependency.Identity.Name); + } + } + } + + /// 单边检查:两端均在分层事实表登记时逐条执行三条规则(同一边可同时命中多条,各自去重报出)。 + private static void CheckEdge(CompilationAnalysisContext context, Location location, HashSet<(int Rule, string From, string To)> reported, string fromName, string toName) + { + if (!CapabilityLayeringFacts.TryGetRank(fromName, out var fromRank) + || !CapabilityLayeringFacts.TryGetRank(toName, out var toRank)) + { + return; + } + + // ① 层级单调 + 同层禁互引(严格小于才合法)。 + if (toRank >= fromRank && reported.Add((1, fromName, toName))) + { + context.ReportDiagnostic(Diagnostic.Create(LayerMonotonicRule, location, fromName, + CapabilityLayeringFacts.FormatRank(fromRank), toName, CapabilityLayeringFacts.FormatRank(toRank))); + } + + // ② 契约包零运行时引用(L0 原语与其他契约包之外一律拒绝)。 + if (CapabilityLayeringFacts.IsContractPackage(fromName) + && !CapabilityLayeringFacts.IsAllowedContractReference(toName) + && reported.Add((2, fromName, toName))) + { + context.ReportDiagnostic(Diagnostic.Create(ContractPurityRule, location, fromName, toName)); + } + + // ③ 能力实现包四禁引(Apps / Hotfix / Proto / Core)。 + if (CapabilityBoundaryFacts.IsImplementation(fromName) + && CapabilityLayeringFacts.IsBannedCapabilityReference(toName) + && reported.Add((3, fromName, toName))) + { + context.ReportDiagnostic(Diagnostic.Create(CapabilityBanRule, location, fromName, toName)); + } + } +} diff --git a/GameFrameX.Launcher/Composition/RuntimeCompositionRoot.cs b/GameFrameX.Launcher/Composition/RuntimeCompositionRoot.cs index 4d1f62afa..0cc551c16 100644 --- a/GameFrameX.Launcher/Composition/RuntimeCompositionRoot.cs +++ b/GameFrameX.Launcher/Composition/RuntimeCompositionRoot.cs @@ -292,6 +292,10 @@ private static CapabilityCompositionOptions BuildFamilyCompositionOptions(AppSet options.Override(new HotfixManagerRollbackExecutor(setting)); options.Override(new HostPlayerDirectory()); options.Override(new LogHelperHotfixRollbackLog()); + options.Override(new OnlineMatchAssignmentSessionNotifier()); + + // 玩法注入:RPS 验收夹具游戏(对局能力零具体玩法;宿主组合根注入演示黄金路径用的样例玩法)。 + options.Configure(match => match.AddGame(new OnlineRockPaperScissorsGame())); // GameDb 一级 store 覆盖(Online.UseGameDbStores 三态):true 预置五个持久化适配器(业务库已就绪由宿主模块早段保证); // 未声明(null)= 无声降级防护位——启用族但未声明存储模式时告警(不 fail-fast,保护既有无键部署),随后保持 InMemory 默认。 diff --git a/GameFrameX.Launcher/GameFrameX.Launcher.csproj b/GameFrameX.Launcher/GameFrameX.Launcher.csproj index aad10e030..a2a8f914c 100644 --- a/GameFrameX.Launcher/GameFrameX.Launcher.csproj +++ b/GameFrameX.Launcher/GameFrameX.Launcher.csproj @@ -45,9 +45,11 @@ + + diff --git a/GameFrameX.Launcher/Online/OnlineMatchAssignmentSessionNotifier.cs b/GameFrameX.Launcher/Online/OnlineMatchAssignmentSessionNotifier.cs new file mode 100644 index 000000000..66749d320 --- /dev/null +++ b/GameFrameX.Launcher/Online/OnlineMatchAssignmentSessionNotifier.cs @@ -0,0 +1,70 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Threading; +using System.Threading.Tasks; +using GameFrameX.Capability.Online.Match; +using GameFrameX.Core.Session; +using GameFrameX.Proto.Proto; + +namespace GameFrameX.Launcher.Online; + +/// +/// 撮合成立通知的宿主投递实现(生产实现):按旧链会话簿记定位成员连接并 best-effort 写出 +/// 协议消息——会话通道与协议产物只存在于宿主侧,能力包经出站端口解耦。 +/// +/// 维护约束(红线):逐成员 best-effort——离线(无会话)成员静默跳过,等待方经状态轮询兜底; +/// 写出异常按调用方既有批次隔离路径外抛(单条失败不吞没,交调度器日志出口观测)。 +/// +/// +public sealed class OnlineMatchAssignmentSessionNotifier : IOnlineMatchAssignmentNotifier +{ + /// + /// 向通知载荷内的全部成员投递撮合成立通知:逐成员解析在线会话,离线跳过,在线写出协议消息。 + /// + /// 撮合成立通知载荷(协议无关)。 + /// 停止取消令牌。 + /// 投递任务。 + public async Task NotifyAssignmentCreatedAsync(OnlineMatchAssignmentNotification notification, CancellationToken cancellationToken) + { + var notify = new NotifyMatchMade { MatchId = notification.MatchId, Mode = notification.Mode }; + foreach (var playerId in notification.PlayerIds) + { + var session = PlayerSessionManager.Instance.GetByPlayerId(playerId); + if (session == null) + { + // 离线方静默跳过:best-effort 推送,等待方经状态轮询兜底。 + continue; + } + + await session.WriteAsync(notify).ConfigureAwait(false); + } + } +} diff --git a/GameFrameX.Localization/Keys.Capability.cs b/GameFrameX.Localization/Keys.Capability.cs index 64ae9950f..46805bc5b 100644 --- a/GameFrameX.Localization/Keys.Capability.cs +++ b/GameFrameX.Localization/Keys.Capability.cs @@ -713,7 +713,7 @@ public static class Match } /// - /// online-competition(竞赛)能力相关消息 + /// online-competition(竞赛,冻结面)能力相关消息 /// public static class Competition { @@ -725,15 +725,21 @@ public static class Competition /// 用途: online-competition 可选依赖 online-assets 未装配时披露的缺失功能名 /// public const string OptionalAssetsAbsent = "Capability.Online.Competition.OptionalAssetsAbsent"; + } + /// + /// online-leaderboard(排行榜)能力相关消息 + /// + public static class Leaderboard + { /// /// 对局结算写榜投影 /// /// - /// 键名: Capability.Online.Competition.OptionalMatchAbsent - /// 用途: online-competition 可选依赖 online-match 未装配时披露的缺失功能名 + /// 键名: Capability.Online.Leaderboard.OptionalMatchAbsent + /// 用途: online-leaderboard 可选依赖 online-match 未装配时披露的缺失功能名 /// - public const string OptionalMatchAbsent = "Capability.Online.Competition.OptionalMatchAbsent"; + public const string OptionalMatchAbsent = "Capability.Online.Leaderboard.OptionalMatchAbsent"; } /// diff --git a/GameFrameX.Localization/Localization/Messages/Resources.resx b/GameFrameX.Localization/Localization/Messages/Resources.resx index 92b225f3a..b438ae925 100644 --- a/GameFrameX.Localization/Localization/Messages/Resources.resx +++ b/GameFrameX.Localization/Localization/Messages/Resources.resx @@ -1173,7 +1173,7 @@ seasons and tournaments - + leaderboard projection from match settlement diff --git a/GameFrameX.Localization/Localization/Messages/Resources.zh-CN.resx b/GameFrameX.Localization/Localization/Messages/Resources.zh-CN.resx index 27b497832..a5d1e0333 100644 --- a/GameFrameX.Localization/Localization/Messages/Resources.zh-CN.resx +++ b/GameFrameX.Localization/Localization/Messages/Resources.zh-CN.resx @@ -1174,7 +1174,7 @@ 赛季、锦标赛 - + 对局结算写榜投影 diff --git a/GameFrameX.Templates/templates/gfx-online/.template.config/template.json b/GameFrameX.Templates/templates/gfx-online/.template.config/template.json index 9bccabfa6..36c3152eb 100644 --- a/GameFrameX.Templates/templates/gfx-online/.template.config/template.json +++ b/GameFrameX.Templates/templates/gfx-online/.template.config/template.json @@ -45,13 +45,19 @@ "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "引用并装配 online-match 能力包(闭包含 Foundation+Assets)" + "description": "引用并装配 online-match 能力包(对局运行时/结算;玩法由宿主注入,模板不含样例玩法,未注入玩法时对局能力零玩法装配)" + }, + "Leaderboard": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "引用并装配 online-leaderboard 能力包(榜单/查询/对局结算投影;闭包含 Foundation+Assets+Match)" }, "Competition": { "type": "parameter", "datatype": "bool", "defaultValue": "false", - "description": "引用并装配 online-competition 能力包(闭包含 Foundation+Assets)" + "description": "引用并装配 online-competition 能力包(冻结面:赛季/锦标赛;闭包含 Leaderboard 必选依赖)" }, "Operations": { "type": "parameter", diff --git a/GameFrameX.Templates/templates/gfx-online/{{Name}}/{{Name}}.csproj b/GameFrameX.Templates/templates/gfx-online/{{Name}}/{{Name}}.csproj index 8b7a2ceca..723241745 100644 --- a/GameFrameX.Templates/templates/gfx-online/{{Name}}/{{Name}}.csproj +++ b/GameFrameX.Templates/templates/gfx-online/{{Name}}/{{Name}}.csproj @@ -11,8 +11,10 @@ + (机制面 Hosting.Abstractions / Hosting.Core 经 Online.Foundation 传递获得;管理面 UseAdminApi + 需显式引 Hosting.AdminApi——管理契约上移后 Online.Abstractions 不再传递 AdminApi)。 + 增减能力 = 只增删 ProjectReference,Program.cs 无按包装配代码。 --> + @@ -26,7 +28,12 @@ + + + + + diff --git a/Server.slnx b/Server.slnx index c90898761..e080d1a38 100644 --- a/Server.slnx +++ b/Server.slnx @@ -13,7 +13,7 @@ - + @@ -23,9 +23,17 @@ + + + + - + + + + + diff --git a/Tests/GameFrameX.Hotfix.Tests/GameFrameX.Hotfix.Tests.csproj b/Tests/GameFrameX.Hotfix.Tests/GameFrameX.Hotfix.Tests.csproj index 19a8f5f12..8e5c856d5 100644 --- a/Tests/GameFrameX.Hotfix.Tests/GameFrameX.Hotfix.Tests.csproj +++ b/Tests/GameFrameX.Hotfix.Tests/GameFrameX.Hotfix.Tests.csproj @@ -29,10 +29,15 @@ + + + + + diff --git a/Tests/GameFrameX.Hotfix.Tests/GoldenPathBridgeChainTests.cs b/Tests/GameFrameX.Hotfix.Tests/GoldenPathBridgeChainTests.cs index 05c7131a3..31044e8fb 100644 --- a/Tests/GameFrameX.Hotfix.Tests/GoldenPathBridgeChainTests.cs +++ b/Tests/GameFrameX.Hotfix.Tests/GoldenPathBridgeChainTests.cs @@ -35,6 +35,7 @@ using GameFrameX.Capability.Hosting.Abstractions; using GameFrameX.Capability.Hosting.Core; using GameFrameX.Capability.Online.Abstractions; +using GameFrameX.Capability.Online.Match; using GameFrameX.Capability.Online.Operations.HotfixRollback; using GameFrameX.Capability.Online.Abstractions.Contracts; using GameFrameX.Capability.Online.Competition.Leaderboard; @@ -86,10 +87,11 @@ public async Task GoldenPath_ZeroSettings_FriendBridge_MatchBridge_RpsMatch_Proj var options = new CapabilityCompositionOptions(section, new HotfixBridgeAssemblyLog()) { HostOptions = new CapabilityHostOptions { ServerId = ServerId, SchedulerIntervalMilliseconds = 3600000, }, - Filter = new CapabilityAssemblyFilter(new[] { "online-foundation", "online-social", "online-matchmaking", "online-match", "online-assets", "online-competition" }), + Filter = new CapabilityAssemblyFilter(new[] { "online-foundation", "online-social", "online-matchmaking", "online-match", "online-assets", "online-leaderboard", "online-competition" }), }; options.Override(new EmptyPlayerDirectoryStub()); options.Override(new NoopHotfixRollbackExecutorStub()); + options.Configure(match => match.AddGame(new OnlineRockPaperScissorsGame())); runtime = CapabilityComposition.Compose(new OnlineCapabilityFamily(), options); await runtime.Host.StartAsync(); diff --git a/Tests/GameFrameX.Tests/Architecture/CapabilityLayeringAnalyzerTests.cs b/Tests/GameFrameX.Tests/Architecture/CapabilityLayeringAnalyzerTests.cs new file mode 100644 index 000000000..742d232e9 --- /dev/null +++ b/Tests/GameFrameX.Tests/Architecture/CapabilityLayeringAnalyzerTests.cs @@ -0,0 +1,194 @@ +// ========================================================================================== +// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 +// GameFrameX organization and its derivative projects' copyrights, trademarks, patents and related rights +// 均受中华人民共和国及相关国际法律法规保护。 +// are protected by the laws of the People's Republic of China and related international regulations. +// 使用本项目须严格遵守相应法律法规与开源许可证之规定。 +// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. +// 本项目采用 Apache License 2.0 单协议分发, +// This project is licensed solely under the Apache License 2.0, +// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 +// please see the LICENSE file in the root directory of the source code for the full license text. +// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 +// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, +// 侵犯他人合法权益等法律法规所禁止的行为! +// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations! +// 因基于本项目二次开发所产生的一切法律纠纷与责任, +// Any legal disputes or liabilities arising from secondary development based on this project +// 本项目组织与贡献者概不承担。 +// shall be borne solely by the developer; the project organization and contributors assume no responsibility. +// GitHub 仓库:https://github.com/GameFrameX +// GitHub Repository: https://github.com/GameFrameX +// Gitee 仓库:https://gitee.com/GameFrameX +// Gitee Repository: https://gitee.com/GameFrameX +// CNB 仓库:https://cnb.cool/GameFrameX +// CNB Repository: https://cnb.cool/GameFrameX +// 官方文档:https://gameframex.doc.alianblank.com/ +// Official documentation: https://gameframex.doc.alianblank.com/ +// ========================================================================================== + + +using System.Collections.Immutable; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using GameFrameX.Architecture.Analyzers; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Diagnostics; +using Xunit; + +namespace GameFrameX.Tests.Architecture; + +/// +/// 分层规则分析器单测(GFX0023 层级单调 + 同层禁互引 / GFX0024 契约包零运行时引用 / GFX0025 能力包四禁引): +/// 全部经内存 Emit 的伪程序集构造引用图(不引入真实工程闭包),正反样例逐规则断言。 +/// +public sealed class CapabilityLayeringAnalyzerTests +{ + private static readonly ImmutableArray PlatformReferences = ((string)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES")) + .Split(Path.PathSeparator) + .Where(path => !Path.GetFileName(path).StartsWith("GameFrameX.", System.StringComparison.Ordinal)) + .Select(path => (MetadataReference)MetadataReference.CreateFromFile(path)).ToImmutableArray(); + + [Fact] + public async Task SameLayerReference_IsRejected() + { + var matchmaking = Emit("GameFrameX.Capability.Online.Matchmaking", "public class Dependency { }"); + var social = Emit("GameFrameX.Capability.Online.Social", "public class Peer { public Dependency Value; }", matchmaking); + var diagnostic = Assert.Single(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", social), new CapabilityPackageLayeringAnalyzer())); + Assert.Equal("GFX0023", diagnostic.Id); + Assert.Equal(DiagnosticSeverity.Error, diagnostic.Severity); + Assert.Contains("GameFrameX.Capability.Online.Social", diagnostic.GetMessage()); + Assert.Contains("GameFrameX.Capability.Online.Matchmaking", diagnostic.GetMessage()); + Assert.Contains("L3.3", diagnostic.GetMessage()); + } + + [Fact] + public async Task UpwardReference_IsRejected() + { + var match = Emit("GameFrameX.Capability.Online.Match", "public class Dependency { }"); + var social = Emit("GameFrameX.Capability.Online.Social", "public class Peer { public Dependency Value; }", match); + var diagnostic = Assert.Single(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", social), new CapabilityPackageLayeringAnalyzer())); + Assert.Equal("GFX0023", diagnostic.Id); + Assert.Contains("L3.4", diagnostic.GetMessage()); + Assert.Contains("L3.3", diagnostic.GetMessage()); + } + + [Theory] + [InlineData("GameFrameX.Capability.Online.Match", "GameFrameX.Capability.Online.Assets")] + [InlineData("GameFrameX.Capability.Online.Leaderboard", "GameFrameX.Capability.Online.Match")] + [InlineData("GameFrameX.Capability.Online.Competition", "GameFrameX.Capability.Online.Leaderboard")] + [InlineData("GameFrameX.Capability.Online.Persistence", "GameFrameX.DataBase")] + [InlineData("GameFrameX.Hotfix", "GameFrameX.Apps")] + [InlineData("GameFrameX.Capability.Hosting.AdminApi", "GameFrameX.Capability.Hosting.Core")] + public async Task DownwardReference_IsAllowed(string fromName, string toName) + { + var dependency = Emit(toName, "public class Dependency { }"); + var consumer = Emit(fromName, "public class Peer { public Dependency Value; }", dependency); + Assert.Empty(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", consumer), new CapabilityPackageLayeringAnalyzer())); + } + + [Fact] + public async Task ContractPackageReferencingRuntime_IsRejected() + { + var adminApi = Emit("GameFrameX.Capability.Hosting.AdminApi", "public class Runtime { }"); + var contracts = Emit("GameFrameX.Capability.Online.Abstractions", "public class Contract { public Runtime Value; }", adminApi); + var diagnostic = Assert.Single(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", contracts), new CapabilityPackageLayeringAnalyzer())); + Assert.Equal("GFX0024", diagnostic.Id); + Assert.Equal(DiagnosticSeverity.Error, diagnostic.Severity); + Assert.Contains("GameFrameX.Capability.Online.Abstractions", diagnostic.GetMessage()); + Assert.Contains("GameFrameX.Capability.Hosting.AdminApi", diagnostic.GetMessage()); + } + + [Theory] + [InlineData("GameFrameX.Localization")] + [InlineData("GameFrameX.Utility")] + [InlineData("GameFrameX.Capability.Hosting.Abstractions")] + public async Task ContractPackageReferencingPrimitivesOrContracts_IsAllowed(string targetName) + { + var primitive = Emit(targetName, "public class Target { }"); + var contracts = Emit("GameFrameX.Capability.Online.Abstractions", "public class Contract { public Target Value; }", primitive); + Assert.Empty(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", contracts), new CapabilityPackageLayeringAnalyzer())); + } + + [Theory] + [InlineData("GameFrameX.Proto")] + [InlineData("GameFrameX.Core")] + public async Task CapabilityPackageReferencingBannedAssembly_IsRejected(string bannedName) + { + var banned = Emit(bannedName, "public class Banned { }"); + var capability = Emit("GameFrameX.Capability.Online.Social", "public class Peer { public Banned Value; }", banned); + var diagnostic = Assert.Single(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", capability), new CapabilityPackageLayeringAnalyzer())); + Assert.Equal("GFX0025", diagnostic.Id); + Assert.Equal(DiagnosticSeverity.Error, diagnostic.Severity); + Assert.Contains("GameFrameX.Capability.Online.Social", diagnostic.GetMessage()); + Assert.Contains(bannedName, diagnostic.GetMessage()); + } + + [Theory] + [InlineData("GameFrameX.Apps")] + [InlineData("GameFrameX.Hotfix")] + public async Task CapabilityPackageReferencingGameplayLayer_ReportsLayeringAndBanTogether(string bannedName) + { + // 玩法层在能力包之上:同一出边同时命中层级单调(GFX0023)与四禁引(GFX0025),两条互补报出。 + var banned = Emit(bannedName, "public class Banned { }"); + var capability = Emit("GameFrameX.Capability.Online.Social", "public class Peer { public Banned Value; }", banned); + var diagnostics = (await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", capability), new CapabilityPackageLayeringAnalyzer())).OrderBy(item => item.Id).ToArray(); + Assert.Equal(2, diagnostics.Length); + Assert.Equal("GFX0023", diagnostics[0].Id); + Assert.Equal("GFX0025", diagnostics[1].Id); + Assert.Contains(bannedName, diagnostics[1].GetMessage()); + } + + [Fact] + public async Task RegisteredConsumerAssembly_OwnEdgesAreChecked() + { + var apps = Emit("GameFrameX.Apps", "public class Data { }"); + var matchmaking = Emit("GameFrameX.Capability.Online.Matchmaking", "public class Dependency { }"); + var social = Emit("GameFrameX.Capability.Online.Social", "public class Peer { public Dependency Value; }", matchmaking); + // 编译自身 = 登记包(同层违规),直接引用出边也应被检查(Hotfix→Apps 合法,Social→Matchmaking 同层违规)。 + var diagnostics = await Analyze(Compile("GameFrameX.Hotfix", "public class Consumer { }", apps, social), new CapabilityPackageLayeringAnalyzer()); + var violation = Assert.Single(diagnostics); + Assert.Equal("GFX0023", violation.Id); + Assert.Contains("GameFrameX.Capability.Online.Social", violation.GetMessage()); + } + + [Fact] + public async Task UnregisteredAssemblies_AreIgnored() + { + var external = Emit("Contoso.External", "public class External { }"); + var consumer = Emit("GameFrameX.Capability.Online.Match", "public class Peer { public External Value; }", external); + Assert.Empty(await Analyze(Compile("GameFrameX.Tests", "public class Consumer { }", consumer), new CapabilityPackageLayeringAnalyzer())); + } + + private static CSharpCompilation Compile(string name, string source, params MetadataReference[] references) + { + var compilation = CSharpCompilation.Create(name, new[] { CSharpSyntaxTree.ParseText(source, path: "Fixture.cs") }, + PlatformReferences.Concat(references), new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)); + AssertNoErrors(compilation); + return compilation; + } + + private static MetadataReference Emit(string name, string source, params MetadataReference[] references) + { + using (var stream = new MemoryStream()) + { + var result = Compile(name, source, references).Emit(stream); + Assert.True(result.Success, string.Join(System.Environment.NewLine, result.Diagnostics)); + return MetadataReference.CreateFromImage(stream.ToArray()); + } + } + + private static void AssertNoErrors(Compilation compilation) + { + Assert.Empty(compilation.GetDiagnostics().Where(diagnostic => diagnostic.Severity == DiagnosticSeverity.Error)); + } + + private static async Task> Analyze(Compilation compilation, DiagnosticAnalyzer analyzer) + { + var diagnostics = await compilation.WithAnalyzers(ImmutableArray.Create(analyzer)).GetAnalyzerDiagnosticsAsync(); + Assert.DoesNotContain(diagnostics, diagnostic => diagnostic.Id == "AD0001"); + return diagnostics; + } +} diff --git a/Tests/GameFrameX.Tests/GameFrameX.Tests.csproj b/Tests/GameFrameX.Tests/GameFrameX.Tests.csproj index 27ec729cb..f7324b7fc 100644 --- a/Tests/GameFrameX.Tests/GameFrameX.Tests.csproj +++ b/Tests/GameFrameX.Tests/GameFrameX.Tests.csproj @@ -53,6 +53,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/Tests/GameFrameX.Tests/Online/CapabilityPackageStructureTests.cs b/Tests/GameFrameX.Tests/Online/CapabilityPackageStructureTests.cs index 142ce9ef8..c5bd2a190 100644 --- a/Tests/GameFrameX.Tests/Online/CapabilityPackageStructureTests.cs +++ b/Tests/GameFrameX.Tests/Online/CapabilityPackageStructureTests.cs @@ -40,9 +40,9 @@ namespace GameFrameX.Tests.Online public class CapabilityPackageStructureTests { /// - /// 期望的 ProjectReference 精确集合(工程 → 允许引用的工程名集合;C294 终态,逐条取自 Capability/*/ *.csproj: - /// Hosting.Abstractions → Localization;Hosting.AdminApi → Abstractions + Localization + Hosting.Core; - /// Online.Abstractions → Localization + Hosting.AdminApi;Social → Apps + DataBase;Match → Core + Proto)。 + /// 期望的 ProjectReference 精确集合(工程 → 允许引用的工程名集合;包结构收敛终态,逐条取自 Capability/*/*.csproj: + /// 管理契约 13 型上移后 Online.Abstractions → Localization + Hosting.Abstractions(不再引 AdminApi); + /// Social 拆 Apps/DataBase、Match 拆 Core/Proto;Leaderboard 自 Competition 拆包;Competition(冻结)→ Abstractions + Assets + Leaderboard)。 /// private static readonly Dictionary ExpectedProjectReferences = new() { @@ -50,12 +50,13 @@ public class CapabilityPackageStructureTests ["GameFrameX.Capability.Hosting.Core"] = new[] { "GameFrameX.Capability.Hosting.Abstractions", "GameFrameX.Localization" }, ["GameFrameX.Capability.Hosting.AdminApi"] = new[] { "GameFrameX.Capability.Hosting.Abstractions", "GameFrameX.Localization", "GameFrameX.Capability.Hosting.Core" }, ["GameFrameX.Capability.Online.Assets"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Hosting.Core" }, - ["GameFrameX.Capability.Online.Social"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Foundation", "GameFrameX.Capability.Hosting.Core", "GameFrameX.DataBase", "GameFrameX.Apps" }, + ["GameFrameX.Capability.Online.Social"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Foundation", "GameFrameX.Capability.Hosting.Core" }, ["GameFrameX.Capability.Online.Matchmaking"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Hosting.Core" }, - ["GameFrameX.Capability.Online.Match"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Assets", "GameFrameX.Core", "GameFrameX.Proto", "GameFrameX.Capability.Online.Matchmaking", "GameFrameX.Capability.Hosting.Core" }, - ["GameFrameX.Capability.Online.Competition"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Match", "GameFrameX.Capability.Hosting.Core" }, + ["GameFrameX.Capability.Online.Leaderboard"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Match" }, + ["GameFrameX.Capability.Online.Match"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Matchmaking", "GameFrameX.Capability.Hosting.Core" }, + ["GameFrameX.Capability.Online.Competition"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Leaderboard" }, ["GameFrameX.Capability.Online.Operations"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Foundation", "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Social", "GameFrameX.Capability.Online.Matchmaking", "GameFrameX.Capability.Online.Match", "GameFrameX.Capability.Hosting.Core" }, - ["GameFrameX.Capability.Online.Abstractions"] = new[] { "GameFrameX.Localization", "GameFrameX.Capability.Hosting.AdminApi" }, + ["GameFrameX.Capability.Online.Abstractions"] = new[] { "GameFrameX.Localization", "GameFrameX.Capability.Hosting.Abstractions" }, ["GameFrameX.Capability.Online.Foundation"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Hosting.Core" }, ["GameFrameX.Capability.Online.Persistence"] = new[] { "GameFrameX.Capability.Online.Abstractions", "GameFrameX.Capability.Online.Foundation", "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Social", "GameFrameX.Capability.Online.Match", "GameFrameX.Capability.Hosting.Core", "GameFrameX.DataBase" }, }; @@ -70,6 +71,7 @@ private static readonly (string PackageName, string CapabilityId, GameFrameX.Cap ("GameFrameX.Capability.Online.Assets", "online-assets", GameFrameX.Capability.Online.Assets.OnlineAssetsCapabilityModule.ManifestInstance), ("GameFrameX.Capability.Online.Social", "online-social", GameFrameX.Capability.Online.Social.OnlineSocialCapabilityModule.ManifestInstance), ("GameFrameX.Capability.Online.Matchmaking", "online-matchmaking", GameFrameX.Capability.Online.Matchmaking.OnlineMatchmakingCapabilityModule.ManifestInstance), + ("GameFrameX.Capability.Online.Leaderboard", "online-leaderboard", GameFrameX.Capability.Online.Leaderboard.OnlineLeaderboardCapabilityModule.ManifestInstance), ("GameFrameX.Capability.Online.Match", "online-match", GameFrameX.Capability.Online.Match.OnlineMatchCapabilityModule.ManifestInstance), ("GameFrameX.Capability.Online.Competition", "online-competition", GameFrameX.Capability.Online.Competition.OnlineCompetitionCapabilityModule.ManifestInstance), ("GameFrameX.Capability.Online.Operations", "online-operations", GameFrameX.Capability.Online.Operations.OnlineOperationsCapabilityModule.ManifestInstance), @@ -180,6 +182,7 @@ public void Launcher_ReferencesOnlineCapabilityPackages_Directly() "GameFrameX.Capability.Online.Assets", "GameFrameX.Capability.Online.Competition", "GameFrameX.Capability.Online.Foundation", + "GameFrameX.Capability.Online.Leaderboard", "GameFrameX.Capability.Online.Match", "GameFrameX.Capability.Online.Matchmaking", "GameFrameX.Capability.Online.Operations", diff --git a/Tests/GameFrameX.Tests/Online/GoldenPathDefaultOnTests.cs b/Tests/GameFrameX.Tests/Online/GoldenPathDefaultOnTests.cs index 12d220169..30bf3929a 100644 --- a/Tests/GameFrameX.Tests/Online/GoldenPathDefaultOnTests.cs +++ b/Tests/GameFrameX.Tests/Online/GoldenPathDefaultOnTests.cs @@ -126,7 +126,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => Assert.True(winnerEntry.Score >= loserEntry.Score, "winner score (" + winnerEntry.Score + ") should rank above loser score (" + loserEntry.Score + ")"); }, null, options => { - options.Filter = new CapabilityAssemblyFilter(new[] { "online-foundation", "online-social", "online-matchmaking", "online-match", "online-assets", "online-competition" }); + options.Filter = new CapabilityAssemblyFilter(new[] { "online-foundation", "online-social", "online-matchmaking", "online-match", "online-assets", "online-leaderboard", "online-competition" }); options.HostOptions.SchedulerIntervalMilliseconds = 3600000; }); } diff --git a/Tests/GameFrameX.Tests/Online/OnlineAdminApiDispatcherTests.cs b/Tests/GameFrameX.Tests/Online/OnlineAdminApiDispatcherTests.cs index 9e24bf7f7..190dc0c49 100644 --- a/Tests/GameFrameX.Tests/Online/OnlineAdminApiDispatcherTests.cs +++ b/Tests/GameFrameX.Tests/Online/OnlineAdminApiDispatcherTests.cs @@ -87,29 +87,29 @@ private static void AssertInnerCode(string innerJson, OnlineErrorCode expectedCo } /// - /// 验证注册表 = 七能力 manifest 声明的全部业务 action + 三个机制元端点(双向对账后两边严格相等)。 + /// 验证注册表 = 八能力 manifest 声明的全部业务 action + 三个机制元端点(双向对账后两边严格相等)。 /// [Fact] - public async Task ActionNames_ShouldRegisterAllThirtySevenDeclaredActionsPlusThreeMetaEndpoints() + public async Task ActionNames_ShouldRegisterAllThirtyDeclaredActionsPlusThreeMetaEndpoints() { await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => { var dispatcher = OnlineCapabilityTestHarness.CreateDispatcher(runtime.Host); - // 业务 action 37 = assets 7(grant_asset / revoke_asset / query_wallet_ledger / query_asset_audit / query_transaction_detail + // 业务 action 30 = assets 7(grant_asset / revoke_asset / query_wallet_ledger / query_asset_audit / query_transaction_detail // / query_compensation_queue / resolve_compensation_manual_review) // + foundation 1(suspend_resume_player) // + social 8(kick_player / revoke_token / mute_player / query_report_cases / update_report_case / // send_admin_notification / query_chat_messages / match_isolation) // + matchmaking 4(query_match_queue_overview / query_match_ticket_failures / query_match_abnormal_tickets / cancel_match_ticket) // + match 2(end_abnormal_match / query_match_settlement) - // + competition 8(LiveOps 7 + query_leaderboard) + // + leaderboard 1(query_leaderboard) // + operations 7(query_online_overview / query_player_timeline / query_online_audit_events + hotfix 受控操作族 4); // 机制元端点 3:list_capabilities + list_capability_settings(调度器持有报告)+ list_capability_services(调度器持有服务面)。 var declaredActions = runtime.Report.Entries.SelectMany(entry => entry.Manifest.Actions).ToList(); - Assert.Equal(37, declaredActions.Count); + Assert.Equal(30, declaredActions.Count); Assert.Equal(declaredActions.Count + 3, dispatcher.ActionNames.Count); - Assert.Equal(40, dispatcher.ActionNames.Count); + Assert.Equal(33, dispatcher.ActionNames.Count); foreach (var action in declaredActions) { Assert.Contains(action, dispatcher.ActionNames); @@ -120,7 +120,6 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => Assert.Contains("list_capability_services", dispatcher.ActionNames); Assert.Contains("query_match_settlement", dispatcher.ActionNames); Assert.Contains("query_leaderboard", dispatcher.ActionNames); - Assert.Contains("rollbackConfigRollout", dispatcher.ActionNames); Assert.Contains("rollback_hotfix_version", dispatcher.ActionNames); return Task.CompletedTask; }); @@ -136,7 +135,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => { var dispatcher = OnlineCapabilityTestHarness.CreateDispatcher(runtime.Host); - var envelopeJson = await dispatcher.DispatchAsync("query_compensation_queue", "{\"ServerId\":1001}"); + var envelopeJson = await dispatcher.DispatchAsync("query_compensation_queue", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001}"); var innerJson = ReadInnerJson(envelopeJson); using (var document = JsonDocument.Parse(innerJson)) { @@ -159,7 +158,7 @@ public async Task Dispatch_UnknownAction_ShouldReturnInner4002() { await WithDispatcherAsync(async dispatcher => { - var envelope = await dispatcher.DispatchAsync("definitely_not_an_action", "{\"ServerId\":1001}"); + var envelope = await dispatcher.DispatchAsync("definitely_not_an_action", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001}"); AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.ResourceNotFound); }); } @@ -191,7 +190,7 @@ await WithDispatcherAsync(async dispatcher => } /// - /// 验证跨区服作用域返回 3004(单键化后不再产生 3002/3003)。 + /// 验证跨区服返回 3004(单键化 D4 后租户位 / App 位不复存在,跨租户 / 跨应用用例废止)。 /// /// 请求体。 /// 期望业务码。 @@ -215,7 +214,7 @@ public async Task Dispatch_GrantAsset_ShouldRoundTripThroughLedgerAndDetail() await WithDispatcherAsync(async dispatcher => { var grantEnvelope = await dispatcher.DispatchAsync("grant_asset", - "{\"ServerId\":1001,\"PlayerId\":\"9001\",\"Reason\":\"admin-test\",\"IdempotencyKey\":\"GFX-GRANT-test-1\",\"GrantItems\":[{\"ItemOrCurrencyType\":\"Coin\",\"Quantity\":100}]}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9001\",\"Reason\":\"admin-test\",\"IdempotencyKey\":\"GFX-GRANT-test-1\",\"GrantItems\":[{\"ItemOrCurrencyType\":\"Coin\",\"Quantity\":100}]}"); string transactionId; using (var document = JsonDocument.Parse(ReadInnerJson(grantEnvelope))) { @@ -230,7 +229,7 @@ await WithDispatcherAsync(async dispatcher => } var ledgerEnvelope = await dispatcher.DispatchAsync("query_wallet_ledger", - "{\"ServerId\":1001,\"PlayerId\":\"9001\",\"PageSize\":20}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9001\",\"PageSize\":20}"); using (var ledgerDocument = JsonDocument.Parse(ReadInnerJson(ledgerEnvelope))) { var items = ledgerDocument.RootElement.GetProperty("Data").GetProperty("Items"); @@ -242,7 +241,7 @@ await WithDispatcherAsync(async dispatcher => } var detailEnvelope = await dispatcher.DispatchAsync("query_transaction_detail", - "{\"ServerId\":1001,\"TransactionId\":\"" + transactionId + "\"}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"TransactionId\":\"" + transactionId + "\"}"); using (var detailDocument = JsonDocument.Parse(ReadInnerJson(detailEnvelope))) { var data = detailDocument.RootElement.GetProperty("Data"); @@ -264,7 +263,7 @@ public async Task Dispatch_GrantAsset_WithoutPlayer_ShouldReturnInner4001() await WithDispatcherAsync(async dispatcher => { var envelope = await dispatcher.DispatchAsync("grant_asset", - "{\"ServerId\":1001,\"Reason\":\"admin-test\",\"GrantItems\":[{\"ItemOrCurrencyType\":\"Coin\",\"Quantity\":100}]}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"Reason\":\"admin-test\",\"GrantItems\":[{\"ItemOrCurrencyType\":\"Coin\",\"Quantity\":100}]}"); AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.ParameterInvalid); }); } @@ -277,7 +276,7 @@ public async Task Dispatch_MutePlayer_TwiceWithSameKey_ShouldReplayFirstResponse { await WithDispatcherAsync(async dispatcher => { - const string body = "{\"ServerId\":1001,\"PlayerId\":\"9002\",\"PenaltyId\":77,\"IdempotencyKey\":\"penalty-77-mute-1001\"}"; + const string body = "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9002\",\"PenaltyId\":77,\"IdempotencyKey\":\"penalty-77-mute-1001\"}"; var first = await dispatcher.DispatchAsync("mute_player", body); var second = await dispatcher.DispatchAsync("mute_player", body); Assert.Equal(first, second); @@ -299,7 +298,7 @@ public async Task Dispatch_KickPlayer_WithoutSessions_ShouldConfirm() await WithDispatcherAsync(async dispatcher => { var envelope = await dispatcher.DispatchAsync("kick_player", - "{\"ServerId\":1001,\"PlayerId\":\"9003\",\"PenaltyId\":78,\"IdempotencyKey\":\"penalty-78-kick-1001\"}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9003\",\"PenaltyId\":78,\"IdempotencyKey\":\"penalty-78-kick-1001\"}"); using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) { var root = document.RootElement; @@ -317,7 +316,7 @@ public async Task Dispatch_QueryOnlineOverview_ShouldReturnCounters() { await WithDispatcherAsync(async dispatcher => { - var envelope = await dispatcher.DispatchAsync("query_online_overview", "{\"ServerId\":1001}"); + var envelope = await dispatcher.DispatchAsync("query_online_overview", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001}"); using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) { var root = document.RootElement; @@ -342,7 +341,7 @@ public async Task Dispatch_EndAbnormalMatch_ShouldReturnInner5003() await WithDispatcherAsync(async dispatcher => { var envelope = await dispatcher.DispatchAsync("end_abnormal_match", - "{\"ServerId\":1001,\"MatchId\":\"m-1\",\"Reason\":\"test\",\"ReviewerOperatorId\":\"admin\",\"IdempotencyKey\":\"onlineControlled-end_abnormal_match-m-1-1001\"}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"MatchId\":\"m-1\",\"Reason\":\"test\",\"ReviewerOperatorId\":\"admin\",\"IdempotencyKey\":\"onlineControlled-end_abnormal_match-m-1-1001\"}"); AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.StateOperationForbidden); }); } @@ -356,7 +355,7 @@ public async Task Dispatch_QueryPlayerTimeline_Empty_ShouldReturnEmptyEvents() await WithDispatcherAsync(async dispatcher => { var envelope = await dispatcher.DispatchAsync("query_player_timeline", - "{\"ServerId\":1001,\"PlayerId\":\"9004\"}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9004\"}"); using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) { var data = document.RootElement.GetProperty("Data"); @@ -366,67 +365,6 @@ await WithDispatcherAsync(async dispatcher => }); } - /// - /// 验证 publishRemoteConfig(LiveOps 族)成功返回确认版本。 - /// - [Fact] - public async Task Dispatch_PublishRemoteConfig_ShouldReturnConfirmVersion() - { - await WithDispatcherAsync(async dispatcher => - { - var envelope = await dispatcher.DispatchAsync("publishRemoteConfig", - "{\"ServerId\":1001,\"ConfigId\":5001,\"Reason\":\"admin-test\"}"); - using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) - { - var root = document.RootElement; - Assert.Equal(0, root.GetProperty("Code").GetInt32()); - var data = root.GetProperty("Data"); - Assert.False(string.IsNullOrEmpty(data.GetProperty("ConfirmVersion").GetString())); - Assert.True(data.GetProperty("ServerTime").GetInt64() > 0); - } - }); - } - - /// - /// 验证 publishConfigRollout 灰度百分比超界(101 / -1)返回内层 4001(边界校验拒绝非法值)。 - /// - [Fact] - public async Task Dispatch_PublishConfigRollout_PercentOutOfRange_ShouldReturnInner4001() - { - await WithDispatcherAsync(async dispatcher => - { - var envelope = await dispatcher.DispatchAsync("publishConfigRollout", - "{\"ServerId\":1001,\"ConfigKind\":1,\"ConfigKey\":\"remote-config-key\",\"ConfigVersion\":3,\"Percent\":101,\"Reason\":\"admin-test\"}"); - AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.ParameterInvalid); - - envelope = await dispatcher.DispatchAsync("publishConfigRollout", - "{\"ServerId\":1001,\"ConfigKind\":1,\"ConfigKey\":\"remote-config-key\",\"ConfigVersion\":3,\"Percent\":-1,\"Reason\":\"admin-test\"}"); - AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.ParameterInvalid); - }); - } - - /// - /// 验证 publishConfigRollout 灰度百分比合法边界(0 / 100 / 缺省)成功返回确认版本。 - /// - [Fact] - public async Task Dispatch_PublishConfigRollout_PercentBoundary_ShouldReturnConfirmVersion() - { - await WithDispatcherAsync(async dispatcher => - { - foreach (var percent in new[] { "\"Percent\":0,", "\"Percent\":100,", "" }) - { - var envelope = await dispatcher.DispatchAsync("publishConfigRollout", - "{\"ServerId\":1001,\"ConfigKind\":1,\"ConfigKey\":\"remote-config-key\",\"ConfigVersion\":3," + percent + "\"Reason\":\"admin-test\"}"); - using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) - { - var root = document.RootElement; - Assert.Equal(0, root.GetProperty("Code").GetInt32()); - Assert.False(string.IsNullOrEmpty(root.GetProperty("Data").GetProperty("ConfirmVersion").GetString())); - } - } - }); - } - /// /// 验证 suspend_resume_player 缺 Direction 返回内层 4001(受控双向命令必填)。 /// @@ -436,7 +374,7 @@ public async Task Dispatch_SuspendResumePlayer_WithoutDirection_ShouldReturnInne await WithDispatcherAsync(async dispatcher => { var envelope = await dispatcher.DispatchAsync("suspend_resume_player", - "{\"ServerId\":1001,\"PlayerId\":\"9005\",\"Reason\":\"test\",\"ReviewerOperatorId\":\"admin\",\"IdempotencyKey\":\"onlineControlled-suspend_resume_player-9005-1001\"}"); + "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"PlayerId\":\"9005\",\"Reason\":\"test\",\"ReviewerOperatorId\":\"admin\",\"IdempotencyKey\":\"onlineControlled-suspend_resume_player-9005-1001\"}"); AssertInnerCode(ReadInnerJson(envelope), OnlineErrorCode.ParameterInvalid); }); } @@ -449,7 +387,7 @@ public async Task Dispatch_QueryReportCases_Empty_ShouldReturnEmptyItems() { await WithDispatcherAsync(async dispatcher => { - var envelope = await dispatcher.DispatchAsync("query_report_cases", "{\"ServerId\":1001}"); + var envelope = await dispatcher.DispatchAsync("query_report_cases", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001}"); using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) { var data = document.RootElement.GetProperty("Data"); @@ -467,7 +405,7 @@ public async Task Dispatch_QueryMatchQueueOverview_ShouldReturnQueuesArray() { await WithDispatcherAsync(async dispatcher => { - var envelope = await dispatcher.DispatchAsync("query_match_queue_overview", "{\"ServerId\":1001}"); + var envelope = await dispatcher.DispatchAsync("query_match_queue_overview", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001}"); using (var document = JsonDocument.Parse(ReadInnerJson(envelope))) { var data = document.RootElement.GetProperty("Data"); diff --git a/Tests/GameFrameX.Tests/Online/OnlineCapabilityComposeTests.cs b/Tests/GameFrameX.Tests/Online/OnlineCapabilityComposeTests.cs index 343eef36c..5a5711999 100644 --- a/Tests/GameFrameX.Tests/Online/OnlineCapabilityComposeTests.cs +++ b/Tests/GameFrameX.Tests/Online/OnlineCapabilityComposeTests.cs @@ -82,13 +82,14 @@ public class OnlineCapabilityComposeTests private static readonly HttpClient SharedHttpClient = new HttpClient(); /// - /// 七能力全装配的拓扑序(依赖边:social→foundation、matchmaking→social、match 可选 assets/matchmaking、 - /// competition 可选 assets/match、operations→foundation 可选 assets/social/match/matchmaking;同层按能力 Id Ordinal)。 + /// 八能力全装配的拓扑序(依赖边:social→foundation、matchmaking→social、match 可选 assets/matchmaking、 + /// leaderboard 可选 match、competition 必选 leaderboard 可选 assets、operations→foundation 可选 assets/social/match/matchmaking; + /// 同层按能力 Id Ordinal)。 /// private static readonly string[] ExpectedTopologicalOrder = { "online-assets", "online-foundation", "online-social", "online-matchmaking", - "online-match", "online-competition", "online-operations", + "online-match", "online-leaderboard", "online-competition", "online-operations", }; /// @@ -189,7 +190,7 @@ private static async Task PostAsync(string action, string body) } /// - /// 业务面单开:产出业务宿主、无管理面;七能力全部启用,装配序 = 拓扑序(依赖恒先于依赖方),宿主模块表同序。 + /// 业务面单开:产出业务宿主、无管理面;八能力全部启用,装配序 = 拓扑序(依赖恒先于依赖方),宿主模块表同序。 /// [Fact] public async Task Compose_RuntimeOnly_ComposesHostWithoutAdminInTopologicalOrder() @@ -199,7 +200,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => Assert.NotNull(runtime.Host); Assert.Null(runtime.AdminApi); Assert.Equal(ExpectedTopologicalOrder, runtime.Report.EnabledIdsInOrder); - Assert.Equal(7, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); + Assert.Equal(8, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); Assert.Equal(ExpectedTopologicalOrder, runtime.Host.Modules.Select(module => module.Manifest.Id).ToArray()); var order = runtime.Report.EnabledIdsInOrder.ToList(); @@ -221,7 +222,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => /// /// 管理面单开(EnableRuntime=false + UseAdminApi):业务宿主不交付(Host 为 null),管理面产出; - /// 新设计下每个模块的 Register 仍执行,报告完整(七能力全部启用、拓扑序不变)。 + /// 新设计下每个模块的 Register 仍执行,报告完整(八能力全部启用、拓扑序不变)。 /// [Fact] public async Task Compose_AdminOnly_HostNullAdminPresentReportComplete() @@ -264,14 +265,14 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => } /// - /// 空列表 = 全装配红线:白名单与排除表均为空数组时不过滤,七能力全部启用。 + /// 空列表 = 全装配红线:白名单与排除表均为空数组时不过滤,八能力全部启用。 /// [Fact] public async Task Compose_EmptyFilterLists_AssembleAll() { await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => { - Assert.Equal(7, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); + Assert.Equal(8, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); Assert.Equal(ExpectedTopologicalOrder, runtime.Report.EnabledIdsInOrder); return Task.CompletedTask; }, null, options => options.Filter = new CapabilityAssemblyFilter(Array.Empty(), Array.Empty())); @@ -285,7 +286,7 @@ public async Task Compose_BlankEntries_TreatedAsUnfiltered() { await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => { - Assert.Equal(7, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); + Assert.Equal(8, runtime.Report.Entries.Count(entry => entry.State == CapabilityFilterState.Enabled)); return Task.CompletedTask; }, null, options => options.Filter = new CapabilityAssemblyFilter(new[] { string.Empty, " " }, new[] { string.Empty, " " })); } @@ -306,7 +307,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => } /// - /// 排除表生效:叶子能力 online-operations(无下游必选依赖)为 ExcludedByDisableList,其余六能力保持装配。 + /// 排除表生效:叶子能力 online-operations(无下游必选依赖)为 ExcludedByDisableList,其余七能力保持装配。 /// [Fact] public async Task Compose_DisableList_ExcludesCapabilityFromReport() @@ -314,7 +315,7 @@ public async Task Compose_DisableList_ExcludesCapabilityFromReport() await OnlineCapabilityTestHarness.WithRuntimeAsync(runtime => { Assert.Equal(CapabilityFilterState.ExcludedByDisableList, FindEntry(runtime.Report, "online-operations").State); - Assert.Equal(6, runtime.Report.EnabledIdsInOrder.Count); + Assert.Equal(7, runtime.Report.EnabledIdsInOrder.Count); Assert.DoesNotContain("online-operations", runtime.Report.EnabledIdsInOrder); return Task.CompletedTask; }, null, options => options.Filter = new CapabilityAssemblyFilter(null, new[] { "online-operations" })); @@ -336,7 +337,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => var payload = inner.RootElement.GetProperty("Data"); Assert.Equal("online-operations", payload.GetProperty("NotInstalledCapability").GetString()); var installed = ReadStrings(payload.GetProperty("InstalledCapabilities")); - Assert.Equal(6, installed.Length); + Assert.Equal(7, installed.Length); Assert.DoesNotContain("online-operations", installed); } }, null, options => options.Filter = new CapabilityAssemblyFilter(null, new[] { "online-operations" })); @@ -368,10 +369,10 @@ await WithComposedAsync(options, async runtime => Assert.Equal(0, inner.RootElement.GetProperty("Code").GetInt32()); var data = inner.RootElement.GetProperty("Data"); var entries = IndexBy(data.GetProperty("Capabilities"), "Id"); - Assert.Equal(7, entries.Count); + Assert.Equal(8, entries.Count); Assert.Equal("ExcludedByDisableList", entries["online-assets"].GetProperty("State").GetString()); Assert.Equal("Enabled", entries["online-foundation"].GetProperty("State").GetString()); - Assert.Equal(6, data.GetProperty("EnabledIdsInOrder").GetArrayLength()); + Assert.Equal(7, data.GetProperty("EnabledIdsInOrder").GetArrayLength()); } using (var inner = ParseInner(await PostAsync("grant_asset", "{\"TenantId\":1,\"AppId\":1,\"ServerId\":1001,\"RequestId\":\"r2\"}"))) @@ -601,7 +602,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => Assert.Equal(ExpectedTopologicalOrder, ReadStrings(data.GetProperty("EnabledIdsInOrder"))); var entries = IndexBy(data.GetProperty("Capabilities"), "Id"); - Assert.Equal(7, entries.Count); + Assert.Equal(8, entries.Count); var match = entries["online-match"]; Assert.Equal(new[] { "online-assets", "online-matchmaking" }, ReadStrings(match.GetProperty("OptionalCapabilityIds"))); @@ -733,7 +734,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => var match = FindEntry(runtime.Report, "online-match"); Assert.Equal(CapabilityFilterState.Enabled, match.State); Assert.Contains("online-match", runtime.Report.EnabledIdsInOrder); - Assert.Equal(5, runtime.Report.EnabledIdsInOrder.Count); + Assert.Equal(6, runtime.Report.EnabledIdsInOrder.Count); foreach (var absentId in new[] { "online-assets", "online-matchmaking" }) { diff --git a/Tests/GameFrameX.Tests/Online/OnlineCapabilityTestHarness.cs b/Tests/GameFrameX.Tests/Online/OnlineCapabilityTestHarness.cs index f2dd9bb9d..34901ff36 100644 --- a/Tests/GameFrameX.Tests/Online/OnlineCapabilityTestHarness.cs +++ b/Tests/GameFrameX.Tests/Online/OnlineCapabilityTestHarness.cs @@ -38,6 +38,7 @@ using GameFrameX.Capability.Online.Abstractions.Contracts; using GameFrameX.Capability.Online.Abstractions.Idempotency; using GameFrameX.Capability.Online.Abstractions.Scope; +using GameFrameX.Capability.Online.Match; using GameFrameX.Capability.Online.Operations.HotfixRollback; using GameFrameX.Capability.Online.Social; using Xunit; @@ -87,6 +88,9 @@ public static CapabilityCompositionOptions CreateOptions(string settingsJson = n // 宿主扩展点:Social 的玩家目录与 Operations 的热更回滚执行器(两者均 RequireHostService,缺失即装配 fail-fast)。 options.Override(new EmptyPlayerDirectory()); options.Override(new NoopHotfixRollbackExecutor()); + + // 玩法注入:RPS 验收夹具游戏(原包内自动注册的对局玩法;生产装配由各宿主组合根自行注入)。 + options.Configure(match => match.AddGame(new OnlineRockPaperScissorsGame())); return options; } diff --git a/Tests/GameFrameX.Tests/Online/OnlineFriendLegacyMigrationTests.cs b/Tests/GameFrameX.Tests/Online/OnlineFriendLegacyMigrationTests.cs deleted file mode 100644 index 50b9e2de7..000000000 --- a/Tests/GameFrameX.Tests/Online/OnlineFriendLegacyMigrationTests.cs +++ /dev/null @@ -1,273 +0,0 @@ -// ========================================================================================== -// GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利 -// GameFrameX organization and its derivative projects' copyrights, trademarks, patents, and related rights -// 均受中华人民共和国及相关国际法律法规保护。 -// are protected by the laws of the People's Republic of China and relevant international regulations. -// 使用本项目须严格遵守相应法律法规及开源许可证之规定。 -// Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses. -// 本项目采用 Apache License 2.0 单协议分发, -// This project is licensed solely under the Apache License 2.0, -// 完整许可证文本请参见源代码根目录下的 LICENSE 文件。 -// please refer to the LICENSE file in the root directory of the source code for the full license text. -// 禁止利用本项目实施任何危害国家安全、破坏社会秩序、 -// It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order, -// 侵犯他人合法权益等法律法规所禁止的行为! -// or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations. -// 因基于本项目二次开发所产生的一切法律纠纷与责任, -// Any legal disputes or liabilities arising from secondary development based on this project -// 本组织及其贡献者不承担任何责任,开发者应自行承担。 -// The organization and contributors assume no responsibility; developers shall bear the responsibility themselves. -// GitHub 仓库:https://github.com/GameFrameX -// GitHub Repository: https://github.com/GameFrameX -// Gitee 仓库:https://gitee.com/GameFrameX -// Gitee Repository: https://gitee.com/GameFrameX -// CNB 仓库:https://cnb.cool/GameFrameX -// CNB Repository: https://cnb.cool/GameFrameX -// 官方文档:https://gameframex.doc.alianblank.com/ -// Official Documentation: https://gameframex.doc.alianblank.com/ -// ========================================================================================== - -using System; -using System.Collections.Generic; -using System.Text.Json; -using System.Threading.Tasks; -using GameFrameX.Apps.Player.Friend.Entity; -using GameFrameX.Apps.ServerRole.Friend.Entity; -using GameFrameX.Capability.Hosting.Abstractions; -using GameFrameX.Capability.Hosting.Core; -using GameFrameX.Capability.Online.Abstractions; -using GameFrameX.Capability.Online.Abstractions.Contracts; -using GameFrameX.Capability.Online.Abstractions.Scope; -using GameFrameX.Capability.Online.Operations.HotfixRollback; -using GameFrameX.Capability.Online.Social; -using GameFrameX.DataBase; -using GameFrameX.DataBase.Abstractions; -using GameFrameX.DataBase.Sqlite; -using Xunit; - -namespace GameFrameX.Tests.Online; - -/// -/// 旧好友数据一次性迁移测试(C244 T3 → C294 机制化):域 120 旧链 FriendRelationState 与域 660 旧 FriendState -/// 档案经真实写路径收敛为 Online 好友关系;只读单向复制(旧数据零改动)、幂等重放、软删行不迁移; -/// 配置开关 online-social.Friend.MigrateLegacyFriendData 打开时社交能力在 Activate 期自动执行迁移。 -/// -/// -/// Tests for the one-shot legacy friend-data migration (C244 T3, mechanism rewrite C294): the legacy domain-120 -/// FriendRelationState rows and the legacy domain-660 FriendState profiles converge into Online -/// friendships through the real write path; the migration is a read-only one-way copy (legacy data -/// untouched), idempotent on replay, skips soft-deleted rows, and runs automatically during activation -/// when the social option switch is on. -/// -[Collection("GameDbStaticStateCollection")] -public sealed class OnlineFriendLegacyMigrationTests -{ - /// 测试作用域租户标识。 - private const long TenantId = 9L; - - /// 测试作用域 App 标识。 - private const long AppId = 4L; - - /// 测试作用域区服标识。 - private const long ServerId = 1001; - - /// - /// 门面初始化后必须归还(关闭 + 复位静态注册表;串行集合保证静态门面独占)。 - /// - private static async Task WithSqliteFacadeAsync(Func action) - { - var opened = await GameDb.InitAsync(new DbOptions - { - ConnectionString = "Data Source=:memory:", - Name = "c244-friend-migration-tests", - }); - Assert.True(opened); - try - { - await action(); - } - finally - { - await GameDb.CloseAsync(); - GameDb.ResetForTesting(); - } - } - - /// - /// 组合 foundation + social(族配置段作用域 9/4/1001;好友 store 保持 InMemory 默认,迁移写路径与生产一致)并启动, - /// 执行用例主体后恒停止撤桥。 - /// - /// 用例主体(入参:已启动的组合产物)。 - /// Settings 子对象原文(null = 不写 Settings 键)。 - /// 异步任务。 - private static async Task WithStartedSocialRuntimeAsync(Func body, string settingsJson = null) - { - var settings = string.IsNullOrEmpty(settingsJson) ? string.Empty : ",\"Settings\":" + settingsJson; - var section = JsonDocument.Parse("{\"TenantId\":9,\"AppId\":4,\"ServerId\":1001" + settings + "}").RootElement.Clone(); - var options = new CapabilityCompositionOptions(section, new CollectingCapabilityAssemblyLog()) - { - HostOptions = new CapabilityHostOptions { ServerId = ServerId, }, - Filter = new CapabilityAssemblyFilter(new[] { "online-foundation", "online-social" }), - }; - options.Override(new OnlineCapabilityTestHarness.EmptyPlayerDirectory()); - options.Override(new OnlineCapabilityTestHarness.NoopHotfixRollbackExecutor()); - - var runtime = CapabilityComposition.Compose(new OnlineCapabilityFamily(), options); - try - { - await runtime.Host.StartAsync(); - await body(runtime); - } - finally - { - await runtime.StopAsync(); - } - } - - /// - /// 构造迁移作用域内的玩家作用域。 - /// - /// 玩家标识。 - /// 玩家作用域。 - private static OnlineScope PlayerScope(long playerId) - { - return new OnlineScope(ServerId, playerId); - } - - /// - /// 预置旧数据:一条已建立关系(11-22,Status=0)、一条软删关系(33-44,Status=1)、 - /// 一份 660 档案(55 → Outgoing[66])。 - /// - private static async Task SeedLegacyDataAsync() - { - await GameDb.AddOrUpdateAsync(new FriendRelationState { Id = 1, PlayerIdA = 11, PlayerIdB = 22, Status = 0, CreateTime = DateTime.UtcNow, CreatedBy = 11 }); - await GameDb.AddOrUpdateAsync(new FriendRelationState { Id = 2, PlayerIdA = 33, PlayerIdB = 44, Status = 1, CreateTime = DateTime.UtcNow, CreatedBy = 33 }); - - var legacyProfiles = new FriendState { Id = 3 }; - legacyProfiles.Profiles[55] = new FriendProfileState { PlayerId = 55 }; - legacyProfiles.Profiles[55].Outgoing.Add(66); - await GameDb.AddOrUpdateAsync(legacyProfiles); - } - - /// - /// 断言迁移收敛结果:11-22 已成友;55-66 待答;33-44(软删)无关系。 - /// - /// 好友服务。 - /// 异步任务。 - private static async Task AssertConvergedRelationsAsync(OnlineFriendService friends) - { - var friendPair = await friends.FindAsync(PlayerScope(11), 22); - Assert.True(friendPair.IsSuccess); - Assert.NotNull(friendPair.Data); - Assert.Equal(OnlineFriendshipState.Accepted, friendPair.Data.State); - var pendingPair = await friends.FindAsync(PlayerScope(55), 66); - Assert.True(pendingPair.IsSuccess); - Assert.NotNull(pendingPair.Data); - Assert.Equal(OnlineFriendshipState.Requested, pendingPair.Data.State); - var deletedPair = await friends.FindAsync(PlayerScope(33), 44); - Assert.True(deletedPair.IsSuccess); - Assert.Null(deletedPair.Data); - } - - /// - /// 迁移收敛:已建立对成友、待答申请入列、软删行不迁移、旧数据零改动。 - /// - [Fact] - public async Task Migrate_ConvergesLegacyData_WithoutTouchingLegacyRows() - { - await WithSqliteFacadeAsync(async () => - { - await SeedLegacyDataAsync(); - await WithStartedSocialRuntimeAsync(async runtime => - { - var friends = runtime.Host.Services.GetService(); - - var (established, pending, failed) = await OnlineFriendLegacyMigration.MigrateAsync(friends, ServerId); - - Assert.Equal(1, established); - Assert.Equal(1, pending); - Assert.Equal(0, failed); - await AssertConvergedRelationsAsync(friends); - - // 旧数据零改动:行数、状态、档案内容原样。 - var relations = await GameDb.FindListAsync(state => true); - Assert.Equal(2, relations.Count); - Assert.Contains(relations, r => r.PlayerIdA == 11 && r.PlayerIdB == 22 && r.Status == 0); - Assert.Contains(relations, r => r.PlayerIdA == 33 && r.PlayerIdB == 44 && r.Status == 1); - var profiles = await GameDb.FindListAsync(state => state.Id >= 0); - var profile = Assert.Single(profiles); - Assert.True(profile.Profiles.TryGetValue(55, out var legacy)); - Assert.Equal(new List { 66 }, legacy.Outgoing); - }); - }); - } - - /// - /// 迁移幂等:重放不产生第二条关系、不重复计数失败(SaveIfAbsent / 幂等收敛);好友域桥视角关系唯一。 - /// - [Fact] - public async Task Migrate_Replay_IsIdempotent() - { - await WithSqliteFacadeAsync(async () => - { - await SeedLegacyDataAsync(); - await WithStartedSocialRuntimeAsync(async runtime => - { - var friends = runtime.Host.Services.GetService(); - - await OnlineFriendLegacyMigration.MigrateAsync(friends, ServerId); - var (established, pending, failed) = await OnlineFriendLegacyMigration.MigrateAsync(friends, ServerId); - - Assert.Equal(1, established); - Assert.Equal(1, pending); - Assert.Equal(0, failed); - - Assert.True(CapabilityBridge.TryAcquire(out var lease)); - var domain = lease.Contract; - var relations = await domain.ListRelationsAsync(PlayerScope(11)); - Assert.Single(relations.Data); - var outgoing = await domain.ListRelationsAsync(PlayerScope(55)); - var only = Assert.Single(outgoing.Data); - Assert.Equal(66, only.OtherPlayerId); - Assert.Equal(OnlineFriendRelationKind.OutgoingRequest, only.Kind); - }); - }); - } - - /// - /// 配置开关打开(online-social.Friend.MigrateLegacyFriendData = true):社交能力在 Activate 期自动执行迁移, - /// 启动完成即可观测到收敛后的关系。 - /// - [Fact] - public async Task Activate_WithMigrateLegacyFriendDataEnabled_MigratesAutomatically() - { - await WithSqliteFacadeAsync(async () => - { - await SeedLegacyDataAsync(); - await WithStartedSocialRuntimeAsync(async runtime => - { - var friends = runtime.Host.Services.GetService(); - await AssertConvergedRelationsAsync(friends); - }, "{\"online-social\":{\"Friend\":{\"MigrateLegacyFriendData\":true}}}"); - }); - } - - /// - /// 配置开关缺省关闭:启动不触发迁移(旧数据在场,Online 侧仍无关系)。 - /// - [Fact] - public async Task Activate_WithMigrateLegacyFriendDataDefault_DoesNotMigrate() - { - await WithSqliteFacadeAsync(async () => - { - await SeedLegacyDataAsync(); - await WithStartedSocialRuntimeAsync(async runtime => - { - var friends = runtime.Host.Services.GetService(); - var friendPair = await friends.FindAsync(PlayerScope(11), 22); - Assert.True(friendPair.IsSuccess); - Assert.Null(friendPair.Data); - }); - }); - } -} diff --git a/Tests/GameFrameX.Tests/Online/OnlineMatchDomainMultiModeTests.cs b/Tests/GameFrameX.Tests/Online/OnlineMatchDomainMultiModeTests.cs new file mode 100644 index 000000000..7d4a712cd --- /dev/null +++ b/Tests/GameFrameX.Tests/Online/OnlineMatchDomainMultiModeTests.cs @@ -0,0 +1,203 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using GameFrameX.Capability.Online.Abstractions.Contracts; +using GameFrameX.Capability.Online.Abstractions.Scope; +using GameFrameX.Capability.Online.Match; +using GameFrameX.Capability.Online.Matchmaking; +using Xunit; + +namespace GameFrameX.Tests.Online +{ + /// + /// 匹配域多模式回归:多玩法注册时票据模式必须命中对应玩法的注册键(不再串写首个玩法的模式), + /// 以及 的精确命中 / 单玩法回落 / 多玩法未命三分支。 + /// + public class OnlineMatchDomainMultiModeTests + { + /// 区服标识。 + private const long ServerId = 100; + + /// 玩家一。 + private const long PlayerOne = 1001; + + /// 玩家二。 + private const long PlayerTwo = 1002; + + /// 第二玩法注册键(票据模式同值精确命中)。 + private const int SecondGameMode = 2; + + [Fact] + public async Task CreateFromTicket_MultiGameRegistered_MatchModeShouldFollowTicketMode() + { + var harness = await Harness.StartedMatchedAsync(SecondGameMode); + foreach (var playerId in new[] { PlayerOne, PlayerTwo }) + { + var entered = await harness.Domain.EnterAsync(harness.ScopeOf(playerId), harness.MatchId); + Assert.True(entered.IsSuccess, entered.Message); + } + + var actor = harness.Runtime.SnapshotActors().Single(); + var snapshot = actor.GetSnapshot(); + + // 票据模式 2 + 玩法 2 在册 → 对局 Mode 必须是玩法 2 的注册键(回归断言:旧实现恒写首个注册玩法的模式)。 + Assert.Equal(SecondGameMode, snapshot.Mode); + } + + [Fact] + public void ResolveGameForTicketMode_ExactRegistration_ShouldReturnThatGame() + { + var runtime = BuildRuntime(new StubMatchGame(1), new StubMatchGame(SecondGameMode)); + + var game = runtime.ResolveGameForTicketMode(SecondGameMode); + + Assert.NotNull(game); + Assert.Equal(SecondGameMode, game.Mode); + } + + [Fact] + public void ResolveGameForTicketMode_SingleGameRegistered_ShouldFallBackForAnyTicketMode() + { + var runtime = BuildRuntime(new StubMatchGame(1)); + + var game = runtime.ResolveGameForTicketMode(SecondGameMode); + + Assert.NotNull(game); + Assert.Equal(1, game.Mode); + } + + [Fact] + public void ResolveGameForTicketMode_MultiGameUnregisteredTicketMode_ShouldReturnNull() + { + var runtime = BuildRuntime(new StubMatchGame(1), new StubMatchGame(SecondGameMode)); + + Assert.Null(runtime.ResolveGameForTicketMode(9)); + } + + /// + /// 测试基座:双玩法(模式 1 + 指定模式)注册 + 票据域 + 运行时 + 域服务, + /// 两名玩家按指定票据模式入队并完成一次撮合(对局已创建)。 + /// + private sealed class Harness + { + public OnlineMatchTicketService Tickets { get; } + + public OnlineMatchmakerCoordinator Coordinator { get; } + + public OnlineMatchRuntime Runtime { get; } + + public OnlineMatchDomainService Domain { get; } + + private Harness(OnlineMatchTicketService tickets, OnlineMatchmakerCoordinator coordinator, OnlineMatchRuntime runtime, OnlineMatchDomainService domain) + { + Tickets = tickets; + Coordinator = coordinator; + Runtime = runtime; + Domain = domain; + } + + public OnlineScope ScopeOf(long playerId) + { + return new OnlineScope(ServerId, playerId); + } + + public static async Task StartedMatchedAsync(int ticketMode) + { + var publisher = new OnlineEventRecorder(); + var ticketStore = new InMemoryOnlineMatchTicketStore(); + var matchmakerOptions = new OnlineMatchmakerOptions(); + var tickets = new OnlineMatchTicketService(ticketStore, publisher, matchmakerOptions); + var coordinator = new OnlineMatchmakerCoordinator(ticketStore, tickets, publisher, matchmakerOptions); + var runtime = new OnlineMatchRuntime(new InMemoryOnlineMatchActorStore(), publisher, new OnlineMatchRuntimeOptions()); + var firstGame = new StubMatchGame(1); + var secondGame = new StubMatchGame(ticketMode); + runtime.RegisterGame(firstGame); + runtime.RegisterGame(secondGame); + var domain = new OnlineMatchDomainService(ticketStore, tickets, runtime, secondGame, new OnlineMatchRegistryOptions()); + var harness = new Harness(tickets, coordinator, runtime, domain); + + foreach (var playerId in new[] { PlayerOne, PlayerTwo }) + { + var enqueued = await domain.EnqueueAsync(harness.ScopeOf(playerId), ticketMode, 1000); + Assert.True(enqueued.IsSuccess, enqueued.Message); + } + + var matched = await coordinator.RunOnceAsync(); + Assert.True(matched.IsSuccess, matched.Message); + Assert.Single(matched.Data.AssignmentIds); + + var firstStatus = await domain.GetStatusAsync(harness.ScopeOf(PlayerOne)); + Assert.True(firstStatus.IsSuccess, firstStatus.Message); + Assert.True(firstStatus.Data.Matched); + harness.MatchId = firstStatus.Data.MatchId; + return harness; + } + + public long MatchId { get; private set; } + } + + + /// 构造指定注册键的最小玩法桩(纯裁决零状态:不开局、不出结果)。 + private sealed class StubMatchGame : IOnlineMatchGame + { + public StubMatchGame(int mode) + { + Mode = mode; + } + + public int Mode { get; } + + public int MinPlayers + { + get { return 2; } + } + + public int MaxPlayers + { + get { return 2; } + } + + public byte[] CreateInitialState(OnlineMatch match) + { + return new byte[0]; + } + + public OnlineMatchGameStepResult ApplyInput(OnlineMatch match, OnlineMatchMember member, OnlineMatchInput input) + { + return new OnlineMatchGameStepResult { Accepted = false }; + } + + public bool Advance(OnlineMatch match, long nowUnixMilliseconds, List emittedEvents) + { + return false; + } + + public bool IsCompleted(OnlineMatch match) + { + return false; + } + + public OnlineMatchBridgeGameView BuildBridgeView(long roomId, OnlineMatchSnapshot snapshot, IReadOnlyList events) + { + return null; + } + + public OnlineMatchResult BuildResult(OnlineMatch match) + { + return null; + } + } + + private static OnlineMatchRuntime BuildRuntime(params IOnlineMatchGame[] games) + { + var runtime = new OnlineMatchRuntime(new InMemoryOnlineMatchActorStore(), new OnlineEventRecorder(), new OnlineMatchRuntimeOptions()); + foreach (var game in games) + { + runtime.RegisterGame(game); + } + + return runtime; + } + } +} diff --git a/Tests/GameFrameX.Tests/Online/OnlineMatchSettledLeaderboardProjectorTests.cs b/Tests/GameFrameX.Tests/Online/OnlineMatchSettledLeaderboardProjectorTests.cs index 06d3e2ad8..31c171ea9 100644 --- a/Tests/GameFrameX.Tests/Online/OnlineMatchSettledLeaderboardProjectorTests.cs +++ b/Tests/GameFrameX.Tests/Online/OnlineMatchSettledLeaderboardProjectorTests.cs @@ -38,6 +38,9 @@ using GameFrameX.Capability.Online.Abstractions.Scope; using GameFrameX.Capability.Online.Assets; using GameFrameX.Capability.Online.Competition; +using GameFrameX.Capability.Online.Abstractions; +using GameFrameX.Capability.Online.Abstractions.Contracts; +using GameFrameX.Capability.Online.Leaderboard; using GameFrameX.Capability.Online.Competition.Leaderboard; using GameFrameX.Capability.Online.Match; using GameFrameX.Foundation.Idempotency; @@ -73,8 +76,8 @@ public class OnlineMatchSettledLeaderboardProjectorTests /// 静默调度间隔(毫秒):tick 一律由用例显式驱动,后台循环在用例时长内不触发。 private const int QuietSchedulerIntervalMilliseconds = 3600000; - /// Competition 投影配置段(Settings 子对象:目标榜单 = )。 - private const string ProjectionSettings = "{\"online-competition\":{\"LeaderboardProjection\":{\"MatchSettledBoardId\":\"" + BoardId + "\"}}}"; + /// Leaderboard 投影配置段(Settings 子对象:目标榜单 = )。 + private const string ProjectionSettings = "{\"online-leaderboard\":{\"LeaderboardProjection\":{\"MatchSettledBoardId\":\"" + BoardId + "\"}}}"; /// /// 验证订阅半边:结算事件驱动投影落榜(Top 查询可见分数),同 EventId 重复投递被去重。 @@ -209,7 +212,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => Assert.NotNull(entry); Assert.Equal(42, entry.Score); Assert.Empty(projector.QueryStatus()); - }, ProjectionSettings, options => ConfigureComposition(options, null, "online-match", "online-competition")); + }, ProjectionSettings, options => ConfigureComposition(options, null, "online-match", "online-leaderboard")); } /// @@ -221,12 +224,41 @@ public async Task Compose_ZeroSettingsDefaultsProjectionOn_BlankOverrideTurnsItO { var configured = await RunOneTickRoundAsync(ProjectionSettings, true); var zeroSettings = await RunOneTickRoundAsync(null, true); - var blankBoard = await RunOneTickRoundAsync("{\"online-competition\":{\"LeaderboardProjection\":{\"MatchSettledBoardId\":\" \"}}}", false); + var blankBoard = await RunOneTickRoundAsync("{\"online-leaderboard\":{\"LeaderboardProjection\":{\"MatchSettledBoardId\":\" \"}}}", false); Assert.Equal(configured, zeroSettings); Assert.Equal(configured - 1, blankBoard); } + /// + /// 零玩法形态回归:宿主未注入任何玩法时 online-match 照常装配(运行时 / 结算管线在场), + /// 但对局桥与匹配域桥均不发布(缺席态由桥显式失败承载)、通知出站端口保持缺省空实现。 + /// + [Fact] + public async Task Compose_WithoutGames_SkipsBridgesButComposesRuntime() + { + var options = new CapabilityCompositionOptions(OnlineCapabilityTestHarness.FamilySection(null), new CollectingCapabilityAssemblyLog()) + { + HostOptions = new CapabilityHostOptions { ServerId = ServerId, }, + }; + ConfigureComposition(options, null, "online-match"); + var runtime = CapabilityComposition.Compose(new OnlineCapabilityFamily(), options); + try + { + await runtime.Host.StartAsync(); + var entry = runtime.Report.Entries.Single(item => item.Manifest.Id == "online-match"); + Assert.Equal(CapabilityFilterState.Enabled, entry.State); + Assert.NotNull(runtime.Host.Services.GetService()); + Assert.Null(runtime.Host.Services.GetOptionalService()); + Assert.Null(runtime.Host.Services.GetOptionalService()); + Assert.IsType(runtime.Host.Services.GetService()); + } + finally + { + await runtime.StopAsync(); + } + } + /// /// 验证可选依赖缺席:配置了投影榜 id 但 online-match 未装配(对局结果存储缺席)→ 不装配投影器、不报错。 /// @@ -239,21 +271,27 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => Assert.DoesNotContain("online-match", runtime.Report.EnabledIdsInOrder); Assert.Null(runtime.Host.Services.GetOptionalService()); - }, ProjectionSettings, options => ConfigureComposition(options, null, "online-competition")); + }, ProjectionSettings, options => ConfigureComposition(options, null, "online-leaderboard")); } /// - /// 验证依赖声明(C294:竞技对对局为可选依赖):online-competition 以可选方式声明 online-match 且无必选依赖, - /// online-match 不以任何方式依赖 online-competition(拓扑无环)。 + /// 验证依赖声明(榜单自竞技拆包后):online-competition 必选依赖 online-leaderboard(赛季 / 锦标赛的榜单写路径)、 + /// 可选依赖 online-assets;online-leaderboard 可选依赖 online-match 且无必选依赖; + /// online-match 不以任何方式依赖两者(拓扑无环)。 /// [Fact] public void ManifestDependency_ShouldBeAcyclic() { var competition = OnlineCompetitionCapabilityModule.ManifestInstance; + var leaderboard = OnlineLeaderboardCapabilityModule.ManifestInstance; var match = OnlineMatchCapabilityModule.ManifestInstance; - Assert.Contains(competition.Optional, dependency => dependency.CapabilityId == "online-match"); - Assert.DoesNotContain("online-match", competition.Requires); + Assert.Contains("online-leaderboard", competition.Requires); + Assert.Contains(competition.Optional, dependency => dependency.CapabilityId == "online-assets"); + Assert.Contains(leaderboard.Optional, dependency => dependency.CapabilityId == "online-match"); + Assert.Empty(leaderboard.Requires); + Assert.DoesNotContain("online-leaderboard", match.Requires); + Assert.DoesNotContain(match.Optional, dependency => dependency.CapabilityId == "online-leaderboard"); Assert.DoesNotContain("online-competition", match.Requires); Assert.DoesNotContain(match.Optional, dependency => dependency.CapabilityId == "online-competition"); } @@ -294,7 +332,7 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime => Assert.Empty(recorder.FailedJobNames); executed = recorder.LastExecutedJobCount; - }, settingsJson, options => ConfigureComposition(options, recorder, "online-match", "online-competition")); + }, settingsJson, options => ConfigureComposition(options, recorder, "online-match", "online-leaderboard")); Assert.True(executed > 0); return executed; diff --git a/Capability/GameFrameX.Capability.Online.Competition/AdminApi/OnlineAdminLiveOpsHandlers.cs b/scripts/detached-liveops/OnlineAdminLiveOpsHandlers.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/AdminApi/OnlineAdminLiveOpsHandlers.cs rename to scripts/detached-liveops/OnlineAdminLiveOpsHandlers.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsCommand.cs b/scripts/detached-liveops/OnlineLiveOpsCommand.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsCommand.cs rename to scripts/detached-liveops/OnlineLiveOpsCommand.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsEntry.cs b/scripts/detached-liveops/OnlineLiveOpsEntry.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsEntry.cs rename to scripts/detached-liveops/OnlineLiveOpsEntry.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsOperation.cs b/scripts/detached-liveops/OnlineLiveOpsOperation.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsOperation.cs rename to scripts/detached-liveops/OnlineLiveOpsOperation.cs diff --git a/Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsRegistry.cs b/scripts/detached-liveops/OnlineLiveOpsRegistry.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Competition/LiveOps/OnlineLiveOpsRegistry.cs rename to scripts/detached-liveops/OnlineLiveOpsRegistry.cs diff --git a/scripts/detached-liveops/README.md b/scripts/detached-liveops/README.md new file mode 100644 index 000000000..df6809e73 --- /dev/null +++ b/scripts/detached-liveops/README.md @@ -0,0 +1,18 @@ +# detached-liveops 存档 + +LiveOps 运营面(远程配置 / 设备组 / 定时任务 / 公告 / 玩家分群 / 配置灰度与回滚)已从能力包 +`GameFrameX.Capability.Online.Competition` 拆离:运营编排属平台运营特征,按包结构收敛裁决移交 +Admin 仓(运营台后端,clientDelivery 承接)。本目录为原文存档,不参与任何工程编译, +供 Admin 仓实现时按需搬迁。 + +原包内位置与形态: + +- `OnlineLiveOpsRegistry.cs` / `OnlineLiveOpsCommand.cs` / `OnlineLiveOpsEntry.cs` / `OnlineLiveOpsOperation.cs` + —— 原位于 `Capability/GameFrameX.Capability.Online.Competition/LiveOps/`(命名空间 + `GameFrameX.Capability.Online.Competition.LiveOps`),纯 POCO + 进程内注册表,零包外依赖。 +- `OnlineAdminLiveOpsHandlers.cs` —— 原位于同包 `AdminApi/`,admin 面 7 个 action 的处理器 + (publishRemoteConfig / syncDeviceGroup / syncScheduledTask / pushAnnouncement / syncPlayerSegment / + publishConfigRollout / rollbackConfigRollout),依赖 Hosting 管理契约与 Foundation.Json。 + +搬迁时注意:管理契约(`IAdminActionContributor` / `AdminActionRegistry` / `AdminApiRequest` 等)已上移 +`GameFrameX.Capability.Hosting.Abstractions` 包;Admin 仓经自身引用面消费。 diff --git a/Capability/GameFrameX.Capability.Online.Social/OnlineFriendLegacyMigration.cs b/scripts/legacy/OnlineFriendLegacyMigration.cs similarity index 100% rename from Capability/GameFrameX.Capability.Online.Social/OnlineFriendLegacyMigration.cs rename to scripts/legacy/OnlineFriendLegacyMigration.cs diff --git a/scripts/legacy/README.md b/scripts/legacy/README.md new file mode 100644 index 000000000..c05639992 --- /dev/null +++ b/scripts/legacy/README.md @@ -0,0 +1,10 @@ +# legacy 脚本存档 + +随包结构收敛移出能力包的旧迁移代码存档:不再参与任何工程编译,仅作历史参考与二次搬迁素材。 + +## OnlineFriendLegacyMigration.cs + +- 原位置:`Capability/GameFrameX.Capability.Online.Social/OnlineFriendLegacyMigration.cs`。 +- 原职责:社交能力激活期可选执行的一次性旧好友数据迁移(只读单向复制旧链域 120 `FriendRelationState` / 域 660 `FriendState`,幂等可重跑),经 `OnlineFriendOptions.MigrateLegacyFriendData` 开关触发(默认关闭)。 +- 移出原因:能力包禁止依赖玩法层(`GameFrameX.Apps`)与数据实现(`GameFrameX.DataBase`);旧好友状态已随旧链退役,无存量生产数据可迁。 +- 依赖形态:编译需 `GameFrameX.Apps.Player.Friend.Entity`、`GameFrameX.Apps.ServerRole.Friend.Entity` 与 `GameFrameX.DataBase.GameDb` 静态门面;如需复用,建议以独立迁移工具工程承载,不回能力包。