js-dos 8.1.3 → 8.1.5

package/README.md

@@ -33,7 +33,7 @@ The key features:
 
 ## Development
 
-1. You need to install node dependencies and put `emulators@beta` into `public/emulators`.
+1. You need to install node dependencies and put `emulators` into `public/emulators`.
 ```
 yarn
 cp -rv node_modules/emulators/dist/* public/emulators

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dos",
-  "version": "8.1.3",
+  "version": "8.1.5",
   "description": "Full-featured DOS player with multiple emulator backends",
   "type": "module",
   "keywords": [
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "^6.20.0",
     "autoprefixer": "^10.4.17",
     "daisyui": "^3.9.3",
-    "emulators": "8.1.2",
+    "emulators": "8.1.3",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
     "postcss": "^8.4.33",

package/src/sockdrive/js/src/sockdrive/drive.ts

@@ -50,6 +50,7 @@ export class Drive {
     preloadQueue: number[] = [];
 
     originReadMode: boolean;
+    readOnly = false;
 
     public constructor(endpoint: string,
         owner: string,
@@ -140,7 +141,8 @@ export class Drive {
                                 }
                                 socket.removeEventListener("message", onPreloadMessage);
                                 socket.addEventListener("message", onMessage);
-                                this.openFn(true, mode === "write",
+                                this.readOnly = mode !== "write";
+                                this.openFn(true, !this.readOnly,
                                     (Number.parseInt(sizeStr) ?? 2 * 1024 * 1024) * 1024,
                                     this.preloadQueue,
                                     aheadRange);
@@ -304,6 +306,8 @@ export class Drive {
                     this.readBuffer[5 + i * 4 + 3] = (origin >> 24) & 0xFF;
                 }
                 socket.send(this.readBuffer.slice(0, sectors.length * 4 + 5).buffer);
+            } else if (this.readOnly) {
+                request.resolve(0);
             } else {
                 const { sectors, buffer, resolve } = request;
                 this.stats.write += this.sectorSize;

package/src/sockdrive/js/yarn.lock

@@ -596,9 +596,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001517:
-  version "1.0.30001527"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba"
-  integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ==
+  version "1.0.30001632"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001632.tgz"
+  integrity sha512-udx3o7yHJfUxMLkGohMlVHCvFvWmirKh9JAH/d7WOLPetlH+LTL5cocMZ0t7oZx/mdlOWXti97xLZWc8uURRHg==
 
 chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"

package/src/vite-env.d.ts

@@ -1,2 +1,5 @@
 // eslint-disable-next-line
 /// <reference types="vite/client" />
+
+// eslint-disable-next-line no-unused-vars
+declare const JSDOS_VERSION: string;

package/src/window/dos/dos-runtime.tsx

@@ -39,8 +39,10 @@ function useLog(ci: CommandInterface): void {
             } else if (msgType === "log" && args[0]?.indexOf("sockdrive:") !== -1) {
                 const drive = args[0].substring(args[0].indexOf(" ") + 1, args[0].indexOf(","));
                 dispatch(uiSlice.actions.cloudSaves(false));
-                if (args[0]?.indexOf("write=false") !== -1) {
+                if (args[0]?.indexOf("write=") !== -1) {
                     console.log("drive", drive, "config:", args[0]);
+                }
+                if (args[0]?.indexOf("write=false") !== -1) {
                     dispatch(uiSlice.actions.readOnlyWarning(true));
                 }
                 if (args[0]?.indexOf("preload=") !== -1) {

package/src/window/prerun-window.tsx

@@ -13,7 +13,6 @@ declare const emulators: Emulators;
 export function PreRunWindow() {
     const account = useSelector((state: State) => state.auth.account);
     const emuVersion = useSelector((state: State) => state.dos.emuVersion);
-    const lang = useSelector((state: State) => state.i18n.lang);
     const dispatch = useDispatch();
     const t = useT();
 
@@ -22,9 +21,7 @@ export function PreRunWindow() {
     }
 
     function openPremiumPage() {
-        window.open(lang === "ru" ?
-            "https://dos.zone/ru/blog/premium-subscription/" :
-            "https://dos.zone/blog/premium-subscription/", "_blank");
+        window.open("https://js-dos.com/cloud-overview.html", "_blank");
     }
 
     return <div class="pre-run-window">
@@ -82,7 +79,8 @@ export function PreRunWindow() {
         <MouseSensitiviySlider class="mt-4 w-full max-w-sm" />
         <VolumeSlider class="w-full max-w-sm" />
 
-        <div class="text-center mt-8">emu-version: <span class="text-ellipsis overflow-hidden">{emuVersion}</span></div>
+        <div class="text-center mt-8">jsdos/emu version:&nbsp;
+            <span class="text-ellipsis overflow-hidden">{JSDOS_VERSION}/{emuVersion}</span></div>
     </div>;
 }
 

package/vite.config.ts

@@ -19,4 +19,7 @@ export default defineConfig({
             },
         },
     },
+    define: {
+        JSDOS_VERSION: JSON.stringify(process.env.npm_package_version),
+    },
 });