v8.3.7: remove dead network servers

caiiiycuk · Nov 8, 2024 · a6a43e4 · a6a43e4
1 parent d27d3d1
commit a6a43e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-dos",
-  "version": "8.3.6",
+  "version": "8.3.7",
   "description": "Full-featured DOS player with multiple emulator backends",
   "type": "module",
   "keywords": [

diff --git a/src/frame/network-frame.tsx b/src/frame/network-frame.tsx
@@ -57,7 +57,7 @@ export function NetworkFrame() {
                 selectClass="w-full"
                 label={t("server") + ":"}
                 selected={server}
-                values={["netherlands", "newyork", "singapore"]}
+                values={["netherlands"]}
                 disabled={disabled}
                 onSelect={onServer}
             />

diff --git a/src/public/types.ts b/src/public/types.ts
@@ -31,7 +31,7 @@ export interface DosOptions {
     workerThread: boolean,
     mouseCapture: boolean,
     onEvent: (event: DosEvent, ci?: any /* CommandInterface */) => void,
-    server: "netherlands" | "newyork" | "singapore",
+    server: "netherlands",
     room: string,
     fullScreen: boolean,
     sockdriveBackend: {

diff --git a/src/store/dos.ts b/src/store/dos.ts
@@ -72,7 +72,7 @@ const initialState: {
     ci: boolean,
     ciStartedAt: number,
     network: {
-        server: "netherlands" | "newyork" | "singapore",
+        server: "netherlands",
         room: string,
         ipx: "connecting" | "connected" | "disconnected" | "error",
     },
@@ -126,7 +126,7 @@ const initialState: {
         driveIo: [],
     },
     network: {
-        server: (lStorage.getItem("net.server") ?? "netherlands") as any,
+        server: "netherlands",
         room: randomRoom(),
         ipx: "disconnected",
     },

diff --git a/src/window/dos/dos-runtime.tsx b/src/window/dos/dos-runtime.tsx
@@ -65,8 +65,7 @@ function useLog(ci: CommandInterface): void {
                     dispatch(uiSlice.actions.showToast({
                         message: t("preloading_sockdrive") + " " +
                             (isFork[name] ? "@" + name : name) + " — " +
-                            (Math.round(preloadProgress[drive] - rest) / 1024 / 1024).toFixed(2) + "/" +
-                            (Math.round(preloadProgress[drive] / 1024 / 1024)) + "Mb",
+                            Math.round((preloadProgress[drive] - rest) * 100 / preloadProgress[drive]) + "%",
                         long: true,
                     }));
                 }