From 0dd28d6d57adf67faadbaa21a8f445f73c9519f5 Mon Sep 17 00:00:00 2001
From: Michael Green <84688932+michael-j-green@users.noreply.github.com>
Date: Mon, 12 Feb 2024 14:31:03 +1100
Subject: [PATCH] Add support for the SMSPlus-GX core (#774)

* Add support for the SMSPlus-GX core

* Added settings.json file to tell the live preview VS Code plugin to set the correct headers for threads

* Updated using the @ethanaobrien's suggestions
---
 .gitignore            |  3 +--
 .vscode/settings.json |  7 +++++++
 data/emulator.js      |  5 +++--
 index.html            | 20 ++++++++++++++++----
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 96090a0..3ddebbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 **/node_modules/
 *.db
-.vscode/settings.json
 data/minify/package-lock.json
 package-lock.json
 yarn.lock
@@ -8,4 +7,4 @@ roms/
 data/emulator.min.js
 data/emulator.min.css
 data/cores
-.DS_Store
+.DS_Store
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..62387bd
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "livePreview.httpHeaders": {
+        "Cross-Origin-Opener-Policy": "same-origin",
+        "Cross-Origin-Embedder-Policy": "require-corp",
+        "Accept-Ranges": "bytes"
+    }
+}
\ No newline at end of file
diff --git a/data/emulator.js b/data/emulator.js
index 3700ede..30663c1 100644
--- a/data/emulator.js
+++ b/data/emulator.js
@@ -60,7 +60,7 @@ class EmulatorJS {
             'jaguar': 'virtualjaguar',
             'lynx': 'handy',
             'segaSaturn': 'yabause',
-            'segaMS': 'genesis_plus_gx',
+            'segaMS': 'smsplus',
             'segaMD': 'genesis_plus_gx',
             'segaGG': 'genesis_plus_gx',
             'segaCD': 'genesis_plus_gx',
@@ -132,6 +132,7 @@ class EmulatorJS {
         'picodrive': ['bin', 'gen', 'smd', 'md', '32x', 'cue', 'iso', 'sms', '68k', 'chd'],
         'ppsspp': ['elf', 'iso', 'cso', 'prx', 'pbp'],
         'prosystem': ['a78', 'bin'],
+        'smsplus': ['m3u', 'mdx', 'md', 'smd', 'gen', 'bin', 'cue', 'iso', 'chd', 'bms', 'sms', 'gg', 'sg', '68k', 'sgd'],
         'snes9x': ['smc', 'sfc', 'swc', 'fig', 'bs', 'st'],
         'stella2014': ['a26', 'bin', 'zip'],
         'vice_x64': ['d64', 'd6z', 'd71', 'd7z', 'd80', 'd81', 'd82', 'd8z', 'g64', 'g6z', 'g41', 'g4z', 'x64', 'x6z', 'nib', 'nbz', 'd2m', 'd4m', 't64', 'tap', 'tcrt', 'prg', 'p00', 'crt', 'bin', 'cmd', 'm3u', 'vfl', 'vsf', 'zip', '7z', 'gz', '20', '40', '60', 'a0', 'b0', 'rom'],
@@ -944,7 +945,7 @@ class EmulatorJS {
                 const altName = this.getBaseFileName(true);
 
                 let disableCue = false;
-                if (['pcsx_rearmed', 'genesis_plus_gx', 'picodrive', 'mednafen_pce', 'vice_x64', 'vice_x64sc', 'vice_x128', 'vice_xvic', 'vice_xplus4', 'vice_xpet'].includes(this.getCore()) && this.config.disableCue === undefined) {
+                if (['pcsx_rearmed', 'genesis_plus_gx', 'picodrive', 'mednafen_pce', 'smsplus', 'vice_x64', 'vice_x64sc', 'vice_x128', 'vice_xvic', 'vice_xplus4', 'vice_xpet'].includes(this.getCore()) && this.config.disableCue === undefined) {
                     disableCue = true;
                 } else {
                     disableCue = this.config.disableCue;
diff --git a/index.html b/index.html
index fe6b85f..9aab780 100644
--- a/index.html
+++ b/index.html
@@ -106,17 +106,28 @@
         </div>
 
         <script>
-            var enableDebug = false;
+            let enableDebug = false;
+            let enableThreads = false;
             const queryString = window.location.search;
             const urlParams = new URLSearchParams(queryString);
-            if (urlParams.get('debug') == 1)
+            if (urlParams.get('debug') == 1) {
                 enableDebug = true;
-            
-            if (enableDebug == true) {
                 console.log("Debug is enabled");
             } else {
                 console.log("Debug is disabled");
             }
+
+            if (urlParams.get('threads') == 1) {
+                if (window.SharedArrayBuffer) {
+                    enableThreads = true;
+                    console.log("Threads are enabled");
+                } else {
+                    console.warn("Threads are disabled as SharedArrayBuffer is not available. Threads requires two headers to be set when sending you html page. See https://stackoverflow.com/a/68630724");
+                    console.log("Threads are disabled");
+                }
+            } else {
+                console.log("Threads are disabled");
+            }
             
             input.onchange = async () => {
                 const url = new Blob([input.files[0]])
@@ -232,6 +243,7 @@
                 window.EJS_startOnLoaded = true;
                 window.EJS_DEBUG_XX = enableDebug;
                 window.EJS_disableDatabases = true;
+                window.EJS_threads = enableThreads;
 
                 script.src = "data/loader.js";
                 document.body.appendChild(script);