Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add new message types and handlers, refactor client and server code #2264

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions skymp5-client/src/messages.ts
Original file line number Diff line number Diff line change
@@ -23,4 +23,15 @@ export enum MsgType {
PlayerBowShot = 22,
SpellCast = 23,
UpdateAnimVariables = 24,

// ex-strings
DestroyActor = 25,
HostStart = 26,
HostStop = 27,
SetInventory = 28,
SetRaceMenuOpen = 29,
SpSnippet = 30,
Teleport2 = 31,
UpdateGamemodeData = 32,
CreateActor = 33
}
2 changes: 0 additions & 2 deletions skymp5-client/src/services/messages/anyMessage.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ import { CraftItemMessage } from "./craftItemMessage";
import { CreateActorMessage } from "./createActorMessage";
import { CustomEventMessage } from "./customEventMessage";
import { CustomPacketMessage } from "./customPacketMessage";
import { CustomPacketMessage2 } from "./customPacketMessage2";
import { DeathStateContainerMessage } from "./deathStateContainerMessage";
import { DestroyActorMessage } from "./destroyActorMessage";
import { DropItemMessage } from "./dropItemMessage";
@@ -59,7 +58,6 @@ export type AnyMessage = ActivateMessage
| HostStopMessage
| SetInventoryMessage
| CreateActorMessage
| CustomPacketMessage2
| DestroyActorMessage
| SetRaceMenuOpenMessage
| SpSnippetMessage
5 changes: 3 additions & 2 deletions skymp5-client/src/services/messages/createActorMessage.ts
Original file line number Diff line number Diff line change
@@ -3,11 +3,12 @@ import { Equipment } from "../../sync/equipment";
import { Inventory } from "../../sync/inventory";
import { Transform } from "../../sync/movement";
import { Animation } from "../../sync/animation";
import { MsgType } from "src/messages";

export interface CreateActorMessage extends CreateActorMessageMainProps {
type: "createActor";
t: MsgType.CreateActor,
idx: number;
baseRecordType: "DOOR" | undefined; // see PartOne.cpp
baseRecordType?: "DOOR"; // see PartOne.cpp
transform: Transform;
isMe: boolean;
props?: CreateActorMessageAdditionalProps;
10 changes: 0 additions & 10 deletions skymp5-client/src/services/messages/customPacketMessage.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
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,
contentJsonDump: string
4 changes: 3 additions & 1 deletion skymp5-client/src/services/messages/destroyActorMessage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { MsgType } from "../../messages";

export interface DestroyActorMessage {
type: "destroyActor";
t: MsgType.DestroyActor,
idx: number;
}
4 changes: 3 additions & 1 deletion skymp5-client/src/services/messages/hostStartMessage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { MsgType } from "../../messages";

export interface HostStartMessage {
type: "hostStart";
t: MsgType.HostStart;
target: number;
}
4 changes: 3 additions & 1 deletion skymp5-client/src/services/messages/hostStopMessage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { MsgType } from "../../messages";

export interface HostStopMessage {
type: "hostStop";
t: MsgType.HostStop;
target: number;
}
3 changes: 2 additions & 1 deletion skymp5-client/src/services/messages/setInventoryMessage.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Inventory } from "skyrimPlatform";
import { MsgType } from "../../messages";

