wkulhanek/bonob
1
0
Fork 0
mirror of https://github.com/wkulhanek/bonob.git synced 2025-12-21 17:33:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix token expiration

Browse Source
This commit is contained in:
Wolfgang Kulhanek
2025-10-17 11:14:10 +02:00
parent 593555bc82
commit fb1a6d9eac
2 changed files with 73 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/smapi.ts
View File

@@ -410,6 +410,15 @@ function bindSmapiSoapServiceToExpress(
) {
const sonosSoap = new SonosSoap(bonobUrl, linkCodes, smapiAuthTokens, clock, tokenStore);
// Clean up expired tokens every hour
setInterval(() => {
try {
tokenStore.cleanupExpired(smapiAuthTokens);
} catch (error) {
logger.error("Failed to cleanup expired tokens", { error });
}
}, 60 * 60 * 1000).unref(); // Run every hour, but don't prevent process exit
const urlWithToken = (accessToken: string) =>
bonobUrl.append({
searchParams: {
@@ -462,10 +471,14 @@ function bindSmapiSoapServiceToExpress(
);
};
const swapToken = (expiredToken:string) => (newToken:SmapiToken) => {
logger.debug("oldToken: "+expiredToken);
logger.debug("newToken: "+JSON.stringify(newToken));
sonosSoap.associateCredentialsForToken(newToken.token, newToken, expiredToken);
const swapToken = (expiredToken: string | undefined) => (newToken: SmapiToken) => {
logger.debug("oldToken: " + expiredToken);
logger.debug("newToken: " + JSON.stringify(newToken));
if (expiredToken) {
sonosSoap.associateCredentialsForToken(newToken.token, newToken, expiredToken);
} else {
sonosSoap.associateCredentialsForToken(newToken.token, newToken);
}
return TE.right(newToken);
}
@@ -513,10 +526,12 @@ function bindSmapiSoapServiceToExpress(
throw SMAPI_FAULT_LOGIN_UNAUTHORIZED;
});
} else if (isExpiredTokenError(authOrFail)) {
// Don't pass old token here to avoid circular reference issues with Jest/SOAP
// Old expired tokens will be cleaned up by TTL or manual cleanup later
throw await pipe(
musicService.refreshToken(authOrFail.expiredToken),
TE.map((it) => smapiAuthTokens.issue(it.serviceToken)),
TE.tap(swapToken(authOrFail.expiredToken)),
TE.tap(swapToken(undefined)),
TE.map((newToken) => ({
Fault: {
faultcode: "Client.TokenRefreshRequired",
@@ -579,10 +594,12 @@ function bindSmapiSoapServiceToExpress(
throw fault.toSmapiFault();
})
);
// Don't pass old token here to avoid circular reference issues with Jest/SOAP
// Old expired tokens will be cleaned up by TTL or manual cleanup later
return pipe(
musicService.refreshToken(serviceToken),
TE.map((it) => smapiAuthTokens.issue(it.serviceToken)),
TE.tap(swapToken(serviceToken)), // ignores the return value, like a tee or peek
TE.tap(swapToken(undefined)), // ignores the return value, like a tee or peek
TE.map((it) => ({
refreshAuthTokenResult: {
authToken: it.token,