fix: gérer l'initialisation de LoggerUtil pour éviter les erreurs d'appel

Author: wiltark

app/assets/js/authmanager.js

@@ -10,7 +10,15 @@
  */
 // Requirements
 const ConfigManager          = require('./configmanager')
-const { LoggerUtil }         = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 const { RestResponseStatus } = require('helios-core/common')
 const { MojangRestAPI, mojangErrorDisplayable, MojangErrorCode } = require('helios-core/mojang')
 const { MicrosoftAuth, microsoftErrorDisplayable, MicrosoftErrorCode } = require('helios-core/microsoft')
@@ -41,7 +49,7 @@ function makeMicrosoftDisplayable(code) {
 }
 const { AZURE_CLIENT_ID }    = require('./ipcconstants')
 
-const log = LoggerUtil.getLogger('AuthManager')
+const log = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('AuthManager') : console
 
 // Functions
 

app/assets/js/configmanager.js

@@ -1,5 +1,14 @@
 const fs = require("fs-extra");
-const { LoggerUtil } = require("helios-core");
+let LoggerUtil
+try {
+  if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+    const _hc = require('helios-core')
+    LoggerUtil = _hc && _hc.LoggerUtil
+  }
+} catch (e) {
+  // ignore
+}
+const logger = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('ConfigManager') : console
 const os = require("os");
 const path = require("path");
 

app/assets/js/discordwrapper.js

@@ -1,5 +1,13 @@
 // Work in progress
-const { LoggerUtil } = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 
 const logger = LoggerUtil.getLogger('DiscordWrapper')
 

app/assets/js/msauth.js

@@ -5,7 +5,15 @@
 const { RestResponseStatus } = require('helios-core/common')
 const { MicrosoftAuth, microsoftErrorDisplayable, MicrosoftErrorCode } = require('helios-core/microsoft')
 const { AZURE_CLIENT_ID } = require('./ipcconstants')
-const { LoggerUtil } = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 
 const log = LoggerUtil.getLogger('MSAuth')
 

app/assets/js/preloader.js

@@ -6,7 +6,15 @@ const path           = require('path')
 const ConfigManager  = require('./configmanager')
 const { DistroAPI }  = require('./distromanager')
 const LangLoader     = require('./langloader')
-const { LoggerUtil } = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 // eslint-disable-next-line no-unused-vars
 const { HeliosDistribution } = require('helios-core/common')
 

app/assets/js/processbuilder.js

@@ -2,7 +2,15 @@ const AdmZip                = require('adm-zip')
 const child_process         = require('child_process')
 const crypto                = require('crypto')
 const fs                    = require('fs-extra')
-const { LoggerUtil }        = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore
+}
 const { getMojangOS, isLibraryCompatible, mcVersionAtLeast }  = require('helios-core/common')
 const { Type }              = require('helios-distribution-types')
 const os                    = require('os')
@@ -14,7 +22,7 @@ const AuthManager              = require('./authmanager')
 const { ipcRenderer }          = require('electron')
 const { MSFT_OPCODE }         = require('./ipcconstants')
 
-const logger = LoggerUtil.getLogger('ProcessBuilder')
+const logger = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('ProcessBuilder') : console
 
 
 /**

app/assets/js/resourcepackfixer.js

@@ -1,11 +1,16 @@
 const fs = require('fs-extra')
 const path = require('path')
-const { LoggerUtil } = require('helios-core')
-
-const fs = require('fs-extra')
-const { LoggerUtil } = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 
-const logger = LoggerUtil.getLogger('ResourcePackFixer')
+const logger = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('ResourcePackFixer') : console
 
 // Stubbed ResourcePackFixer: module removed by request. This minimal
 // implementation provides no-op functions to keep any existing imports

app/assets/js/scripts/uicore.js

@@ -9,11 +9,19 @@ const $                              = require('jquery')
 const {ipcRenderer, shell, webFrame} = require('electron')
 const remote                         = require('@electron/remote')
 const isDev                          = require('./assets/js/isdev')
-const { LoggerUtil }                 = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore
+}
 const Lang                           = require('./assets/js/langloader')
 
-const loggerUICore             = LoggerUtil.getLogger('UICore')
-const loggerAutoUpdater        = LoggerUtil.getLogger('AutoUpdater')
+const loggerUICore = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('UICore') : console
+const loggerAutoUpdater = (LoggerUtil && typeof LoggerUtil.getLogger === 'function') ? LoggerUtil.getLogger('AutoUpdater') : console
 
 // Log deprecation and process warnings.
 process.traceProcessWarnings = true

app/assets/js/sqlstorage.js

@@ -1,7 +1,15 @@
 // SQLite storage using sql.js (WASM) for portability (no native rebuild)
 const fs = require('fs')
 const path = require('path')
-const { LoggerUtil } = require('helios-core')
+let LoggerUtil
+try {
+    if (typeof LoggerUtil === 'undefined' || !LoggerUtil) {
+        const _hc = require('helios-core')
+        LoggerUtil = _hc && _hc.LoggerUtil
+    }
+} catch (e) {
+    // ignore - may be provided globally
+}
 const { getSqlJsConfig } = require('./wasm-config')
 const log = LoggerUtil.getLogger('SqlStorage')
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "multigames-studio-launcher",
-  "version": "3.8.7",
+  "version": "3.8.8",
   "description": "MultiGames Studios Launcher - Your simple and efficient gaming launcher",
   "author": "MultiGames Studio <noreply@multigames-studio.fr>",
   "license": "MIT",