js-dos 8.1.5 → 8.1.6

package/src/i18n.ts

@@ -1,185 +0,0 @@
-import { createSlice } from "@reduxjs/toolkit";
-import { useSelector } from "react-redux";
-import { State } from "./store";
-
-const translations: {[lang: string]: {[key: string]: string} } = {
-    ru: {
-        enter_name_of_drive: "Введите название диска",
-        ws_outdated: "Необходимо обновить DOS Браузер",
-        update: "Обновить",
-        preloading_sockdrive: "Загрузка FAT",
-        filter: "Фильтр",
-        add: "Добавить",
-        logout: "Выйти",
-        please_login: "Войдите в аккаунт",
-        features: "Функции",
-        premium: "Премиум",
-        buy: "Купить",
-        experimental_features: "Доступ к экспериентальным функциям",
-        cloud_saves: "Облачные сохранения",
-        writeable_fat32: "FAT32 диски",
-        net_no_limits: "Выбор сервера для стевой игры",
-        unlock_options: "Доступ ко всем настройкам",
-        error: "Упс... Что-то пошло не так...",
-        consult_logs: "Проверьте логи браузера",
-        bundle_loading: "Загрузка бандла",
-        bundle_config: "Чтение конфигурации",
-        try_free: "дней бесплатно",
-        upload_file: "Выбирите архив jsdos/zip что бы начать...",
-        emulation_backend: "Эмуляция",
-        render_backend: "Рендер",
-        render_aspect: "Соотношение сторон",
-        worker: "Фоновый поток",
-        mouse_sensitivity: "Чувст. мыши",
-        mouse_lock: "Захват мыши",
-        volume: "Громкость",
-        pause: "Пауза",
-        dosboxconf_template: "dosbox.conf шаблон:",
-        preview: "Превью",
-        continue: "Продолжить",
-        skip: "Пропустить",
-        loading: "Загрузка",
-        extract_loading: "Распаковка архива",
-        extract_long_time: "Может занять длительное время, пожалуйста ждите...",
-        theme: "Тема",
-        create_empty: "Создать пустой бандл",
-        uploading_file: "Загрузка файла",
-        fs_restart: "Вы хотите пересобрать бандл используя эту FS?",
-        please_wait: "Пожалуйста подождите",
-        making_bundle: "Создаем бандл",
-        size: "Размер",
-        room: "Команта",
-        server: "Сервер",
-        load_by_url: "Загрузить по ссылке",
-        enter_url: "Введите ссылку",
-        load: "Загрузить",
-        stored: "Сохраненные",
-        delete: "Удалить",
-        editor: "Редактор",
-        download: "Скачать",
-        changes: "Сохранения",
-        account_not_ready: "Пропустить загрузку сохранений",
-        loading_saves: "Загрузка сохранений",
-        success: "Успешно",
-        unable_to_save: "Ошибка записи",
-        not_premium: "Подключить премиум",
-        copy_net_link: "Отправьте ссылку на подключение",
-        copied: "Скопировано",
-        image_rendering: "Обработка изображения",
-        read_only_access: "Диск FAT32 открыт только для чтения",
-        fix: "Исправить",
-        close: "Закрыть",
-        cancle: "Отказаться",
-        manage: "Управлять",
-        unable_to_cancle_subscription: "Не удалось отменить подписку",
-        subscription_cancelled: "Подписка отменена",
-        hardware: "Аппаратное ускорение",
-        net_drives: "Сетевые диски",
-        fat_write: "FAT запись",
-    },
-    en: {
-        enter_name_of_drive: "Enter name of drive",
-        ws_outdated: "Must update DOS Browser App",
-        update: "Update",
-        preloading_sockdrive: "Preloading FAT",
-        filter: "Filter",
-        add: "Add",
-        logout: "Logout",
-        please_login: "Please login",
-        features: "Features",
-        premium: "Premium",
-        buy: "Buy",
-        experimental_features: "Access to all experimental features",
-        cloud_saves: "Cloud saves",
-        writeable_fat32: "Writable FAT32",
-        net_no_limits: "Change the network region",
-        unlock_options: "Unlock all configuration options",
-        error: "Oops... Something went wrong...",
-        consult_logs: "Please check browser logs",
-        bundle_loading: "Bundle loading",
-        bundle_config: "Reading config",
-        try_free: "days for free",
-        upload_file: "Select jsdos/zip file to start...",
-        emulation_backend: "Emulation",
-        render_backend: "Render",
-        render_aspect: "Aspect",
-        worker: "Worker thread",
-        mouse_sensitivity: "Mouse sens...",
-        mouse_lock: "Capture mouse",
-        volume: "Volume",
-        pause: "Pause",
-        dosboxconf_template: "dosbox.conf template:",
-        preview: "Preview",
-        continue: "Continue",
-        skip: "Skip",
-        loading: "Loading",
-        extract_loading: "Unpacking archive",
-        extract_long_time: "Can take long time, please be patient...",
-        theme: "Theme",
-        create_empty: "Create empty bundle",
-        uploading_file: "Uploading file",
-        fs_restart: "Do you want to rebuild the bundle using this fs?",
-        please_wait: "Please wait",
-        making_bundle: "Creating bundle",
-        size: "Size",
-        room: "Room",
-        server: "Server",
-        load_by_url: "Load by url",
-        enter_url: "Enter url",
-        load: "Load",
-        stored: "Stored",
-        delete: "Delete",
-        editor: "Editor",
-        download: "Download",
-        changes: "Saves",
-        account_not_ready: "Skip loading saves",
-        loading_saves: "Loading saves",
-        success: "Success",
-        unable_to_save: "Unable to save",
-        not_premium: "Subscribe to premium",
-        copy_net_link: "Share this link to connect",
-        copied: "Copied",
-        image_rendering: "Image rendering",
-        read_only_access: "The FAT32 drive is open in read-only mode",
-        fix: "Fix",
-        close: "Close",
-        cancle: "Cancle",
-        manage: "Manage",
-        unable_to_cancle_subscription: "Unable to cancle subscription",
-        subscription_cancelled: "Subscription cancelled",
-        hardware: "Hardware acceleration",
-        net_drives: "Net drives",
-        fat_write: "Writeable FAT",
-    },
-};
-
-const initialLang = navigator.language.startsWith("ru") ? "ru" : "en";
-
-const initialState: {
-    lang: "ru" | "en",
-    keys: {[key: string]: string},
-} = {
-    lang: initialLang,
-    keys: translations[initialLang],
-};
-
-export type I18NState = typeof initialState;
-
-export const i18nSlice = createSlice({
-    name: "i18n",
-    initialState,
-    reducers: {
-        setLang: (state, action: { payload: "ru" | "en" }) => {
-            state.lang = action.payload;
-            state.keys = translations[action.payload];
-        },
-    },
-});
-
-export function useT() {
-    const keys = useSelector((state: State) => state.i18n.keys);
-    return (key: string) => {
-        return keys[key] ?? key;
-    };
-};
-

