Merge f551a064ce into 7e95771957

app/assets/js/scripts/landing.js

@@ -2,8 +2,6 @@
  * Script for landing.ejs
  */
 // Requirements
-const cp                      = require('child_process')
-const crypto                  = require('crypto')
 const { URL }                 = require('url')
 const {
     MojangRestAPI,
@@ -800,6 +798,16 @@ function showNewsAlert(){
     $(newsButtonAlert).fadeIn(250)
 }
 
+async function digestMessage(str) {
+    const msgUint8 = new TextEncoder().encode(str)
+    const hashBuffer = await crypto.subtle.digest('SHA-1', msgUint8)
+    const hashArray = Array.from(new Uint8Array(hashBuffer))
+    const hashHex = hashArray
+        .map((b) => b.toString(16).padStart(2, '0'))
+        .join('')
+    return hashHex
+}
+
 /**
  * Initialize News UI. This will load the news and prepare
  * the UI accordingly.
@@ -807,13 +815,11 @@ function showNewsAlert(){
  * @returns {Promise.<void>} A promise which resolves when the news
  * content has finished loading and transitioning.
  */
-function initNews(){
+async function initNews(){
 
-    return new Promise((resolve, reject) => {
     setNewsLoading(true)
 
-        let news = {}
+    const news = await loadNews()
-        loadNews().then(news => {
 
     newsArr = news?.articles || null
 
@@ -821,11 +827,9 @@ function initNews(){
         // News Loading Failed
         setNewsLoading(false)
 
-                $('#newsErrorLoading').fadeOut(250, () => {
+        await $('#newsErrorLoading').fadeOut(250).promise()
-                    $('#newsErrorFailed').fadeIn(250, () => {
+        await $('#newsErrorFailed').fadeIn(250).promise()
-                        resolve()
+
-                    })
-                })
     } else if(newsArr.length === 0) {
         // No News Articles
         setNewsLoading(false)
@@ -837,18 +841,15 @@ function initNews(){
         })
         ConfigManager.save()
 
-                $('#newsErrorLoading').fadeOut(250, () => {
+        await $('#newsErrorLoading').fadeOut(250).promise()
-                    $('#newsErrorNone').fadeIn(250, () => {
+        await $('#newsErrorNone').fadeIn(250).promise()
-                        resolve()
-                    })
-                })
     } else {
         // Success
         setNewsLoading(false)
 
         const lN = newsArr[0]
         const cached = ConfigManager.getNewsCache()
-                let newHash = crypto.createHash('sha1').update(lN.content).digest('hex')
+        let newHash = await digestMessage(lN.content)
         let newDate = new Date(lN.date)
         let isNew = false
 
@@ -895,18 +896,12 @@ function initNews(){
 
         document.getElementById('newsNavigateRight').onclick = () => { switchHandler(true) }
         document.getElementById('newsNavigateLeft').onclick = () => { switchHandler(false) }
-
+        await $('#newsErrorContainer').fadeOut(250).promise()
-                $('#newsErrorContainer').fadeOut(250, () => {
         displayArticle(newsArr[0], 1)
-                    $('#newsContent').fadeIn(250, () => {
+        await $('#newsContent').fadeIn(250).promise()
-                        resolve()
-                    })
-                })
     }
 
-        })
 
-    })
 }
 
 /**

app/assets/js/scripts/uicore.js

@@ -49,7 +49,7 @@ if(!isDev){
                 loggerAutoUpdater.info('New update available', info.version)
                 
                 if(process.platform === 'darwin'){
-                    info.darwindownload = `https://github.com/dscalzi/HeliosLauncher/releases/download/v${info.version}/Helios-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg`
+                    info.darwindownload = `https://github.com/dscalzi/HeliosLauncher/releases/download/v${info.version}/Helios-Launcher-setup.dmg`
                     showUpdateUI(info)
                 }
                 

electron-builder.yml

@@ -31,9 +31,8 @@ mac:
   target:
     - target: 'dmg'
       arch:
-        - 'x64'
+        - 'universal'
-        - 'arm64'
+  artifactName: '${productName}-setup-${version}.${ext}'
-  artifactName: '${productName}-setup-${version}-${arch}.${ext}'
   category: 'public.app-category.games'
 
 # Linux Configuration