js-dos 8.1.5 → 8.1.7

package/src/store/ui.ts

@@ -1,191 +0,0 @@
-import { Dispatch, createAction, createSlice } from "@reduxjs/toolkit";
-import { lStorage } from "../host/lstorage";
-import { Account } from "./auth";
-import { DosAction } from "../store";
-
-export const ThemeValues = <const>["light", "dark", "cupcake", "bumblebee", "emerald", "corporate",
-    "synthwave", "retro", "cyberpunk", "valentine", "halloween", "garden", "forest", "aqua", "lofi",
-    "pastel", "fantasy", "wireframe", "black", "luxury", "dracula", "cmyk", "autumn", "business",
-    "acid", "lemonade", "night", "coffee", "winter"];
-export type Theme = typeof ThemeValues[number];
-
-export type Frame = "none" | "account" | "settings" |
-    "editor-conf" | "editor-fs" | "network" |
-    "stats" | "fat-drives" | "quick-save" | "image-rendering";
-
-const initialState: {
-    modal: "none" | "login",
-    frame: Frame,
-    frameXs: boolean,
-    window: "none" | "error" | "loading" | "prerun" | "run" | "select",
-    theme: Theme,
-    editor: boolean,
-    wideScreen: boolean,
-    fullScreen: boolean,
-    toast: string | null,
-    toastIntent: "none" | "error" | "success" | "panic",
-    toastTimeoutId: number,
-    background: string | null,
-    readOnlyWarning: boolean,
-    updateWsWarning: boolean,
-    cloudSaves: boolean,
-} = {
-    modal: "none",
-    frame: "none",
-    frameXs: false,
-    window: "none",
-    theme: (lStorage.getItem("theme") ?? "dark") as Theme,
-    editor: false,
-    wideScreen: true,
-    fullScreen: false,
-    toast: null,
-    toastIntent: "none",
-    toastTimeoutId: 0,
-    background: null,
-    readOnlyWarning: false,
-    updateWsWarning: false,
-    cloudSaves: true,
-};
-
-export type UiState = typeof initialState;
-
-export const uiSlice = createSlice({
-    name: "js-dos v8s",
-    initialState,
-    reducers: {
-        theme: (state, a: { payload: Theme }) => {
-            lStorage.setItem("theme", a.payload);
-            state.theme = a.payload;
-        },
-        modalLogin: (state) => {
-            state.modal = "login";
-        },
-        modalNone: (state) => {
-            state.modal = "none";
-        },
-        frameNone: (state) => {
-            state.frame = "none";
-            state.frameXs = false;
-        },
-        frameAccount: (state) => {
-            toggleFrameIfNeeded(state, "account");
-            state.frameXs = false;
-        },
-        frameSettings: (state) => {
-            state.frame = "settings";
-            state.frameXs = false;
-        },
-        frameNetwork: (state) => {
-            state.frame = "network";
-            state.frameXs = false;
-        },
-        frameStats: (state) => {
-            state.frame = "stats";
-            state.frameXs = false;
-        },
-        frameConf: (state) => {
-            state.frame = "editor-conf";
-            state.frameXs = false;
-        },
-        frameFs: (state) => {
-            state.frame = "editor-fs";
-            state.frameXs = false;
-        },
-        frameFatDrives: (state) => {
-            state.frame = "fat-drives";
-            state.frameXs = false;
-        },
-        frameQuickSave: (state) => {
-            state.frame = "quick-save";
-            state.frameXs = true;
-        },
-        frameImageRendering: (state) => {
-            state.frame = "image-rendering";
-            state.frameXs = false;
-        },
-        windowSelect: (state) => {
-            state.window = "select";
-        },
-        background: (state, a: { payload: string }) => {
-            state.background = a.payload;
-        },
-        setEditor: (state, a: { payload: boolean }) => {
-            state.editor = a.payload;
-        },
-        setWideScreen: (state, a: { payload: boolean }) => {
-            state.wideScreen = a.payload;
-        },
-        setFullScreen: (state, a: { payload: boolean }) => {
-            state.fullScreen = a.payload;
-        },
-        showToast: (state, a: { payload: { message: string, intent?: typeof initialState.toastIntent,
-            long?: boolean } }) => {
-            if (state.toastTimeoutId !== 0) {
-                clearInterval(state.toastTimeoutId);
-            }
-            state.toast = a.payload.message;
-            state.toastIntent = a.payload.intent ?? "none";
-            if (a.payload.intent !== "panic") {
-                state.toastTimeoutId = setTimeout(() => {
-                    (a as unknown as DosAction).asyncStore((store) => store.dispatch(uiSlice.actions.hideToast()));
-                }, a.payload.long ? 5000 : 1500);
-            }
-        },
-        hideToast: (state) => {
-            state.toast = null;
-            state.toastTimeoutId = 0;
-        },
-        readOnlyWarning: (state, a: { payload: boolean }) => {
-            state.readOnlyWarning = a.payload;
-        },
-        updateWsWarning: (state, a: { payload: boolean }) => {
-            state.updateWsWarning = a.payload;
-        },
-        cloudSaves: (state, a: { payload: boolean }) => {
-            state.cloudSaves = a.payload;
-        },
-    },
-    extraReducers: (builder) => {
-        builder
-            .addCase(createAction<string>("dos/bndLoad"), (s, a) => {
-                s.window = "loading";
-            })
-            .addCase(createAction<string>("editor/extract"), (s, a) => {
-                s.window = "loading";
-            })
-            .addCase(createAction<string>("editor/ready"), (s, a) => {
-                s.window = "prerun";
-            })
-            .addCase(createAction<string>("dos/bndReady"), (s, a) => {
-                s.window = "prerun";
-            })
-            .addCase(createAction<string>("dos/bndPlay"), (s, a) => {
-                s.window = "run";
-                s.frame = "none";
-            })
-            .addMatcher((action: { type: string }) => {
-                return action.type.startsWith("dos/") &&
-                    action.type.endsWith("Error");
-            }, (s, a) => {
-                s.window = "error";
-            });
-    },
-});
-
-function toggleFrameIfNeeded(
-    state: typeof initialState,
-    newFrame: typeof initialState.frame) {
-    if (state.frame === newFrame) {
-        state.frame = "none";
-    } else {
-        state.frame = newFrame;
-    }
-}
-
-export function dispatchLoginAction(account: Account | null, dispatch: Dispatch) {
-    if (account === null) {
-        dispatch(uiSlice.actions.modalLogin());
-    } else {
-        dispatch(uiSlice.actions.frameAccount());
-    }
-}