package/src/index.css

@@ -1,7 +0,0 @@
-@import "./base.css";
-@import "./app.css";
-@import "./components/components.css";
-@import "./sidebar/sidebar.css";
-@import "./login/login.css";
-@import "./window/window.css";
-@import "./frame/frame.css";

package/src/load.ts

@@ -1,132 +0,0 @@
-import { Dispatch, Store, Unsubscribe } from "@reduxjs/toolkit";
-import { DosConfig, Emulators } from "emulators";
-import { dosSlice } from "./store/dos";
-import { bundleFromChanges, bundleFromFile, bundleFromUrl } from "./host/bundle-storage";
-import { uiSlice } from "./store/ui";
-import { editorSlice } from "./store/editor";
-import { getChangesUrl } from "./v8/changes";
-import { storageSlice } from "./store/storage";
-import { getNonSerializableStore } from "./store";
-
-declare const emulators: Emulators;
-
-export async function loadEmptyBundle(store: Store) {
-    await doLoadBundle("empty.jsdos",
-        (async () => {
-            const bundle = await emulators.bundle();
-            return bundle.toUint8Array();
-        })(), null, null, store);
-
-    store.dispatch(uiSlice.actions.frameConf());
-    store.dispatch(uiSlice.actions.setEditor(true));
-}
-
-export async function loadBundle(bundle: Uint8Array, openConfig: boolean, store: Store) {
-    await doLoadBundle("bundle.jsdos", Promise.resolve(bundle),
-        null, null, store);
-    if (openConfig) {
-        store.dispatch(uiSlice.actions.frameConf());
-    }
-}
-
-export function loadBundleFromFile(file: File, store: Store) {
-    return doLoadBundle(file.name,
-        bundleFromFile(file, store),
-        null, null, store);
-}
-
-export async function loadBundleFromConfg(config: DosConfig, store: Store) {
-    const nonSerializableStore = getNonSerializableStore(store);
-    const dispatch = store.dispatch;
-    nonSerializableStore.loadedBundle = null;
-
-    dispatch(editorSlice.actions.init(config));
-    syncWithConfig(config, dispatch);
-
-    nonSerializableStore.loadedBundle = {
-        bundleUrl: null,
-        bundleChangesUrl: null,
-        bundle: config,
-        bundleChanges: null,
-    };
-    dispatch(dosSlice.actions.bndReady({}));
-}
-
-export async function loadBundleFromUrl(url: string, store: Store) {
-    const owner = store.getState().auth.account?.email ?? "guest";
-    const changesUrl = await getChangesUrl(owner, url);
-    return doLoadBundle(url,
-        bundleFromUrl(url, store),
-        changesProducer(changesUrl, store),
-        url,
-        store);
-}
-
-async function doLoadBundle(bundleName: string,
-                            bundlePromise: Promise<Uint8Array>,
-                            bundleChangesPromise: (ReturnType<typeof changesProducer>) | null,
-                            bundleUrl: string | null,
-                            store: Store) {
-    const nonSerializableStore = getNonSerializableStore(store);
-    const dispatch = store.dispatch;
-    nonSerializableStore.loadedBundle = null;
-
-
-    dispatch(dosSlice.actions.bndLoad(bundleName));
-
-    const bundle = await bundlePromise;
-    dispatch(storageSlice.actions.ready());
-    const bundleChanges = await bundleChangesPromise;
-    dispatch(dosSlice.actions.bndConfig());
-
-    const config = await emulators.bundleConfig(bundle);
-    dispatch(editorSlice.actions.init(config));
-    if (config === null) {
-        dispatch(uiSlice.actions.frameConf());
-    } else {
-        syncWithConfig(config, dispatch);
-    }
-
-    nonSerializableStore.loadedBundle = {
-        bundleUrl,
-        bundleChangesUrl: bundleChanges?.url ?? null,
-        bundle,
-        bundleChanges: bundleChanges?.bundle ?? null,
-    };
-    dispatch(dosSlice.actions.bndReady({}));
-}
-
-async function changesProducer(bundleUrl: string, store: Store): Promise<{
-    url: string,
-    bundle: Uint8Array | null,
-}> {
-    if (!store.getState().auth.ready) {
-        await new Promise<void>((resolve) => {
-            let unsubscirbe: Unsubscribe | null = null;
-            const updateFn = () => {
-                if (store.getState().auth.ready) {
-                    unsubscirbe!();
-                    resolve();
-                }
-            };
-            unsubscirbe = store.subscribe(updateFn);
-        });
-    }
-
-    const account = store.getState().auth.account;
-    const owner = account?.email ?? "guest";
-    const url = getChangesUrl(owner, bundleUrl);
-    const bundle = await bundleFromChanges(url, account, store);
-    return {
-        url,
-        bundle,
-    };
-}
-
-function syncWithConfig(config: DosConfig, dispatch: Dispatch) {
-    if (config.dosboxConf.indexOf("sockdrive") >= 0) {
-        dispatch(dosSlice.actions.dosBackendLocked(true));
-        dispatch(dosSlice.actions.dosBackend("dosboxX"));
-    }
-    dispatch(dosSlice.actions.mouseCapture(config.dosboxConf.indexOf("autolock=true") >= 0));
-}

