Injector v3.0.1: Minor tweaks and fixes

CHANGELOG.md

@@ -1,5 +1,20 @@
 # GooseMod Changelog
 
+## v3.0.1
+
+  - ### Tweaks
+    - Removed migration code replacing for modules to fix issues
+    - Removed old unneeded logging on startup
+    - New way of getting injector version hash
+    - Add version toast on injection
+
+
+## v3.0.0
+
+  - ### Backend
+    - Rewritten to use multiple JS files with Parcel
+
+
 ## v2.4.0
 
   - ### Features

build.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+rm -rf ./dist
+
+npx parcel build src/index.js
+
+hash="$(sha512sum dist/index.js | cut -d" " -f1)"
+
+echo $hash
+
+sed -i "s/<hash>/$hash/g" dist/index.js

package.json

@@ -4,7 +4,7 @@
   "description": "GooseMod injector",
   "main": "index.js",
   "scripts": {
-    "build": "parcel build src/index.js"
+    "build": "bash ./build.sh"
   },
   "repository": {
     "type": "git",

src/index.js

@@ -3,21 +3,13 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 globalThis.modules = {};
 globalThis.disabledModules = {};
 
-console.log('pass 1');
-
 import * as Logger from './util/logger';
 globalThis.logger = Logger;
 
-import * as Hash from './util/hash';
-
-globalThis.version = '3.0.0';
-
-Hash.sha512('foobar').then((hash) => {
-  globalThis.injectorHash = hash;
-  globalThis.logger.debug('import.version.goosemod', `${globalThis.version} (${globalThis.injectorHash})`);
-});
+globalThis.version = '3.0.1';
+globalThis.versionHash = '<hash>';
 
-console.log('pass 2');
+globalThis.logger.debug('import.version.goosemod', `${globalThis.version} (${globalThis.versionHash})`);
 
 if (window.DiscordNative !== undefined) globalThis.logger.debug('import.version.discord', `${DiscordNative.app.getReleaseChannel()} ${DiscordNative.app.getVersion()}`);
 
@@ -27,19 +19,17 @@ if (window.gmUntethered) {
   // delete window.gmUntethered;
 }
 
-console.log('pass 3');
-
 import WebpackModules from './util/discord/webpackModules';
 globalThis.webpackModules = WebpackModules;
 
 import fixLocalStorage from './util/discord/fixLocalStorage';
 fixLocalStorage();
 
-console.log('pass 4');
-
 import showToast from './ui/toast';
 globalThis.showToast = showToast;
 
+globalThis.showToast(`GooseMod v${globalThis.version} (${globalThis.versionHash.substring(0, 7)})`, {timeout: 1000});
+
 import easterEggs from './ui/easterEggs';
 globalThis.messageEasterEggs = easterEggs;
 
@@ -55,8 +45,6 @@ Object.assign(globalThis, {
   updateLoadingScreen
 });
 
-console.log('pass 5');
-
 import { removeModuleUI, isSettingsOpen, closeSettings, openSettings, openSettingItem, reopenSettings, injectInSettings, checkSettingsOpenInterval } from './ui/settings';
 Object.assign(globalThis, {
   removeModuleUI,

src/moduleManager.js

@@ -21,7 +21,7 @@ export const importModule = async (f) => {
     f.data = ab2str(f.data);
   }
 
-  globalThis.modules[field] = eval(f.data.replace(/\bthis\./g, 'globalThis.')); // Set globalThis.modules.<module_name> to the return value of the module (an object containing handlers)
+  globalThis.modules[field] = eval(f.data); // Set globalThis.modules.<module_name> to the return value of the module (an object containing handlers)
 
   globalThis.logger.debug(`import.load.module.${field}`, `Evaled module JS`);
 

src/ui/settings.js

@@ -665,7 +665,7 @@ export const injectInSettings = async () => {
   let versionEl = document.createElement('div');
   versionEl.classList.add('colorMuted-HdFt4q', 'size12-3cLvbJ');
 
-  versionEl.textContent = `GooseMod ${globalThis.version} (${globalThis.injectorHash.substring(0, 7)})`;
+  versionEl.textContent = `GooseMod ${globalThis.version} (${globalThis.versionHash.substring(0, 7)})`;
 
   settingsSidebarEl.lastChild.appendChild(versionEl);