race condition
This commit is contained in:
@@ -15,6 +15,7 @@ const path = require('path');
|
|||||||
|
|
||||||
let oauthClient = null;
|
let oauthClient = null;
|
||||||
let _lastSavedAccessToken = null;
|
let _lastSavedAccessToken = null;
|
||||||
|
let refreshInFlight = null; // single-flight lock for concurrent token refresh
|
||||||
const tokenFile = path.join(__dirname, 'qbo_token.json');
|
const tokenFile = path.join(__dirname, 'qbo_token.json');
|
||||||
|
|
||||||
const getOAuthClient = () => {
|
const getOAuthClient = () => {
|
||||||
@@ -110,25 +111,34 @@ async function makeQboApiCall(requestOptions) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const doRefresh = async () => {
|
const doRefresh = async () => {
|
||||||
|
if (refreshInFlight) {
|
||||||
|
console.log(`[${ts()}] ⏳ Awaiting in-flight token refresh...`);
|
||||||
|
return refreshInFlight;
|
||||||
|
}
|
||||||
console.log(`[${ts()}] 🔄 QBO Token Refresh...`);
|
console.log(`[${ts()}] 🔄 QBO Token Refresh...`);
|
||||||
const refreshTokenStr = currentToken.refresh_token;
|
const refreshTokenStr = currentToken.refresh_token;
|
||||||
try {
|
refreshInFlight = (async () => {
|
||||||
const authResponse = await client.refreshUsingToken(refreshTokenStr);
|
try {
|
||||||
console.log(`[${ts()}] ✅ Token refreshed via refreshUsingToken()`);
|
const authResponse = await client.refreshUsingToken(refreshTokenStr);
|
||||||
saveTokens(); // saveTokens prüft selbst ob sich was geändert hat
|
console.log(`[${ts()}] ✅ Token refreshed via refreshUsingToken()`);
|
||||||
return authResponse;
|
saveTokens();
|
||||||
} catch (e) {
|
return authResponse;
|
||||||
const errMsg = e.originalMessage || e.message || String(e);
|
} catch (e) {
|
||||||
console.error(`[${ts()}] ❌ Refresh failed: ${errMsg}`);
|
const errMsg = e.originalMessage || e.message || String(e);
|
||||||
if (e.intuit_tid) console.error(` intuit_tid: ${e.intuit_tid}`);
|
console.error(`[${ts()}] ❌ Refresh failed: ${errMsg}`);
|
||||||
if (errMsg.includes('invalid_grant')) {
|
if (e.intuit_tid) console.error(` intuit_tid: ${e.intuit_tid}`);
|
||||||
throw new Error(
|
if (errMsg.includes('invalid_grant')) {
|
||||||
"Der Refresh Token ist bei Intuit ungültig (invalid_grant). " +
|
throw new Error(
|
||||||
"Bitte im Playground einen neuen Token holen und set_qbo_token.js ausführen."
|
"Der Refresh Token ist bei Intuit ungültig (invalid_grant). " +
|
||||||
);
|
"Bitte im Playground einen neuen Token holen und set_qbo_token.js ausführen."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
} finally {
|
||||||
|
refreshInFlight = null;
|
||||||
}
|
}
|
||||||
throw e;
|
})();
|
||||||
}
|
return refreshInFlight;
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user