Skip to content

fix: auto-refresh token, persist to session, fix Object.keys length b… #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tibrown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: auto-refresh token, persist to session, fix Object.keys length b… #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ function startWebConfig() {
if (valid) {
sendCookiesToEndpoint(configData.settings.appCallbackUrl ? String(configData.settings.appCallbackUrl).replace("/receiveData?", "/cookie?") : null, result);
runTimeData.savedConfig.cookieData = result;
updSessionItem("cookieData", result);
// console.log('RESULT: ' + err + ' / ' + JSON.stringify(result));
logger.info("Successfully Refreshed Alexa Cookie...");
res.send({
Expand Down Expand Up @@ -368,6 +369,44 @@ function startWebServer(checkForCookie = false) {
configFile.save();
logger.silly("Echo Speaks Alexa API is Actively Running at (IP: " + configData.settings.ipAddress + " | Port: " + configData.settings.serverPort + ") | ProcessId: " + process.pid);
runTimeData.guardData = await getGuardDataSupport();
if (!runTimeData.scheduledUpdatesActive) {
// Heroku dynos cycle every ~24h wiping the local filesystem, so refresh
// must fire well within that window to keep the hub's copy of the tokens
// fresh before the dyno restarts and needs to re-fetch them from the hub.
// Locally, 24 hours is plenty since session.json survives restarts.
const REFRESH_INTERVAL_MS = configData.settings.useHeroku === true
? 6 * 60 * 60 * 1000 // 6 hours on Heroku (safe margin under the 24h dyno cycle)
: 24 * 60 * 60 * 1000; // 24 hours locally
logger.info(`Starting scheduled cookie refresh (every ${configData.settings.useHeroku === true ? "6 hours (Heroku)" : "24 hours (local)"})...`);
runTimeData.cookieRefreshInterval = setInterval(() => {
logger.info("Scheduled cookie refresh triggered...");
if (!runTimeData.savedConfig || !runTimeData.savedConfig.cookieData) {
logger.warn("Scheduled refresh skipped: no cookieData in memory.");
return;
}
alexaCookie.refreshAlexaCookie(
{ formerRegistrationData: runTimeData.savedConfig.cookieData },
(err, result) => {
if (result && Object.keys(result).length >= 2) {
isCookieValid(result).then((valid) => {
if (valid) {
runTimeData.savedConfig.cookieData = result;
updSessionItem("cookieData", result);
sendCookiesToEndpoint(configData.settings.appCallbackUrl ? String(configData.settings.appCallbackUrl).replace("/receiveData?", "/cookie?") : null, result);
logger.info("Scheduled cookie refresh completed successfully.");
} else {
logger.error("Scheduled refresh: refreshed cookie failed validation. Clearing auth.");
sendClearAuthToHub();
}
});
} else {
logger.error("Scheduled refresh: failed to obtain new tokens. Error: " + (err && err.message));
}
}
);
}, REFRESH_INTERVAL_MS);
runTimeData.scheduledUpdatesActive = true;
}
}
});
}
Expand Down Expand Up @@ -553,7 +592,7 @@ function alexaLogin(username, password, alexaOptions, callback) {
updSessionItem("cookieData", remoteCookies.cookieData);
config.cookieData = remoteCookies.cookieData;
callback(null, `Login Successful (Retreived from ${configData.settings.hubPlatform})`, config);
} else if (sessionData && sessionData.cookieData && Object.keys(sessionData.cookieData) >= 2) {
} else if (sessionData && sessionData.cookieData && Object.keys(sessionData.cookieData).length >= 2) {
config.cookieData = sessionData.cookieData || {};
callback(null, "Login Successful (Stored Session)", config);
} else {
Expand Down Expand Up @@ -874,7 +913,8 @@ process.on(
function exitHandler(options, exitCode) {
alexaCookie.stopProxyServer();
if (runTimeData.scheduledUpdatesActive) {
// stopScheduledDataUpdates();
if (runTimeData.cookieRefreshInterval) clearInterval(runTimeData.cookieRefreshInterval);
runTimeData.scheduledUpdatesActive = false;
}
if (options.cleanup) {
console.log("clean");
Expand Down