feat: added global caching for settings, default settings and credentials

src/components/TheSettingsTab.vue

@@ -26,7 +26,7 @@
 			<a href="https://codeberg.org/RemixDev/deemix/wiki/Getting-your-own-ARL" target="_blank">
 				{{ $t('settings.login.arl.question') }}
 			</a>
-			<a id="settings_btn_applogin" class="hide" href="#" @click="applogin">
+			<a id="settings_btn_applogin" class="hide" href="#" @click.prevent="applogin">
 				Automated login
 			</a>
 			<button id="settings_btn_updateArl" @click="login" style="width: 100%;">
@@ -612,6 +612,8 @@
 </style>
 
 <script>
+import Vue from 'vue'
+import { mapGetters } from 'vuex'
 import { toast } from '@/utils/toasts'
 import { socket } from '@/utils/socket'
 import EventBus from '@/utils/EventBus'
@@ -629,7 +631,7 @@ export default {
 		lastSettings: {},
 		spotifyFeatures: {},
 		lastCredentials: {},
-		defaultSettings: {},
+		// defaultSettings: {},
 		lastUser: '',
 		spotifyUser: '',
 		slimDownloads: false,
@@ -644,6 +646,7 @@ export default {
 	mounted() {
 		console.log('settings mounted')
 		this.$refs.root.style.display = 'block'
+
 		this.locales = this.$i18n.availableLocales
 
 		EventBus.$on('settingsTab:revertSettings', this.revertSettings)
@@ -688,12 +691,19 @@ export default {
 
 		window.vol.preview_max_volume = volume
 
-		socket.on('init_settings', this.initSettings)
+		// socket.on('init_settings', this.initSettings)
+		this.waitSettings()
 		socket.on('updateSettings', this.updateSettings)
 		socket.on('accountChanged', this.accountChanged)
 		socket.on('familyAccounts', this.initAccounts)
+		socket.on('downloadFolderSelected', this.downloadFolderSelected)
+		socket.on('applogin_arl', this.setArl)
 	},
 	computed: {
+		...mapGetters(['getSettings', 'getCredentials', 'getDefaultSettings']),
+		needToWait() {
+			return Object.keys(this.getSettings).length === 0
+		},
 		changeSlimDownloads: {
 			get() {
 				return this.slimDownloads
@@ -705,58 +715,22 @@ export default {
 			}
 		}
 	},
-	// mounted() {
-	// 	this.locales = this.$i18n.availableLocales
-
-	// 	EventBus.$on('settingsTab:revertSettings', this.revertSettings)
-	// 	EventBus.$on('settingsTab:revertCredentials', this.revertCredentials)
-
-	// 	this.$refs.loggedInInfo.classList.add('hide')
-
-	// 	let storedLocale = localStorage.getItem('locale')
-
-	// 	if (storedLocale) {
-	// 		this.$i18n.locale = storedLocale
-	// 		this.currentLocale = storedLocale
-	// 	}
-
-	// 	let storedArl = localStorage.getItem('arl')
-
-	// 	if (storedArl) {
-	// 		this.$refs.loginInput.value = storedArl.trim()
-	// 	}
-
-	// 	let storedAccountNum = localStorage.getItem('accountNum')
-
-	// 	if (storedAccountNum) {
-	// 		this.accountNum = storedAccountNum
-	// 	}
-
-	// 	let spotifyUser = localStorage.getItem('spotifyUser')
-
-	// 	if (spotifyUser) {
-	// 		this.lastUser = spotifyUser
-	// 		this.spotifyUser = spotifyUser
-	// 		socket.emit('update_userSpotifyPlaylists', spotifyUser)
-	// 	}
-
-	// 	this.changeSlimDownloads = 'true' === localStorage.getItem('slimDownloads')
-
-	// 	let volume = parseInt(localStorage.getItem('previewVolume'))
-	// 	if (isNaN(volume)) {
-	// 		volume = 80
-	// 		localStorage.setItem('previewVolume', volume)
-	// 	}
-	// 	window.vol.preview_max_volume = volume
-
-	// 	socket.on('init_settings', this.initSettings)
-	// 	socket.on('updateSettings', this.updateSettings)
-	// 	socket.on('accountChanged', this.accountChanged)
-	// 	socket.on('familyAccounts', this.initAccounts)
-	// 	socket.on('downloadFolderSelected', this.downloadFolderSelected)
-	// 	socket.on('applogin_arl', this.setArl)
-	// },
 	methods: {
+		waitSettings() {
+			if (this.needToWait) {
+				// Checking if the saving of the settings is completed
+				let unsub = this.$store.subscribeAction({
+					after: (action, state) => {
+						if (action.type === 'setSettings') {
+							this.initSettings()
+							unsub()
+						}
+					}
+				})
+			} else {
+				this.initSettings()
+			}
+		},
 		revertSettings() {
 			this.settings = { ...this.lastSettings }
 		},
@@ -801,17 +775,17 @@ export default {
 		},
 		downloadFolderSelected(folder) {
 			console.log(folder)
-			this.settings.downloadLocation = folder
+			this.$set(this.settings, 'downloadLocation', folder)
 		},
-		loadSettings(settings, spotifyCredentials, defaults = null) {
+		// loadDefaultSettings() {
-			if (defaults) {
+		// 	this.defaultSettings = { ...this.getDefaultSettings }
-				this.defaultSettings = { ...defaults }
+		// },
-			}
+		loadSettings() {
+			this.lastSettings = { ...this.getSettings }
+			this.lastCredentials = { ...this.getCredentials }
 
-			this.lastSettings = { ...settings }
+			this.settings = { ...this.getSettings }
-			this.lastCredentials = { ...spotifyCredentials }
+			this.spotifyFeatures = { ...this.getCredentials }
-			this.settings = settings
-			this.spotifyFeatures = spotifyCredentials
 		},
 		login() {
 			let arl = this.$refs.loginInput.value.trim()
@@ -820,8 +794,9 @@ export default {
 			}
 		},
 		applogin(e) {
-			e.preventDefault()
+			if (window.clientMode) {
-			if (window.clientMode) socket.emit('applogin')
+				socket.emit('applogin')
+			}
 		},
 		setArl(arl) {
 			this.$refs.loginInput.value = arl
@@ -842,16 +817,19 @@ export default {
 		logout() {
 			socket.emit('logout')
 		},
-		initSettings(settings, credentials, defaults) {
+		initSettings() {
-			this.loadSettings(settings, credentials, defaults)
+			// this.loadDefaultSettings()
+			this.loadSettings()
+
 			toast(this.$t('settings.toasts.init'), 'settings')
 		},
-		updateSettings(settings, credentials) {
+		updateSettings() {
-			this.loadSettings(settings, credentials)
+			this.loadSettings()
+
 			toast(this.$t('settings.toasts.update'), 'settings')
 		},
 		resetSettings() {
-			this.settings = { ...this.defaultSettings }
+			this.settings = { ...this.getDefaultSettings }
 		}
 	}
 }

src/store/index.js

@@ -3,6 +3,8 @@ import Vue from 'vue'
 
 import home from '@/store/modules/home'
 import settings from '@/store/modules/settings'
+import defaultSettings from '@/store/modules/defaultSettings'
+import spotifyCredentials from '@/store/modules/spotifyCredentials'
 
 // Load Vuex
 Vue.use(Vuex)
@@ -11,7 +13,9 @@ Vue.use(Vuex)
 export default new Vuex.Store({
 	modules: {
 		home,
-		settings
+		settings,
+		defaultSettings,
+		credentials: spotifyCredentials
 	},
 	strict: process.env.NODE_ENV !== 'production'
 })

src/store/modules/defaultSettings.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+
+const state = {}
+
+const actions = {
+	setDefaultSettings({ commit }, payload) {
+		for (const settingName in payload) {
+			if (!payload.hasOwnProperty(settingName)) return
+
+			const settingValue = payload[settingName]
+			commit('SET_UNKNOWN_DEFAULT_SETTING', { settingName, settingValue })
+		}
+	}
+}
+
+const getters = {
+	getDefaultSettings: state => state
+}
+
+const mutations = {
+	SET_UNKNOWN_DEFAULT_SETTING(state, payload) {
+		Vue.set(state, payload.settingName, payload.settingValue)
+	}
+}
+
+export default {
+	state,
+	actions,
+	getters,
+	mutations
+}

src/store/modules/spotifyCredentials.js

@@ -0,0 +1,31 @@
+const state = {
+	clientId: '',
+	clientSecret: ''
+}
+
+const actions = {
+	setCredentials({ commit }, payload) {
+		commit('SET_CLIENT_ID', payload.clientId)
+		commit('SET_CLIENT_SECRET', payload.clientSecret)
+	}
+}
+
+const getters = {
+	getCredentials: state => state
+}
+
+const mutations = {
+	SET_CLIENT_ID(state, payload) {
+		state.clientId = payload
+	},
+	SET_CLIENT_SECRET(state, payload) {
+		state.clientSecret = payload
+	}
+}
+
+export default {
+	state,
+	getters,
+	actions,
+	mutations
+}

src/utils/socket.js

@@ -11,8 +11,10 @@ socket.on('connect', () => {
 // })
 
 socket.on('init_settings', (settings, credentials, defaults) => {
-	console.log(settings, credentials, defaults)
+	console.log(credentials)
 	store.dispatch('setSettings', settings)
+	store.dispatch('setDefaultSettings', defaults)
+	store.dispatch('setCredentials', credentials)
 })
 
 socket.on('init_home', data => {