refactor neos.config.json

neos.config.json

 {
   "version": 4961,
-	"servers": [{
+  "servers": [
+    {
       "name": "koishi",
       "ip": "koishi.momobako.com",
       "port": "7211"
@@ -19,14 +20,23 @@
       "name": "pre-release",
       "ip": "koishi.momobako.com",
       "port": "889"
+    },
+    {
+      "name": "408",
+      "ip": "koishi.momobako.com",
+      "port": "1408"
     }
   ],
   "assetsPath": "/neos-assets",
-	"releaseImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
-	"preReleaseImgUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
-	"releaseDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
-	"preReleaseDbUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
-  "preReleaseConfig": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json",
+  "releaseResource": {
+    "img": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
+    "cdb": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb"
+  },
+  "preReleaseResource": {
+    "img": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
+    "cdb": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
+    "config": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json"
+  },
   "stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
   "lflistUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
   "replayUrl": "replay.neos.moe",
@@ -38,65 +48,10 @@
   "userApi": "https://sapi.moecube.com:444/accounts/users/{username}.json",
   "mdproServer": "https://rarnu.xyz:38443",
   "agentServer": "https://sapi.moecube.com:444/neos-ai-agent",
-	"streamInterval": 20,
   "startDelay": 1000,
   "ui": {
     "hint": {
       "maxCount": 1
     }
-	},
-	"unimplementedWhiteList": [
-		1,
-		6,
-		7,
-		34,
-		54,
-		55,
-		56,
-		60,
-		61,
-		62,
-		63,
-		64,
-		65,
-		70,
-		71,
-		72,
-		73,
-		74,
-		75,
-		76,
-		80,
-		81,
-		83,
-		93,
-		95,
-		96,
-		97,
-		101,
-		102,
-		110,
-		111,
-		112,
-		113,
-		114,
-		120,
-		121,
-		122,
-		123,
-		130,
-		131,
-		132,
-		133,
-		160,
-		161,
-		163,
-		164,
-		165,
-		170,
-		180,
-		230,
-		231,
-		236
-	]
+  }
 }

neos.config.prod.json

 {
   "version": 4961,
-	"servers": [{
+  "servers": [
+    {
       "name": "koishi",
       "ip": "koishi.momobako.com",
       "port": "7211"
@@ -19,14 +20,23 @@
       "name": "pre-release",
       "ip": "koishi.momobako.com",
       "port": "889"
+    },
+    {
+      "name": "408",
+      "ip": "koishi.momobako.com",
+      "port": "1408"
     }
   ],
   "assetsPath": "/neos-assets",
-	"releaseImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
-	"preReleaseImgUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
-	"releaseDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
-	"preReleaseDbUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
-  "preReleaseConfig": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json",
+  "releaseResource": {
+    "img": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
+    "cdb": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb"
+  },
+  "preReleaseResource": {
+    "img": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
+    "cdb": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
+    "config": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json"
+  },
   "stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
   "lflistUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
   "replayUrl": "replay.neos.moe",
@@ -38,65 +48,10 @@
   "userApi": "https://sapi.moecube.com:444/accounts/users/{username}.json",
   "mdproServer": "https://rarnu.xyz:38443",
   "agentServer": "https://sapi.moecube.com:444/neos-ai-agent",
-	"streamInterval": 20,
   "startDelay": 1000,
   "ui": {
     "hint": {
       "maxCount": 1
     }
-	},
-	"unimplementedWhiteList": [
-		1,
-		6,
-		7,
-		34,
-		54,
-		55,
-		56,
-		60,
-		61,
-		62,
-		63,
-		64,
-		65,
-		70,
-		71,
-		72,
-		73,
-		74,
-		75,
-		76,
-		80,
-		81,
-		83,
-		93,
-		95,
-		96,
-		97,
-		101,
-		102,
-		110,
-		111,
-		112,
-		113,
-		114,
-		120,
-		121,
-		122,
-		123,
-		130,
-		131,
-		132,
-		133,
-		160,
-		161,
-		163,
-		164,
-		165,
-		170,
-		180,
-		230,
-		231,
-		236
-	]
+  }
 }

src/api/cards.ts

@@ -4,7 +4,7 @@ import { FtsParams } from "@/middleware/sqlite/fts";
 
 import { isSuperReleaseCard } from "./superPreRelease";
 
-const NeosConfig = useConfig();
+const { assetsPath, releaseResource, preReleaseResource } = useConfig();
 
 export interface CardMeta {
   id: number;
@@ -80,12 +80,13 @@ export function getCardStr(meta: CardMeta, idx: number): string | undefined {
 export function getCardImgUrl(code: number, back = false) {
   const ASSETS_BASE =
     import.meta.env.BASE_URL === "/"
-      ? NeosConfig.assetsPath
-      : `${import.meta.env.BASE_URL}${NeosConfig.assetsPath}`;
+      ? assetsPath
+      : `${import.meta.env.BASE_URL}${assetsPath}`;
   if (back || code === 0) {
     return `${ASSETS_BASE}/card_back.jpg`;
-  }
-
+  } else if (isSuperReleaseCard(code)) {
+    return `${preReleaseResource.img}/${code}.jpg`;
+  } else {
     // Define translations for different languages (I18N)
     const language = localStorage.getItem("language");
     let imgUrl;
@@ -96,17 +97,14 @@ export function getCardImgUrl(code: number, back = false) {
       case "pt":
       case "fr":
       case "es":
-      imgUrl = NeosConfig.releaseImgUrl.replace("zh-CN", "en-US");
+        imgUrl = releaseResource.img.replace("zh-CN", "en-US");
         break;
       default:
-      imgUrl = NeosConfig.releaseImgUrl;
+        imgUrl = releaseResource.img;
         break;
     }
     /* End of definition (I18N) */
 
-  if (isSuperReleaseCard(code)) {
-    return `${NeosConfig.preReleaseImgUrl}/${code}.jpg`;
-  } else {
     return `${imgUrl}/${code}.jpg`;
   }
 }

src/api/superPreRelease.ts

 import { useConfig } from "@/config";
 
-const { preReleaseConfig } = useConfig();
+const {
+  preReleaseResource: { config },
+} = useConfig();
 
 interface SuperPreInfo {
   /* only use id currently, other fields see:
@@ -12,7 +14,7 @@ interface SuperPreInfo {
 let superPreList: SuperPreInfo[] = [];
 
 export async function initSuperPrerelease() {
-  const json = await (await fetch(preReleaseConfig)).text();
+  const json = await (await fetch(config)).text();
   const list: SuperPreInfo[] = JSON.parse(json);
   superPreList = list;
 }

src/infra/stream.ts

@@ -69,7 +69,6 @@ export class WebSocketStream {
         // but now it seems that we don't need wait any more,
         // so comment the following line and check if it's ok without it.
         //
-        // await sleep(useConfig().streamInterval);
         await onMessage(value);
       } else {
         console.warn("value from ReadableStream is undefined!");

src/service/duel/unimplemented.ts

 import { ygopro } from "@/api";
-import { useConfig } from "@/config";
 import { Container } from "@/container";
 
-const NeosConfig = useConfig();
+const UNIMPLEMENTED_WHITE_LIST = [
+  1, 6, 7, 34, 54, 55, 56, 60, 61, 62, 63, 64, 65, 70, 71, 72, 73, 74, 75, 76,
+  80, 81, 83, 93, 95, 96, 97, 101, 102, 110, 111, 112, 113, 114, 120, 121, 122,
+  123, 130, 131, 132, 133, 160, 161, 163, 164, 165, 170, 180, 230, 231, 236,
+];
 
 export default (
   container: Container,
   unimplemented: ygopro.StocGameMessage.MsgUnimplemented,
 ) => {
-  if (!NeosConfig.unimplementedWhiteList.includes(unimplemented.command)) {
+  if (!UNIMPLEMENTED_WHITE_LIST.includes(unimplemented.command)) {
     container.context.matStore.unimplemented = unimplemented.command;
   }
 };

src/ui/I18N/Source/Chinese/translation.json

@@ -165,6 +165,7 @@
     "Server": "服务器",
     "KoishiServer": "Koishi服",
     "UltraPreemptiveServer": "超先行服",
+    "408": "408环境",
     "PlayerNickname": "玩家昵称",
     "RoomPasswordOptional": "房间密码(可选)",
     "JoinRoom": "加入房间",

src/ui/I18N/Source/English/translation.json

@@ -165,6 +165,7 @@
     "Server": "Server",
     "KoishiServer": "Koishi Server",
     "UltraPreemptiveServer": "Ultra Preemptive Server",
+    "408": "408 Environment",
     "PlayerNickname": "Player Nickname",
     "RoomPasswordOptional": "Room Password (optional)",
     "JoinRoom": "Join the Room"

src/ui/I18N/Source/Japanese/translation.json

@@ -163,6 +163,7 @@
     "Server": "サーバー",
     "KoishiServer": "コイシサーバー",
     "UltraPreemptiveServer": "超先行サーバー",
+    "408": "408環境",
     "PlayerNickname": "プレイヤーニックネーム",
     "RoomPasswordOptional": "ルームパスワード（任意）",
     "JoinRoom": "ルームに参加"

src/ui/Layout/utils.ts

@@ -12,7 +12,7 @@ import { useConfig } from "@/config";
 import { useEnv } from "@/hook";
 import sqliteMiddleWare, { sqliteCmd } from "@/middleware/sqlite";
 import { accountStore, deckStore, initStore, type User } from "@/stores";
-const { releaseDbUrl, preReleaseDbUrl } = useConfig();
+const { releaseResource, preReleaseResource } = useConfig();
 const { BASE_URL } = useEnv();
 
 /** 加载ygodb */
@@ -24,7 +24,11 @@ export const initSqlite = async () => {
     sqlite.progress = 0.01;
     await sqliteMiddleWare({
       cmd: sqliteCmd.INIT,
-      initInfo: { releaseDbUrl, preReleaseDbUrl, progressCallback },
+      initInfo: {
+        releaseDbUrl: releaseResource.cdb,
+        preReleaseDbUrl: preReleaseResource.cdb,
+        progressCallback,
+      },
     });
     sqlite.progress = 1;
   }

src/ui/Match/MatchModal/index.tsx

@@ -16,6 +16,7 @@ const serverConfig = NeosConfig.servers;
 
 const KOISHI_INDEX = 0;
 const PRERELEASE_INDEX = 3;
+const ENV_408 = 4;
 
 const {
   defaults: { defaultPlayer, defaultPassword },
@@ -115,6 +116,10 @@ export const MatchModal: React.FC = ({}) => {
               value: PRERELEASE_INDEX,
               label: i18n("UltraPreemptiveServer"),
             },
+            {
+              value: ENV_408,
+              label: i18n("408"),
+            },
           ]}
           onChange={handleServerChange}
         />