ambient-display 1.1.13 → 1.1.15

package/build/server/manifest.js

@@ -10,10 +10,10 @@ return {
 	assets: new Set(["favicon.ico","favicon.png","icons/144.favicon.png","icons/168.favicon.png","icons/192.favicon.png","icons/48.favicon.png","icons/72.favicon.png","icons/96.favicon.png","manifest.json"]),
 	mimeTypes: {".png":"image/png",".json":"application/json"},
 	_: {
-		client: {start:"_app/immutable/entry/start.DdZVr3Jo.js",app:"_app/immutable/entry/app.BqIwniV2.js",imports:["_app/immutable/entry/start.DdZVr3Jo.js","_app/immutable/chunks/jqhKT5WL.js","_app/immutable/chunks/CDVeMiAl.js","_app/immutable/chunks/ynvIH2CR.js","_app/immutable/entry/app.BqIwniV2.js","_app/immutable/chunks/CDVeMiAl.js","_app/immutable/chunks/qSIFE6bv.js","_app/immutable/chunks/CvUX3i4L.js","_app/immutable/chunks/DnG2xkSB.js","_app/immutable/chunks/ynvIH2CR.js"],stylesheets:[],fonts:[],uses_env_dynamic_public:false},
+		client: {start:"_app/immutable/entry/start.GAUDqQZ9.js",app:"_app/immutable/entry/app.BnYS1ESK.js",imports:["_app/immutable/entry/start.GAUDqQZ9.js","_app/immutable/chunks/Bfhjek-f.js","_app/immutable/chunks/CDVeMiAl.js","_app/immutable/chunks/ynvIH2CR.js","_app/immutable/entry/app.BnYS1ESK.js","_app/immutable/chunks/CDVeMiAl.js","_app/immutable/chunks/qSIFE6bv.js","_app/immutable/chunks/CvUX3i4L.js","_app/immutable/chunks/DnG2xkSB.js","_app/immutable/chunks/ynvIH2CR.js"],stylesheets:[],fonts:[],uses_env_dynamic_public:false},
 		nodes: [
-			__memo(() => import('./chunks/0-Byw92AzS.js')),
-			__memo(() => import('./chunks/1-BAnl2We4.js')),
+			__memo(() => import('./chunks/0-Bedes_cv.js')),
+			__memo(() => import('./chunks/1-BRZwGoSV.js')),
 			__memo(() => import('./chunks/2-B3ii1avX.js')),
 			__memo(() => import('./chunks/3-Cz5Rp48l.js'))
 		],

package/build/server/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sources":["../../.svelte-kit/adapter-node/manifest.js"],"sourcesContent":["export const manifest = (() => {\nfunction __memo(fn) {\n\tlet value;\n\treturn () => value ??= (value = fn());\n}\n\nreturn {\n\tappDir: \"_app\",\n\tappPath: \"_app\",\n\tassets: new Set([\"favicon.ico\",\"favicon.png\",\"icons/144.favicon.png\",\"icons/168.favicon.png\",\"icons/192.favicon.png\",\"icons/48.favicon.png\",\"icons/72.favicon.png\",\"icons/96.favicon.png\",\"manifest.json\"]),\n\tmimeTypes: {\".png\":\"image/png\",\".json\":\"application/json\"},\n\t_: {\n\t\tclient: {start:\"_app/immutable/entry/start.DdZVr3Jo.js\",app:\"_app/immutable/entry/app.BqIwniV2.js\",imports:[\"_app/immutable/entry/start.DdZVr3Jo.js\",\"_app/immutable/chunks/jqhKT5WL.js\",\"_app/immutable/chunks/CDVeMiAl.js\",\"_app/immutable/chunks/ynvIH2CR.js\",\"_app/immutable/entry/app.BqIwniV2.js\",\"_app/immutable/chunks/CDVeMiAl.js\",\"_app/immutable/chunks/qSIFE6bv.js\",\"_app/immutable/chunks/CvUX3i4L.js\",\"_app/immutable/chunks/DnG2xkSB.js\",\"_app/immutable/chunks/ynvIH2CR.js\"],stylesheets:[],fonts:[],uses_env_dynamic_public:false},\n\t\tnodes: [\n\t\t\t__memo(() => import('./nodes/0.js')),\n\t\t\t__memo(() => import('./nodes/1.js')),\n\t\t\t__memo(() => import('./nodes/2.js')),\n\t\t\t__memo(() => import('./nodes/3.js'))\n\t\t],\n\t\troutes: [\n\t\t\t{\n\t\t\t\tid: \"/\",\n\t\t\t\tpattern: /^\\/$/,\n\t\t\t\tparams: [],\n\t\t\t\tpage: { layouts: [0,], errors: [1,], leaf: 2 },\n\t\t\t\tendpoint: null\n\t\t\t},\n\t\t\t{\n\t\t\t\tid: \"/player\",\n\t\t\t\tpattern: /^\\/player\\/?$/,\n\t\t\t\tparams: [],\n\t\t\t\tpage: { layouts: [0,], errors: [1,], leaf: 3 },\n\t\t\t\tendpoint: null\n\t\t\t}\n\t\t],\n\t\tprerendered_routes: new Set([]),\n\t\tmatchers: async () => {\n\t\t\t\n\t\t\treturn {  };\n\t\t},\n\t\tserver_assets: {}\n\t}\n}\n})();\n\nexport const prerendered = new Set([]);\n\nexport const base = \"\";"],"names":[],"mappings":"AAAY,MAAC,QAAQ,GAAG,CAAC,MAAM;AAC/B,SAAS,MAAM,CAAC,EAAE,EAAE;AACpB,CAAC,IAAI,KAAK;AACV,CAAC,OAAO,MAAM,KAAK,MAAM,KAAK,GAAG,EAAE,EAAE,CAAC;AACtC;;AAEA,OAAO;AACP,CAAC,MAAM,EAAE,MAAM;AACf,CAAC,OAAO,EAAE,MAAM;AAChB,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC;AAC5M,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC;AAC3D,CAAC,CAAC,EAAE;AACJ,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,GAAG,CAAC,sCAAsC,CAAC,OAAO,CAAC,CAAC,wCAAwC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,sCAAsC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAAC,KAAK,CAAC;AACrhB,EAAE,KAAK,EAAE;AACT,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC;AACtC,GAAG;AACH,EAAE,MAAM,EAAE;AACV,GAAG;AACH,IAAI,EAAE,EAAE,GAAG;AACX,IAAI,OAAO,EAAE,MAAM;AACnB,IAAI,MAAM,EAAE,EAAE;AACd,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;AAClD,IAAI,QAAQ,EAAE;AACd,IAAI;AACJ,GAAG;AACH,IAAI,EAAE,EAAE,SAAS;AACjB,IAAI,OAAO,EAAE,eAAe;AAC5B,IAAI,MAAM,EAAE,EAAE;AACd,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;AAClD,IAAI,QAAQ,EAAE;AACd;AACA,GAAG;AACH,EAAE,kBAAkB,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC;AACjC,EAAE,QAAQ,EAAE,YAAY;AACxB;AACA,GAAG,OAAO,IAAI;AACd,GAAG;AACH,EAAE,aAAa,EAAE;AACjB;AACA;AACA,CAAC;;AAEW,MAAC,WAAW,GAAG,IAAI,GAAG,CAAC,EAAE;;AAEzB,MAAC,IAAI,GAAG;;;;"}
+{"version":3,"file":"manifest.js","sources":["../../.svelte-kit/adapter-node/manifest.js"],"sourcesContent":["export const manifest = (() => {\nfunction __memo(fn) {\n\tlet value;\n\treturn () => value ??= (value = fn());\n}\n\nreturn {\n\tappDir: \"_app\",\n\tappPath: \"_app\",\n\tassets: new Set([\"favicon.ico\",\"favicon.png\",\"icons/144.favicon.png\",\"icons/168.favicon.png\",\"icons/192.favicon.png\",\"icons/48.favicon.png\",\"icons/72.favicon.png\",\"icons/96.favicon.png\",\"manifest.json\"]),\n\tmimeTypes: {\".png\":\"image/png\",\".json\":\"application/json\"},\n\t_: {\n\t\tclient: {start:\"_app/immutable/entry/start.GAUDqQZ9.js\",app:\"_app/immutable/entry/app.BnYS1ESK.js\",imports:[\"_app/immutable/entry/start.GAUDqQZ9.js\",\"_app/immutable/chunks/Bfhjek-f.js\",\"_app/immutable/chunks/CDVeMiAl.js\",\"_app/immutable/chunks/ynvIH2CR.js\",\"_app/immutable/entry/app.BnYS1ESK.js\",\"_app/immutable/chunks/CDVeMiAl.js\",\"_app/immutable/chunks/qSIFE6bv.js\",\"_app/immutable/chunks/CvUX3i4L.js\",\"_app/immutable/chunks/DnG2xkSB.js\",\"_app/immutable/chunks/ynvIH2CR.js\"],stylesheets:[],fonts:[],uses_env_dynamic_public:false},\n\t\tnodes: [\n\t\t\t__memo(() => import('./nodes/0.js')),\n\t\t\t__memo(() => import('./nodes/1.js')),\n\t\t\t__memo(() => import('./nodes/2.js')),\n\t\t\t__memo(() => import('./nodes/3.js'))\n\t\t],\n\t\troutes: [\n\t\t\t{\n\t\t\t\tid: \"/\",\n\t\t\t\tpattern: /^\\/$/,\n\t\t\t\tparams: [],\n\t\t\t\tpage: { layouts: [0,], errors: [1,], leaf: 2 },\n\t\t\t\tendpoint: null\n\t\t\t},\n\t\t\t{\n\t\t\t\tid: \"/player\",\n\t\t\t\tpattern: /^\\/player\\/?$/,\n\t\t\t\tparams: [],\n\t\t\t\tpage: { layouts: [0,], errors: [1,], leaf: 3 },\n\t\t\t\tendpoint: null\n\t\t\t}\n\t\t],\n\t\tprerendered_routes: new Set([]),\n\t\tmatchers: async () => {\n\t\t\t\n\t\t\treturn {  };\n\t\t},\n\t\tserver_assets: {}\n\t}\n}\n})();\n\nexport const prerendered = new Set([]);\n\nexport const base = \"\";"],"names":[],"mappings":"AAAY,MAAC,QAAQ,GAAG,CAAC,MAAM;AAC/B,SAAS,MAAM,CAAC,EAAE,EAAE;AACpB,CAAC,IAAI,KAAK;AACV,CAAC,OAAO,MAAM,KAAK,MAAM,KAAK,GAAG,EAAE,EAAE,CAAC;AACtC;;AAEA,OAAO;AACP,CAAC,MAAM,EAAE,MAAM;AACf,CAAC,OAAO,EAAE,MAAM;AAChB,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC;AAC5M,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC;AAC3D,CAAC,CAAC,EAAE;AACJ,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,GAAG,CAAC,sCAAsC,CAAC,OAAO,CAAC,CAAC,wCAAwC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,sCAAsC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,mCAAmC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAAC,KAAK,CAAC;AACrhB,EAAE,KAAK,EAAE;AACT,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC,CAAC;AACvC,GAAG,MAAM,CAAC,MAAM,OAAO,wBAAc,CAAC;AACtC,GAAG;AACH,EAAE,MAAM,EAAE;AACV,GAAG;AACH,IAAI,EAAE,EAAE,GAAG;AACX,IAAI,OAAO,EAAE,MAAM;AACnB,IAAI,MAAM,EAAE,EAAE;AACd,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;AAClD,IAAI,QAAQ,EAAE;AACd,IAAI;AACJ,GAAG;AACH,IAAI,EAAE,EAAE,SAAS;AACjB,IAAI,OAAO,EAAE,eAAe;AAC5B,IAAI,MAAM,EAAE,EAAE;AACd,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;AAClD,IAAI,QAAQ,EAAE;AACd;AACA,GAAG;AACH,EAAE,kBAAkB,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC;AACjC,EAAE,QAAQ,EAAE,YAAY;AACxB;AACA,GAAG,OAAO,IAAI;AACd,GAAG;AACH,EAAE,aAAa,EAAE;AACjB;AACA;AACA,CAAC;;AAEW,MAAC,WAAW,GAAG,IAAI,GAAG,CAAC,EAAE;;AAEzB,MAAC,IAAI,GAAG;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ambient-display",
-	"version": "1.1.13",
+	"version": "1.1.15",
 	"description": "Like a spotify jam but much worse, but also much better. If you need it, you'll love it.",
 	"type": "module",
 	"bin": {

package/server/spotify/auth.js

@@ -54,6 +54,30 @@ export const SpotifyAuth = {
 	}
 };
 
+export const refreshAuth = async (client_id, client_secret, previous) => {
+	const { error, ...token } = await SpotifyAuth.token.refresh(
+		client_id,
+		client_secret,
+		previous.refresh_token,
+		previous.access_token
+	);
+
+	if (error) {
+		// This is a shot in the dark, but this was throwing sometimes in quick success of accessing, so wondered if its a rate limit thing
+		if (error === 'invalid_request') {
+			return previous;
+		}
+
+		throw new Error('Invalid token');
+	}
+
+	// Intialise the return with the refresh token, in case it didn't come in the refreshed call. Will get overwritten if it did
+	return {
+		refresh_token: previous.refresh_token,
+		...token
+	};
+};
+
 /**
  *
  * @param {OptionsTypes.SpotifyOptions} options
@@ -71,27 +95,9 @@ export async function initialisePreviousAuth({
 		// Parse the object to utilise it
 		const previous = JSON.parse(previousAuth);
 
-		const { error, ...token } = await SpotifyAuth.token.refresh(
-			client_id,
-			client_secret,
-			previous.refresh_token,
-			previous.access_token
-		);
-
-		if (error) {
-			// This is a shot in the dark, but this was throwing sometimes in quick success of accessing, so wondered if its a rate limit thing
-			if (error === 'invalid_request') {
-				return previous;
-			}
-
-			throw new Error('Invalid token');
-		}
+		const token = await refreshAuth(client_id, client_secret, previous);
 
-		// Intialise the return with the refresh token, in case it didn't come in the refreshed call. Will get overwritten if it did
-		return {
-			refresh_token: previous.refresh_token,
-			...token
-		};
+		return token;
 	} catch {
 		return false;
 	}

package/server/spotify/index.js

@@ -3,7 +3,7 @@ import { Router } from 'express';
 import { ERROR } from '../constants.js';
 import { events } from '../events.js';
 import { initialisePreviousAuth, SpotifyAuth } from './auth.js';
-import { persistSdk } from './sdk.js';
+import { initiateSdk, persistSdk } from './sdk.js';
 import { catchAndRetry } from '../utils.js';
 
 // These scoped items are fixed and necessary for the app to run
@@ -24,7 +24,8 @@ const run = async (sdk, options) => {
 
 	// If there is, initialise it while also persisting the auth
 	if (refreshedAuth) {
-		sdk.current = await persistSdk(refreshedAuth, options);
+		await persistSdk(refreshedAuth, options);
+		sdk.current = initiateSdk(refreshedAuth, options);
 	}
 
 	// Initalise a sub router
@@ -92,7 +93,8 @@ const run = async (sdk, options) => {
 			);
 		});
 
-		sdk.current = await persistSdk(accessTokenJson, options);
+		await persistSdk(accessTokenJson, options);
+		sdk.current = initiateSdk(accessTokenJson, options);
 
 		events.system('authenticated');
 

package/server/spotify/sdk.js

@@ -5,7 +5,7 @@ import { events } from '../events.js';
 import { log } from '../logs.js';
 import * as Types from '../types/index.js';
 import * as OptionTypes from '../types/options.js';
-import { SpotifyAuth } from './auth.js';
+import { refreshAuth, SpotifyAuth } from './auth.js';
 import { ERROR } from '../constants.js';
 import path from 'node:path';
 import { expandAliases, __dirname } from '../utils.js';
@@ -99,7 +99,7 @@ const safeBody = async (resp) => {
  */
 export async function persistSdk(
 	accessTokenData,
-	{ spotify: { client_id, client_secret, accessTokenJsonLocation }, verbose }
+	{ spotify: { accessTokenJsonLocation }, verbose }
 ) {
 	const p = path.resolve(expandAliases(accessTokenJsonLocation));
 
@@ -131,11 +131,27 @@ export async function persistSdk(
 
 	// Persist the access token data to disk
 	await fs.writeFile(p, JSON.stringify(accessTokenData), 'utf-8');
+}
+
+/**
+ *
+ * @param {Types.SpotifyAccessToken} accessTokenData
+ * @param {OptionTypes.SpotifyAmbientDisplayOptions} opts
+ * @returns
+ */
+export function initiateSdk(accessTokenData, opts) {
+	const {
+		spotify: { client_id, client_secret }
+	} = opts;
 
 	return new SpotifyApi(
-		new FixedAccessTokenStrategy(client_id, accessTokenData, (_client_id, token) =>
-			SpotifyAuth.token.refresh(client_id, client_secret, token.refresh_token, token.access_token)
-		),
+		new FixedAccessTokenStrategy(client_id, accessTokenData, async (_client_id, token) => {
+			const refreshedToken = await refreshAuth(client_id, client_secret, token);
+
+			await persistSdk(refreshedToken, opts);
+
+			return refreshedToken;
+		}),
 		{
 			deserializer: {
 				async deserialize(response) {

package/build/client/_app/immutable/entry/start.DdZVr3Jo.js

@@ -1 +0,0 @@
-import{l as o,a as r}from"../chunks/jqhKT5WL.js";export{o as load_css,r as start};

package/build/client/_app/immutable/entry/start.DdZVr3Jo.js.br

@@ -1,2 +0,0 @@
-)�import{l as o,a as r}from"../chunks/jqhKT5WL.js";export{o as load_css,r as start};
-