.

misc/git-hooks/clang-format-hook.js

@@ -56,7 +56,14 @@ const checks = [
 
       // Check if the file belongs to one of the valid parent directories
       return validDirs.some((dir) => file.includes(path.sep + dir + path.sep))
-        && !file.endsWith(path.sep + "anyMessage.ts");
+        && !file.endsWith(path.sep + "anyMessage.ts")
+        && !file.endsWith(path.sep + "refrIdMessageBase.ts")
+        && !file.endsWith(path.sep + "MessageBase.h")
+        && !file.endsWith(path.sep + "MessageSerializerFactory.cpp")
+        && !file.endsWith(path.sep + "MessageSerializerFactory.h")
+        && !file.endsWith(path.sep + "Messages.h")
+        && !file.endsWith(path.sep + "MinPacketId.h")
+        && !file.endsWith(path.sep + "MsgType.h");
     },
     lint: (file) => {
       const serverDir = "skymp5-server/cpp/messages";

skymp5-client/src/services/messages/customPacketMessage.ts

@@ -1,11 +1,16 @@
 import { MsgType } from "../../messages";
 
+// export interface CustomPacketMessage {
+//     t: MsgType.CustomPacket,
+//     content: CustomPacketMessageContent
+// }
+
+// interface CustomPacketMessageContent {
+//     customPacketType: string,
+//     gameData: Record<string, unknown>
+// }
+
 export interface CustomPacketMessage {
     t: MsgType.CustomPacket,
-    content: CustomPacketMessageContent
-}
-
-interface CustomPacketMessageContent {
-    customPacketType: string,
-    gameData: Record<string, unknown>
+    contentJsonDump: string
 }

skymp5-client/src/services/messages/putItemMessage.ts

@@ -3,6 +3,7 @@ import { MsgType } from "../../messages";
 
 export interface PutItemMessage extends Extra {
     t: MsgType.PutItem,
+    baseId: number;
     count: number;
     target: number;
 };

skymp5-client/src/services/messages/spellCastMessage.ts

@@ -1,6 +1,4 @@
 import { MsgType } from "../../messages";
-// @ts-expect-error (TODO: Remove in 2.10.0)
-import { ActorAnimationVariables } from 'skyrimPlatform';
 
 export interface SpellCastMsgData {
     caster: number
@@ -11,7 +9,11 @@ export interface SpellCastMsgData {
     castingSource: number
     aimAngle: number,
     aimHeading: number,
-    actorAnimationVariables: ActorAnimationVariables
+    actorAnimationVariables: {
+        booleans: number[]
+        floats: number[]
+        integers: number[]
+    }
 }
 
 export interface SpellCastMessage {

skymp5-client/src/services/messages/takeItemMessage.ts

@@ -3,6 +3,7 @@ import { MsgType } from "../../messages";
 
 export interface TakeItemMessage extends Extra {
     t: MsgType.TakeItem,
+    baseId: number;
     count: number;
     target: number;
 };

skymp5-client/src/services/messages/updateAnimVariablesMessage.ts

@@ -1,10 +1,12 @@
 import { MsgType } from "../../messages";
-// @ts-expect-error (TODO: Remove in 2.10.0)
-import { ActorAnimationVariables } from 'skyrimPlatform';
 
 export interface UpdateAnimVariablesMessageMsgData {
     actorRemoteId: number
-    actorAnimationVariables: ActorAnimationVariables
+    actorAnimationVariables: {
+        booleans: number[]
+        floats: number[]
+        integers: number[]
+    }
 }
 
 export interface UpdateAnimVariablesMessage {

skymp5-client/src/services/messages/updateGameModeDataMessage.ts

@@ -1,6 +1,11 @@
+export interface GamemodeValuePair {
+    name: string;
+    content: string;
+}
+
 export interface UpdateGamemodeDataMessage {
     type: "updateGamemodeData";
-    eventSources: Record<string, string>;
-    updateOwnerFunctions: Record<string, string>;
-    updateNeighborFunctions: Record<string, string>;
+    eventSources: GamemodeValuePair[];
+    updateOwnerFunctions: GamemodeValuePair[];
+    updateNeighborFunctions: GamemodeValuePair[];
 }

skymp5-client/src/services/services/gamemodeEventSourceService.ts

@@ -37,7 +37,10 @@ export class GamemodeEventSourceService extends ClientListener {
             });
         }
 
-        let eventNames = Object.keys(event.message.eventSources);
+        let eventSourcesRecord: Record<string, string | undefined> = {};
+        event.message.eventSources.forEach(pair => eventSourcesRecord[pair.name] = pair.content);
+
+        let eventNames = Object.keys(eventSourcesRecord);
 
         let blockedEventSources = this.sp.settings["skymp5-client"]["blockedEventSources"];
 
@@ -50,7 +53,7 @@ export class GamemodeEventSourceService extends ClientListener {
 
         eventNames.forEach((eventName) => {
             try {
-                const fn = new Function('ctx', event.message.eventSources[eventName]);
+                const fn = new Function('ctx', eventSourcesRecord[eventName]!);
                 const ctx: GamemodeApiEventSourceCtx = {
                     refr: undefined,
                     value: undefined,

skymp5-client/src/services/services/gamemodeUpdateService.ts

@@ -1,7 +1,7 @@
 import { FormModel } from "../../view/model";
 import { ConnectionMessage } from "../events/connectionMessage";
 import { CreateActorMessage } from "../messages/createActorMessage";
-import { UpdateGamemodeDataMessage } from "../messages/updateGameModeDataMessage";
+import { GamemodeValuePair, UpdateGamemodeDataMessage } from "../messages/updateGameModeDataMessage";
 import { ClientListener, CombinedController, Sp } from "./clientListener";
 import { RemoteServer } from "./remoteServer";
 import { ObjectReference } from "skyrimPlatform";
@@ -109,11 +109,11 @@ export class GamemodeUpdateService extends ClientListener {
 
         this.updateGamemodeUpdateFunctions(
             'updateNeighborFunctions',
-            event.message.updateNeighborFunctions || {},
+            event.message.updateNeighborFunctions,
         );
         this.updateGamemodeUpdateFunctions(
             'updateOwnerFunctions',
-            event.message.updateOwnerFunctions || {},
+            event.message.updateOwnerFunctions,
         );
     }
 
@@ -196,16 +196,20 @@ export class GamemodeUpdateService extends ClientListener {
 
     private updateGamemodeUpdateFunctions(
         storageVar: string,
-        functionSources: Record<string, string>,
+        functionSources: GamemodeValuePair[],
     ) {
-        this.sp.storage[storageVar] = JSON.parse(JSON.stringify(functionSources));
-        for (const propName of Object.keys(functionSources)) {
+        let functionSourcesRecord: Record<string, string | undefined> = {};
+        functionSources.forEach(pair => functionSourcesRecord[pair.name] = pair.content);
+
+        this.sp.storage[storageVar] = functionSourcesRecord;
+
+        for (const propName of Object.keys(functionSourcesRecord)) {
             try {
                 (this.sp.storage[storageVar] as any)[propName] = new Function(
                     'ctx',
                     (this.sp.storage[storageVar] as any)[propName],
                 );
-                const emptyFunction = functionSources[propName] === '';
+                const emptyFunction = functionSourcesRecord[propName] === '';
                 if (emptyFunction) {
                     delete (this.sp.storage[storageVar] as any)[propName];
                     logTrace(this, storageVar, propName, 'Added empty');

skymp5-client/src/services/services/magicSyncService.ts

@@ -45,7 +45,7 @@ export class MagicSyncService extends ClientListener {
                 return;
             }
 
-            const animVariables = getAnimationVariablesFromActor(ac.getFormID());
+            const animVariables = this.getAnimationVariablesFromActorConverted(ac.getFormID());
 
             this.controller.emitter.emit("sendMessage", {
                 message: { t: MsgType.UpdateAnimVariables, data: this.getUpdateAnimVariablesEventData(ac, animVariables) },
@@ -81,7 +81,7 @@ export class MagicSyncService extends ClientListener {
 
             let msg: SpellCastMsgData = this.lastSpellCastEventMsg;
             msg.interruptCast = true;
-            msg.actorAnimationVariables = getAnimationVariablesFromActor(remoteIdToLocalId(this.lastSpellCastEventMsg.caster));
+            msg.actorAnimationVariables = this.getAnimationVariablesFromActorConverted(remoteIdToLocalId(this.lastSpellCastEventMsg.caster));
 
             this.controller.emitter.emit("sendMessage", {
                 message: { t: MsgType.SpellCast, data: msg },
@@ -106,11 +106,23 @@ export class MagicSyncService extends ClientListener {
             aimAngle: e.aimAngle,
             // @ts-expect-error (TODO: Remove in 2.10.0)
             aimHeading: e.aimHeading,
-            actorAnimationVariables: getAnimationVariablesFromActor(e.caster.getFormID()),
+            actorAnimationVariables: this.getAnimationVariablesFromActorConverted(e.caster.getFormID()),
         }
         return spellCastData;
     }
 
+    private getAnimationVariablesFromActorConverted(actorId: number) {
+        const animVars = getAnimationVariablesFromActor(actorId);
+        const booleans: ArrayBuffer = animVars.booleans;
+        const floats: ArrayBuffer = animVars.floats;
+        const integers: ArrayBuffer = animVars.integers;
+        return { 
+            booleans: Array.from(new Uint8Array(booleans)),
+            floats: Array.from(new Uint8Array(floats)),
+            integers: Array.from(new Uint8Array(integers)),
+        }
+    }
+
     private getUpdateAnimVariablesEventData(ac: Actor, animVariables: ActorAnimationVariables): UpdateAnimVariablesMessageMsgData {
         const animVarsData: UpdateAnimVariablesMessageMsgData = {
             actorRemoteId: localIdToRemoteId(ac.getFormID(), true),

skymp5-client/src/services/services/remoteServer.ts

@@ -903,9 +903,9 @@ export class RemoteServer extends ClientListener {
       if (!ac) return;
 
       const actorAnimationVariables: ActorAnimationVariables = {
-        booleans: new Uint8Array(Object.values(msg.data.actorAnimationVariables.booleans)),
-        floats: new Uint8Array(Object.values(msg.data.actorAnimationVariables.floats)),
-        integers: new Uint8Array(Object.values(msg.data.actorAnimationVariables.integers))
+        booleans: new Uint8Array(msg.data.actorAnimationVariables.booleans),
+        floats: new Uint8Array(msg.data.actorAnimationVariables.floats),
+        integers: new Uint8Array(msg.data.actorAnimationVariables.integers)
       };
 
       if (msg.data.interruptCast) {
@@ -929,9 +929,9 @@ export class RemoteServer extends ClientListener {
       if (!ac) return;
 
       const actorAnimationVariables: ActorAnimationVariables = {
-        booleans: new Uint8Array(Object.values(msg.data.actorAnimationVariables.booleans)),
-        floats: new Uint8Array(Object.values(msg.data.actorAnimationVariables.floats)),
-        integers: new Uint8Array(Object.values(msg.data.actorAnimationVariables.integers))
+        booleans: new Uint8Array(msg.data.actorAnimationVariables.booleans),
+        floats: new Uint8Array(msg.data.actorAnimationVariables.floats),
+        integers: new Uint8Array(msg.data.actorAnimationVariables.integers)
       };
 
       const isApplyed = applyAnimationVariablesToActor(ac.getFormID(), actorAnimationVariables);

skymp5-server/cpp/messages/CustomPacketMessage.h

@@ -0,0 +1,18 @@
+#include "MessageBase.h"
+#include "MsgType.h"
+#include <type_traits>
+
+struct CustomPacketMessage : public MessageBase<CustomPacketMessage>
+{
+  static constexpr auto kMsgType =
+    std::integral_constant<char, static_cast<char>(MsgType::CustomPacket)>{};
+
+  template <class Archive>
+  void Serialize(Archive& archive)
+  {
+    archive.Serialize("t", kMsgType)
+      .Serialize("contentJsonDump", contentJsonDump);
+  }
+
+  std::string contentJsonDump;
+};

skymp5-server/cpp/messages/HostStartMessage.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "MessageBase.h"
+#include "MsgType.h"
+#include <type_traits>
+
+struct HostStartMessage : public MessageBase<HostStartMessage>
+{
+  static constexpr auto kMsgType =
+    std::integral_constant<char, static_cast<char>(MsgType::HostStart)>{};
+
+  template <class Archive>
+  void Serialize(Archive& archive)
+  {
+    archive.Serialize("t", kMsgType).Serialize("target", target);
+  }
+
+  uint64_t target = 0;
+};

skymp5-server/cpp/messages/HostStopMessage.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "MessageBase.h"
+#include "MsgType.h"
+#include <type_traits>
+
+struct HostStopMessage : public MessageBase<HostStopMessage>
+{
+  static constexpr auto kMsgType =
+    std::integral_constant<char, static_cast<char>(MsgType::HostStop)>{};
+
+  template <class Archive>
+  void Serialize(Archive& archive)
+  {
+    archive.Serialize("t", kMsgType).Serialize("target", target);
+  }
+
+  uint64_t target = 0;
+};

skymp5-server/cpp/messages/Messages.h

@@ -1,11 +1,26 @@
 #pragma once
 #include "ActivateMessage.h"
 #include "ChangeValuesMessage.h"
+#include "CustomPacketMessage.h"
 #include "DeathStateContainerMessage.h"
+#include "HostStartMessage.h"
+#include "HostStopMessage.h"
+#include "OnEquipMessage.h"
 #include "OpenContainerMessage.h"
+#include "PlayerBowShotMessage.h"
+#include "PutItemMessage.h"
+#include "SetInventoryMessage.h"
+#include "SetRaceMenuOpenMessage.h"
+#include "SpSnippetMessage.h"
+#include "SpellCastMessage.h"
+#include "TakeItemMessage.h"
 #include "TeleportMessage.h"
+#include "TeleportMessage2.h"
+#include "UpdateAnimVariablesMessage.h"
 #include "UpdateAnimationMessage.h"
+#include "UpdateAppearanceMessage.h"
 #include "UpdateEquipmentMessage.h"
+#include "UpdateGameModeDataMessage.h"
 #include "UpdateMovementMessage.h"
 #include "UpdatePropertyMessage.h"
 
@@ -26,4 +41,19 @@
   REGISTER_MESSAGE(TeleportMessage)                                           \
   REGISTER_MESSAGE(UpdatePropertyMessage)                                     \
   REGISTER_MESSAGE(OpenContainerMessage)                                      \
-  REGISTER_MESSAGE(UpdateEquipmentMessage)
+  REGISTER_MESSAGE(UpdateEquipmentMessage)                                    \
+  REGISTER_MESSAGE(CustomPacketMessage.h)                                     \
+  REGISTER_MESSAGE(HostStartMessage.h)                                        \
+  REGISTER_MESSAGE(HostStopMessage.h)                                         \
+  REGISTER_MESSAGE(OnEquipMessage.h)                                          \
+  REGISTER_MESSAGE(PlayerBowShotMessage.h)                                    \
+  REGISTER_MESSAGE(PutItemMessage.h)                                          \
+  REGISTER_MESSAGE(SetInventoryMessage.h)                                     \
+  REGISTER_MESSAGE(SetRaceMenuOpenMessage.h)                                  \
+  REGISTER_MESSAGE(SpellCastMessage.h)                                        \
+  REGISTER_MESSAGE(SpSnippetMessage.h)                                        \
+  REGISTER_MESSAGE(TakeItemMessage.h)                                         \
+  REGISTER_MESSAGE(TeleportMessage2.h)                                        \
+  REGISTER_MESSAGE(UpdateAnimVariablesMessage.h)                              \
+  REGISTER_MESSAGE(UpdateAppearanceMessage.h)                                 \
+  REGISTER_MESSAGE(UpdateGameModeDataMessage.h)

skymp5-server/cpp/messages/MsgType.h

@@ -30,7 +30,15 @@ enum class MsgType : uint8_t
   UpdateAnimVariables = 24,
 
   // ex-strings
-  DestroyActor = 100,
+  DestroyActor = 25,
+  HostStart = 26,
+  HostStop = 27,
+  SetInventory = 28,
+  SetRaceMenuOpen = 29,
+  SpellCast = 30,
+  SpSnippet = 31,
+  Teleport2 = 32,
+  UpdateGamemodeData = 33,
 
   Max
 };

skymp5-server/cpp/messages/OnEquipMessage.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "MessageBase.h"
+#include "MsgType.h"
+#include <type_traits>
+
+struct OnEquipMessage : public MessageBase<OnEquipMessage>
+{
+  static constexpr auto kMsgType =
+    std::integral_constant<char, static_cast<char>(MsgType::OnEquip)>{};
+
+  template <class Archive>
+  void Serialize(Archive& archive)
+  {
+    archive.Serialize("t", kMsgType).Serialize("baseId", baseId);
+  }
+
+  uint32_t baseId = 0;
+};

skymp5-server/cpp/messages/OpenContainerMessage.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "MessageBase.h"
 #include "MsgType.h"
-#include <array>
 #include <type_traits>
 
 struct OpenContainerMessage : public MessageBase<OpenContainerMessage>