fix(browser): Fix issue where browsers where unable to boot

Play-OS · Dec 18, 2019 · 8edeae1 · 8edeae1
1 parent 29f8dc9
commit 8edeae1
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 6 deletions.
diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -24,7 +24,8 @@
   },
   "devDependencies": {
     "cross-env": "^6.0.3",
-    "electron": "^4.0.0"
+    "electron": "^4.0.0",
+    "worker-plugin": "^3.2.0"
   },
   "keywords": [
     "capacitor",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,6 +101,7 @@
     "node-sass": "^4.13.0",
     "standard-version": "^7.0.1",
     "typescript": "^3.7.3",
-    "url-loader": "^2.2.0"
+    "url-loader": "^2.2.0",
+    "worker-plugin": "^3.2.0"
   }
 }
diff --git a/src/js/pages/RegisterPage/RegisterPage.tsx b/src/js/pages/RegisterPage/RegisterPage.tsx
@@ -20,7 +20,7 @@ export default function RegisterPage() {
                 ...values,
                 [name]: event.target.value,
             });
-        }
+        };
     }
 
     function createAccount() {

diff --git a/src/js/services/TerminalService.ts b/src/js/services/TerminalService.ts
@@ -19,7 +19,7 @@ export default class TerminalService {
         this.currentPath = currentPath;
     }
 
-    async handleCommand(commandName: string, args: string[], envEntriest: any[]) {
+    async handleCommand(commandName: string, args: string[], envEntriest: any) {
         if (commandName.endsWith('.wasm')) {
             return this.fs.readFile(commandName);
         }
@@ -43,7 +43,16 @@ export default class TerminalService {
             };
         }
 
+        const kernel = InstanceBag.get<Kernel>('kernel');
         const wasmBinary = await fetchCommandFromWAPM(commandName, [], [['PATH', '/']]);
-        return lowerI64Imports(wasmBinary);
+        const preparedBin = await kernel.vm.prepareBin(wasmBinary);
+
+        return preparedBin;
+        // args.unshift(commandName);
+        // const vmOutput = await kernel.spawnProcess(preparedBin, args, {
+        //     env: envEntriest,
+        // });
+
+        // return () => vmOutput;
     }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const WorkerPlugin = require('worker-plugin');
 
 const exclude = '/node_modules';
 
@@ -16,6 +17,11 @@ module.exports = {
         filename: '[name].js',
         publicPath: 'build/',
     },
+    plugins: [
+        new WorkerPlugin({
+            globalObject: 'self',
+        }),
+    ],
     module: {
         rules: [
             {

diff --git a/www/index.html b/www/index.html
@@ -18,9 +18,13 @@
     <body>
         <div id="app"></div>
         <script>
-            if (process.env.NODE_ENV === 'development') {
+            if (typeof process !== 'undefined' && process.env.NODE_ENV === 'development') {
                 const script = document.createElement('script');
+                const base = document.createElement('base');
+                base.href = 'http://localhost:3000/';
+
                 script.src = 'http://localhost:3000/build/index.js';
+                document.head.appendChild(base);
                 document.head.appendChild(script);
             } else {
                 const script = document.createElement('script');
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ export default function RegisterPage() { @@
                     ...values,
                     [name]: event.target.value,
                 });
-            }
+            };
         }
         function createAccount() {
@@ Expand Down @@