723885e74e
Tests · UI / test (push) Has been cancelled
Tests · Go / test (push) Successful in 2m3s
Tests · Go / test (pull_request) Successful in 2m5s
Tests · Integration / integration (pull_request) Successful in 1m44s
Tests · UI / test (pull_request) Failing after 4m28s
Three issues surfaced once the per-command rejection from the previous commit actually reached the UI: 1. Sync banner falsely red. `OrderDraftStore.runSync` flipped `syncStatus = "error"` whenever any command was rejected and advertised a Retry button. A per-command rejection is a player-correctable state — the round trip succeeded, the engine just refused that command — so the retry can't help. Keep `syncStatus = "synced"` on `success`; the red row highlight is the visible cue. 2. Rejection reason missing. Add `cmd_error_message: string` to `CommandItem` in `pkg/schema/fbs/order.fbs` (appended last to preserve existing slot offsets) and regenerate the Go + TS stubs for that one type. Plumb the message through `CommandMeta`, `Controller.applyCommand`'s `m.Result(code, message)` call, the Go transcoder, the UI decoders in `submit.ts` / `order-load.ts`, and the `OrderDraftStore.errorMessages` map. `order-tab.svelte` renders it as an italic danger-coloured line under rejected commands, with new CSS for `.error-reason`. 3. Verdict lost on navigation. `order-load.ts.decodeCommand` never read `cmdApplied`/`cmdErrorCode`, so `hydrateFromServer` fell back to a blanket "applied" status — a previously-rejected command came back green after a lobby → game round trip. Extend the fetch decoder to populate `statuses`/`errorCodes`/ `errorMessages` maps and have `hydrateFromServer` use them. Engine-side persistence already records the verdict on disk — verified against the live `0000/order/<id>.json`. `flatbuffers@25` elides default-int8/int64 fields on write; the Go transcoder force-slots `cmd_applied=false` / `cmd_error_code=0` already, the new test fixtures flip `builder.forceDefaults(true)` to mirror that behaviour so the round trip survives. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
188 lines
8.3 KiB
TypeScript
188 lines
8.3 KiB
TypeScript
// automatically generated by the FlatBuffers compiler, do not modify
|
|
|
|
/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
|
|
|
|
import * as flatbuffers from 'flatbuffers';
|
|
|
|
import { CommandFleetMerge, CommandFleetMergeT } from '../order/command-fleet-merge.js';
|
|
import { CommandFleetSend, CommandFleetSendT } from '../order/command-fleet-send.js';
|
|
import { CommandPayload, unionToCommandPayload, unionListToCommandPayload } from '../order/command-payload.js';
|
|
import { CommandPlanetProduce, CommandPlanetProduceT } from '../order/command-planet-produce.js';
|
|
import { CommandPlanetRename, CommandPlanetRenameT } from '../order/command-planet-rename.js';
|
|
import { CommandPlanetRouteRemove, CommandPlanetRouteRemoveT } from '../order/command-planet-route-remove.js';
|
|
import { CommandPlanetRouteSet, CommandPlanetRouteSetT } from '../order/command-planet-route-set.js';
|
|
import { CommandRaceQuit, CommandRaceQuitT } from '../order/command-race-quit.js';
|
|
import { CommandRaceRelation, CommandRaceRelationT } from '../order/command-race-relation.js';
|
|
import { CommandRaceVote, CommandRaceVoteT } from '../order/command-race-vote.js';
|
|
import { CommandScienceCreate, CommandScienceCreateT } from '../order/command-science-create.js';
|
|
import { CommandScienceRemove, CommandScienceRemoveT } from '../order/command-science-remove.js';
|
|
import { CommandShipClassCreate, CommandShipClassCreateT } from '../order/command-ship-class-create.js';
|
|
import { CommandShipClassMerge, CommandShipClassMergeT } from '../order/command-ship-class-merge.js';
|
|
import { CommandShipClassRemove, CommandShipClassRemoveT } from '../order/command-ship-class-remove.js';
|
|
import { CommandShipGroupBreak, CommandShipGroupBreakT } from '../order/command-ship-group-break.js';
|
|
import { CommandShipGroupDismantle, CommandShipGroupDismantleT } from '../order/command-ship-group-dismantle.js';
|
|
import { CommandShipGroupJoinFleet, CommandShipGroupJoinFleetT } from '../order/command-ship-group-join-fleet.js';
|
|
import { CommandShipGroupLoad, CommandShipGroupLoadT } from '../order/command-ship-group-load.js';
|
|
import { CommandShipGroupMerge, CommandShipGroupMergeT } from '../order/command-ship-group-merge.js';
|
|
import { CommandShipGroupSend, CommandShipGroupSendT } from '../order/command-ship-group-send.js';
|
|
import { CommandShipGroupTransfer, CommandShipGroupTransferT } from '../order/command-ship-group-transfer.js';
|
|
import { CommandShipGroupUnload, CommandShipGroupUnloadT } from '../order/command-ship-group-unload.js';
|
|
import { CommandShipGroupUpgrade, CommandShipGroupUpgradeT } from '../order/command-ship-group-upgrade.js';
|
|
|
|
|
|
export class CommandItem implements flatbuffers.IUnpackableObject<CommandItemT> {
|
|
bb: flatbuffers.ByteBuffer|null = null;
|
|
bb_pos = 0;
|
|
__init(i:number, bb:flatbuffers.ByteBuffer):CommandItem {
|
|
this.bb_pos = i;
|
|
this.bb = bb;
|
|
return this;
|
|
}
|
|
|
|
static getRootAsCommandItem(bb:flatbuffers.ByteBuffer, obj?:CommandItem):CommandItem {
|
|
return (obj || new CommandItem()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
|
|
}
|
|
|
|
static getSizePrefixedRootAsCommandItem(bb:flatbuffers.ByteBuffer, obj?:CommandItem):CommandItem {
|
|
bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
|
|
return (obj || new CommandItem()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
|
|
}
|
|
|
|
cmdId():string|null
|
|
cmdId(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
|
cmdId(optionalEncoding?:any):string|Uint8Array|null {
|
|
const offset = this.bb!.__offset(this.bb_pos, 4);
|
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
|
}
|
|
|
|
cmdApplied():boolean|null {
|
|
const offset = this.bb!.__offset(this.bb_pos, 6);
|
|
return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : null;
|
|
}
|
|
|
|
cmdErrorCode():bigint|null {
|
|
const offset = this.bb!.__offset(this.bb_pos, 8);
|
|
return offset ? this.bb!.readInt64(this.bb_pos + offset) : null;
|
|
}
|
|
|
|
payloadType():CommandPayload {
|
|
const offset = this.bb!.__offset(this.bb_pos, 10);
|
|
return offset ? this.bb!.readUint8(this.bb_pos + offset) : CommandPayload.NONE;
|
|
}
|
|
|
|
payload<T extends flatbuffers.Table>(obj:any):any|null {
|
|
const offset = this.bb!.__offset(this.bb_pos, 12);
|
|
return offset ? this.bb!.__union(obj, this.bb_pos + offset) : null;
|
|
}
|
|
|
|
cmdErrorMessage():string|null
|
|
cmdErrorMessage(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
|
cmdErrorMessage(optionalEncoding?:any):string|Uint8Array|null {
|
|
const offset = this.bb!.__offset(this.bb_pos, 14);
|
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
|
}
|
|
|
|
static startCommandItem(builder:flatbuffers.Builder) {
|
|
builder.startObject(6);
|
|
}
|
|
|
|
static addCmdId(builder:flatbuffers.Builder, cmdIdOffset:flatbuffers.Offset) {
|
|
builder.addFieldOffset(0, cmdIdOffset, 0);
|
|
}
|
|
|
|
static addCmdApplied(builder:flatbuffers.Builder, cmdApplied:boolean) {
|
|
builder.addFieldInt8(1, +cmdApplied, 0);
|
|
}
|
|
|
|
static addCmdErrorCode(builder:flatbuffers.Builder, cmdErrorCode:bigint) {
|
|
builder.addFieldInt64(2, cmdErrorCode, BigInt(0));
|
|
}
|
|
|
|
static addPayloadType(builder:flatbuffers.Builder, payloadType:CommandPayload) {
|
|
builder.addFieldInt8(3, payloadType, CommandPayload.NONE);
|
|
}
|
|
|
|
static addPayload(builder:flatbuffers.Builder, payloadOffset:flatbuffers.Offset) {
|
|
builder.addFieldOffset(4, payloadOffset, 0);
|
|
}
|
|
|
|
static addCmdErrorMessage(builder:flatbuffers.Builder, cmdErrorMessageOffset:flatbuffers.Offset) {
|
|
builder.addFieldOffset(5, cmdErrorMessageOffset, 0);
|
|
}
|
|
|
|
static endCommandItem(builder:flatbuffers.Builder):flatbuffers.Offset {
|
|
const offset = builder.endObject();
|
|
builder.requiredField(offset, 12) // payload
|
|
return offset;
|
|
}
|
|
|
|
static createCommandItem(builder:flatbuffers.Builder, cmdIdOffset:flatbuffers.Offset, cmdApplied:boolean|null, cmdErrorCode:bigint|null, payloadType:CommandPayload, payloadOffset:flatbuffers.Offset, cmdErrorMessageOffset:flatbuffers.Offset):flatbuffers.Offset {
|
|
CommandItem.startCommandItem(builder);
|
|
CommandItem.addCmdId(builder, cmdIdOffset);
|
|
if (cmdApplied !== null)
|
|
CommandItem.addCmdApplied(builder, cmdApplied);
|
|
if (cmdErrorCode !== null)
|
|
CommandItem.addCmdErrorCode(builder, cmdErrorCode);
|
|
CommandItem.addPayloadType(builder, payloadType);
|
|
CommandItem.addPayload(builder, payloadOffset);
|
|
CommandItem.addCmdErrorMessage(builder, cmdErrorMessageOffset);
|
|
return CommandItem.endCommandItem(builder);
|
|
}
|
|
|
|
unpack(): CommandItemT {
|
|
return new CommandItemT(
|
|
this.cmdId(),
|
|
this.cmdApplied(),
|
|
this.cmdErrorCode(),
|
|
this.payloadType(),
|
|
(() => {
|
|
const temp = unionToCommandPayload(this.payloadType(), this.payload.bind(this));
|
|
if(temp === null) { return null; }
|
|
return temp.unpack()
|
|
})(),
|
|
this.cmdErrorMessage()
|
|
);
|
|
}
|
|
|
|
|
|
unpackTo(_o: CommandItemT): void {
|
|
_o.cmdId = this.cmdId();
|
|
_o.cmdApplied = this.cmdApplied();
|
|
_o.cmdErrorCode = this.cmdErrorCode();
|
|
_o.payloadType = this.payloadType();
|
|
_o.payload = (() => {
|
|
const temp = unionToCommandPayload(this.payloadType(), this.payload.bind(this));
|
|
if(temp === null) { return null; }
|
|
return temp.unpack()
|
|
})();
|
|
_o.cmdErrorMessage = this.cmdErrorMessage();
|
|
}
|
|
}
|
|
|
|
export class CommandItemT implements flatbuffers.IGeneratedObject {
|
|
constructor(
|
|
public cmdId: string|Uint8Array|null = null,
|
|
public cmdApplied: boolean|null = null,
|
|
public cmdErrorCode: bigint|null = null,
|
|
public payloadType: CommandPayload = CommandPayload.NONE,
|
|
public payload: CommandFleetMergeT|CommandFleetSendT|CommandPlanetProduceT|CommandPlanetRenameT|CommandPlanetRouteRemoveT|CommandPlanetRouteSetT|CommandRaceQuitT|CommandRaceRelationT|CommandRaceVoteT|CommandScienceCreateT|CommandScienceRemoveT|CommandShipClassCreateT|CommandShipClassMergeT|CommandShipClassRemoveT|CommandShipGroupBreakT|CommandShipGroupDismantleT|CommandShipGroupJoinFleetT|CommandShipGroupLoadT|CommandShipGroupMergeT|CommandShipGroupSendT|CommandShipGroupTransferT|CommandShipGroupUnloadT|CommandShipGroupUpgradeT|null = null,
|
|
public cmdErrorMessage: string|Uint8Array|null = null
|
|
){}
|
|
|
|
|
|
pack(builder:flatbuffers.Builder): flatbuffers.Offset {
|
|
const cmdId = (this.cmdId !== null ? builder.createString(this.cmdId!) : 0);
|
|
const payload = builder.createObjectOffset(this.payload);
|
|
const cmdErrorMessage = (this.cmdErrorMessage !== null ? builder.createString(this.cmdErrorMessage!) : 0);
|
|
|
|
return CommandItem.createCommandItem(builder,
|
|
cmdId,
|
|
this.cmdApplied,
|
|
this.cmdErrorCode,
|
|
this.payloadType,
|
|
payload,
|
|
cmdErrorMessage
|
|
);
|
|
}
|
|
}
|