package/src/login/login.css

@@ -1,9 +0,0 @@
-.jsdos-rso {
-  .login-widget {
-    @apply absolute z-40 left-12 top-0 bottom-0 right-0 bg-white;
-
-    iframe {
-      @apply w-full h-full p-0 m-0 border-0;
-    }
-  }
-}

package/src/login/login.tsx

@@ -1,77 +0,0 @@
-import { useEffect, useRef } from "preact/hooks";
-import { useDispatch, useSelector } from "react-redux";
-import { State } from "../store";
-import { uiSlice } from "../store/ui";
-import { CloseButton } from "../components/close-button";
-import { authentificator } from "../v8/config";
-import { Account, authSlice, postAuthMessage } from "../store/auth";
-import { havePremium } from "../v8/subscriptions";
-
-export function Login() {
-    const iframeRef = useRef<HTMLIFrameElement>(null);
-    const activeAccount = useSelector((state: State) => state.auth.account);
-    const visible = useSelector((state: State) => state.ui.modal) === "login";
-    const dispatch = useDispatch();
-
-    useEffect(() => {
-        if (activeAccount != null) {
-            return;
-        }
-
-        const iframe = iframeRef.current;
-        if (iframe === null) {
-            dispatch(authSlice.actions.logout({}));
-            dispatch(authSlice.actions.ready());
-            console.error("Unable to inialize authentificator!");
-            return;
-        }
-
-        async function onAuthMessage(e: any) {
-            if (e.data.action === "auth/ready") {
-                postAuthMessage("auth/authenicate");
-            } else if (e.data.action === "auth/authenicate") {
-                const account = e.data.account as Account | null;
-                if (account !== null) {
-                    try {
-                        account.premium = await havePremium(account.token.access_token);
-                    } catch (e: any) {
-                        console.error(e);
-                        account.premium = false;
-                    }
-                    dispatch(authSlice.actions.login(e.data.account));
-                } else {
-                    dispatch(authSlice.actions.logout({}));
-                    dispatch(authSlice.actions.ready());
-                }
-            }
-        }
-
-        window.addEventListener("message", onAuthMessage);
-        iframe.src = authentificator;
-
-        return () => {
-            window.removeEventListener("message", onAuthMessage);
-        };
-    }, []);
-
-    useEffect(() => {
-        const iframe = iframeRef.current;
-        if (iframe === null) {
-            return;
-        }
-
-        postAuthMessage("auth/login");
-    }, [visible]);
-
-    return <div
-        id={"login"}
-        class={
-            "login-widget " + (visible ? "block" : "hidden")
-        }>
-        <iframe id="authentificator" ref={iframeRef} />
-        <CloseButton
-            class="absolute z-40 right-24 top-10"
-            onClose={() => dispatch(uiSlice.actions.modalNone()) }
-        />
-    </div>;
-}

