From 72918634819d93e34c654a9c0f2173db9be49f14 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 4 Jul 2025 12:22:49 -0400 Subject: [PATCH] Move scrambler module to packet This is to make WebAssembly builds work again, because the world module isn't compiled there. --- src/packet/compression.rs | 6 ++++-- src/packet/mod.rs | 5 +++++ src/{world => packet}/scrambler.rs | 0 src/packet/send_helpers.rs | 4 ++-- src/world/connection.rs | 8 ++++---- src/world/mod.rs | 5 ----- 6 files changed, 15 insertions(+), 13 deletions(-) rename src/{world => packet}/scrambler.rs (100%) diff --git a/src/packet/compression.rs b/src/packet/compression.rs index 1caa8a6..372fc76 100644 --- a/src/packet/compression.rs +++ b/src/packet/compression.rs @@ -6,10 +6,12 @@ use binrw::{BinRead, BinResult}; use crate::{ config::get_config, packet::{PacketHeader, PacketSegment}, - world::{ScramblerKeys, scramble_packet}, }; -use super::{IPC_HEADER_SIZE, PacketState, ReadWriteIpcSegment, SegmentData, oodle::OodleNetwork}; +use super::{ + IPC_HEADER_SIZE, PacketState, ReadWriteIpcSegment, ScramblerKeys, SegmentData, + oodle::OodleNetwork, scramble_packet, +}; #[binrw] #[brw(repr = u8)] diff --git a/src/packet/mod.rs b/src/packet/mod.rs index e887ac3..1714fa0 100644 --- a/src/packet/mod.rs +++ b/src/packet/mod.rs @@ -21,3 +21,8 @@ pub mod oodle; mod send_helpers; #[cfg(not(target_family = "wasm"))] pub use send_helpers::{send_keep_alive, send_packet}; + +mod scrambler; +pub use scrambler::{ + OBFUSCATION_ENABLED_MODE, ScramblerKeyGenerator, ScramblerKeys, scramble_packet, +}; diff --git a/src/world/scrambler.rs b/src/packet/scrambler.rs similarity index 100% rename from src/world/scrambler.rs rename to src/packet/scrambler.rs diff --git a/src/packet/send_helpers.rs b/src/packet/send_helpers.rs index f8bcd28..6f63ca9 100644 --- a/src/packet/send_helpers.rs +++ b/src/packet/send_helpers.rs @@ -3,11 +3,11 @@ use std::io::Cursor; use binrw::BinWrite; use tokio::{io::AsyncWriteExt, net::TcpStream}; -use crate::{common::timestamp_msecs, world::ScramblerKeys}; +use crate::common::timestamp_msecs; use super::{ CompressionType, ConnectionType, PacketHeader, PacketSegment, PacketState, ReadWriteIpcSegment, - SegmentData, SegmentType, compression::compress, + ScramblerKeys, SegmentData, SegmentType, compression::compress, }; pub async fn send_packet( diff --git a/src/world/connection.rs b/src/world/connection.rs index b4aaa56..6cbf7e0 100644 --- a/src/world/connection.rs +++ b/src/world/connection.rs @@ -28,14 +28,14 @@ use crate::{ }, opcodes::ServerZoneIpcType, packet::{ - CompressionType, ConnectionType, PacketSegment, PacketState, SegmentData, SegmentType, - parse_packet, send_packet, + CompressionType, ConnectionType, OBFUSCATION_ENABLED_MODE, PacketSegment, PacketState, + ScramblerKeyGenerator, ScramblerKeys, SegmentData, SegmentType, parse_packet, send_packet, }, }; use super::{ - Actor, CharacterData, EffectsBuilder, Event, LuaPlayer, OBFUSCATION_ENABLED_MODE, - ScramblerKeyGenerator, ScramblerKeys, StatusEffects, ToServer, WorldDatabase, Zone, + Actor, CharacterData, EffectsBuilder, Event, LuaPlayer, StatusEffects, ToServer, WorldDatabase, + Zone, common::{ClientId, ServerHandle}, load_init_script, lua::Task, diff --git a/src/world/mod.rs b/src/world/mod.rs index d7e6a72..d2b4929 100644 --- a/src/world/mod.rs +++ b/src/world/mod.rs @@ -30,8 +30,3 @@ pub use custom_ipc_handler::handle_custom_ipc; mod common; pub use common::{ClientHandle, ClientId, FromServer, ServerHandle, ToServer}; - -mod scrambler; -pub use scrambler::{ - OBFUSCATION_ENABLED_MODE, ScramblerKeyGenerator, ScramblerKeys, scramble_packet, -};