From a2ad99f01a4683eadace56d4822d529075cb065b Mon Sep 17 00:00:00 2001 From: Tau Date: Tue, 2 Apr 2019 16:58:46 -0400 Subject: [PATCH] wip normalize request tags --- src/idz/decoder.ts | 30 +++++++++++++++--------------- src/idz/defs.ts | 4 ++-- src/idz/index.ts | 28 ++++++++++++++-------------- src/idz/request.ts | 28 ++++++++++++++-------------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/idz/decoder.ts b/src/idz/decoder.ts index c82e5a6..ba61767 100644 --- a/src/idz/decoder.ts +++ b/src/idz/decoder.ts @@ -34,7 +34,7 @@ readers.set(MSG.ACCOUNT_UNLOCK_REQ, buf => { readers.set(MSG.CREATE_PROFILE_REQ, buf => { return { - type: "create_record_req", + type: "create_profile_req", aimeId: buf.readInt32LE(0x0004), luid: buf.slice(0x0008, buf.indexOf("\0", 0x0008)).toString("ascii"), name: iconv.decode(buf.slice(0x001e, buf.indexOf("\0", 0x001e)), sjis), @@ -73,7 +73,7 @@ readers.set(MSG.CREATE_TEAM_REQ, buf => { readers.set(MSG.LOAD_2ON2_REQ, buf => { return { - type: "get_2on2_req", + type: "load_2on2_req", field_0002: buf.readUInt16LE(0x0002), field_0004: buf.readUInt32LE(0x0004), field_0008: buf.readUInt32LE(0x0008), @@ -81,30 +81,30 @@ readers.set(MSG.LOAD_2ON2_REQ, buf => { }); readers.set(MSG.LOAD_CONFIG_REQ, () => { - return { type: "get_config_req" }; + return { type: "load_config_req" }; }); readers.set(MSG.LOAD_CONFIG_V2_REQ, () => { - return { type: "get_config_2_req" }; + return { type: "load_config_v2_req" }; }); readers.set(MSG.DISCOVER_PROFILE_REQ, buf => { return { - type: "get_exist_record_req", + type: "discover_profile_req", aimeId: buf.readUInt32LE(0x0004), }; }); readers.set(MSG.LOAD_GENERAL_REWARD_REQ, buf => { return { - type: "get_general_reward_req", + type: "load_general_reward_req", field_0004: buf.readUInt32LE(0x0004), }; }); -readers.set(MSG.LOAD_RECORD_REQ, buf => { +readers.set(MSG.LOAD_PROFILE_REQ, buf => { return { - type: "get_record_req", + type: "load_profile_req", aimeId: buf.readUInt32LE(0x0004), pcbId: buf.slice(0x0008, buf.indexOf("\0", 0x0008)).toString("ascii"), }; @@ -112,24 +112,24 @@ readers.set(MSG.LOAD_RECORD_REQ, buf => { readers.set(MSG.LOAD_STOCKER_REQ, buf => { return { - type: "get_stocker_req", + type: "load_stocker_req", field_0004: buf.readUInt32LE(0x0004), }; }); readers.set(MSG.LOAD_REWARD_TABLE_REQ, () => { return { - type: "get_reward_table_req", + type: "load_reward_table_req", }; }); readers.set(MSG.LOAD_SERVER_LIST_REQ, () => { - return { type: "get_server_list_req" }; + return { type: "load_server_list_req" }; }); readers.set(MSG.LOAD_TEAM_REQ, buf => { return { - type: "get_team_req", + type: "load_team_req", teamId: buf.readUInt32LE(0x0004), field_0008: buf.readUInt32LE(0x0008), }; @@ -137,7 +137,7 @@ readers.set(MSG.LOAD_TEAM_REQ, buf => { readers.set(MSG.SAVE_EXPEDITION_REQ, buf => { return { - type: "update_expedition_req", + type: "save_expedition_req", field_0004: buf.readUInt32LE(0x0004), }; }); @@ -151,7 +151,7 @@ readers.set(MSG.UPDATE_PROVISIONAL_STORE_RANK_REQ, buf => { readers.set(MSG.SAVE_RECORD_REQ, buf => { return { - type: "update_record_req", + type: "save_profile_req", // mega TODO }; }); @@ -166,7 +166,7 @@ readers.set(MSG.SAVE_TOPIC_REQ, buf => { const aimeId = buf.readUInt32LE(0x0004); return { - type: "update_topic_req", + type: "save_topic_req", aimeId: aimeId !== 0xffffffff ? aimeId : undefined, }; }); diff --git a/src/idz/defs.ts b/src/idz/defs.ts index 60d6b45..1a96562 100644 --- a/src/idz/defs.ts +++ b/src/idz/defs.ts @@ -7,7 +7,7 @@ export const MSG = { LOAD_PROFILE_V1_RES: 0x0064, LOAD_PROFILE_V2_RES: 0x0065, CREATE_PROFILE_REQ: 0x0066, - LOAD_RECORD_REQ: 0x0067, + LOAD_PROFILE_REQ: 0x0067, SAVE_RECORD_REQ: 0x0068, ACCOUNT_LOCK_REQ: 0x0069, ACCOUNT_LOCK_RES: 0x006a, @@ -50,7 +50,7 @@ REQ_LEN.set(MSG.LOAD_CONFIG_REQ, 0x0050); REQ_LEN.set(MSG.LOAD_CONFIG_V2_REQ, 0x0010); REQ_LEN.set(MSG.DISCOVER_PROFILE_REQ, 0x0010); REQ_LEN.set(MSG.LOAD_GENERAL_REWARD_REQ, 0x0010); -REQ_LEN.set(MSG.LOAD_RECORD_REQ, 0x0020); +REQ_LEN.set(MSG.LOAD_PROFILE_REQ, 0x0020); REQ_LEN.set(MSG.LOAD_REWARD_TABLE_REQ, 0x0010); REQ_LEN.set(MSG.LOAD_SERVER_LIST_REQ, 0x0020); REQ_LEN.set(MSG.LOAD_STOCKER_REQ, 0x0010); diff --git a/src/idz/index.ts b/src/idz/index.ts index 0235678..d224ad4 100644 --- a/src/idz/index.ts +++ b/src/idz/index.ts @@ -32,7 +32,7 @@ export default async function idz(socket: Socket) { break; - case "create_record_req": + case "create_profile_req": res = { type: "generic_res", status: 1, @@ -49,14 +49,14 @@ export default async function idz(socket: Socket) { break; - case "get_2on2_req": + case "load_2on2_req": res = { type: "get_2on2_res", }; break; - case "get_config_req": + case "load_config_req": res = { type: "get_config_res", status: 1, @@ -64,7 +64,7 @@ export default async function idz(socket: Socket) { break; - case "get_config_2_req": + case "load_config_v2_req": res = { type: "get_config_2_res", status: 1, @@ -72,7 +72,7 @@ export default async function idz(socket: Socket) { break; - case "get_exist_record_req": + case "discover_profile_req": res = { type: "get_exist_record_res", result: true, @@ -80,7 +80,7 @@ export default async function idz(socket: Socket) { break; - case "get_general_reward_req": + case "load_general_reward_req": // A non-generic response is also accepted, but why bother? res = { type: "generic_res", @@ -89,7 +89,7 @@ export default async function idz(socket: Socket) { break; - case "get_record_req": + case "load_profile_req": res = { type: "get_record_v2_res", name: "てすと", @@ -101,14 +101,14 @@ export default async function idz(socket: Socket) { break; - case "get_reward_table_req": + case "load_reward_table_req": res = { type: "get_reward_table_res", }; break; - case "get_server_list_req": + case "load_server_list_req": const myHost = hostname(); res = { @@ -153,7 +153,7 @@ export default async function idz(socket: Socket) { break; - case "get_stocker_req": + case "load_stocker_req": res = { type: "get_stocker_res", status: 1, @@ -161,7 +161,7 @@ export default async function idz(socket: Socket) { break; - case "get_team_req": + case "load_team_req": res = { type: "get_team_res", name: "ＡＳＳ ＧＥＮＴＬＥＭＥＮ", @@ -176,7 +176,7 @@ export default async function idz(socket: Socket) { break; - case "update_expedition_req": + case "save_expedition_req": if (req.field_0004 === 0) { res = { type: "generic_res", @@ -198,7 +198,7 @@ export default async function idz(socket: Socket) { break; - case "update_record_req": + case "save_profile_req": res = { type: "generic_res", status: 1, @@ -213,7 +213,7 @@ export default async function idz(socket: Socket) { break; - case "update_topic_req": + case "save_topic_req": res = { type: "update_topic_res", }; diff --git a/src/idz/request.ts b/src/idz/request.ts index 68e68cc..29f2f07 100644 --- a/src/idz/request.ts +++ b/src/idz/request.ts @@ -12,7 +12,7 @@ export interface AccountUnlockRequest { } export interface CreateRecordRequest { - type: "create_record_req"; + type: "create_profile_req"; aimeId: number; luid: string; name: string; @@ -45,57 +45,57 @@ export interface CreateTeamRequest { } export interface Get2on2Request { - type: "get_2on2_req"; + type: "load_2on2_req"; field_0002: number; field_0004: number; field_0008: number; } export interface GetConfigRequest { - type: "get_config_req"; + type: "load_config_req"; } export interface GetConfigRequest2 { - type: "get_config_2_req"; + type: "load_config_v2_req"; } export interface GetExistRecordRequest { - type: "get_exist_record_req"; + type: "discover_profile_req"; aimeId: number; } export interface GetGeneralRewardRequest { - type: "get_general_reward_req"; + type: "load_general_reward_req"; field_0004: number; } export interface GetRecordRequest { - type: "get_record_req"; + type: "load_profile_req"; aimeId: number; pcbId: string; } export interface GetRewardTableRequest { - type: "get_reward_table_req"; + type: "load_reward_table_req"; } export interface GetServerListRequest { - type: "get_server_list_req"; + type: "load_server_list_req"; } export interface GetStockerRequest { - type: "get_stocker_req"; + type: "load_stocker_req"; field_0004: number; } export interface GetTeamRequest { - type: "get_team_req"; + type: "load_team_req"; teamId: number; field_0008: number; } export interface UpdateExpeditionRequest { - type: "update_expedition_req"; + type: "save_expedition_req"; field_0004: number; } @@ -105,7 +105,7 @@ export interface UpdateProvisionalStoreRankRequest { } export interface UpdateRecordRequest { - type: "update_record_req"; + type: "save_profile_req"; // TODO } @@ -114,7 +114,7 @@ export interface UpdateStoryClearNumRequest { } export interface UpdateTopicRequest { - type: "update_topic_req"; + type: "save_topic_req"; aimeId?: number; }