package/src/main.tsx

@@ -1,197 +0,0 @@
-import { render } from "preact";
-import "./index.css";
-
-import { Provider } from "react-redux";
-import { Ui } from "./ui";
-import { dosSlice } from "./store/dos";
-import { initEmulators } from "./store/dos";
-// eslint-disable-next-line
-import { uiSlice } from "./store/ui";
-import { i18nSlice } from "./i18n";
-import { getCache } from "./host/lcache";
-import { loadBundleFromConfg, loadBundleFromUrl } from "./load";
-
-import { DosOptions, DosProps, DosFn } from "./public/types";
-import { browserSetFullScreen } from "./host/fullscreen";
-import { NonSerializableStore, Store, makeNonSerializableStore, makeStore, postJsDosEvent } from "./store";
-
-export const Dos: DosFn = (element: HTMLDivElement,
-    options: Partial<DosOptions> = {}): DosProps => {
-    const nonSerializableStore = makeNonSerializableStore(options);
-    const store = makeStore(nonSerializableStore, options);
-
-
-    if (store.getState().auth.account?.email === "dz.caiiiycuk@gmail.com" ||
-        store.getState().auth.account?.email === "caiiiycuk@gmail.com") {
-        store.dispatch(dosSlice.actions.setSockdriveWrite(false));
-    }
-
-    setupRootElement(element, nonSerializableStore, store);
-
-    let pollStep = "none";
-    function pollEvents() {
-        (async () => {
-            const state = store.getState();
-            const step = state.dos.step;
-
-            if (step === pollStep) {
-                return;
-            }
-            pollStep = step;
-
-            switch (state.dos.step) {
-                case "emu-ready": {
-                    const cachedEmail = state.auth.account?.email;
-                    nonSerializableStore.cache = await getCache(cachedEmail ?? "guest");
-
-                    if (nonSerializableStore.options.url) {
-                        try {
-                            await loadBundleFromUrl(nonSerializableStore.options.url, store);
-                        } catch (e: any) {
-                            store.dispatch(dosSlice.actions.bndError(e.message));
-                        }
-                    } else if (nonSerializableStore.options.dosboxConf) {
-                        loadBundleFromConfg({
-                            dosboxConf: nonSerializableStore.options.dosboxConf,
-                            jsdosConf: {
-                                version: "8",
-                            },
-                        }, store);
-                    } else {
-                        store.dispatch(uiSlice.actions.windowSelect());
-                    }
-
-                    postJsDosEvent(nonSerializableStore, "emu-ready");
-                } break;
-            };
-        })().catch(console.error);
-    }
-    store.subscribe(pollEvents);
-
-    initEmulators(store, options.pathPrefix ?? "https://v8.js-dos.com/latest/emulators/");
-
-    function setTheme(theme: DosOptions["theme"]) {
-        store.dispatch(uiSlice.actions.theme(theme));
-    }
-
-    function setLang(lang: DosOptions["lang"]) {
-        store.dispatch(i18nSlice.actions.setLang(lang));
-    }
-
-    function setBackend(backend: DosOptions["backend"]) {
-        store.dispatch(dosSlice.actions.dosBackend(backend));
-    }
-
-    function setBackendLocked(locked: boolean) {
-        store.dispatch(dosSlice.actions.dosBackendLocked(locked));
-    }
-
-    function setWorkerThread(workerThread: DosOptions["workerThread"]) {
-        store.dispatch(dosSlice.actions.dosWorker(workerThread));
-    }
-
-    function setMouseCapture(capture: DosOptions["mouseCapture"]) {
-        store.dispatch(dosSlice.actions.mouseCapture(capture));
-    }
-
-    function setServer(server: DosOptions["server"]) {
-        store.dispatch(dosSlice.actions.setServer(server));
-    }
-
-    function setRoom(room: DosOptions["room"]) {
-        store.dispatch(dosSlice.actions.setRoom(room));
-    }
-
-    function setFrame(frame: "network") {
-        store.dispatch(uiSlice.actions.frameNetwork());
-    }
-
-    function setBackground(background: string) {
-        store.dispatch(uiSlice.actions.background(background));
-    }
-
-    function setFullScreen(fullScreen: boolean) {
-        browserSetFullScreen(fullScreen, store);
-    }
-
-    if (options.theme) {
-        setTheme(options.theme);
-    }
-
-    if (options.lang) {
-        setLang(options.lang);
-    }
-
-    if (options.backend) {
-        setBackend(options.backend);
-    }
-
-    if (options.backendLocked) {
-        setBackendLocked(options.backendLocked);
-    }
-
-    if (options.workerThread !== undefined) {
-        setWorkerThread(options.workerThread);
-    }
-
-    if (options.mouseCapture !== undefined) {
-        setMouseCapture(options.mouseCapture);
-    }
-
-    if (options.server) {
-        setServer(options.server);
-    }
-
-    if (options.room) {
-        setRoom(options.room);
-    }
-
-    if (options.background) {
-        setBackground(options.background);
-    }
-
-    if (options.fullScreen !== undefined) {
-        setFullScreen(options.fullScreen);
-    }
-
-    render(
-        <Provider store={store}>
-            {<Ui /> as any}
-        </Provider>,
-        element,
-    );
-
-    return {
-        setTheme,
-        setLang,
-        setBackend,
-        setBackendLocked,
-        setWorkerThread,
-        setMouseCapture,
-        setServer,
-        setRoom,
-        setFrame,
-        setBackground,
-        setFullScreen,
-    };
-};
-
-function setupRootElement(root: HTMLDivElement, nonSerializableStore: NonSerializableStore, store: Store) {
-    nonSerializableStore.root = root;
-    root.classList.add("jsdos-rso");
-    root.addEventListener("contextmenu", (e) => {
-        if (e.target !== null &&
-            (e.target as HTMLElement).classList?.contains("contextmenu")) {
-            return;
-        }
-        e.stopPropagation();
-        e.preventDefault();
-        return false;
-    });
-    document.addEventListener("fullscreenchange", () => {
-        const fullscreen = document.fullscreenElement === root;
-        store.dispatch(uiSlice.actions.setFullScreen(fullscreen));
-    });
-}
-
-(window as any).Dos = Dos;