package/src/store.tsx

@@ -1,116 +0,0 @@
-import { ThunkMiddleware, configureStore } from "@reduxjs/toolkit";
-import { UiState, uiSlice } from "./store/ui";
-import { AuthState, authSlice } from "./store/auth";
-import { DosState, dosSlice } from "./store/dos";
-import { I18NState, i18nSlice } from "./i18n";
-import { StorageState, storageSlice } from "./store/storage";
-import { EditorState, editorSlice } from "./store/editor";
-import { DosEvent, DosOptions } from "./public/types";
-import { CommandInterface, InitFs } from "emulators";
-import { useStore } from "react-redux";
-import { Cache, CacheNoop } from "./host/lcache";
-import { InitState, createInitSlice, initSlice, sockdriveBackend, sockdriveBackendNames } from "./store/init";
-
-export interface LoadedBundle {
-    bundleUrl: string | null,
-    bundleChangesUrl: string | null,
-    bundle: InitFs | null,
-    bundleChanges: Uint8Array | null,
-}
-
-export interface NonSerializableStore {
-    root: HTMLDivElement,
-    loadedBundle: LoadedBundle | null,
-    ci: CommandInterface | null,
-    cache: Cache,
-    options: Partial<DosOptions>,
-}
-
-export interface DosAction {
-    asyncStore: (cakkback: (store: Store) => void) => void,
-}
-
-const dosMiddleware: ThunkMiddleware<any> = (store) => (next) => (action) => {
-    function asyncStore(callback: (store: any) => void) {
-        setTimeout(() => callback(store), 4);
-    }
-
-    const actionWithAsyncDispatch =
-        Object.assign({}, action, { asyncStore });
-
-    next(actionWithAsyncDispatch);
-};
-
-const nonSerializableStoreMap: { [uid: string]: NonSerializableStore } = {};
-
-export function makeNonSerializableStore(options: Partial<DosOptions>): NonSerializableStore {
-    return {
-        root: null as any,
-        loadedBundle: null,
-        ci: null,
-        cache: new CacheNoop(),
-        options,
-    };
-}
-
-export function makeStore(nonSerializableStore: NonSerializableStore, options: Partial<DosOptions>) {
-    const { storeUid, slice } = createInitSlice();
-    const store = configureStore({
-        reducer: {
-            init: slice.reducer,
-            i18n: i18nSlice.reducer,
-            auth: authSlice.reducer,
-            ui: uiSlice.reducer,
-            dos: dosSlice.reducer,
-            storage: storageSlice.reducer,
-            editor: editorSlice.reducer,
-        },
-        middleware: (getDefault) => {
-            const all = getDefault();
-            all.push(dosMiddleware);
-            return all;
-        },
-    });
-    nonSerializableStoreMap[storeUid] = nonSerializableStore;
-    if (options.sockdriveBackend && sockdriveBackendNames.indexOf(options.sockdriveBackend.name) === -1) {
-        sockdriveBackendNames.push(options.sockdriveBackend.name);
-        sockdriveBackend[options.sockdriveBackend.name] = {
-            sockdriveEndpoint: "https://" + options.sockdriveBackend.host,
-            sockdriveWssEndpoint: "wss://" + options.sockdriveBackend.host,
-        };
-        store.dispatch(initSlice.actions.setSockdriveBackendName(options.sockdriveBackend.name));
-    }
-    return store;
-};
-
-export interface State {
-    init: InitState,
-    ui: UiState,
-    auth: AuthState,
-    dos: DosState,
-    i18n: I18NState,
-    editor: EditorState,
-    storage: StorageState,
-}
-
-export type Store = ReturnType<typeof makeStore>;
-
-export function getNonSerializableStore(storeOrState: any): NonSerializableStore {
-    if (typeof storeOrState.getState === "function") {
-        return nonSerializableStoreMap[storeOrState.getState().init.uid];
-    } else {
-        return nonSerializableStoreMap[storeOrState.init.uid];
-    }
-}
-
-export function useNonSerializableStore() {
-    return getNonSerializableStore(useStore());
-}
-
-export function postJsDosEvent(nonSerializableStore: NonSerializableStore, event: DosEvent, ci?: CommandInterface) {
-    if (nonSerializableStore.options.onEvent) {
-        setTimeout(() => {
-            nonSerializableStore.options.onEvent?.(event, ci);
-        }, 4);
-    }
-};

