diff --git a/src/idz/bigint.ts b/src/idz/userdb/bigint.ts similarity index 100% rename from src/idz/bigint.ts rename to src/idz/userdb/bigint.ts diff --git a/src/idz/decoder/_bitmap.ts b/src/idz/userdb/decoder/_bitmap.ts similarity index 100% rename from src/idz/decoder/_bitmap.ts rename to src/idz/userdb/decoder/_bitmap.ts diff --git a/src/idz/decoder/_car.ts b/src/idz/userdb/decoder/_car.ts similarity index 100% rename from src/idz/decoder/_car.ts rename to src/idz/userdb/decoder/_car.ts diff --git a/src/idz/decoder/_chara.ts b/src/idz/userdb/decoder/_chara.ts similarity index 100% rename from src/idz/decoder/_chara.ts rename to src/idz/userdb/decoder/_chara.ts diff --git a/src/idz/decoder/_mission.ts b/src/idz/userdb/decoder/_mission.ts similarity index 100% rename from src/idz/decoder/_mission.ts rename to src/idz/userdb/decoder/_mission.ts diff --git a/src/idz/decoder/checkTeamName.ts b/src/idz/userdb/decoder/checkTeamName.ts similarity index 100% rename from src/idz/decoder/checkTeamName.ts rename to src/idz/userdb/decoder/checkTeamName.ts diff --git a/src/idz/decoder/createAutoTeam.ts b/src/idz/userdb/decoder/createAutoTeam.ts similarity index 90% rename from src/idz/decoder/createAutoTeam.ts rename to src/idz/userdb/decoder/createAutoTeam.ts index 0c188d1..578b90b 100644 --- a/src/idz/decoder/createAutoTeam.ts +++ b/src/idz/userdb/decoder/createAutoTeam.ts @@ -1,5 +1,5 @@ import { CreateAutoTeamRequest } from "../request/createAutoTeam"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; createAutoTeam.msgCode = 0x007b; createAutoTeam.msgLen = 0x0010; diff --git a/src/idz/decoder/createProfile.ts b/src/idz/userdb/decoder/createProfile.ts similarity index 94% rename from src/idz/decoder/createProfile.ts rename to src/idz/userdb/decoder/createProfile.ts index 0c1f130..06d18d3 100644 --- a/src/idz/decoder/createProfile.ts +++ b/src/idz/userdb/decoder/createProfile.ts @@ -3,7 +3,7 @@ import iconv from "iconv-lite"; import { car } from "./_car"; import { chara } from "./_chara"; import { CreateProfileRequest } from "../request/createProfile"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; createProfile.msgCode = 0x0066; createProfile.msgLen = 0x00c0; diff --git a/src/idz/decoder/createTeam.ts b/src/idz/userdb/decoder/createTeam.ts similarity index 94% rename from src/idz/decoder/createTeam.ts rename to src/idz/userdb/decoder/createTeam.ts index a9133ef..9b96248 100644 --- a/src/idz/decoder/createTeam.ts +++ b/src/idz/userdb/decoder/createTeam.ts @@ -1,7 +1,7 @@ import iconv from "iconv-lite"; import { CreateTeamRequest } from "../request/createTeam"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; createTeam.msgCode = 0x0071; createTeam.msgLen = 0x0050; diff --git a/src/idz/decoder/discoverProfile.ts b/src/idz/userdb/decoder/discoverProfile.ts similarity index 88% rename from src/idz/decoder/discoverProfile.ts rename to src/idz/userdb/decoder/discoverProfile.ts index 4658727..ce58a88 100644 --- a/src/idz/decoder/discoverProfile.ts +++ b/src/idz/userdb/decoder/discoverProfile.ts @@ -1,5 +1,5 @@ import { DiscoverProfileRequest } from "../request/discoverProfile"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; discoverProfile.msgCode = 0x006b; discoverProfile.msgLen = 0x0010; diff --git a/src/idz/decoder/index.ts b/src/idz/userdb/decoder/index.ts similarity index 99% rename from src/idz/decoder/index.ts rename to src/idz/userdb/decoder/index.ts index ec8574f..4d539d9 100644 --- a/src/idz/decoder/index.ts +++ b/src/idz/userdb/decoder/index.ts @@ -50,7 +50,7 @@ import { updateUiReport } from "./updateUiReport"; import { updateUserLog } from "./updateUserLog"; import { lockProfileExtend } from "./lockProfileExtend"; -const debug = logger("app:idz:decoder"); +const debug = logger("app:idz:userdb:decoder"); export type ReaderFn = ((buf: Buffer) => Request) & { msgCode: number; diff --git a/src/idz/decoder/load2on2.ts b/src/idz/userdb/decoder/load2on2.ts similarity index 95% rename from src/idz/decoder/load2on2.ts rename to src/idz/userdb/decoder/load2on2.ts index bd52e4a..dbf8873 100644 --- a/src/idz/decoder/load2on2.ts +++ b/src/idz/userdb/decoder/load2on2.ts @@ -1,7 +1,7 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; import { Load2on2Request1, Load2on2Request2 } from "../request/load2on2"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; load2on2_v1.msgCode = 0x00b0; load2on2_v1.msgLen = 0x0010; diff --git a/src/idz/decoder/loadConfig.ts b/src/idz/userdb/decoder/loadConfig.ts similarity index 100% rename from src/idz/decoder/loadConfig.ts rename to src/idz/userdb/decoder/loadConfig.ts diff --git a/src/idz/decoder/loadConfig2.ts b/src/idz/userdb/decoder/loadConfig2.ts similarity index 100% rename from src/idz/decoder/loadConfig2.ts rename to src/idz/userdb/decoder/loadConfig2.ts diff --git a/src/idz/decoder/loadEventInfo.ts b/src/idz/userdb/decoder/loadEventInfo.ts similarity index 87% rename from src/idz/decoder/loadEventInfo.ts rename to src/idz/userdb/decoder/loadEventInfo.ts index ce2393f..86d3796 100644 --- a/src/idz/decoder/loadEventInfo.ts +++ b/src/idz/userdb/decoder/loadEventInfo.ts @@ -1,5 +1,5 @@ import { LoadEventInfoRequest } from "../request/loadEventInfo"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadEventInfo.msgCode = 0x00be; loadEventInfo.msgLen = 0x0010; diff --git a/src/idz/decoder/loadGacha.ts b/src/idz/userdb/decoder/loadGacha.ts similarity index 86% rename from src/idz/decoder/loadGacha.ts rename to src/idz/userdb/decoder/loadGacha.ts index 375a155..4ead3f7 100644 --- a/src/idz/decoder/loadGacha.ts +++ b/src/idz/userdb/decoder/loadGacha.ts @@ -1,5 +1,5 @@ import { LoadGachaRequest } from "../request/loadGacha"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadGacha.msgCode = 0x00c1; loadGacha.msgLen = 0x0010; diff --git a/src/idz/decoder/loadGarage.ts b/src/idz/userdb/decoder/loadGarage.ts similarity index 89% rename from src/idz/decoder/loadGarage.ts rename to src/idz/userdb/decoder/loadGarage.ts index 3961619..80862f3 100644 --- a/src/idz/decoder/loadGarage.ts +++ b/src/idz/userdb/decoder/loadGarage.ts @@ -1,5 +1,5 @@ import { LoadGarageRequest } from "../request/loadGarage"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadGarage.msgCode = 0x0090; loadGarage.msgLen = 0x0010; diff --git a/src/idz/decoder/loadGeneralReward.ts b/src/idz/userdb/decoder/loadGeneralReward.ts similarity index 94% rename from src/idz/decoder/loadGeneralReward.ts rename to src/idz/userdb/decoder/loadGeneralReward.ts index 2f5dd23..ff761c1 100644 --- a/src/idz/decoder/loadGeneralReward.ts +++ b/src/idz/userdb/decoder/loadGeneralReward.ts @@ -2,7 +2,7 @@ import { LoadGeneralRewardRequest1, LoadGeneralRewardRequest2, } from "../request/loadGeneralReward"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadGeneralReward1.msgCode = 0x009c; loadGeneralReward1.msgLen = 0x0010; diff --git a/src/idz/decoder/loadGhost.ts b/src/idz/userdb/decoder/loadGhost.ts similarity index 100% rename from src/idz/decoder/loadGhost.ts rename to src/idz/userdb/decoder/loadGhost.ts diff --git a/src/idz/decoder/loadProfile.ts b/src/idz/userdb/decoder/loadProfile.ts similarity index 94% rename from src/idz/decoder/loadProfile.ts rename to src/idz/userdb/decoder/loadProfile.ts index 1b5fbfa..54c6e9b 100644 --- a/src/idz/decoder/loadProfile.ts +++ b/src/idz/userdb/decoder/loadProfile.ts @@ -2,7 +2,7 @@ import { LoadProfileRequest2, LoadProfileRequest3, } from "../request/loadProfile"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadProfile2.msgCode = 0x0067; loadProfile2.msgLen = 0x0020; diff --git a/src/idz/decoder/loadRewardTable.ts b/src/idz/userdb/decoder/loadRewardTable.ts similarity index 100% rename from src/idz/decoder/loadRewardTable.ts rename to src/idz/userdb/decoder/loadRewardTable.ts diff --git a/src/idz/decoder/loadServerList.ts b/src/idz/userdb/decoder/loadServerList.ts similarity index 100% rename from src/idz/decoder/loadServerList.ts rename to src/idz/userdb/decoder/loadServerList.ts diff --git a/src/idz/decoder/loadStocker.ts b/src/idz/userdb/decoder/loadStocker.ts similarity index 87% rename from src/idz/decoder/loadStocker.ts rename to src/idz/userdb/decoder/loadStocker.ts index f708960..c4067fa 100644 --- a/src/idz/decoder/loadStocker.ts +++ b/src/idz/userdb/decoder/loadStocker.ts @@ -1,5 +1,5 @@ import { LoadStockerRequest } from "../request/loadStocker"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadStocker.msgCode = 0x00a7; loadStocker.msgLen = 0x0010; diff --git a/src/idz/decoder/loadTeam.ts b/src/idz/userdb/decoder/loadTeam.ts similarity index 100% rename from src/idz/decoder/loadTeam.ts rename to src/idz/userdb/decoder/loadTeam.ts diff --git a/src/idz/decoder/loadTeamRanking.ts b/src/idz/userdb/decoder/loadTeamRanking.ts similarity index 100% rename from src/idz/decoder/loadTeamRanking.ts rename to src/idz/userdb/decoder/loadTeamRanking.ts diff --git a/src/idz/decoder/loadTopTen1.ts b/src/idz/userdb/decoder/loadTopTen1.ts similarity index 96% rename from src/idz/decoder/loadTopTen1.ts rename to src/idz/userdb/decoder/loadTopTen1.ts index 7b75590..b827545 100644 --- a/src/idz/decoder/loadTopTen1.ts +++ b/src/idz/userdb/decoder/loadTopTen1.ts @@ -4,7 +4,7 @@ import { LoadTopTenRequest, LoadTopTenRequestSelector, } from "../request/loadTopTen"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadTopTen1.msgCode = 0x00b5; loadTopTen1.msgLen = 0x00e0; diff --git a/src/idz/decoder/loadTopTen2.ts b/src/idz/userdb/decoder/loadTopTen2.ts similarity index 96% rename from src/idz/decoder/loadTopTen2.ts rename to src/idz/userdb/decoder/loadTopTen2.ts index ca73160..2573c51 100644 --- a/src/idz/decoder/loadTopTen2.ts +++ b/src/idz/userdb/decoder/loadTopTen2.ts @@ -4,7 +4,7 @@ import { LoadTopTenRequest, LoadTopTenRequestSelector, } from "../request/loadTopTen"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; loadTopTen2.msgCode = 0x012c; loadTopTen2.msgLen = 0x0110; diff --git a/src/idz/decoder/lockGarage.ts b/src/idz/userdb/decoder/lockGarage.ts similarity index 100% rename from src/idz/decoder/lockGarage.ts rename to src/idz/userdb/decoder/lockGarage.ts diff --git a/src/idz/decoder/lockProfile.ts b/src/idz/userdb/decoder/lockProfile.ts similarity index 100% rename from src/idz/decoder/lockProfile.ts rename to src/idz/userdb/decoder/lockProfile.ts diff --git a/src/idz/decoder/lockProfileExtend.ts b/src/idz/userdb/decoder/lockProfileExtend.ts similarity index 90% rename from src/idz/decoder/lockProfileExtend.ts rename to src/idz/userdb/decoder/lockProfileExtend.ts index 4810445..f9e6df7 100644 --- a/src/idz/decoder/lockProfileExtend.ts +++ b/src/idz/userdb/decoder/lockProfileExtend.ts @@ -1,5 +1,5 @@ import { LockProfileExtendRequest } from "../request/lockProfileExtend"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; lockProfileExtend.msgCode = 0x006d; lockProfileExtend.msgLen = 0x0020; diff --git a/src/idz/decoder/msg00AD.ts b/src/idz/userdb/decoder/msg00AD.ts similarity index 100% rename from src/idz/decoder/msg00AD.ts rename to src/idz/userdb/decoder/msg00AD.ts diff --git a/src/idz/decoder/saveExpedition.ts b/src/idz/userdb/decoder/saveExpedition.ts similarity index 100% rename from src/idz/decoder/saveExpedition.ts rename to src/idz/userdb/decoder/saveExpedition.ts diff --git a/src/idz/decoder/saveGarage.ts b/src/idz/userdb/decoder/saveGarage.ts similarity index 100% rename from src/idz/decoder/saveGarage.ts rename to src/idz/userdb/decoder/saveGarage.ts diff --git a/src/idz/decoder/saveNewCar.ts b/src/idz/userdb/decoder/saveNewCar.ts similarity index 91% rename from src/idz/decoder/saveNewCar.ts rename to src/idz/userdb/decoder/saveNewCar.ts index c252ba6..ca63ed3 100644 --- a/src/idz/decoder/saveNewCar.ts +++ b/src/idz/userdb/decoder/saveNewCar.ts @@ -1,6 +1,6 @@ import { car } from "./_car"; import { SaveNewCarRequest } from "../request/saveNewCar"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; saveNewCar.msgCode = 0x0079; saveNewCar.msgLen = 0x0090; diff --git a/src/idz/decoder/saveProfile2.ts b/src/idz/userdb/decoder/saveProfile2.ts similarity index 98% rename from src/idz/decoder/saveProfile2.ts rename to src/idz/userdb/decoder/saveProfile2.ts index 7e00e69..3e06d27 100644 --- a/src/idz/decoder/saveProfile2.ts +++ b/src/idz/userdb/decoder/saveProfile2.ts @@ -3,7 +3,7 @@ import { mission } from "./_mission"; import { BackgroundCode, CourseNo, TitleCode } from "../model/base"; import { SaveProfileRequest2 } from "../request/saveProfile"; import { bitmap } from "./_bitmap"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; saveProfile2.msgCode = 0x0068; saveProfile2.msgLen = 0x0940; diff --git a/src/idz/decoder/saveProfile3.ts b/src/idz/userdb/decoder/saveProfile3.ts similarity index 98% rename from src/idz/decoder/saveProfile3.ts rename to src/idz/userdb/decoder/saveProfile3.ts index 7e07600..ba85590 100644 --- a/src/idz/decoder/saveProfile3.ts +++ b/src/idz/userdb/decoder/saveProfile3.ts @@ -3,7 +3,7 @@ import { mission } from "./_mission"; import { BackgroundCode, CourseNo, TitleCode } from "../model/base"; import { SaveProfileRequest2 } from "../request/saveProfile"; import { bitmap } from "./_bitmap"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; saveProfile3.msgCode = 0x0138; saveProfile3.msgLen = 0x0a70; diff --git a/src/idz/decoder/saveSettings.ts b/src/idz/userdb/decoder/saveSettings.ts similarity index 93% rename from src/idz/decoder/saveSettings.ts rename to src/idz/userdb/decoder/saveSettings.ts index f18fa71..5166ef2 100644 --- a/src/idz/decoder/saveSettings.ts +++ b/src/idz/userdb/decoder/saveSettings.ts @@ -1,5 +1,5 @@ import { SaveSettingsRequest } from "../request/saveSettings"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; saveSettings.msgCode = 0x00a5; saveSettings.msgLen = 0x0020; diff --git a/src/idz/decoder/saveStocker.ts b/src/idz/userdb/decoder/saveStocker.ts similarity index 93% rename from src/idz/decoder/saveStocker.ts rename to src/idz/userdb/decoder/saveStocker.ts index 035afca..a8a9f5a 100644 --- a/src/idz/decoder/saveStocker.ts +++ b/src/idz/userdb/decoder/saveStocker.ts @@ -2,7 +2,7 @@ import { bitmap } from "./_bitmap"; import { chara } from "./_chara"; import { CarSelector } from "../model/car"; import { SaveStockerRequest } from "../request/saveStocker"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; saveStocker.msgCode = 0x00a6; saveStocker.msgLen = 0x00c0; diff --git a/src/idz/decoder/saveTeamBanner.ts b/src/idz/userdb/decoder/saveTeamBanner.ts similarity index 100% rename from src/idz/decoder/saveTeamBanner.ts rename to src/idz/userdb/decoder/saveTeamBanner.ts diff --git a/src/idz/decoder/saveTimeAttack.ts b/src/idz/userdb/decoder/saveTimeAttack.ts similarity index 97% rename from src/idz/decoder/saveTimeAttack.ts rename to src/idz/userdb/decoder/saveTimeAttack.ts index 171abbf..515218f 100644 --- a/src/idz/decoder/saveTimeAttack.ts +++ b/src/idz/userdb/decoder/saveTimeAttack.ts @@ -1,7 +1,7 @@ import { RouteNo } from "../model/base"; import { CarSelector } from "../model/car"; import { SaveTimeAttackRequest } from "../request/saveTimeAttack"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; function saveTimeAttack(buf: Buffer): SaveTimeAttackRequest { return { diff --git a/src/idz/decoder/saveTopic.ts b/src/idz/userdb/decoder/saveTopic.ts similarity index 100% rename from src/idz/decoder/saveTopic.ts rename to src/idz/userdb/decoder/saveTopic.ts diff --git a/src/idz/decoder/unlockProfile.ts b/src/idz/userdb/decoder/unlockProfile.ts similarity index 100% rename from src/idz/decoder/unlockProfile.ts rename to src/idz/userdb/decoder/unlockProfile.ts diff --git a/src/idz/decoder/updateProvisionalStoreRank.ts b/src/idz/userdb/decoder/updateProvisionalStoreRank.ts similarity index 100% rename from src/idz/decoder/updateProvisionalStoreRank.ts rename to src/idz/userdb/decoder/updateProvisionalStoreRank.ts diff --git a/src/idz/decoder/updateResult.ts b/src/idz/userdb/decoder/updateResult.ts similarity index 100% rename from src/idz/decoder/updateResult.ts rename to src/idz/userdb/decoder/updateResult.ts diff --git a/src/idz/decoder/updateStoryClearNum.ts b/src/idz/userdb/decoder/updateStoryClearNum.ts similarity index 100% rename from src/idz/decoder/updateStoryClearNum.ts rename to src/idz/userdb/decoder/updateStoryClearNum.ts diff --git a/src/idz/decoder/updateTeamLeader.ts b/src/idz/userdb/decoder/updateTeamLeader.ts similarity index 92% rename from src/idz/decoder/updateTeamLeader.ts rename to src/idz/userdb/decoder/updateTeamLeader.ts index fb2b0e2..35d5660 100644 --- a/src/idz/decoder/updateTeamLeader.ts +++ b/src/idz/userdb/decoder/updateTeamLeader.ts @@ -1,7 +1,7 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; import { UpdateTeamLeaderRequest } from "../request/updateTeamLeader"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; updateTeamLeader.msgCode = 0x008a; updateTeamLeader.msgLen = 0x0020; diff --git a/src/idz/decoder/updateTeamMember.ts b/src/idz/userdb/decoder/updateTeamMember.ts similarity index 92% rename from src/idz/decoder/updateTeamMember.ts rename to src/idz/userdb/decoder/updateTeamMember.ts index 62d1316..3624978 100644 --- a/src/idz/decoder/updateTeamMember.ts +++ b/src/idz/userdb/decoder/updateTeamMember.ts @@ -1,7 +1,7 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; import { UpdateTeamMemberRequest } from "../request/updateTeamMember"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; updateTeamMember.msgCode = 0x0073; updateTeamMember.msgLen = 0x0010; diff --git a/src/idz/decoder/updateTeamPoints.ts b/src/idz/userdb/decoder/updateTeamPoints.ts similarity index 100% rename from src/idz/decoder/updateTeamPoints.ts rename to src/idz/userdb/decoder/updateTeamPoints.ts diff --git a/src/idz/decoder/updateUiReport.ts b/src/idz/userdb/decoder/updateUiReport.ts similarity index 100% rename from src/idz/decoder/updateUiReport.ts rename to src/idz/userdb/decoder/updateUiReport.ts diff --git a/src/idz/decoder/updateUserLog.ts b/src/idz/userdb/decoder/updateUserLog.ts similarity index 100% rename from src/idz/decoder/updateUserLog.ts rename to src/idz/userdb/decoder/updateUserLog.ts diff --git a/src/idz/encoder/_bitmap.ts b/src/idz/userdb/encoder/_bitmap.ts similarity index 100% rename from src/idz/encoder/_bitmap.ts rename to src/idz/userdb/encoder/_bitmap.ts diff --git a/src/idz/encoder/_car.ts b/src/idz/userdb/encoder/_car.ts similarity index 100% rename from src/idz/encoder/_car.ts rename to src/idz/userdb/encoder/_car.ts diff --git a/src/idz/encoder/_chara.ts b/src/idz/userdb/encoder/_chara.ts similarity index 100% rename from src/idz/encoder/_chara.ts rename to src/idz/userdb/encoder/_chara.ts diff --git a/src/idz/encoder/_mission.ts b/src/idz/userdb/encoder/_mission.ts similarity index 100% rename from src/idz/encoder/_mission.ts rename to src/idz/userdb/encoder/_mission.ts diff --git a/src/idz/encoder/_team.ts b/src/idz/userdb/encoder/_team.ts similarity index 100% rename from src/idz/encoder/_team.ts rename to src/idz/userdb/encoder/_team.ts diff --git a/src/idz/encoder/checkTeamName.ts b/src/idz/userdb/encoder/checkTeamName.ts similarity index 100% rename from src/idz/encoder/checkTeamName.ts rename to src/idz/userdb/encoder/checkTeamName.ts diff --git a/src/idz/encoder/createTeam.ts b/src/idz/userdb/encoder/createTeam.ts similarity index 100% rename from src/idz/encoder/createTeam.ts rename to src/idz/userdb/encoder/createTeam.ts diff --git a/src/idz/encoder/discoverProfile.ts b/src/idz/userdb/encoder/discoverProfile.ts similarity index 100% rename from src/idz/encoder/discoverProfile.ts rename to src/idz/userdb/encoder/discoverProfile.ts diff --git a/src/idz/encoder/generic.ts b/src/idz/userdb/encoder/generic.ts similarity index 100% rename from src/idz/encoder/generic.ts rename to src/idz/userdb/encoder/generic.ts diff --git a/src/idz/encoder/index.ts b/src/idz/userdb/encoder/index.ts similarity index 98% rename from src/idz/encoder/index.ts rename to src/idz/userdb/encoder/index.ts index c890069..ee7108d 100644 --- a/src/idz/encoder/index.ts +++ b/src/idz/userdb/encoder/index.ts @@ -34,7 +34,7 @@ import { updateTeamLeader } from "./updateTeamLeader"; import { updateTeamMember } from "./updateTeamMember"; import { Response } from "../response"; -const debug = logger("app:idz:encoder"); +const debug = logger("app:idz:userdb:encoder"); function encode(res: Response): Buffer { switch (res.type) { diff --git a/src/idz/encoder/load2on2.ts b/src/idz/userdb/encoder/load2on2.ts similarity index 100% rename from src/idz/encoder/load2on2.ts rename to src/idz/userdb/encoder/load2on2.ts diff --git a/src/idz/encoder/loadConfig.ts b/src/idz/userdb/encoder/loadConfig.ts similarity index 100% rename from src/idz/encoder/loadConfig.ts rename to src/idz/userdb/encoder/loadConfig.ts diff --git a/src/idz/encoder/loadConfig2.ts b/src/idz/userdb/encoder/loadConfig2.ts similarity index 100% rename from src/idz/encoder/loadConfig2.ts rename to src/idz/userdb/encoder/loadConfig2.ts diff --git a/src/idz/encoder/loadEventInfo.ts b/src/idz/userdb/encoder/loadEventInfo.ts similarity index 100% rename from src/idz/encoder/loadEventInfo.ts rename to src/idz/userdb/encoder/loadEventInfo.ts diff --git a/src/idz/encoder/loadGacha.ts b/src/idz/userdb/encoder/loadGacha.ts similarity index 100% rename from src/idz/encoder/loadGacha.ts rename to src/idz/userdb/encoder/loadGacha.ts diff --git a/src/idz/encoder/loadGarage.ts b/src/idz/userdb/encoder/loadGarage.ts similarity index 100% rename from src/idz/encoder/loadGarage.ts rename to src/idz/userdb/encoder/loadGarage.ts diff --git a/src/idz/encoder/loadGeneralReward.ts b/src/idz/userdb/encoder/loadGeneralReward.ts similarity index 100% rename from src/idz/encoder/loadGeneralReward.ts rename to src/idz/userdb/encoder/loadGeneralReward.ts diff --git a/src/idz/encoder/loadGhost.ts b/src/idz/userdb/encoder/loadGhost.ts similarity index 100% rename from src/idz/encoder/loadGhost.ts rename to src/idz/userdb/encoder/loadGhost.ts diff --git a/src/idz/encoder/loadProfile.ts b/src/idz/userdb/encoder/loadProfile.ts similarity index 100% rename from src/idz/encoder/loadProfile.ts rename to src/idz/userdb/encoder/loadProfile.ts diff --git a/src/idz/encoder/loadProfile1.ts b/src/idz/userdb/encoder/loadProfile1.ts similarity index 100% rename from src/idz/encoder/loadProfile1.ts rename to src/idz/userdb/encoder/loadProfile1.ts diff --git a/src/idz/encoder/loadProfile2.ts b/src/idz/userdb/encoder/loadProfile2.ts similarity index 100% rename from src/idz/encoder/loadProfile2.ts rename to src/idz/userdb/encoder/loadProfile2.ts diff --git a/src/idz/encoder/loadProfile3.ts b/src/idz/userdb/encoder/loadProfile3.ts similarity index 100% rename from src/idz/encoder/loadProfile3.ts rename to src/idz/userdb/encoder/loadProfile3.ts diff --git a/src/idz/encoder/loadRewardTable.ts b/src/idz/userdb/encoder/loadRewardTable.ts similarity index 100% rename from src/idz/encoder/loadRewardTable.ts rename to src/idz/userdb/encoder/loadRewardTable.ts diff --git a/src/idz/encoder/loadServerList.ts b/src/idz/userdb/encoder/loadServerList.ts similarity index 100% rename from src/idz/encoder/loadServerList.ts rename to src/idz/userdb/encoder/loadServerList.ts diff --git a/src/idz/encoder/loadStocker.ts b/src/idz/userdb/encoder/loadStocker.ts similarity index 100% rename from src/idz/encoder/loadStocker.ts rename to src/idz/userdb/encoder/loadStocker.ts diff --git a/src/idz/encoder/loadTeamRanking.ts b/src/idz/userdb/encoder/loadTeamRanking.ts similarity index 100% rename from src/idz/encoder/loadTeamRanking.ts rename to src/idz/userdb/encoder/loadTeamRanking.ts diff --git a/src/idz/encoder/loadTopTen.ts b/src/idz/userdb/encoder/loadTopTen.ts similarity index 100% rename from src/idz/encoder/loadTopTen.ts rename to src/idz/userdb/encoder/loadTopTen.ts diff --git a/src/idz/encoder/lockProfile.ts b/src/idz/userdb/encoder/lockProfile.ts similarity index 100% rename from src/idz/encoder/lockProfile.ts rename to src/idz/userdb/encoder/lockProfile.ts diff --git a/src/idz/encoder/lockProfileExtend.ts b/src/idz/userdb/encoder/lockProfileExtend.ts similarity index 100% rename from src/idz/encoder/lockProfileExtend.ts rename to src/idz/userdb/encoder/lockProfileExtend.ts diff --git a/src/idz/encoder/saveExpedition.ts b/src/idz/userdb/encoder/saveExpedition.ts similarity index 100% rename from src/idz/encoder/saveExpedition.ts rename to src/idz/userdb/encoder/saveExpedition.ts diff --git a/src/idz/encoder/saveGarage.ts b/src/idz/userdb/encoder/saveGarage.ts similarity index 100% rename from src/idz/encoder/saveGarage.ts rename to src/idz/userdb/encoder/saveGarage.ts diff --git a/src/idz/encoder/saveNewCar.ts b/src/idz/userdb/encoder/saveNewCar.ts similarity index 100% rename from src/idz/encoder/saveNewCar.ts rename to src/idz/userdb/encoder/saveNewCar.ts diff --git a/src/idz/encoder/saveTimeAttack.ts b/src/idz/userdb/encoder/saveTimeAttack.ts similarity index 100% rename from src/idz/encoder/saveTimeAttack.ts rename to src/idz/userdb/encoder/saveTimeAttack.ts diff --git a/src/idz/encoder/saveTopic.ts b/src/idz/userdb/encoder/saveTopic.ts similarity index 100% rename from src/idz/encoder/saveTopic.ts rename to src/idz/userdb/encoder/saveTopic.ts diff --git a/src/idz/encoder/unlockProfile.ts b/src/idz/userdb/encoder/unlockProfile.ts similarity index 100% rename from src/idz/encoder/unlockProfile.ts rename to src/idz/userdb/encoder/unlockProfile.ts diff --git a/src/idz/encoder/updateProvisionalStoreRank.ts b/src/idz/userdb/encoder/updateProvisionalStoreRank.ts similarity index 100% rename from src/idz/encoder/updateProvisionalStoreRank.ts rename to src/idz/userdb/encoder/updateProvisionalStoreRank.ts diff --git a/src/idz/encoder/updateStoryClearNum.ts b/src/idz/userdb/encoder/updateStoryClearNum.ts similarity index 100% rename from src/idz/encoder/updateStoryClearNum.ts rename to src/idz/userdb/encoder/updateStoryClearNum.ts diff --git a/src/idz/encoder/updateTeamLeader.ts b/src/idz/userdb/encoder/updateTeamLeader.ts similarity index 100% rename from src/idz/encoder/updateTeamLeader.ts rename to src/idz/userdb/encoder/updateTeamLeader.ts diff --git a/src/idz/encoder/updateTeamMember.ts b/src/idz/userdb/encoder/updateTeamMember.ts similarity index 100% rename from src/idz/encoder/updateTeamMember.ts rename to src/idz/userdb/encoder/updateTeamMember.ts diff --git a/src/idz/handler/_team.ts b/src/idz/userdb/handler/_team.ts similarity index 96% rename from src/idz/handler/_team.ts rename to src/idz/userdb/handler/_team.ts index e74a64e..cf6486c 100644 --- a/src/idz/handler/_team.ts +++ b/src/idz/userdb/handler/_team.ts @@ -1,6 +1,6 @@ import { Team } from "../model/team"; import { Repositories } from "../repo"; -import { Id } from "../../model"; +import { Id } from "../../../model"; // Bleh. This factorization is kind of messy. diff --git a/src/idz/handler/checkTeamName.ts b/src/idz/userdb/handler/checkTeamName.ts similarity index 100% rename from src/idz/handler/checkTeamName.ts rename to src/idz/userdb/handler/checkTeamName.ts diff --git a/src/idz/handler/createAutoTeam.ts b/src/idz/userdb/handler/createAutoTeam.ts similarity index 100% rename from src/idz/handler/createAutoTeam.ts rename to src/idz/userdb/handler/createAutoTeam.ts diff --git a/src/idz/handler/createProfile.ts b/src/idz/userdb/handler/createProfile.ts similarity index 100% rename from src/idz/handler/createProfile.ts rename to src/idz/userdb/handler/createProfile.ts diff --git a/src/idz/handler/createTeam.ts b/src/idz/userdb/handler/createTeam.ts similarity index 100% rename from src/idz/handler/createTeam.ts rename to src/idz/userdb/handler/createTeam.ts diff --git a/src/idz/handler/discoverProfile.ts b/src/idz/userdb/handler/discoverProfile.ts similarity index 100% rename from src/idz/handler/discoverProfile.ts rename to src/idz/userdb/handler/discoverProfile.ts diff --git a/src/idz/handler/index.ts b/src/idz/userdb/handler/index.ts similarity index 100% rename from src/idz/handler/index.ts rename to src/idz/userdb/handler/index.ts diff --git a/src/idz/handler/load2on2.ts b/src/idz/userdb/handler/load2on2.ts similarity index 100% rename from src/idz/handler/load2on2.ts rename to src/idz/userdb/handler/load2on2.ts diff --git a/src/idz/handler/loadConfig.ts b/src/idz/userdb/handler/loadConfig.ts similarity index 100% rename from src/idz/handler/loadConfig.ts rename to src/idz/userdb/handler/loadConfig.ts diff --git a/src/idz/handler/loadConfig2.ts b/src/idz/userdb/handler/loadConfig2.ts similarity index 100% rename from src/idz/handler/loadConfig2.ts rename to src/idz/userdb/handler/loadConfig2.ts diff --git a/src/idz/handler/loadEventInfo.ts b/src/idz/userdb/handler/loadEventInfo.ts similarity index 100% rename from src/idz/handler/loadEventInfo.ts rename to src/idz/userdb/handler/loadEventInfo.ts diff --git a/src/idz/handler/loadGacha.ts b/src/idz/userdb/handler/loadGacha.ts similarity index 100% rename from src/idz/handler/loadGacha.ts rename to src/idz/userdb/handler/loadGacha.ts diff --git a/src/idz/handler/loadGarage.ts b/src/idz/userdb/handler/loadGarage.ts similarity index 100% rename from src/idz/handler/loadGarage.ts rename to src/idz/userdb/handler/loadGarage.ts diff --git a/src/idz/handler/loadGeneralReward.ts b/src/idz/userdb/handler/loadGeneralReward.ts similarity index 100% rename from src/idz/handler/loadGeneralReward.ts rename to src/idz/userdb/handler/loadGeneralReward.ts diff --git a/src/idz/handler/loadGhost.ts b/src/idz/userdb/handler/loadGhost.ts similarity index 100% rename from src/idz/handler/loadGhost.ts rename to src/idz/userdb/handler/loadGhost.ts diff --git a/src/idz/handler/loadProfile.ts b/src/idz/userdb/handler/loadProfile.ts similarity index 100% rename from src/idz/handler/loadProfile.ts rename to src/idz/userdb/handler/loadProfile.ts diff --git a/src/idz/handler/loadRewardTable.ts b/src/idz/userdb/handler/loadRewardTable.ts similarity index 100% rename from src/idz/handler/loadRewardTable.ts rename to src/idz/userdb/handler/loadRewardTable.ts diff --git a/src/idz/handler/loadServerList.ts b/src/idz/userdb/handler/loadServerList.ts similarity index 94% rename from src/idz/handler/loadServerList.ts rename to src/idz/userdb/handler/loadServerList.ts index 3fd3300..cd4039b 100644 --- a/src/idz/handler/loadServerList.ts +++ b/src/idz/userdb/handler/loadServerList.ts @@ -1,7 +1,7 @@ import { LoadServerListRequest } from "../request/loadServerList"; import { LoadServerListResponse } from "../response/loadServerList"; import { Repositories } from "../repo"; -import { HOST_EXT, PORT_IDZ } from "../../switchboard"; +import { HOST_EXT, PORT_IDZ } from "../../../switchboard"; export function loadServerList( w: Repositories, diff --git a/src/idz/handler/loadStocker.ts b/src/idz/userdb/handler/loadStocker.ts similarity index 100% rename from src/idz/handler/loadStocker.ts rename to src/idz/userdb/handler/loadStocker.ts diff --git a/src/idz/handler/loadTeam.ts b/src/idz/userdb/handler/loadTeam.ts similarity index 100% rename from src/idz/handler/loadTeam.ts rename to src/idz/userdb/handler/loadTeam.ts diff --git a/src/idz/handler/loadTeamRanking.ts b/src/idz/userdb/handler/loadTeamRanking.ts similarity index 100% rename from src/idz/handler/loadTeamRanking.ts rename to src/idz/userdb/handler/loadTeamRanking.ts diff --git a/src/idz/handler/loadTopTen.ts b/src/idz/userdb/handler/loadTopTen.ts similarity index 100% rename from src/idz/handler/loadTopTen.ts rename to src/idz/userdb/handler/loadTopTen.ts diff --git a/src/idz/handler/lockGarage.ts b/src/idz/userdb/handler/lockGarage.ts similarity index 100% rename from src/idz/handler/lockGarage.ts rename to src/idz/userdb/handler/lockGarage.ts diff --git a/src/idz/handler/lockProfile.ts b/src/idz/userdb/handler/lockProfile.ts similarity index 100% rename from src/idz/handler/lockProfile.ts rename to src/idz/userdb/handler/lockProfile.ts diff --git a/src/idz/handler/lockProfileExtend.ts b/src/idz/userdb/handler/lockProfileExtend.ts similarity index 100% rename from src/idz/handler/lockProfileExtend.ts rename to src/idz/userdb/handler/lockProfileExtend.ts diff --git a/src/idz/handler/msg00AD.ts b/src/idz/userdb/handler/msg00AD.ts similarity index 100% rename from src/idz/handler/msg00AD.ts rename to src/idz/userdb/handler/msg00AD.ts diff --git a/src/idz/handler/saveExpedition.ts b/src/idz/userdb/handler/saveExpedition.ts similarity index 100% rename from src/idz/handler/saveExpedition.ts rename to src/idz/userdb/handler/saveExpedition.ts diff --git a/src/idz/handler/saveGarage.ts b/src/idz/userdb/handler/saveGarage.ts similarity index 100% rename from src/idz/handler/saveGarage.ts rename to src/idz/userdb/handler/saveGarage.ts diff --git a/src/idz/handler/saveNewCar.ts b/src/idz/userdb/handler/saveNewCar.ts similarity index 100% rename from src/idz/handler/saveNewCar.ts rename to src/idz/userdb/handler/saveNewCar.ts diff --git a/src/idz/handler/saveProfile.ts b/src/idz/userdb/handler/saveProfile.ts similarity index 100% rename from src/idz/handler/saveProfile.ts rename to src/idz/userdb/handler/saveProfile.ts diff --git a/src/idz/handler/saveSettings.ts b/src/idz/userdb/handler/saveSettings.ts similarity index 100% rename from src/idz/handler/saveSettings.ts rename to src/idz/userdb/handler/saveSettings.ts diff --git a/src/idz/handler/saveStocker.ts b/src/idz/userdb/handler/saveStocker.ts similarity index 100% rename from src/idz/handler/saveStocker.ts rename to src/idz/userdb/handler/saveStocker.ts diff --git a/src/idz/handler/saveTeamBanner.ts b/src/idz/userdb/handler/saveTeamBanner.ts similarity index 100% rename from src/idz/handler/saveTeamBanner.ts rename to src/idz/userdb/handler/saveTeamBanner.ts diff --git a/src/idz/handler/saveTimeAttack.ts b/src/idz/userdb/handler/saveTimeAttack.ts similarity index 100% rename from src/idz/handler/saveTimeAttack.ts rename to src/idz/userdb/handler/saveTimeAttack.ts diff --git a/src/idz/handler/saveTopic.ts b/src/idz/userdb/handler/saveTopic.ts similarity index 100% rename from src/idz/handler/saveTopic.ts rename to src/idz/userdb/handler/saveTopic.ts diff --git a/src/idz/handler/unlockProfile.ts b/src/idz/userdb/handler/unlockProfile.ts similarity index 100% rename from src/idz/handler/unlockProfile.ts rename to src/idz/userdb/handler/unlockProfile.ts diff --git a/src/idz/handler/updateProvisionalStoreRank.ts b/src/idz/userdb/handler/updateProvisionalStoreRank.ts similarity index 100% rename from src/idz/handler/updateProvisionalStoreRank.ts rename to src/idz/userdb/handler/updateProvisionalStoreRank.ts diff --git a/src/idz/handler/updateResult.ts b/src/idz/userdb/handler/updateResult.ts similarity index 100% rename from src/idz/handler/updateResult.ts rename to src/idz/userdb/handler/updateResult.ts diff --git a/src/idz/handler/updateStoryClearNum.ts b/src/idz/userdb/handler/updateStoryClearNum.ts similarity index 100% rename from src/idz/handler/updateStoryClearNum.ts rename to src/idz/userdb/handler/updateStoryClearNum.ts diff --git a/src/idz/handler/updateTeamLeader.ts b/src/idz/userdb/handler/updateTeamLeader.ts similarity index 100% rename from src/idz/handler/updateTeamLeader.ts rename to src/idz/userdb/handler/updateTeamLeader.ts diff --git a/src/idz/handler/updateTeamMember.ts b/src/idz/userdb/handler/updateTeamMember.ts similarity index 100% rename from src/idz/handler/updateTeamMember.ts rename to src/idz/userdb/handler/updateTeamMember.ts diff --git a/src/idz/handler/updateTeamPoints.ts b/src/idz/userdb/handler/updateTeamPoints.ts similarity index 100% rename from src/idz/handler/updateTeamPoints.ts rename to src/idz/userdb/handler/updateTeamPoints.ts diff --git a/src/idz/handler/updateUiReport.ts b/src/idz/userdb/handler/updateUiReport.ts similarity index 100% rename from src/idz/handler/updateUiReport.ts rename to src/idz/userdb/handler/updateUiReport.ts diff --git a/src/idz/handler/updateUserLog.ts b/src/idz/userdb/handler/updateUserLog.ts similarity index 100% rename from src/idz/handler/updateUserLog.ts rename to src/idz/userdb/handler/updateUserLog.ts diff --git a/src/idz/index.ts b/src/idz/userdb/index.ts similarity index 89% rename from src/idz/index.ts rename to src/idz/userdb/index.ts index c3954ba..2a9625c 100644 --- a/src/idz/index.ts +++ b/src/idz/userdb/index.ts @@ -3,10 +3,10 @@ import { Socket } from "net"; import { dispatch } from "./handler"; import { setup } from "./setup"; -import { DataSource } from "../sql"; +import { DataSource } from "../../sql"; import { SqlRepositories } from "./sql"; -const debug = logger("app:idz:session"); +const debug = logger("app:idz:userdb"); export default function idz(db: DataSource) { return async function(socket: Socket) { diff --git a/src/idz/model/base.ts b/src/idz/userdb/model/base.ts similarity index 100% rename from src/idz/model/base.ts rename to src/idz/userdb/model/base.ts diff --git a/src/idz/model/car.ts b/src/idz/userdb/model/car.ts similarity index 100% rename from src/idz/model/car.ts rename to src/idz/userdb/model/car.ts diff --git a/src/idz/model/chara.ts b/src/idz/userdb/model/chara.ts similarity index 100% rename from src/idz/model/chara.ts rename to src/idz/userdb/model/chara.ts diff --git a/src/idz/model/index.ts b/src/idz/userdb/model/index.ts similarity index 100% rename from src/idz/model/index.ts rename to src/idz/userdb/model/index.ts diff --git a/src/idz/model/mission.ts b/src/idz/userdb/model/mission.ts similarity index 100% rename from src/idz/model/mission.ts rename to src/idz/userdb/model/mission.ts diff --git a/src/idz/model/profile.ts b/src/idz/userdb/model/profile.ts similarity index 82% rename from src/idz/model/profile.ts rename to src/idz/userdb/model/profile.ts index 12fa0e1..cc87b5e 100644 --- a/src/idz/model/profile.ts +++ b/src/idz/userdb/model/profile.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface Profile { aimeId: AimeId; diff --git a/src/idz/model/settings.ts b/src/idz/userdb/model/settings.ts similarity index 100% rename from src/idz/model/settings.ts rename to src/idz/userdb/model/settings.ts diff --git a/src/idz/model/story.ts b/src/idz/userdb/model/story.ts similarity index 100% rename from src/idz/model/story.ts rename to src/idz/userdb/model/story.ts diff --git a/src/idz/model/team.ts b/src/idz/userdb/model/team.ts similarity index 100% rename from src/idz/model/team.ts rename to src/idz/userdb/model/team.ts diff --git a/src/idz/model/tickets.ts b/src/idz/userdb/model/tickets.ts similarity index 100% rename from src/idz/model/tickets.ts rename to src/idz/userdb/model/tickets.ts diff --git a/src/idz/model/timeAttack.ts b/src/idz/userdb/model/timeAttack.ts similarity index 100% rename from src/idz/model/timeAttack.ts rename to src/idz/userdb/model/timeAttack.ts diff --git a/src/idz/model/unlocks.ts b/src/idz/userdb/model/unlocks.ts similarity index 100% rename from src/idz/model/unlocks.ts rename to src/idz/userdb/model/unlocks.ts diff --git a/src/idz/repo.ts b/src/idz/userdb/repo.ts similarity index 98% rename from src/idz/repo.ts rename to src/idz/userdb/repo.ts index fef2903..f1f2d0c 100644 --- a/src/idz/repo.ts +++ b/src/idz/userdb/repo.ts @@ -1,7 +1,7 @@ import { Subtract } from "utility-types"; import * as Model from "./model"; -import { AimeId, Id } from "../model"; +import { AimeId, Id } from "../../model"; export type TeamSpec = Subtract< Model.Team, diff --git a/src/idz/request/checkTeamName.ts b/src/idz/userdb/request/checkTeamName.ts similarity index 100% rename from src/idz/request/checkTeamName.ts rename to src/idz/userdb/request/checkTeamName.ts diff --git a/src/idz/request/createAutoTeam.ts b/src/idz/userdb/request/createAutoTeam.ts similarity index 77% rename from src/idz/request/createAutoTeam.ts rename to src/idz/userdb/request/createAutoTeam.ts index d77d0cb..1b15194 100644 --- a/src/idz/request/createAutoTeam.ts +++ b/src/idz/userdb/request/createAutoTeam.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface CreateAutoTeamRequest { type: "create_auto_team_req"; diff --git a/src/idz/request/createProfile.ts b/src/idz/userdb/request/createProfile.ts similarity index 85% rename from src/idz/request/createProfile.ts rename to src/idz/userdb/request/createProfile.ts index d76415e..8645025 100644 --- a/src/idz/request/createProfile.ts +++ b/src/idz/userdb/request/createProfile.ts @@ -1,6 +1,6 @@ import { Car } from "../model/car"; import { Chara } from "../model/chara"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface CreateProfileRequest { type: "create_profile_req"; diff --git a/src/idz/request/createTeam.ts b/src/idz/userdb/request/createTeam.ts similarity index 87% rename from src/idz/request/createTeam.ts rename to src/idz/userdb/request/createTeam.ts index 8bca943..786c23a 100644 --- a/src/idz/request/createTeam.ts +++ b/src/idz/userdb/request/createTeam.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface CreateTeamRequest { type: "create_team_req"; diff --git a/src/idz/request/discoverProfile.ts b/src/idz/userdb/request/discoverProfile.ts similarity index 69% rename from src/idz/request/discoverProfile.ts rename to src/idz/userdb/request/discoverProfile.ts index 0cdc5b6..a1e4bb3 100644 --- a/src/idz/request/discoverProfile.ts +++ b/src/idz/userdb/request/discoverProfile.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface DiscoverProfileRequest { type: "discover_profile_req"; diff --git a/src/idz/request/index.ts b/src/idz/userdb/request/index.ts similarity index 100% rename from src/idz/request/index.ts rename to src/idz/userdb/request/index.ts diff --git a/src/idz/request/load2on2.ts b/src/idz/userdb/request/load2on2.ts similarity index 91% rename from src/idz/request/load2on2.ts rename to src/idz/userdb/request/load2on2.ts index 7af40ea..7490a7b 100644 --- a/src/idz/request/load2on2.ts +++ b/src/idz/userdb/request/load2on2.ts @@ -1,6 +1,6 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; interface Load2on2RequestBase { type: "load_2on2_req"; diff --git a/src/idz/request/loadConfig.ts b/src/idz/userdb/request/loadConfig.ts similarity index 100% rename from src/idz/request/loadConfig.ts rename to src/idz/userdb/request/loadConfig.ts diff --git a/src/idz/request/loadConfig2.ts b/src/idz/userdb/request/loadConfig2.ts similarity index 100% rename from src/idz/request/loadConfig2.ts rename to src/idz/userdb/request/loadConfig2.ts diff --git a/src/idz/request/loadEventInfo.ts b/src/idz/userdb/request/loadEventInfo.ts similarity index 69% rename from src/idz/request/loadEventInfo.ts rename to src/idz/userdb/request/loadEventInfo.ts index 072b628..36d9386 100644 --- a/src/idz/request/loadEventInfo.ts +++ b/src/idz/userdb/request/loadEventInfo.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LoadEventInfoRequest { type: "load_event_info_req"; diff --git a/src/idz/request/loadGacha.ts b/src/idz/userdb/request/loadGacha.ts similarity index 66% rename from src/idz/request/loadGacha.ts rename to src/idz/userdb/request/loadGacha.ts index 995b2c5..95a70ec 100644 --- a/src/idz/request/loadGacha.ts +++ b/src/idz/userdb/request/loadGacha.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LoadGachaRequest { type: "load_gacha_req"; diff --git a/src/idz/request/loadGarage.ts b/src/idz/userdb/request/loadGarage.ts similarity index 76% rename from src/idz/request/loadGarage.ts rename to src/idz/userdb/request/loadGarage.ts index b9625d8..d3c2f9d 100644 --- a/src/idz/request/loadGarage.ts +++ b/src/idz/userdb/request/loadGarage.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LoadGarageRequest { type: "load_garage_req"; diff --git a/src/idz/request/loadGeneralReward.ts b/src/idz/userdb/request/loadGeneralReward.ts similarity index 90% rename from src/idz/request/loadGeneralReward.ts rename to src/idz/userdb/request/loadGeneralReward.ts index 57c5fde..91bcc02 100644 --- a/src/idz/request/loadGeneralReward.ts +++ b/src/idz/userdb/request/loadGeneralReward.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; interface LoadGeneralRewardRequestBase { type: "load_general_reward_req"; diff --git a/src/idz/request/loadGhost.ts b/src/idz/userdb/request/loadGhost.ts similarity index 100% rename from src/idz/request/loadGhost.ts rename to src/idz/userdb/request/loadGhost.ts diff --git a/src/idz/request/loadProfile.ts b/src/idz/userdb/request/loadProfile.ts similarity index 89% rename from src/idz/request/loadProfile.ts rename to src/idz/userdb/request/loadProfile.ts index e2c2143..de42473 100644 --- a/src/idz/request/loadProfile.ts +++ b/src/idz/userdb/request/loadProfile.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; interface LoadProfileRequestBase { type: "load_profile_req"; diff --git a/src/idz/request/loadRewardTable.ts b/src/idz/userdb/request/loadRewardTable.ts similarity index 100% rename from src/idz/request/loadRewardTable.ts rename to src/idz/userdb/request/loadRewardTable.ts diff --git a/src/idz/request/loadServerList.ts b/src/idz/userdb/request/loadServerList.ts similarity index 100% rename from src/idz/request/loadServerList.ts rename to src/idz/userdb/request/loadServerList.ts diff --git a/src/idz/request/loadStocker.ts b/src/idz/userdb/request/loadStocker.ts similarity index 67% rename from src/idz/request/loadStocker.ts rename to src/idz/userdb/request/loadStocker.ts index 50d7b52..10d5774 100644 --- a/src/idz/request/loadStocker.ts +++ b/src/idz/userdb/request/loadStocker.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LoadStockerRequest { type: "load_stocker_req"; diff --git a/src/idz/request/loadTeam.ts b/src/idz/userdb/request/loadTeam.ts similarity index 100% rename from src/idz/request/loadTeam.ts rename to src/idz/userdb/request/loadTeam.ts diff --git a/src/idz/request/loadTeamRanking.ts b/src/idz/userdb/request/loadTeamRanking.ts similarity index 100% rename from src/idz/request/loadTeamRanking.ts rename to src/idz/userdb/request/loadTeamRanking.ts diff --git a/src/idz/request/loadTopTen.ts b/src/idz/userdb/request/loadTopTen.ts similarity index 90% rename from src/idz/request/loadTopTen.ts rename to src/idz/userdb/request/loadTopTen.ts index 5a160d9..aeb60a3 100644 --- a/src/idz/request/loadTopTen.ts +++ b/src/idz/userdb/request/loadTopTen.ts @@ -1,6 +1,6 @@ import { ExtId, RouteNo } from "../model/base"; import { Team } from "../model/team"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LoadTopTenRequestSelector { routeNo: RouteNo; diff --git a/src/idz/request/lockGarage.ts b/src/idz/userdb/request/lockGarage.ts similarity index 100% rename from src/idz/request/lockGarage.ts rename to src/idz/userdb/request/lockGarage.ts diff --git a/src/idz/request/lockProfile.ts b/src/idz/userdb/request/lockProfile.ts similarity index 100% rename from src/idz/request/lockProfile.ts rename to src/idz/userdb/request/lockProfile.ts diff --git a/src/idz/request/lockProfileExtend.ts b/src/idz/userdb/request/lockProfileExtend.ts similarity index 73% rename from src/idz/request/lockProfileExtend.ts rename to src/idz/userdb/request/lockProfileExtend.ts index c0e5b0f..e6fed13 100644 --- a/src/idz/request/lockProfileExtend.ts +++ b/src/idz/userdb/request/lockProfileExtend.ts @@ -1,4 +1,4 @@ -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface LockProfileExtendRequest { type: "lock_profile_extend_req"; diff --git a/src/idz/request/msg00AD.ts b/src/idz/userdb/request/msg00AD.ts similarity index 100% rename from src/idz/request/msg00AD.ts rename to src/idz/userdb/request/msg00AD.ts diff --git a/src/idz/request/saveExpedition.ts b/src/idz/userdb/request/saveExpedition.ts similarity index 100% rename from src/idz/request/saveExpedition.ts rename to src/idz/userdb/request/saveExpedition.ts diff --git a/src/idz/request/saveGarage.ts b/src/idz/userdb/request/saveGarage.ts similarity index 100% rename from src/idz/request/saveGarage.ts rename to src/idz/userdb/request/saveGarage.ts diff --git a/src/idz/request/saveNewCar.ts b/src/idz/userdb/request/saveNewCar.ts similarity index 80% rename from src/idz/request/saveNewCar.ts rename to src/idz/userdb/request/saveNewCar.ts index a14eac9..792f7f2 100644 --- a/src/idz/request/saveNewCar.ts +++ b/src/idz/userdb/request/saveNewCar.ts @@ -1,5 +1,5 @@ import { Car } from "../model/car"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface SaveNewCarRequest { type: "save_new_car_req"; diff --git a/src/idz/request/saveProfile.ts b/src/idz/userdb/request/saveProfile.ts similarity index 95% rename from src/idz/request/saveProfile.ts rename to src/idz/userdb/request/saveProfile.ts index 65283bb..82e7700 100644 --- a/src/idz/request/saveProfile.ts +++ b/src/idz/userdb/request/saveProfile.ts @@ -5,7 +5,7 @@ import { Settings } from "../model/settings"; import { Story } from "../model/story"; import { Tickets } from "../model/tickets"; import { Unlocks } from "../model/unlocks"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; interface SaveProfileRequestBase { type: "save_profile_req"; diff --git a/src/idz/request/saveSettings.ts b/src/idz/userdb/request/saveSettings.ts similarity index 83% rename from src/idz/request/saveSettings.ts rename to src/idz/userdb/request/saveSettings.ts index c49b896..68418a6 100644 --- a/src/idz/request/saveSettings.ts +++ b/src/idz/userdb/request/saveSettings.ts @@ -1,5 +1,5 @@ import { Settings } from "../model/settings"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface SaveSettingsRequest { type: "save_settings_req"; diff --git a/src/idz/request/saveStocker.ts b/src/idz/userdb/request/saveStocker.ts similarity index 87% rename from src/idz/request/saveStocker.ts rename to src/idz/userdb/request/saveStocker.ts index 9c7aef6..32488d3 100644 --- a/src/idz/request/saveStocker.ts +++ b/src/idz/userdb/request/saveStocker.ts @@ -1,7 +1,7 @@ import { BackgroundCode } from "../model/base"; import { CarSelector } from "../model/car"; import { Chara } from "../model/chara"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface SaveStockerRequest { type: "save_stocker_req"; diff --git a/src/idz/request/saveTeamBanner.ts b/src/idz/userdb/request/saveTeamBanner.ts similarity index 100% rename from src/idz/request/saveTeamBanner.ts rename to src/idz/userdb/request/saveTeamBanner.ts diff --git a/src/idz/request/saveTimeAttack.ts b/src/idz/userdb/request/saveTimeAttack.ts similarity index 90% rename from src/idz/request/saveTimeAttack.ts rename to src/idz/userdb/request/saveTimeAttack.ts index ef81205..ae79297 100644 --- a/src/idz/request/saveTimeAttack.ts +++ b/src/idz/userdb/request/saveTimeAttack.ts @@ -1,5 +1,5 @@ import { TimeAttackScore } from "../model/timeAttack"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface SaveTimeAttackRequest { type: "save_time_attack_req"; diff --git a/src/idz/request/saveTopic.ts b/src/idz/userdb/request/saveTopic.ts similarity index 100% rename from src/idz/request/saveTopic.ts rename to src/idz/userdb/request/saveTopic.ts diff --git a/src/idz/request/unlockProfile.ts b/src/idz/userdb/request/unlockProfile.ts similarity index 100% rename from src/idz/request/unlockProfile.ts rename to src/idz/userdb/request/unlockProfile.ts diff --git a/src/idz/request/updateProvisionalStoreRank.ts b/src/idz/userdb/request/updateProvisionalStoreRank.ts similarity index 100% rename from src/idz/request/updateProvisionalStoreRank.ts rename to src/idz/userdb/request/updateProvisionalStoreRank.ts diff --git a/src/idz/request/updateResult.ts b/src/idz/userdb/request/updateResult.ts similarity index 100% rename from src/idz/request/updateResult.ts rename to src/idz/userdb/request/updateResult.ts diff --git a/src/idz/request/updateStoryClearNum.ts b/src/idz/userdb/request/updateStoryClearNum.ts similarity index 100% rename from src/idz/request/updateStoryClearNum.ts rename to src/idz/userdb/request/updateStoryClearNum.ts diff --git a/src/idz/request/updateTeamLeader.ts b/src/idz/userdb/request/updateTeamLeader.ts similarity index 84% rename from src/idz/request/updateTeamLeader.ts rename to src/idz/userdb/request/updateTeamLeader.ts index 741b402..c5f8f42 100644 --- a/src/idz/request/updateTeamLeader.ts +++ b/src/idz/userdb/request/updateTeamLeader.ts @@ -1,6 +1,6 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface UpdateTeamLeaderRequest { type: "update_team_leader_req"; diff --git a/src/idz/request/updateTeamMember.ts b/src/idz/userdb/request/updateTeamMember.ts similarity index 84% rename from src/idz/request/updateTeamMember.ts rename to src/idz/userdb/request/updateTeamMember.ts index 6e71d42..aa293e7 100644 --- a/src/idz/request/updateTeamMember.ts +++ b/src/idz/userdb/request/updateTeamMember.ts @@ -1,6 +1,6 @@ import { ExtId } from "../model/base"; import { Team } from "../model/team"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; export interface UpdateTeamMemberRequest { type: "update_team_member_req"; diff --git a/src/idz/request/updateTeamPoints.ts b/src/idz/userdb/request/updateTeamPoints.ts similarity index 100% rename from src/idz/request/updateTeamPoints.ts rename to src/idz/userdb/request/updateTeamPoints.ts diff --git a/src/idz/request/updateUiReport.ts b/src/idz/userdb/request/updateUiReport.ts similarity index 100% rename from src/idz/request/updateUiReport.ts rename to src/idz/userdb/request/updateUiReport.ts diff --git a/src/idz/request/updateUserLog.ts b/src/idz/userdb/request/updateUserLog.ts similarity index 100% rename from src/idz/request/updateUserLog.ts rename to src/idz/userdb/request/updateUserLog.ts diff --git a/src/idz/response/_team.ts b/src/idz/userdb/response/_team.ts similarity index 100% rename from src/idz/response/_team.ts rename to src/idz/userdb/response/_team.ts diff --git a/src/idz/response/checkTeamName.ts b/src/idz/userdb/response/checkTeamName.ts similarity index 100% rename from src/idz/response/checkTeamName.ts rename to src/idz/userdb/response/checkTeamName.ts diff --git a/src/idz/response/createAutoTeam.ts b/src/idz/userdb/response/createAutoTeam.ts similarity index 100% rename from src/idz/response/createAutoTeam.ts rename to src/idz/userdb/response/createAutoTeam.ts diff --git a/src/idz/response/createTeam.ts b/src/idz/userdb/response/createTeam.ts similarity index 100% rename from src/idz/response/createTeam.ts rename to src/idz/userdb/response/createTeam.ts diff --git a/src/idz/response/discoverProfile.ts b/src/idz/userdb/response/discoverProfile.ts similarity index 100% rename from src/idz/response/discoverProfile.ts rename to src/idz/userdb/response/discoverProfile.ts diff --git a/src/idz/response/generic.ts b/src/idz/userdb/response/generic.ts similarity index 100% rename from src/idz/response/generic.ts rename to src/idz/userdb/response/generic.ts diff --git a/src/idz/response/index.ts b/src/idz/userdb/response/index.ts similarity index 100% rename from src/idz/response/index.ts rename to src/idz/userdb/response/index.ts diff --git a/src/idz/response/load2on2.ts b/src/idz/userdb/response/load2on2.ts similarity index 100% rename from src/idz/response/load2on2.ts rename to src/idz/userdb/response/load2on2.ts diff --git a/src/idz/response/loadConfig.ts b/src/idz/userdb/response/loadConfig.ts similarity index 100% rename from src/idz/response/loadConfig.ts rename to src/idz/userdb/response/loadConfig.ts diff --git a/src/idz/response/loadConfig2.ts b/src/idz/userdb/response/loadConfig2.ts similarity index 100% rename from src/idz/response/loadConfig2.ts rename to src/idz/userdb/response/loadConfig2.ts diff --git a/src/idz/response/loadEventInfo.ts b/src/idz/userdb/response/loadEventInfo.ts similarity index 100% rename from src/idz/response/loadEventInfo.ts rename to src/idz/userdb/response/loadEventInfo.ts diff --git a/src/idz/response/loadGacha.ts b/src/idz/userdb/response/loadGacha.ts similarity index 100% rename from src/idz/response/loadGacha.ts rename to src/idz/userdb/response/loadGacha.ts diff --git a/src/idz/response/loadGarage.ts b/src/idz/userdb/response/loadGarage.ts similarity index 100% rename from src/idz/response/loadGarage.ts rename to src/idz/userdb/response/loadGarage.ts diff --git a/src/idz/response/loadGeneralReward.ts b/src/idz/userdb/response/loadGeneralReward.ts similarity index 100% rename from src/idz/response/loadGeneralReward.ts rename to src/idz/userdb/response/loadGeneralReward.ts diff --git a/src/idz/response/loadGeneralReward1.ts b/src/idz/userdb/response/loadGeneralReward1.ts similarity index 100% rename from src/idz/response/loadGeneralReward1.ts rename to src/idz/userdb/response/loadGeneralReward1.ts diff --git a/src/idz/response/loadGeneralReward2.ts b/src/idz/userdb/response/loadGeneralReward2.ts similarity index 100% rename from src/idz/response/loadGeneralReward2.ts rename to src/idz/userdb/response/loadGeneralReward2.ts diff --git a/src/idz/response/loadGhost.ts b/src/idz/userdb/response/loadGhost.ts similarity index 100% rename from src/idz/response/loadGhost.ts rename to src/idz/userdb/response/loadGhost.ts diff --git a/src/idz/response/loadProfile.ts b/src/idz/userdb/response/loadProfile.ts similarity index 96% rename from src/idz/response/loadProfile.ts rename to src/idz/userdb/response/loadProfile.ts index 2e41537..fcf5778 100644 --- a/src/idz/response/loadProfile.ts +++ b/src/idz/userdb/response/loadProfile.ts @@ -7,7 +7,7 @@ import { Story } from "../model/story"; import { Tickets } from "../model/tickets"; import { TimeAttackScore } from "../model/timeAttack"; import { Unlocks } from "../model/unlocks"; -import { AimeId } from "../../model"; +import { AimeId } from "../../../model"; interface LoadProfileResponseBase { type: "load_profile_res"; diff --git a/src/idz/response/loadRewardTable.ts b/src/idz/userdb/response/loadRewardTable.ts similarity index 100% rename from src/idz/response/loadRewardTable.ts rename to src/idz/userdb/response/loadRewardTable.ts diff --git a/src/idz/response/loadServerList.ts b/src/idz/userdb/response/loadServerList.ts similarity index 100% rename from src/idz/response/loadServerList.ts rename to src/idz/userdb/response/loadServerList.ts diff --git a/src/idz/response/loadStocker.ts b/src/idz/userdb/response/loadStocker.ts similarity index 100% rename from src/idz/response/loadStocker.ts rename to src/idz/userdb/response/loadStocker.ts diff --git a/src/idz/response/loadTeam.ts b/src/idz/userdb/response/loadTeam.ts similarity index 100% rename from src/idz/response/loadTeam.ts rename to src/idz/userdb/response/loadTeam.ts diff --git a/src/idz/response/loadTeamRanking.ts b/src/idz/userdb/response/loadTeamRanking.ts similarity index 100% rename from src/idz/response/loadTeamRanking.ts rename to src/idz/userdb/response/loadTeamRanking.ts diff --git a/src/idz/response/loadTopTen.ts b/src/idz/userdb/response/loadTopTen.ts similarity index 100% rename from src/idz/response/loadTopTen.ts rename to src/idz/userdb/response/loadTopTen.ts diff --git a/src/idz/response/lockProfile.ts b/src/idz/userdb/response/lockProfile.ts similarity index 100% rename from src/idz/response/lockProfile.ts rename to src/idz/userdb/response/lockProfile.ts diff --git a/src/idz/response/lockProfileExtend.ts b/src/idz/userdb/response/lockProfileExtend.ts similarity index 100% rename from src/idz/response/lockProfileExtend.ts rename to src/idz/userdb/response/lockProfileExtend.ts diff --git a/src/idz/response/saveExpedition.ts b/src/idz/userdb/response/saveExpedition.ts similarity index 100% rename from src/idz/response/saveExpedition.ts rename to src/idz/userdb/response/saveExpedition.ts diff --git a/src/idz/response/saveGarage.ts b/src/idz/userdb/response/saveGarage.ts similarity index 100% rename from src/idz/response/saveGarage.ts rename to src/idz/userdb/response/saveGarage.ts diff --git a/src/idz/response/saveNewCar.ts b/src/idz/userdb/response/saveNewCar.ts similarity index 100% rename from src/idz/response/saveNewCar.ts rename to src/idz/userdb/response/saveNewCar.ts diff --git a/src/idz/response/saveTimeAttack.ts b/src/idz/userdb/response/saveTimeAttack.ts similarity index 100% rename from src/idz/response/saveTimeAttack.ts rename to src/idz/userdb/response/saveTimeAttack.ts diff --git a/src/idz/response/saveTopic.ts b/src/idz/userdb/response/saveTopic.ts similarity index 100% rename from src/idz/response/saveTopic.ts rename to src/idz/userdb/response/saveTopic.ts diff --git a/src/idz/response/unlockProfile.ts b/src/idz/userdb/response/unlockProfile.ts similarity index 100% rename from src/idz/response/unlockProfile.ts rename to src/idz/userdb/response/unlockProfile.ts diff --git a/src/idz/response/updateProvisionalStoreRank.ts b/src/idz/userdb/response/updateProvisionalStoreRank.ts similarity index 100% rename from src/idz/response/updateProvisionalStoreRank.ts rename to src/idz/userdb/response/updateProvisionalStoreRank.ts diff --git a/src/idz/response/updateStoryClearNum.ts b/src/idz/userdb/response/updateStoryClearNum.ts similarity index 100% rename from src/idz/response/updateStoryClearNum.ts rename to src/idz/userdb/response/updateStoryClearNum.ts diff --git a/src/idz/response/updateTeamLeader.ts b/src/idz/userdb/response/updateTeamLeader.ts similarity index 100% rename from src/idz/response/updateTeamLeader.ts rename to src/idz/userdb/response/updateTeamLeader.ts diff --git a/src/idz/response/updateTeamMember.ts b/src/idz/userdb/response/updateTeamMember.ts similarity index 100% rename from src/idz/response/updateTeamMember.ts rename to src/idz/userdb/response/updateTeamMember.ts diff --git a/src/idz/setup.ts b/src/idz/userdb/setup.ts similarity index 100% rename from src/idz/setup.ts rename to src/idz/userdb/setup.ts diff --git a/src/idz/sql/backgrounds.ts b/src/idz/userdb/sql/backgrounds.ts similarity index 93% rename from src/idz/sql/backgrounds.ts rename to src/idz/userdb/sql/backgrounds.ts index e183b08..06932c6 100644 --- a/src/idz/sql/backgrounds.ts +++ b/src/idz/userdb/sql/backgrounds.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { BackgroundCode } from "../model/base"; import { Profile } from "../model/profile"; import { FlagRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlBackgroundsRepository implements FlagRepository { diff --git a/src/idz/sql/car.ts b/src/idz/userdb/sql/car.ts similarity index 97% rename from src/idz/sql/car.ts rename to src/idz/userdb/sql/car.ts index a36565e..711767a 100644 --- a/src/idz/sql/car.ts +++ b/src/idz/userdb/sql/car.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { Car, CarSelector } from "../model/car"; import { Profile } from "../model/profile"; import { CarRepository } from "../repo"; -import { Id } from "../../model"; -import { Row, Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Row, Transaction } from "../../../sql"; function _extractRow(row: Row): Car { return { diff --git a/src/idz/sql/chara.ts b/src/idz/userdb/sql/chara.ts similarity index 95% rename from src/idz/sql/chara.ts rename to src/idz/userdb/sql/chara.ts index 2203743..15c2046 100644 --- a/src/idz/sql/chara.ts +++ b/src/idz/userdb/sql/chara.ts @@ -4,8 +4,8 @@ import { BackgroundCode, TitleCode } from "../model/base"; import { Chara, Gender } from "../model/chara"; import { Profile } from "../model/profile"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Row, Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Row, Transaction } from "../../../sql"; export function _extractChara(row: Row): Chara { return { diff --git a/src/idz/sql/coursePlays.ts b/src/idz/userdb/sql/coursePlays.ts similarity index 94% rename from src/idz/sql/coursePlays.ts rename to src/idz/userdb/sql/coursePlays.ts index b44559f..857465a 100644 --- a/src/idz/sql/coursePlays.ts +++ b/src/idz/userdb/sql/coursePlays.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { CourseNo } from "../model/base"; import { Profile } from "../model/profile"; import { CoursePlaysRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlCoursePlaysRepository implements CoursePlaysRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/index.ts b/src/idz/userdb/sql/index.ts similarity index 98% rename from src/idz/sql/index.ts rename to src/idz/userdb/sql/index.ts index 03ca617..07f3ebc 100644 --- a/src/idz/sql/index.ts +++ b/src/idz/userdb/sql/index.ts @@ -16,7 +16,7 @@ import { SqlTitlesRepository } from "./titles"; import { SqlUnlocksRepository } from "./unlocks"; import * as Model from "../model"; import * as Repo from "../repo"; -import { Transaction } from "../../sql"; +import { Transaction } from "../../../sql"; export class SqlRepositories implements Repo.Repositories { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/missions.ts b/src/idz/userdb/sql/missions.ts similarity index 96% rename from src/idz/sql/missions.ts rename to src/idz/userdb/sql/missions.ts index ef33c94..bd77965 100644 --- a/src/idz/sql/missions.ts +++ b/src/idz/userdb/sql/missions.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { MissionGrid, MissionState } from "../model/mission"; import { Profile } from "../model/profile"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlMissionsRepository implements FacetRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/profile.ts b/src/idz/userdb/sql/profile.ts similarity index 96% rename from src/idz/sql/profile.ts rename to src/idz/userdb/sql/profile.ts index 4dfc550..b2dd142 100644 --- a/src/idz/sql/profile.ts +++ b/src/idz/userdb/sql/profile.ts @@ -2,8 +2,8 @@ import sql from "sql-bricks-postgres"; import { Profile } from "../model/profile"; import { ProfileRepository } from "../repo"; -import { AimeId, Id } from "../../model"; -import { Row, Transaction } from "../../sql"; +import { AimeId, Id } from "../../../model"; +import { Row, Transaction } from "../../../sql"; export function _extractProfile(row: Row): Profile { return { diff --git a/src/idz/sql/settings.ts b/src/idz/userdb/sql/settings.ts similarity index 94% rename from src/idz/sql/settings.ts rename to src/idz/userdb/sql/settings.ts index d90782f..dea530d 100644 --- a/src/idz/sql/settings.ts +++ b/src/idz/userdb/sql/settings.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { Settings } from "../model/settings"; import { Profile } from "../model/profile"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlSettingsRepository implements FacetRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/story.ts b/src/idz/userdb/sql/story.ts similarity index 96% rename from src/idz/sql/story.ts rename to src/idz/userdb/sql/story.ts index aad2d0f..758ed04 100644 --- a/src/idz/sql/story.ts +++ b/src/idz/userdb/sql/story.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { Profile } from "../model/profile"; import { Story, StoryRow, StoryCell } from "../model/story"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlStoryRepository implements FacetRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/team.ts b/src/idz/userdb/sql/team.ts similarity index 95% rename from src/idz/sql/team.ts rename to src/idz/userdb/sql/team.ts index 0d3b0f4..24a4a6f 100644 --- a/src/idz/sql/team.ts +++ b/src/idz/userdb/sql/team.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { ExtId } from "../model/base"; import { Team } from "../model/team"; import { TeamSpec, TeamRepository } from "../repo"; -import { Id, generateExtId } from "../../model"; -import { Transaction } from "../../sql"; +import { Id, generateExtId } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlTeamRepository implements TeamRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/teamAuto.ts b/src/idz/userdb/sql/teamAuto.ts similarity index 92% rename from src/idz/sql/teamAuto.ts rename to src/idz/userdb/sql/teamAuto.ts index 4030686..464b171 100644 --- a/src/idz/sql/teamAuto.ts +++ b/src/idz/userdb/sql/teamAuto.ts @@ -2,8 +2,8 @@ import sql from "sql-bricks-postgres"; import { Team, TeamAuto } from "../model/team"; import { TeamAutoRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlTeamAutoRepository implements TeamAutoRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/teamMember.ts b/src/idz/userdb/sql/teamMember.ts similarity index 97% rename from src/idz/sql/teamMember.ts rename to src/idz/userdb/sql/teamMember.ts index 629debf..ab7d3f9 100644 --- a/src/idz/sql/teamMember.ts +++ b/src/idz/userdb/sql/teamMember.ts @@ -5,8 +5,8 @@ import { Team, TeamMember } from "../model/team"; import { TeamMemberRepository } from "../repo"; import { _extractProfile } from "./profile"; import { _extractChara } from "./chara"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlTeamMemberRepository implements TeamMemberRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/teamReservation.ts b/src/idz/userdb/sql/teamReservation.ts similarity index 96% rename from src/idz/sql/teamReservation.ts rename to src/idz/userdb/sql/teamReservation.ts index e8babae..a61e9eb 100644 --- a/src/idz/sql/teamReservation.ts +++ b/src/idz/userdb/sql/teamReservation.ts @@ -2,8 +2,8 @@ import sql from "sql-bricks-postgres"; import { Team } from "../model/team"; import { TeamReservationRepository } from "../repo"; -import { AimeId, Id } from "../../model"; -import { Transaction } from "../../sql"; +import { AimeId, Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlTeamReservationRepository implements TeamReservationRepository { diff --git a/src/idz/sql/tickets.ts b/src/idz/userdb/sql/tickets.ts similarity index 93% rename from src/idz/sql/tickets.ts rename to src/idz/userdb/sql/tickets.ts index 8d6821d..eef2136 100644 --- a/src/idz/sql/tickets.ts +++ b/src/idz/userdb/sql/tickets.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { Profile } from "../model/profile"; import { Tickets } from "../model/tickets"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; // TODO free continue diff --git a/src/idz/sql/timeAttack.ts b/src/idz/userdb/sql/timeAttack.ts similarity index 98% rename from src/idz/sql/timeAttack.ts rename to src/idz/userdb/sql/timeAttack.ts index f289065..8de3af3 100644 --- a/src/idz/sql/timeAttack.ts +++ b/src/idz/userdb/sql/timeAttack.ts @@ -6,8 +6,8 @@ import { Team } from "../model/team"; import { Profile } from "../model/profile"; import { TimeAttackScore } from "../model/timeAttack"; import { TimeAttackRepository, TopTenResult } from "../repo"; -import { Id } from "../../model"; -import { Row, Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Row, Transaction } from "../../../sql"; function _extractRow(row: Row): TimeAttackScore { return { diff --git a/src/idz/sql/titles.ts b/src/idz/userdb/sql/titles.ts similarity index 93% rename from src/idz/sql/titles.ts rename to src/idz/userdb/sql/titles.ts index d80a321..61c4c04 100644 --- a/src/idz/sql/titles.ts +++ b/src/idz/userdb/sql/titles.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { TitleCode } from "../model/base"; import { Profile } from "../model/profile"; import { FlagRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlTitlesRepository implements FlagRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/idz/sql/unlocks.ts b/src/idz/userdb/sql/unlocks.ts similarity index 94% rename from src/idz/sql/unlocks.ts rename to src/idz/userdb/sql/unlocks.ts index 95acbe5..2c9c3a6 100644 --- a/src/idz/sql/unlocks.ts +++ b/src/idz/userdb/sql/unlocks.ts @@ -3,8 +3,8 @@ import sql from "sql-bricks-postgres"; import { Profile } from "../model/profile"; import { Unlocks } from "../model/unlocks"; import { FacetRepository } from "../repo"; -import { Id } from "../../model"; -import { Transaction } from "../../sql"; +import { Id } from "../../../model"; +import { Transaction } from "../../../sql"; export class SqlUnlocksRepository implements FacetRepository { constructor(private readonly _txn: Transaction) {} diff --git a/src/index.ts b/src/index.ts index 2943408..b76907f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -18,8 +18,8 @@ import billing from "./billing"; import checkdb from "./checkdb"; import chunithm from "./chunithm"; import diva from "./diva"; -import idz from "./idz"; import idzPing from "./idz/ping"; +import idzUserDb from "./idz/userdb"; import { openSqlite } from "./sql"; import * as Swb from "./switchboard"; @@ -48,7 +48,9 @@ import * as Swb from "./switchboard"; http.createServer(chunithm(db)).listen(Swb.PORT_CHUNITHM, Swb.HOST_INT); http.createServer(diva).listen(Swb.PORT_DIVA, Swb.HOST_INT); - net.createServer(idz(db)).listen(Swb.PORT_IDZ.USERDB.TCP, Swb.HOST_INT); + net + .createServer(idzUserDb(db)) + .listen(Swb.PORT_IDZ.USERDB.TCP, Swb.HOST_INT); idzPing(10001, Swb.HOST_INT); // ?? tbd idzPing(Swb.PORT_IDZ.MATCH.UDP_SEND, Swb.HOST_INT); idzPing(Swb.PORT_IDZ.ECHO1, Swb.HOST_INT);