v0.73.4: report extraction progress

Author: caiiiycuk

package.json

@@ -1,6 +1,6 @@
 {
     "name": "emulators-ui",
-    "version": "0.73.2",
+    "version": "0.73.4",
     "description": "Emulators UI",
     "main": "dist/emulators-ui.js",
     "types": "dist/types/emulators-ui.d.ts",
@@ -34,23 +34,22 @@
         "@babel/preset-env": "^7.16.4",
         "@types/browserify": "^12.0.36",
         "@types/gulp": "^4.0.6",
-        "@types/gulp-rename": "0.0.33",
-        "@types/gulp-size": "^2.1.1",
-        "@types/gulp-sourcemaps": "0.0.32",
+        "@types/gulp-rename": "2.0.1",
+        "@types/gulp-size": "^4.0.0",
+        "@types/gulp-sourcemaps": "0.0.35",
         "@types/gulp-terser": "^1.2.1",
-        "@types/md5-file": "^4.0.1",
-        "@types/node": "^10.17.21",
+        "@types/node": "^17.0.25",
         "@types/vinyl-buffer": "^1.0.0",
         "@types/vinyl-source-stream": "0.0.30",
-        "@typescript-eslint/eslint-plugin": "^4.33.0",
-        "@typescript-eslint/parser": "^4.33.0",
+        "@typescript-eslint/eslint-plugin": "^5.20.0",
+        "@typescript-eslint/parser": "^5.20.0",
         "babelify": "^10.0.0",
         "browserify": "^17.0.0",
-        "core-js": "^3.19.1",
-        "del": "^5.1.0",
+        "core-js": "^3.22.2",
+        "del": "^6.0.0",
         "element-resize-detector": "^1.2.4",
-        "emulators": "^0.73.4",
-        "eslint": "^7.30.0",
+        "emulators": "^0.73.5",
+        "eslint": "^8.13.0",
         "eslint-config-google": "^0.14.0",
         "git-repo-info": "^2.1.1",
         "gulp": "^4.0.2",

src/build.ts

@@ -5,6 +5,6 @@
 
 export const Build = {
     short: "0.73.2",
-    version: "0.73.2 (2e3e846edbcb9a05fcaec03a3a2fcd32)",
-    buildSeed: 1650002532619,
+    version: "0.73.2 (40eefa1795cae0673481705edc30f239)",
+    buildSeed: 1650619479904,
 };

src/js-dos.ts

@@ -1,4 +1,4 @@
-import { Emulators, CommandInterface } from "emulators";
+import { Emulators, CommandInterface, BackendOptions } from "emulators";
 import { TransportLayer } from "emulators/dist/types/protocol/protocol";
 import { EmulatorsUi } from "./emulators-ui";
 import { Layers, LayersOptions } from "./dom/layers";
@@ -254,6 +254,19 @@ export class DosInstance {
             const bundlePromise = emulatorsUi.network.resolveBundle(bundleUrl, {
                 onprogress: (percent) => this.layers.setLoadingMessage("Downloading bundle " + percent + "%"),
             });
+            const options: BackendOptions = {
+                onExtractProgress: (index, file, extracted, total) => {
+                    if (index !== 0) {
+                        return;
+                    }
+
+                    const percent = Math.round(extracted / total * 100);
+                    const lastIndex = file.lastIndexOf("/");
+
+                    const name = file.substring(lastIndex + 1);
+                    this.layers.setLoadingMessage("Extracting " + percent + "% (" + name + ")");
+                },
+            };
             try {
                 let changesBundle: Uint8Array | undefined;
                 if (optionalChangesUrl !== undefined && optionalChangesUrl !== null && optionalChangesUrl.length > 0) {
@@ -264,17 +277,17 @@ export class DosInstance {
                 const bundle = await bundlePromise;
                 if (this.emulatorFunction === "backend") {
                     this.ciPromise = emulators.backend([bundle, changesBundle],
-                        (this as any).createTransportLayer() as TransportLayer);
+                        (this as any).createTransportLayer() as TransportLayer, options);
                 } else {
-                    this.ciPromise = emulators[this.emulatorFunction]([bundle, changesBundle]);
+                    this.ciPromise = emulators[this.emulatorFunction]([bundle, changesBundle], options);
                 }
             } catch {
                 const bundle = await bundlePromise;
                 if (this.emulatorFunction === "backend") {
                     this.ciPromise = emulators.backend([bundle],
-                        (this as any).createTransportLayer() as TransportLayer);
+                        (this as any).createTransportLayer() as TransportLayer, options);
                 } else {
-                    this.ciPromise = emulators[this.emulatorFunction]([bundle]);
+                    this.ciPromise = emulators[this.emulatorFunction]([bundle], options);
                 }
             }
         }