package/src/ui.tsx

@@ -1,140 +0,0 @@
-import { useEffect, useRef } from "preact/hooks";
-import { useDispatch, useSelector } from "react-redux";
-import { Login } from "./login/login";
-import { Frame } from "./frame/frame";
-import { SideBar } from "./sidebar/sidebar";
-import { State } from "./store";
-import { dispatchLoginAction, uiSlice } from "./store/ui";
-import { Window } from "./window/window";
-import { useT } from "./i18n";
-
-let currentWideScreen = uiSlice.getInitialState().wideScreen;
-export function Ui() {
-    const rootRef = useRef<HTMLDivElement>(null);
-    const theme = useSelector((state: State) => state.ui.theme);
-    const dispatch = useDispatch();
-
-    useEffect(() => {
-        if (rootRef === null || rootRef.current === null) {
-            return;
-        }
-
-        const root = rootRef.current;
-        function onResize() {
-            const size = root.getBoundingClientRect().width;
-            const wide = size > 640;
-            if (wide !== currentWideScreen) {
-                currentWideScreen = wide;
-                dispatch(uiSlice.actions.setWideScreen(currentWideScreen));
-            }
-        }
-
-        const resizeObserver = new ResizeObserver(onResize);
-        resizeObserver.observe(root);
-        window.addEventListener("resize", onResize);
-
-        return () => {
-            resizeObserver.disconnect();
-            window.removeEventListener("resize", onResize);
-        };
-    }, [rootRef, dispatch]);
-
-    return <div
-        ref={rootRef}
-        class="w-full h-full relative"
-        data-theme={theme}>
-        <Window />
-        <Frame />
-        <SideBar />
-        <Login />
-        <Toast />
-        <ReadOnlyWarning />
-        <UpdateWsWarning />
-    </div>;
-};
-
-function Toast() {
-    const toast = useSelector((state: State) => state.ui.toast);
-    const intent = useSelector((state: State) => state.ui.toastIntent);
-    const readOnlyWarning = useSelector((state: State) => state.ui.readOnlyWarning);
-
-    if (toast === null) {
-        return null;
-    }
-
-    return <div class={"absolute right-10 " + (readOnlyWarning ? "bottom-32" : "bottom-10")}>
-        <div class={"alert alert-" + (intent === "panic" ? "error" : intent)} >
-            {toast}
-        </div>
-    </div>;
-}
-
-function ReadOnlyWarning() {
-    const readOnlyWarning = useSelector((state: State) => state.ui.readOnlyWarning);
-    const account = useSelector((state: State) => state.auth.account);
-    const t = useT();
-    const dispatch = useDispatch();
-
-    if (!readOnlyWarning) {
-        return null;
-    }
-
-    function fix() {
-        dispatch(uiSlice.actions.readOnlyWarning(false));
-        dispatchLoginAction(account, dispatch);
-    }
-
-    function close() {
-        dispatch(uiSlice.actions.readOnlyWarning(false));
-    }
-
-    return <div class="absolute right-10 bottom-10">
-        <div class="alert">
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                class="stroke-info shrink-0 w-6 h-6">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                    d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-            </svg>
-            <span>{t("read_only_access")}</span>
-            <div>
-                <button class="btn btn-sm btn-primary mr-2" onClick={fix}>{t("fix")}</button>
-                <button class="btn btn-sm" onClick={close}>{t("close")}</button>
-            </div>
-        </div>
-    </div>;
-}
-
-function UpdateWsWarning() {
-    const updateWsWarning = useSelector((state: State) => state.ui.updateWsWarning);
-    const t = useT();
-    const dispatch = useDispatch();
-
-    if (!updateWsWarning) {
-        return null;
-    }
-
-    function fix() {
-        window.open("https://dos.zone/download/", "_blank");
-        dispatch(uiSlice.actions.updateWsWarning(false));
-    }
-
-    function close() {
-        dispatch(uiSlice.actions.updateWsWarning(false));
-    }
-
-    return <div class="absolute left-20 right-10 top-10 flex justify-center">
-        <div class="alert w-auto">
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                stroke-width="1.5" stroke="currentColor" class="size-6 text-error">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217
-                    3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898
-                    0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z" />
-            </svg>
-            <span>{t("ws_outdated")}</span>
-            <div>
-                <button class="btn btn-sm btn-primary mr-2" onClick={fix}>{t("update")}</button>
-                <button class="btn btn-sm" onClick={close}>{t("close")}</button>
-            </div>
-        </div>
-    </div>;
-}

