Fetches iso from github on prod builds

.github/workflows/deploy.yml

@@ -24,9 +24,6 @@ jobs:
       - name: Install NPM Dependencies
         run: npm ci
 
-      - name: Download ISO
-        run: wget https://spacestation13.github.io/dm-playground-linux/rootfs.iso9660 -O public/lib/rootfs.iso
-
       - name: Build project
         run: npx ng build --base-href /dm-playground/
 

angular.json

@@ -88,7 +88,13 @@
             "development": {
               "optimization": false,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development.ts"
+                }
+              ]
             }
           },
           "defaultConfiguration": "production"

src/environments/environment.development.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  isoUrl: './lib/rootfs.iso',
+};

src/environments/environment.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  isoUrl: 'https://spacestation13.github.io/dm-playground-linux/rootfs.iso9660',
+};

src/utils/literalConstants.ts

@@ -0,0 +1 @@
+export const isoUrlSearchParameter = 'isoUrl';

src/vm/emulator.service.ts

@@ -1,5 +1,7 @@
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import type { WorkerMsgWithoutCID, WorkerResponseMsg } from './emulator.worker';
+import { environment } from '../environments/environment';
+import { isoUrlSearchParameter } from '../utils/literalConstants';
 
 const encoder = new TextEncoder();
 
@@ -16,11 +18,20 @@ export class EmulatorService {
   @Output()
   public receivedOutputController = new EventEmitter<string>();
 
-  private worker = new Worker(new URL('./emulator.worker', import.meta.url));
+  private worker;
 
   private asyncCallbacks = new Map<number, Function>();
 
   constructor() {
+    interface FakeWorker {
+      new (url: URL): Worker;
+    }
+    const Worker = function (url: URL) {
+      url.searchParams.set(isoUrlSearchParameter, environment.isoUrl);
+      return new window.Worker(url);
+    } as unknown as FakeWorker;
+    this.worker = new Worker(new URL('./emulator.worker', import.meta.url));
+
     this.worker.onmessage = (event: MessageEvent<WorkerResponseMsg>) => {
       let e = event.data;
       if ('event' in e) {

src/vm/emulator.worker.ts

@@ -1,9 +1,8 @@
 /// <reference lib="webworker" />
 
-// @ts-ignore
-import { dynamic_import } from '../utils/misc';
+import { isoUrlSearchParameter } from '../utils/literalConstants';
 
-await dynamic_import('./lib/libv86.js');
+importScripts('./lib/libv86.js');
 
 interface MsgSendTerminal {
   command: 'sendTerminal';
@@ -73,6 +72,7 @@ export type WorkerEventResponseMsg =
       data: void;
     };
 
+const parameters = new URLSearchParams(location.search);
 const emulator = new V86({
   //Emulator binaries
   wasm_path: 'lib/v86.wasm',
@@ -131,7 +131,7 @@ const emulator = new V86({
     url: 'https://raw.githubusercontent.com/copy/v86/master/bios/vgabios.bin',
   },
   cdrom: {
-    url: './lib/rootfs.iso', //TODO: Use github url
+    url: parameters.get(isoUrlSearchParameter),
   },
   hda: null,
   hdb: null,