refactor: rename and relocate receivePersonaData function for better …

…organization
rustymotors · Jan 4, 2025 · 67be790 · 67be790
1 parent 970dd3f
commit 67be790
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 66 deletions.
diff --git a/packages/persona/index.ts b/packages/persona/index.ts
@@ -1,2 +1,2 @@
 export { getPersonasByPersonaId } from "./src/getPersonasByPersonaId.js";
-export { receivePersonaData } from "./src/internal.js";
+export { receivePersonaData } from "./src/receivePersonaData.js";
diff --git a/packages/persona/src/index.ts → ...es/persona/src/handleSelectGamePersona.ts b/packages/persona/src/index.ts → ...es/persona/src/handleSelectGamePersona.ts
@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 import { NPSMessage, ServerLogger } from "rusty-motors-shared";
 
 /**
@@ -22,7 +21,11 @@ import { NPSMessage, ServerLogger } from "rusty-motors-shared";
  * @param {ServerLogger} log
  * @returns {Promise<NPSMessage>}
  */
-export async function handleSelectGamePersona(requestPacket: NPSMessage, log: ServerLogger): Promise<NPSMessage> {
+
+export async function handleSelectGamePersona(
+	requestPacket: NPSMessage,
+	log: ServerLogger,
+): Promise<NPSMessage> {
 	log.debug("_npsSelectGamePersona...");
 
 	log.debug(

diff --git a/packages/persona/src/internal.ts b/packages/persona/src/internal.ts
@@ -25,7 +25,6 @@ import { _gameLogout } from "./_gameLogout.js";
 import { _getFirstBuddy } from "./_getFirstBuddy.js";
 import { _selectGamePersona } from "./_selectGamePersona.js";
 import { validatePersonaName } from "./handlers/validatePersonaName.js";
-import type { BufferSerializer } from "rusty-motors-shared-packets";
 import { getPersonaInfo } from "./handlers/getPersonaInfo.js";
 import { getServerLogger } from "rusty-motors-shared";
 
@@ -257,68 +256,6 @@ async function getPersonaMaps({
 	}
 }
 
-/**
- *
- *
- * @param {object} args
- * @param {string} args.connectionId
- * @param {SerializedBufferOld} args.message
- * @param {ServerLogger} [args.log=getServerLogger({ name: "PersonaServer" })]
- * @returns {Promise<{
- *  connectionId: string,
- * messages: SerializedBufferOld[],
- * }>}
- * @throws {Error} Unknown code was received
- */
-export async function receivePersonaData({
-	connectionId,
-	message,
-	log = getServerLogger("PersonaServer/receivePersonaData"),
-}: {
-	connectionId: string;
-	message: BufferSerializer;
-	log?: ServerLogger;
-}): Promise<{
-	connectionId: string;
-	messages: SerializedBufferOld[];
-}> {
-	const data = message.serialize();
-	log.debug(`[${connectionId}] Entering receivePersonaData`);
-	log.debug(`[${connectionId}] Received persona data: ${data.toString("hex")}`);
-
-	// The packet needs to be an NPSMessage
-	const inboundMessage = new LegacyMessage();
-	inboundMessage._doDeserialize(message.serialize());
-
-	const supportedHandler = messageHandlers.find((h) => {
-		return h.opCode === inboundMessage._header.id;
-	});
-
-	if (typeof supportedHandler === "undefined") {
-		// We do not yet support this message code
-		throw Error(
-			`[connectionId}] UNSUPPORTED_MESSAGECODE: ${inboundMessage._header.id}`,
-		);
-	}
-
-	try {
-		const result = await supportedHandler.handler({
-			connectionId,
-			message: inboundMessage,
-			log,
-		});
-		log.debug(
-			`[${connectionId}] Returning with ${result.messages.length} messages`,
-		);
-		return result;
-	} catch (error) {
-		const err = Error(`[${connectionId}] Error handling persona data`, {
-			cause: error,
-		});
-		throw err;
-	}
-}
-
 export function personaToString(persona: Partial<PersonaRecord>): string {
 	return "".concat(
 		`PersonaRecord: customerId=${persona.customerId}, `,

diff --git a/packages/persona/src/receivePersonaData.ts b/packages/persona/src/receivePersonaData.ts
@@ -0,0 +1,71 @@
+import {
+	getServerLogger,
+	ServerLogger,
+	SerializedBufferOld,
+	LegacyMessage,
+} from "rusty-motors-shared";
+import type { BufferSerializer } from "rusty-motors-shared-packets";
+import { messageHandlers } from "./internal";
+
+/**
+ *
+ *
+ * @param {object} args
+ * @param {string} args.connectionId
+ * @param {SerializedBufferOld} args.message
+ * @param {ServerLogger} [args.log=getServerLogger({ name: "PersonaServer" })]
+ * @returns {Promise<{
+ *  connectionId: string,
+ * messages: SerializedBufferOld[],
+ * }>}
+ * @throws {Error} Unknown code was received
+ */
+
+export async function receivePersonaData({
+	connectionId,
+	message,
+	log = getServerLogger("PersonaServer/receivePersonaData"),
+}: {
+	connectionId: string;
+	message: BufferSerializer;
+	log?: ServerLogger;
+}): Promise<{
+	connectionId: string;
+	messages: SerializedBufferOld[];
+}> {
+	const data = message.serialize();
+	log.debug(`[${connectionId}] Entering receivePersonaData`);
+	log.debug(`[${connectionId}] Received persona data: ${data.toString("hex")}`);
+
+	// The packet needs to be an NPSMessage
+	const inboundMessage = new LegacyMessage();
+	inboundMessage._doDeserialize(message.serialize());
+
+	const supportedHandler = messageHandlers.find((h) => {
+		return h.opCode === inboundMessage._header.id;
+	});
+
+	if (typeof supportedHandler === "undefined") {
+		// We do not yet support this message code
+		throw Error(
+			`[connectionId}] UNSUPPORTED_MESSAGECODE: ${inboundMessage._header.id}`,
+		);
+	}
+
+	try {
+		const result = await supportedHandler.handler({
+			connectionId,
+			message: inboundMessage,
+			log,
+		});
+		log.debug(
+			`[${connectionId}] Returning with ${result.messages.length} messages`,
+		);
+		return result;
+	} catch (error) {
+		const err = Error(`[${connectionId}] Error handling persona data`, {
+			cause: error,
+		});
+		throw err;
+	}
+}