package/src/public/types.ts

@@ -1,45 +0,0 @@
-export type DosEvent = "emu-ready" | "ci-ready" | "bnd-play";
-
-export interface DosOptions {
-    url: string,
-    dosboxConf: string,
-    background: string,
-    pathPrefix: string,
-    theme: "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",
-    lang: "ru" | "en",
-    backend: "dosbox" | "dosboxX",
-    backendLocked: boolean,
-    backendHardware: ((backend: "dosbox" | "dosboxX") => Promise<string | null>),
-    workerThread: boolean,
-    mouseCapture: boolean,
-    onEvent: (event: DosEvent, ci?: any /* CommandInterface */) => void,
-    server: "netherlands" | "newyork" | "singapore",
-    room: string,
-    fullScreen: boolean,
-    sockdriveBackend: {
-        name: string,
-        host: string,
-    }
-}
-
-export interface DosProps {
-    setTheme(theme: DosOptions["theme"]): void;
-    setLang(lang: DosOptions["lang"]): void;
-    setBackend(backend: DosOptions["backend"]): void;
-    setBackendLocked(locked: boolean): void;
-    setWorkerThread(capture: DosOptions["workerThread"]): void;
-    setMouseCapture(capture: DosOptions["mouseCapture"]): void;
-    setServer(server: DosOptions["server"]): void;
-    setRoom(room: DosOptions["room"]): void;
-    setFrame(frame: "network"): void;
-    setBackground(background: string | null): void;
-    setFullScreen(fullScreen: boolean): void;
-}
-
-export type DosFn = (element: HTMLDivElement, options: Partial<DosOptions>) => DosProps;
-
-// declare const Dos: DosFn;