package/src/v8/changes.ts

@@ -1,56 +0,0 @@
-import { uploadsS3Url, uploadsS3Bucket, uploadNamspace, presignPut } from "./config";
-
-function getPersonalBundleKey(id: string,
-                              bundleUrl: string): string {
-    const index = bundleUrl.lastIndexOf("/");
-    const basename = bundleUrl.substring(index + 1);
-    return "personal-v2/" + uploadNamspace + "/" + id + "/" + basename;
-}
-
-export function getChangesUrlPrefix(id: string): string {
-    return uploadsS3Url + "/" + uploadsS3Bucket + "/" + "personal-v2" + "/" + uploadNamspace + "/" + id + "/";
-}
-
-export function getChangesUrl(id: string, bundleUrl: string): string {
-    const personalBundleKey = getPersonalBundleKey(id, bundleUrl);
-    return uploadsS3Url + "/" + uploadsS3Bucket + "/" + personalBundleKey;
-}
-
-export async function putChanges(bundleUrl: string,
-                                 data: Uint8Array): Promise<void> {
-    let response = await fetch(presignPut + "?bundleUrl=" + encodeURIComponent(bundleUrl));
-    const result = await response.json();
-
-    if (!result.success) {
-        throw new Error("Unable to put personal bundle");
-    }
-
-    const post = result.post as {
-        url: string,
-        fields: {
-            Policy: string,
-            "X-Amz-Algorithm": string,
-            "X-Amz-Credential": string,
-            "X-Amz-Date": string,
-            "X-Amz-Signature": string,
-            bucket: string,
-            key: string,
-        },
-    };
-
-    const formData = new FormData();
-    Object.entries(post.fields).forEach(([k, v]) => {
-        formData.append(k, v);
-    });
-    formData.append("acl", "public-read");
-    formData.append("file", new Blob([data]));
-
-    response = await fetch(post.url, {
-        method: "post",
-        body: formData,
-    });
-
-    if (response.status !== 200 && response.status !== 204) {
-        throw new Error("Unable to put changes: " + response.statusText);
-    }
-}