export interface SetInventoryMessage {
type: "setInventory";
t: MsgType.SetInventory;
inventory: Inventory;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { MsgType } from "../../messages";

export interface SetRaceMenuOpenMessage {
type: "setRaceMenuOpen";
t: MsgType.SetRaceMenuOpen;
open: boolean;
}
4 changes: 3 additions & 1 deletion skymp5-client/src/services/messages/spSnippetMessage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { MsgType } from "../../messages";

export interface SpSnippetMessage {
type: "spSnippet";
t: MsgType.SpSnippet;
class: string;
function: string;
arguments: any[];
4 changes: 3 additions & 1 deletion skymp5-client/src/services/messages/teleportMessage2.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { MsgType } from "../../messages";

export interface TeleportMessage2 {
type: "teleport";
t: MsgType.Teleport2;
pos: number[];
rot: number[];
worldOrCell: number;
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { MsgType } from "../../messages";

export interface GamemodeValuePair {
name: string;
content: string;
}

export interface UpdateGamemodeDataMessage {
type: "updateGamemodeData";
t: MsgType.UpdateGamemodeData;
eventSources: GamemodeValuePair[];
updateOwnerFunctions: GamemodeValuePair[];
updateNeighborFunctions: GamemodeValuePair[];
215 changes: 105 additions & 110 deletions skymp5-client/src/services/services/networkingService.ts
Original file line number Diff line number Diff line change
@@ -79,118 +79,113 @@ export class NetworkingService extends ClientListener {
// TODO: in theory can be empty jsonContent and non-empty error
const msgAny: AnyMessage = JSON.parse(jsonContent);

if ("type" in msgAny) {
if (msgAny.type === "createActor") {
const event = { message: msgAny };
this.controller.emitter.emit("createActorMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "customPacket") {
const event = { message: msgAny };
this.controller.emitter.emit("customPacketMessage2", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "destroyActor") {
const event = { message: msgAny };
this.controller.emitter.emit("destroyActorMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "hostStart") {
const event = { message: msgAny };
this.controller.emitter.emit("hostStartMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "hostStop") {
const event = { message: msgAny };
this.controller.emitter.emit("hostStopMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "setInventory") {
const event = { message: msgAny };
this.controller.emitter.emit("setInventoryMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "setRaceMenuOpen") {
const event = { message: msgAny };
this.controller.emitter.emit("setRaceMenuOpenMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "spSnippet") {
const event = { message: msgAny };
this.controller.emitter.emit("spSnippetMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "updateGamemodeData") {
const event = { message: msgAny };
this.controller.emitter.emit("updateGamemodeDataMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.type === "teleport") {
const event = { message: msgAny };
this.controller.emitter.emit("teleportMessage2", event);
this.controller.emitter.emit("anyMessage", event);
}
else {
throw new NeverError(msgAny);
}
if (msgAny.t === MsgType.OpenContainer) {
const event = { message: msgAny };
this.controller.emitter.emit("openContainerMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateMovement) {
const event = { message: msgAny };
this.controller.emitter.emit("updateMovementMessage", event)
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAnimation) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAnimationMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateEquipment) {
const event = { message: msgAny };
this.controller.emitter.emit("updateEquipmentMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.ChangeValues) {
const event = { message: msgAny };
this.controller.emitter.emit("changeValuesMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.SpellCast) {
const event = { message: msgAny };
this.controller.emitter.emit("spellCastMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAnimVariables) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAnimVariablesMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAppearance) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAppearanceMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.Teleport) {
const event = { message: msgAny };
this.controller.emitter.emit("teleportMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateProperty) {
const event = { message: msgAny };
this.controller.emitter.emit("updatePropertyMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.DeathStateContainer) {
const event = { message: msgAny };
this.controller.emitter.emit("deathStateContainerMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.CreateActor) {
const event = { message: msgAny };
this.controller.emitter.emit("createActorMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.CustomPacket) {
const event = { message: msgAny };
this.controller.emitter.emit("customPacketMessage2", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.DestroyActor) {
const event = { message: msgAny };
this.controller.emitter.emit("destroyActorMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.HostStart) {
const event = { message: msgAny };
this.controller.emitter.emit("hostStartMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.HostStop) {
const event = { message: msgAny };
this.controller.emitter.emit("hostStopMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.SetInventory) {
const event = { message: msgAny };
this.controller.emitter.emit("setInventoryMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.SetRaceMenuOpen) {
const event = { message: msgAny };
this.controller.emitter.emit("setRaceMenuOpenMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.SpSnippet) {
const event = { message: msgAny };
this.controller.emitter.emit("spSnippetMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateGamemodeData) {
const event = { message: msgAny };
this.controller.emitter.emit("updateGamemodeDataMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.Teleport2) {
const event = { message: msgAny };
this.controller.emitter.emit("teleportMessage2", event);
this.controller.emitter.emit("anyMessage", event);
}
else {
if (msgAny.t === MsgType.OpenContainer) {
const event = { message: msgAny };
this.controller.emitter.emit("openContainerMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateMovement) {
const event = { message: msgAny };
this.controller.emitter.emit("updateMovementMessage", event)
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAnimation) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAnimationMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateEquipment) {
const event = { message: msgAny };
this.controller.emitter.emit("updateEquipmentMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.ChangeValues) {
const event = { message: msgAny };
this.controller.emitter.emit("changeValuesMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.SpellCast) {
const event = { message: msgAny };
this.controller.emitter.emit("spellCastMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAnimVariables) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAnimVariablesMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateAppearance) {
const event = { message: msgAny };
this.controller.emitter.emit("updateAppearanceMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.Teleport) {
const event = { message: msgAny };
this.controller.emitter.emit("teleportMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.UpdateProperty) {
const event = { message: msgAny };
this.controller.emitter.emit("updatePropertyMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
else if (msgAny.t === MsgType.DeathStateContainer) {
const event = { message: msgAny };
this.controller.emitter.emit("deathStateContainerMessage", event);
this.controller.emitter.emit("anyMessage", event);
}
// todo: never error
throw new NeverError(msgAny);
}
break;
}
19 changes: 7 additions & 12 deletions skymp5-server/cpp/addon/property_bindings/AppearanceBinding.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "AppearanceBinding.h"
#include "NapiHelper.h"
#include "UpdateAppearanceMessage.h"

Napi::Value AppearanceBinding::Get(Napi::Env env, ScampServer& scampServer,
uint32_t formId)
@@ -34,19 +35,13 @@ void AppearanceBinding::Set(Napi::Env env, ScampServer& scampServer,

auto appearance = actor.GetAppearance();

std::string msg;
msg += Networking::MinPacketId;
msg += nlohmann::json{
{ "data",
appearance ? nlohmann::json::parse(appearance->ToJson())
: nlohmann::json{} },
{ "idx", actor.GetIdx() },
{ "t", MsgType::UpdateAppearance }
}.dump();
UpdateAppearanceMessage message;
message.appearance = appearance ? *appearance : std::nullopt;
message.idx = actor.GetIdx();

for (auto listener : actor.GetActorListeners()) {
// TODO: change to SendToUser
listener->SendToUserDeferred(msg.data(), msg.size(), true,
kChannelAppearance, false);
// TODO: change to SendToUser, probably was deferred only for ability to
// send text packets
listener->SendToUserDeferred(message, true, kChannelAppearance, false);
}
}
Loading