package/src/sidebar/account-button.tsx

@@ -1,33 +0,0 @@
-import { useDispatch, useSelector } from "react-redux";
-import { dispatchLoginAction } from "../store/ui";
-import { State } from "../store";
-
-export function AccountButton(props: {
-    class?: string,
-}) {
-    const account = useSelector((state: State) => state.auth.account);
-    const loggedIn = account !== null;
-    const hightlight = useSelector((state: State) => state.ui.frame) === "account";
-    const dispatch = useDispatch();
-
-    function onClick() {
-        dispatchLoginAction(account, dispatch);
-    }
-
-    return <div class={"sidebar-button " + (hightlight ? "sidebar-highlight " : "") +
-        (account?.email === "dz.caiiiycuk@gmail.com" ? "bg-accent " : "") +
-        props.class} onClick={onClick}>
-
-        <svg xmlns="http://www.w3.org/2000/svg" fill="none"
-            viewBox="0 0 24 24" stroke-width="1.5"
-            stroke="currentColor" class="w-full h-full">
-            <path stroke-linecap="round"
-                stroke-linejoin="round"
-                d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963
-                    0m11.963 0A8.966 8.966 0 0112 21a8.966
-                    8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z" />
-        </svg>
-
-        {loggedIn === false && <div class="sidebar-badge" />}
-    </div>;
-}