fix: freeze global constants (#554)

* deps

* url

* onEvent

* bump

* freeze

* u16

* ChatMessage

* deps

Author: ferreira-tb

Cargo.lock

@@ -23,7 +23,7 @@ members = [
 
 [workspace.package]
 description = "Multiplayer strategy game"
-version = "0.7.19"
+version = "0.7.20"
 edition = "2024"
 rust-version = "1.99"
 license = "AGPL-3.0-only"

Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Call of Nil",
-  "version": "0.7.19",
+  "version": "0.7.20",
   "identifier": "tsukilabs.nil",
   "build": {
     "beforeDevCommand": "pnpm run -F app dev",

app/src-tauri/tauri.conf.json

@@ -16,9 +16,9 @@ import type { Locale } from "@tsukilabs/nil-bindings";
 import { setDragDropEventListener } from "@/lib/event";
 import { createTrayIcon, showWindow } from "@/commands";
 import { onAltKeyDown, onKeyDown, useBreakpoints } from "@tb-dev/vue";
-import { defineGlobalCheats, defineGlobalCommands } from "@/lib/global";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { type BasicColorSchema, useColorMode, watchImmediate } from "@vueuse/core";
+import { defineGlobalCheats, defineGlobalCommands, freezeGlobalConstants } from "@/lib/global";
 
 const i18n = useI18n();
 
@@ -50,6 +50,7 @@ if (__DESKTOP__) {
 
 onMounted(async () => {
   try {
+    freezeGlobalConstants();
     defineGlobalCommands();
     defineGlobalCheats();
 

app/src/App.vue

@@ -16,7 +16,7 @@ const datetime = computed(() => props.message.formatDate());
   <div class="flex w-full flex-col gap-1 overflow-hidden">
     <div class="text-muted-foreground flex items-center justify-between gap-4 text-xs">
       <span v-if="message.author.kind === 'player'" class="ellipsis">
-        {{ message.author.id }}
+        {{ message.author.player }}
       </span>
       <span class="hidden md:block">{{ datetime }}</span>
     </div>

app/src/components/chat/ChatMessage.vue

@@ -3,6 +3,7 @@
 
 import * as commands from "@/commands";
 import * as cheats from "@/commands/cheat";
+import { freezeObject } from "@/lib/object";
 import { camelCase } from "es-toolkit/string";
 
 export const CONSTS = globalThis.__CONSTS__;
@@ -11,6 +12,10 @@ export const DESKTOP = globalThis.__DESKTOP__;
 export const MOBILE = globalThis.__MOBILE__;
 export const VERSION = globalThis.__VERSION__;
 
+export function freezeGlobalConstants() {
+  freezeObject(globalThis.__CONSTS__);
+}
+
 export function defineGlobalCommands() {
   if (!Object.hasOwn(globalThis.NIL, "cmd")) {
     Object.defineProperty(globalThis.NIL, "cmd", {

app/src/lib/global.ts

@@ -0,0 +1,15 @@
+// Copyright (C) Call of Nil contributors
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { isPlainObject } from "es-toolkit/predicate";
+
+export function freezeObject(object: Record<PropertyKey, unknown>) {
+  Object.freeze(object);
+
+  for (const key of Reflect.ownKeys(object)) {
+    const value = object[key];
+    if (isPlainObject(value)) {
+      freezeObject(value);
+    }
+  }
+}

app/src/lib/object.ts

@@ -41,7 +41,7 @@ function onChatMessage({ message }: ChatMessagePayload) {
     !isChatOpen.value &&
     route.name !== ("chat" satisfies GameScene) &&
     message.author.kind === "player" &&
-    message.author.id !== player.value?.id
+    message.author.player !== player.value?.id
   ) {
     hasUnread.value = true;
   }

app/src/scenes/game/FooterChat.vue

@@ -8,7 +8,7 @@ use jiff::Zoned;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::collections::VecDeque;
-use std::num::NonZeroUsize;
+use std::num::NonZeroU16;
 use std::sync::Arc;
 use strum::EnumIs;
 use uuid::Uuid;
@@ -38,16 +38,16 @@ impl Chat {
 pub struct ChatHistory {
   #[cfg_attr(feature = "typescript", ts(as = "Vec<ChatMessage>"))]
   queue: VecDeque<ChatMessage>,
-  size: NonZeroUsize,
+  size: NonZeroU16,
 }
 
 impl ChatHistory {
-  pub const MIN: NonZeroUsize = NonZeroUsize::new(100).unwrap();
-  pub const MAX: NonZeroUsize = NonZeroUsize::new(500).unwrap();
+  pub const MIN: NonZeroU16 = NonZeroU16::new(100).unwrap();
+  pub const MAX: NonZeroU16 = NonZeroU16::new(500).unwrap();
 
-  const fn new(size: usize) -> Self {
+  const fn new(size: u16) -> Self {
     let size = size.clamp(Self::MIN.get(), Self::MAX.get());
-    let size = unsafe { NonZeroUsize::new_unchecked(size) };
+    let size = unsafe { NonZeroU16::new_unchecked(size) };
     Self { queue: VecDeque::new(), size }
   }
 
@@ -57,8 +57,8 @@ impl ChatHistory {
   }
 
   fn prune(&mut self) {
-    let size = self.size.get();
     let len = self.queue.len();
+    let size = usize::from(self.size.get());
     if len >= size {
       self.queue.drain(..=(len - size));
     }
@@ -144,19 +144,19 @@ pub enum ChatMessageAuthor {
   #[default]
   System,
   Player {
-    id: PlayerId,
+    player: PlayerId,
   },
 }
 
 impl From<PlayerId> for ChatMessageAuthor {
   fn from(id: PlayerId) -> Self {
-    Self::Player { id }
+    Self::Player { player: id }
   }
 }
 
 impl From<&PlayerId> for ChatMessageAuthor {
   fn from(id: &PlayerId) -> Self {
-    Self::Player { id: id.clone() }
+    Self::Player { player: id.clone() }
   }
 }
 

crates/nil-core/src/chat.rs

@@ -11,5 +11,5 @@ use tokio::sync::RwLock;
 pub(crate) static CLIENT: LazyLock<RwLock<Client>> = LazyLock::new(RwLock::default);
 
 pub(crate) fn on_event() -> impl Fn(Event) -> BoxFuture<'static, ()> {
-  move |event: Event| Box::pin(async move { push_event(event) })
+  move |event: Event| Box::pin(async move { push_event(&event) })
 }