package/src/v8/config.ts

@@ -1,20 +0,0 @@
-export const endpoint = "https://v8.js-dos.com";
-export const authentificator = endpoint + "/auth/";
-export const uploadsS3Bucket = "doszone-uploads";
-export const uploadsS3Url = "https://storage.yandexcloud.net";
-export const uploadNamspace = "dzapi";
-
-export const apiEndpoint = "https://d5dn8hh4ivlobv6682ep.apigw.yandexcloud.net";
-export const presignPut = apiEndpoint + "/presign-put";
-
-export const xsollaSubscriptons = "https://subscriptions.xsolla.com​/api/user/v1/projects/184012/subscriptions";
-export const xsollaPremiumId = "sumOxNVr";
-
-export const brCdn = "https://br.cdn.dos.zone";
-
-export const cancelSubscriptionPage = {
-    en: "https://v8.js-dos.com/cancel-your-subscription/",
-    ru: "https://v8.js-dos.com/ru/cancel-your-subscription/",
-};
-
-export const actualWsVersion = 2;

package/src/v8/subscriptions.ts

@@ -1,62 +0,0 @@
-import { xsollaPremiumId, xsollaSubscriptons } from "../v8/config";
-
-export async function linkToBuy(token: string): Promise<string | null> {
-    const response = await fetch(xsollaSubscriptons + "/buy", {
-        method: "POST",
-        cache: "no-cache",
-        headers: {
-            "Authorization": "Bearer " + token,
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            plan_external_id: xsollaPremiumId,
-        }),
-    });
-
-    const json = await response.json();
-
-    if (json.link_to_ps === undefined) {
-        console.error("Unexpected subscriptions response:", json);
-        return null;
-    }
-
-    return json.link_to_ps;
-}
-
-export async function havePremium(token: string): Promise<boolean> {
-    const response = await fetch(xsollaSubscriptons, {
-        method: "GET",
-        cache: "no-cache",
-        headers: {
-            "Authorization": "Bearer " + token,
-        },
-    });
-
-    const json = await response.json();
-    if (json.items === undefined) {
-        console.error("Unexpected subscriptions response:", json);
-        return false;
-    }
-
-    return json.items.length > 0 && json.items[0].plan_external_id === xsollaPremiumId;
-}
-
-export async function cancle(token: string): Promise<boolean> {
-    // eslint-disable-next-line
-    // https://subscriptions.xsolla.com/api/doc/user#/Subscriptions/put_xsolla_subscription_apiuser_cancelusersubscription
-    const response = await fetch(xsollaSubscriptons + "/" + xsollaPremiumId + "/cancel", {
-        method: "PUT",
-        cache: "no-cache",
-        headers: {
-            "Authorization": "Bearer " + token,
-        },
-    });
-
-    const json = await response.json();
-    if (json.error) {
-        console.error("Unexpected subscriptions response:", json);
-        return false;
-    }
-
-    return true;
-}

package/src/vite-env.d.ts

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

package/src/window/dos/controls/keyboard.ts

@@ -1,32 +0,0 @@
-import { CommandInterface } from "emulators";
-import { domToKeyCode } from "./keys";
-
-export function keyboard(el: HTMLElement, ci: CommandInterface) {
-    function onKeyDown(e: KeyboardEvent) {
-        if ((e.target as any).type === "text") {
-            return;
-        }
-        const keyCode = domToKeyCode(e.keyCode);
-        ci.sendKeyEvent(keyCode, true);
-        e.stopPropagation();
-        e.preventDefault();
-    };
-
-    function onKeyUp(e: KeyboardEvent) {
-        if ((e.target as any).type === "text") {
-            return;
-        }
-        const keyCode = domToKeyCode(e.keyCode);
-        ci.sendKeyEvent(keyCode, false);
-        e.stopPropagation();
-        e.preventDefault();
-    };
-
-    el.addEventListener("keydown", onKeyDown);
-    el.addEventListener("keyup", onKeyUp);
-
-    return () => {
-        el.removeEventListener("keydown", onKeyDown);
-        el.removeEventListener("keyup", onKeyUp);
-    };
-}