last device ID persistence

Author: ntanis-dev

src/library/connector.js

@@ -23,6 +23,7 @@ class Connector extends EventEmitter {
 	#clientSecret = null
 	#port = null
 	#server = null
+	#lastDeviceId = null
 	#setup = false
 	#faked = false
 	#error = false
@@ -184,12 +185,13 @@ class Connector extends EventEmitter {
 		res.end()
 	}
 
-	startSetup(clientId = null, clientSecret = null, refreshToken = null) {
+	startSetup(clientId = null, clientSecret = null, refreshToken = null, lastDeviceId = null) {
 		logger.info('Starting connector setup.')
 
 		this.#clientId = clientId
 		this.#clientSecret = clientSecret
 		this.#refreshToken = refreshToken
+		this.#lastDeviceId = lastDeviceId
 
 		if (this.#refreshToken)
 			this.#refreshAccessToken().then(() => this.#setSetup(true)).catch(e => {
@@ -213,16 +215,28 @@ class Connector extends EventEmitter {
 
 		this.#listenWithRetry()
 
+		this.#lastDeviceId = null
+
 		this.#saveGlobalSettings({
 			clientId: null,
 			clientSecret: null,
 			refreshToken: null,
-			accessToken: null
+			accessToken: null,
+			lastDeviceId: null
 		})
 
 		logger.warn('The connector setup has been invalidated.')
 	}
 
+	saveLastDeviceId(deviceId) {
+		this.#lastDeviceId = deviceId
+		this.#saveGlobalSettings({ lastDeviceId: deviceId })
+	}
+
+	get lastDeviceId() {
+		return this.#lastDeviceId
+	}
+
 	#listenWithRetry(attempt = 0) {
 		const port = constants.CONNECTOR_DEFAULT_PORT + attempt
 

src/library/wrapper.js

@@ -38,9 +38,12 @@ class Wrapper extends EventEmitter {
 		super()
 
 		connector.on('setupStateChanged', state => {
-			if (state)
+			if (state) {
+				if (connector.lastDeviceId)
+					this.#lastDeviceId = connector.lastDeviceId
+
 				this.#updatePlaybackState(true)
-			else {
+			} else {
 				this.#updatePlaybackContext(null)
 				this.#setPlaying(false)
 				this.#setRepeatState('off')
@@ -54,8 +57,12 @@ class Wrapper extends EventEmitter {
 			}
 		})
 
-		if (connector.set)
+		if (connector.set) {
+			if (connector.lastDeviceId)
+				this.#lastDeviceId = connector.lastDeviceId
+
 			this.#updatePlaybackState()
+		}
 
 		setInterval(() => {
 			if (!connector.set)
@@ -600,6 +607,9 @@ class Wrapper extends EventEmitter {
 			this.#updatePlaybackStateStatus = 'skip'
 			this.#lastDeviceId = lastDeviceId
 			this.emit('deviceChanged', lastDeviceId)
+
+			if (lastDeviceId)
+				connector.saveLastDeviceId(lastDeviceId)
 		}
 
 		if (this.#lastDevices && this.#lastDevices.length === devices.length && this.#lastDevices.every((device, index) => device.id === devices[index].id))

src/plugin.js

@@ -16,7 +16,7 @@ StreamDeck.connect().then(() => {
 
 		if (settings.clientId && settings.clientSecret && settings.refreshToken) {
 			logger.info('Found global settings.')
-			connector.startSetup(settings.clientId, settings.clientSecret, settings.refreshToken)
+			connector.startSetup(settings.clientId, settings.clientSecret, settings.refreshToken, settings.lastDeviceId)
 		} else {
 			logger.info('No global settings found.')
 			connector.startSetup()