v8.1.4

caiiiycuk · Jun 28, 2024 · 98c8b3b · 98c8b3b
1 parent a491972
commit 98c8b3b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/build.js.yml b/.github/workflows/build.js.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       matrix:
         node-version: [18.x]
-        emsdk-version: [3.1.41]
-        binaryen-version: [version_116_e]
+        emsdk-version: [3.1.61]
+        binaryen-version: [version_117_e]
     steps:
     - uses: actions/checkout@v4
       with:

diff --git a/native/jsdos/jsdos-log.cpp b/native/jsdos/jsdos-log.cpp
@@ -33,7 +33,7 @@ const char* LOG_TYPE_NAMES[] = {
 constexpr int LOG_TYPE_NAMES_COUNT = sizeof(LOG_TYPE_NAMES) / sizeof(char*);
 
 void Logger::operator()(char const* format, ...) {
-  if (logSeverity != LOG_ERROR) {
+  if (logSeverity != LOG_ERROR && !(logSeverity == LOG_NORMAL && logType == LOG_NET)) {
     return;
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "emulators",
-    "version": "8.1.3",
+    "version": "8.1.4",
     "description": "Emulators (dos) with standartized API",
     "main": "dist/emulators.js",
     "types": "dist/types/emulators.d.ts",

diff --git a/src/build.ts b/src/build.ts
@@ -5,30 +5,30 @@
 // gulpfile.ts/wasm.ts --> generateBuildInfo
 
 export const Build = {
-    version: "8.1.2 (e35844d643e26a3b173b517de55a7d58)",
-    buildSeed: 1718002958772,
+    version: "8.1.3 (1fda67ff2dba857fc1e150cca17155d1)",
+    buildSeed: 1719560943810,
     "wdosbox-x.wasm": {
-        "size": 6528408,
+        "size": 6302198,
         "gzSize": 0
     },
     "wdosbox-x.js": {
-        "size": 252665,
+        "size": 245849,
         "gzSize": 0
     },
     "wdosbox.wasm": {
-        "size": 1465320,
+        "size": 1465831,
         "gzSize": 0
     },
     "wdosbox.js": {
-        "size": 128947,
+        "size": 123620,
         "gzSize": 0
     },
     "wlibzip.wasm": {
-        "size": 111473,
+        "size": 111043,
         "gzSize": 0
     },
     "wlibzip.js": {
-        "size": 76430,
+        "size": 74095,
         "gzSize": 0
     }
 ,

diff --git a/src/impl/modules.ts b/src/impl/modules.ts
@@ -12,6 +12,9 @@ export interface IWasmModules {
 
 interface Globals {
     exports: {[moduleName: string]: any},
+    module: {
+        exports?: () => void,
+    },
     compiled: {[moduleName: string]: Promise<WasmModule>},
 }
 
@@ -20,6 +23,9 @@ class Host {
     public globals: Globals;
     constructor() {
         this.globals = typeof window === "undefined" ? {} : window as any;
+        if (!this.globals.module) {
+            this.globals.module = {};
+        }
         if (!this.globals.exports) {
             this.globals.exports = {};
         }
@@ -211,6 +217,7 @@ function loadWasmModuleBrowser(url: string,
         };
 
         eval.call(window, script as string);
+        host.globals.exports[moduleName] = host.globals.module.exports;
 
         return new CompiledBrowserModule(wasmModule,
             host.globals.exports[moduleName],