mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-27 03:14:36 +00:00
71849b47cd
## Description: Taken from PR #506 Improve transport source tile by considering border extremums Only calculate better spawn tile for humans, and have the sender calculate it and send the src tile in the intent for better performance. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: <DISCORD USERNAME> evan Co-authored-by: evan <openfrontio@gmail.com>
437 lines
12 KiB
TypeScript
437 lines
12 KiB
TypeScript
import { z } from "zod";
|
|
import {
|
|
AllPlayers,
|
|
Difficulty,
|
|
GameMapType,
|
|
GameMode,
|
|
GameType,
|
|
PlayerType,
|
|
Team,
|
|
UnitType,
|
|
} from "./game/Game";
|
|
|
|
export type GameID = string;
|
|
export type ClientID = string;
|
|
|
|
export type Intent =
|
|
| SpawnIntent
|
|
| AttackIntent
|
|
| CancelAttackIntent
|
|
| BoatAttackIntent
|
|
| AllianceRequestIntent
|
|
| AllianceRequestReplyIntent
|
|
| BreakAllianceIntent
|
|
| TargetPlayerIntent
|
|
| EmojiIntent
|
|
| DonateGoldIntent
|
|
| DonateTroopsIntent
|
|
| TargetTroopRatioIntent
|
|
| BuildUnitIntent
|
|
| EmbargoIntent
|
|
| MoveWarshipIntent;
|
|
|
|
export type AttackIntent = z.infer<typeof AttackIntentSchema>;
|
|
export type CancelAttackIntent = z.infer<typeof CancelAttackIntentSchema>;
|
|
export type SpawnIntent = z.infer<typeof SpawnIntentSchema>;
|
|
export type BoatAttackIntent = z.infer<typeof BoatAttackIntentSchema>;
|
|
export type AllianceRequestIntent = z.infer<typeof AllianceRequestIntentSchema>;
|
|
export type AllianceRequestReplyIntent = z.infer<
|
|
typeof AllianceRequestReplyIntentSchema
|
|
>;
|
|
export type BreakAllianceIntent = z.infer<typeof BreakAllianceIntentSchema>;
|
|
export type TargetPlayerIntent = z.infer<typeof TargetPlayerIntentSchema>;
|
|
export type EmojiIntent = z.infer<typeof EmojiIntentSchema>;
|
|
export type DonateGoldIntent = z.infer<typeof DonateGoldIntentSchema>;
|
|
export type DonateTroopsIntent = z.infer<typeof DonateTroopIntentSchema>;
|
|
export type EmbargoIntent = z.infer<typeof EmbargoIntentSchema>;
|
|
export type TargetTroopRatioIntent = z.infer<
|
|
typeof TargetTroopRatioIntentSchema
|
|
>;
|
|
export type BuildUnitIntent = z.infer<typeof BuildUnitIntentSchema>;
|
|
export type MoveWarshipIntent = z.infer<typeof MoveWarshipIntentSchema>;
|
|
|
|
export type Turn = z.infer<typeof TurnSchema>;
|
|
export type GameConfig = z.infer<typeof GameConfigSchema>;
|
|
|
|
export type ClientMessage =
|
|
| ClientSendWinnerMessage
|
|
| ClientPingMessage
|
|
| ClientIntentMessage
|
|
| ClientJoinMessage
|
|
| ClientLogMessage
|
|
| ClientHashMessage;
|
|
export type ServerMessage =
|
|
| ServerSyncMessage
|
|
| ServerStartGameMessage
|
|
| ServerPingMessage
|
|
| ServerDesyncMessage
|
|
| ServerPrestartMessage;
|
|
|
|
export type ServerSyncMessage = z.infer<typeof ServerTurnMessageSchema>;
|
|
export type ServerStartGameMessage = z.infer<
|
|
typeof ServerStartGameMessageSchema
|
|
>;
|
|
export type ServerPingMessage = z.infer<typeof ServerPingMessageSchema>;
|
|
export type ServerDesyncMessage = z.infer<typeof ServerDesyncSchema>;
|
|
export type ServerPrestartMessage = z.infer<typeof ServerPrestartMessageSchema>;
|
|
export type ClientSendWinnerMessage = z.infer<typeof ClientSendWinnerSchema>;
|
|
export type ClientPingMessage = z.infer<typeof ClientPingMessageSchema>;
|
|
export type ClientIntentMessage = z.infer<typeof ClientIntentMessageSchema>;
|
|
export type ClientJoinMessage = z.infer<typeof ClientJoinMessageSchema>;
|
|
export type ClientLogMessage = z.infer<typeof ClientLogMessageSchema>;
|
|
export type ClientHashMessage = z.infer<typeof ClientHashSchema>;
|
|
|
|
export type PlayerRecord = z.infer<typeof PlayerRecordSchema>;
|
|
export type GameRecord = z.infer<typeof GameRecordSchema>;
|
|
|
|
export type AllPlayersStats = z.infer<typeof AllPlayersStatsSchema>;
|
|
export type PlayerStats = z.infer<typeof PlayerStatsSchema>;
|
|
export type Player = z.infer<typeof PlayerSchema>;
|
|
export type GameStartInfo = z.infer<typeof GameStartInfoSchema>;
|
|
const PlayerTypeSchema = z.nativeEnum(PlayerType);
|
|
|
|
export interface GameInfo {
|
|
gameID: GameID;
|
|
clients?: ClientInfo[];
|
|
numClients?: number;
|
|
msUntilStart?: number;
|
|
gameConfig?: GameConfig;
|
|
}
|
|
export interface ClientInfo {
|
|
clientID: ClientID;
|
|
username: string;
|
|
}
|
|
export enum LogSeverity {
|
|
Debug = "DEBUG",
|
|
Info = "INFO",
|
|
Warn = "WARN",
|
|
Error = "ERROR",
|
|
Fatal = "FATAL",
|
|
}
|
|
|
|
const GameConfigSchema = z.object({
|
|
gameMap: z.nativeEnum(GameMapType),
|
|
difficulty: z.nativeEnum(Difficulty),
|
|
gameType: z.nativeEnum(GameType),
|
|
gameMode: z.nativeEnum(GameMode),
|
|
disableNPCs: z.boolean(),
|
|
disableNukes: z.boolean(),
|
|
bots: z.number().int().min(0).max(400),
|
|
infiniteGold: z.boolean(),
|
|
infiniteTroops: z.boolean(),
|
|
instantBuild: z.boolean(),
|
|
maxPlayers: z.number().optional(),
|
|
numPlayerTeams: z.number().optional(),
|
|
});
|
|
|
|
const SafeString = z
|
|
.string()
|
|
.regex(
|
|
/^([a-zA-Z0-9\s.,!?@#$%&*()-_+=\[\]{}|;:"'\/\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff]|üÜ])*$/,
|
|
)
|
|
.max(1000);
|
|
|
|
const EmojiSchema = z.string().refine(
|
|
(val) => {
|
|
return /\p{Emoji}/u.test(val);
|
|
},
|
|
{
|
|
message: "Must contain at least one emoji character",
|
|
},
|
|
);
|
|
const ID = z
|
|
.string()
|
|
.regex(/^[a-zA-Z0-9]+$/)
|
|
.length(8);
|
|
|
|
const NukesEnum = z.enum([
|
|
"Atom Bomb",
|
|
"Hydrogen Bomb",
|
|
"MIRV",
|
|
"MIRV Warhead",
|
|
]);
|
|
|
|
const NukeStatsSchema = z.record(NukesEnum, z.number());
|
|
|
|
export const PlayerStatsSchema = z.object({
|
|
sentNukes: z.record(ID, NukeStatsSchema),
|
|
});
|
|
|
|
export const AllPlayersStatsSchema = z.record(ID, PlayerStatsSchema);
|
|
|
|
// Zod schemas
|
|
const BaseIntentSchema = z.object({
|
|
type: z.enum([
|
|
"attack",
|
|
"cancel_attack",
|
|
"spawn",
|
|
"boat",
|
|
"name",
|
|
"targetPlayer",
|
|
"emoji",
|
|
"troop_ratio",
|
|
"build_unit",
|
|
"embargo",
|
|
"move_warship",
|
|
]),
|
|
clientID: ID,
|
|
});
|
|
|
|
export const AttackIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("attack"),
|
|
targetID: ID.nullable(),
|
|
troops: z.number().nullable(),
|
|
});
|
|
|
|
export const SpawnIntentSchema = BaseIntentSchema.extend({
|
|
flag: z.string().nullable(),
|
|
type: z.literal("spawn"),
|
|
name: SafeString,
|
|
playerType: PlayerTypeSchema,
|
|
x: z.number(),
|
|
y: z.number(),
|
|
});
|
|
|
|
export const BoatAttackIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("boat"),
|
|
targetID: ID.nullable(),
|
|
troops: z.number().nullable(),
|
|
dstX: z.number(),
|
|
dstY: z.number(),
|
|
srcX: z.number(),
|
|
srcY: z.number(),
|
|
});
|
|
|
|
export const AllianceRequestIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("allianceRequest"),
|
|
recipient: ID,
|
|
});
|
|
|
|
export const AllianceRequestReplyIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("allianceRequestReply"),
|
|
requestor: ID, // The one who made the original alliance request
|
|
accept: z.boolean(),
|
|
});
|
|
|
|
export const BreakAllianceIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("breakAlliance"),
|
|
recipient: ID,
|
|
});
|
|
|
|
export const TargetPlayerIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("targetPlayer"),
|
|
target: ID,
|
|
});
|
|
|
|
export const EmojiIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("emoji"),
|
|
recipient: z.union([ID, z.literal(AllPlayers)]),
|
|
emoji: EmojiSchema,
|
|
});
|
|
|
|
export const EmbargoIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("embargo"),
|
|
targetID: ID,
|
|
action: z.union([z.literal("start"), z.literal("stop")]),
|
|
});
|
|
|
|
export const DonateGoldIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("donate_gold"),
|
|
recipient: ID,
|
|
gold: z.number().nullable(),
|
|
});
|
|
|
|
export const DonateTroopIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("donate_troops"),
|
|
recipient: ID,
|
|
troops: z.number().nullable(),
|
|
});
|
|
|
|
export const TargetTroopRatioIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("troop_ratio"),
|
|
ratio: z.number().min(0).max(1),
|
|
});
|
|
|
|
export const BuildUnitIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("build_unit"),
|
|
unit: z.nativeEnum(UnitType),
|
|
x: z.number(),
|
|
y: z.number(),
|
|
});
|
|
|
|
export const CancelAttackIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("cancel_attack"),
|
|
attackID: z.string(),
|
|
});
|
|
|
|
export const MoveWarshipIntentSchema = BaseIntentSchema.extend({
|
|
type: z.literal("move_warship"),
|
|
unitId: z.number(),
|
|
tile: z.number(),
|
|
});
|
|
|
|
const IntentSchema = z.union([
|
|
AttackIntentSchema,
|
|
CancelAttackIntentSchema,
|
|
SpawnIntentSchema,
|
|
BoatAttackIntentSchema,
|
|
AllianceRequestIntentSchema,
|
|
AllianceRequestReplyIntentSchema,
|
|
BreakAllianceIntentSchema,
|
|
TargetPlayerIntentSchema,
|
|
EmojiIntentSchema,
|
|
DonateGoldIntentSchema,
|
|
DonateTroopIntentSchema,
|
|
TargetTroopRatioIntentSchema,
|
|
BuildUnitIntentSchema,
|
|
EmbargoIntentSchema,
|
|
MoveWarshipIntentSchema,
|
|
]);
|
|
|
|
export const TurnSchema = z.object({
|
|
turnNumber: z.number(),
|
|
gameID: ID,
|
|
intents: z.array(IntentSchema),
|
|
// The hash of the game state at the end of the turn.
|
|
hash: z.number().nullable().optional(),
|
|
});
|
|
|
|
// Server
|
|
|
|
const ServerBaseMessageSchema = z.object({
|
|
type: z.enum(["turn", "ping", "prestart", "start", "desync"]),
|
|
});
|
|
|
|
export const ServerTurnMessageSchema = ServerBaseMessageSchema.extend({
|
|
type: z.literal("turn"),
|
|
turn: TurnSchema,
|
|
});
|
|
|
|
export const ServerPingMessageSchema = ServerBaseMessageSchema.extend({
|
|
type: z.literal("ping"),
|
|
});
|
|
|
|
export const ServerPrestartMessageSchema = ServerBaseMessageSchema.extend({
|
|
type: z.literal("prestart"),
|
|
gameMap: z.nativeEnum(GameMapType),
|
|
});
|
|
|
|
export const PlayerSchema = z.object({
|
|
playerID: ID,
|
|
clientID: ID,
|
|
username: SafeString,
|
|
flag: SafeString.optional(),
|
|
});
|
|
|
|
export const GameStartInfoSchema = z.object({
|
|
gameID: ID,
|
|
config: GameConfigSchema,
|
|
players: z.array(PlayerSchema),
|
|
});
|
|
|
|
export const ServerStartGameMessageSchema = ServerBaseMessageSchema.extend({
|
|
type: z.literal("start"),
|
|
// Turns the client missed if they are late to the game.
|
|
turns: z.array(TurnSchema),
|
|
gameStartInfo: GameStartInfoSchema,
|
|
});
|
|
|
|
export const ServerDesyncSchema = ServerBaseMessageSchema.extend({
|
|
type: z.literal("desync"),
|
|
turn: z.number(),
|
|
correctHash: z.number().nullable(),
|
|
clientsWithCorrectHash: z.number(),
|
|
totalActiveClients: z.number(),
|
|
yourHash: z.number().optional(),
|
|
});
|
|
|
|
export const ServerMessageSchema = z.union([
|
|
ServerTurnMessageSchema,
|
|
ServerPrestartMessageSchema,
|
|
ServerStartGameMessageSchema,
|
|
ServerPingMessageSchema,
|
|
ServerDesyncSchema,
|
|
]);
|
|
|
|
// Client
|
|
|
|
const ClientBaseMessageSchema = z.object({
|
|
type: z.enum(["winner", "join", "intent", "ping", "log", "hash"]),
|
|
clientID: ID,
|
|
persistentID: SafeString.nullable(), // WARNING: persistent id is private.
|
|
gameID: ID,
|
|
});
|
|
|
|
export const ClientSendWinnerSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("winner"),
|
|
winner: ID.or(z.nativeEnum(Team)).nullable(),
|
|
allPlayersStats: AllPlayersStatsSchema,
|
|
winnerType: z.enum(["player", "team"]),
|
|
});
|
|
|
|
export const ClientHashSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("hash"),
|
|
hash: z.number(),
|
|
turnNumber: z.number(),
|
|
});
|
|
|
|
export const ClientLogMessageSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("log"),
|
|
severity: z.nativeEnum(LogSeverity),
|
|
log: ID,
|
|
persistentID: SafeString,
|
|
});
|
|
|
|
export const ClientPingMessageSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("ping"),
|
|
});
|
|
|
|
export const ClientIntentMessageSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("intent"),
|
|
intent: IntentSchema,
|
|
});
|
|
|
|
// WARNING: never send this message to clients.
|
|
export const ClientJoinMessageSchema = ClientBaseMessageSchema.extend({
|
|
type: z.literal("join"),
|
|
lastTurn: z.number(), // The last turn the client saw.
|
|
username: SafeString,
|
|
flag: SafeString.nullable().optional(),
|
|
});
|
|
|
|
export const ClientMessageSchema = z.union([
|
|
ClientSendWinnerSchema,
|
|
ClientPingMessageSchema,
|
|
ClientIntentMessageSchema,
|
|
ClientJoinMessageSchema,
|
|
ClientLogMessageSchema,
|
|
ClientHashSchema,
|
|
]);
|
|
|
|
export const PlayerRecordSchema = z.object({
|
|
clientID: ID,
|
|
username: SafeString,
|
|
ip: SafeString.nullable(), // WARNING: PII
|
|
persistentID: SafeString, // WARNING: PII
|
|
});
|
|
|
|
export const GameRecordSchema = z.object({
|
|
id: ID,
|
|
gameStartInfo: GameStartInfoSchema,
|
|
players: z.array(PlayerRecordSchema),
|
|
startTimestampMS: z.number(),
|
|
endTimestampMS: z.number(),
|
|
durationSeconds: z.number(),
|
|
date: SafeString,
|
|
num_turns: z.number(),
|
|
turns: z.array(TurnSchema),
|
|
winner: z
|
|
.union([ID, z.nativeEnum(Team)])
|
|
.nullable()
|
|
.optional(),
|
|
winnerType: z.enum(["player", "team"]).nullable().optional(),
|
|
allPlayersStats: z.record(ID, PlayerStatsSchema),
|
|
version: z.enum(["v0.0.1"]),
|
|
gitCommit: z.string().nullable().optional(),
|
|
});
|