Compare commits
7 Commits
78c050a6fa
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f21a400c82 | ||
|
|
73e953f579 | ||
|
|
71116f9f6e | ||
|
|
13eccdd3cc | ||
|
|
c447dc51ee | ||
|
|
5fb60b069f | ||
|
|
fb68c1ad5d |
@@ -1,12 +1,15 @@
|
|||||||
// engage-api/get-activity.ts
|
// engage-api/get-activity.ts
|
||||||
import axios from 'axios';
|
import axios, { type AxiosRequestConfig } from 'axios';
|
||||||
import { logger } from '../utils/logger';
|
import { logger } from '../utils/logger';
|
||||||
import {
|
import {
|
||||||
ensureSingleLogin,
|
ensureSingleLogin,
|
||||||
loadCachedCookies,
|
|
||||||
saveCookiesToCache,
|
saveCookiesToCache,
|
||||||
clearCookieCache,
|
clearCookieCache,
|
||||||
getCachedCookieString
|
getCachedCookieString,
|
||||||
|
backupCookies,
|
||||||
|
restoreCookieBackup,
|
||||||
|
tryAcquireAuthLock,
|
||||||
|
releaseAuthCooldown
|
||||||
} from '../services/playwright-auth';
|
} from '../services/playwright-auth';
|
||||||
|
|
||||||
// Define interfaces for our data structures
|
// Define interfaces for our data structures
|
||||||
@@ -45,12 +48,14 @@ async function getCompleteCookies(userName: string, userPwd: string): Promise<st
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get activity details from API
|
* Get activity details from API
|
||||||
|
* Only returns data on HTTP 200. Returns null on any error (5xx, timeout, etc.)
|
||||||
*/
|
*/
|
||||||
async function getActivityDetailsRaw(
|
async function getActivityDetailsRaw(
|
||||||
activityId: string,
|
activityId: string,
|
||||||
cookies: string,
|
cookies: string,
|
||||||
maxRetries: number = 3,
|
maxRetries: number = 3,
|
||||||
timeoutMilliseconds: number = 10000
|
timeoutMilliseconds: number = 10000,
|
||||||
|
signal?: AbortSignal
|
||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const url = 'https://engage.nkcswx.cn/Services/ActivitiesService.asmx/GetActivityDetails';
|
const url = 'https://engage.nkcswx.cn/Services/ActivitiesService.asmx/GetActivityDetails';
|
||||||
const headers = {
|
const headers = {
|
||||||
@@ -64,15 +69,40 @@ async function getActivityDetailsRaw(
|
|||||||
};
|
};
|
||||||
|
|
||||||
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
||||||
|
if (signal?.aborted) {
|
||||||
|
logger.debug(`Activity ${activityId} aborted before attempt ${attempt + 1}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
logger.debug(`Attempt ${attempt + 1}/${maxRetries} for activity ${activityId} - Sending POST request to ${url}`);
|
logger.debug(`Attempt ${attempt + 1}/${maxRetries} for activity ${activityId} - Sending POST request to ${url}`);
|
||||||
const response = await axios.post(url, payload, {
|
const response = await axios.post(url, payload, {
|
||||||
headers,
|
headers,
|
||||||
timeout: timeoutMilliseconds,
|
timeout: timeoutMilliseconds,
|
||||||
responseType: 'text',
|
responseType: 'text',
|
||||||
// Add additional timeout safety
|
signal,
|
||||||
maxRedirects: 5
|
maxRedirects: 5
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// CRITICAL: Only accept HTTP 200. Reject all other status codes including 5xx
|
||||||
|
if (response.status !== 200) {
|
||||||
|
logger.error(`Non-200 status ${response.status} for activity ${activityId}. NOT updating cache to preserve local data.`);
|
||||||
|
|
||||||
|
// IMPORTANT: Only 500 is cookie expiration. Other 5xx (502/503/504) are real server outages.
|
||||||
|
// The backend returns 500 when cookie is expired but session not yet invalidated.
|
||||||
|
// It takes several hours before it returns 401/403.
|
||||||
|
// 502/503/504 are real server errors (bad gateway, service unavailable, gateway timeout)
|
||||||
|
if (response.status === 500) {
|
||||||
|
logger.warn(`Server error 500 - this is cookie expiration. Throwing AuthenticationError to trigger immediate re-login.`);
|
||||||
|
throw new AuthenticationError(`Received 500 for activity ${activityId} - expired cookie`, 500);
|
||||||
|
} else if (response.status >= 500 && response.status < 600) {
|
||||||
|
// Real server outage (502/503/504), preserve cache and don't re-login
|
||||||
|
logger.error(`Real server outage ${response.status} - preserving local cache, not re-login.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return null immediately on non-200 errors
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
logger.debug(`Attempt ${attempt + 1}/${maxRetries} for activity ${activityId} - Received response status ${response.status}`);
|
logger.debug(`Attempt ${attempt + 1}/${maxRetries} for activity ${activityId} - Received response status ${response.status}`);
|
||||||
const outerData = JSON.parse(response.data);
|
const outerData = JSON.parse(response.data);
|
||||||
if (outerData && typeof outerData.d === 'string') {
|
if (outerData && typeof outerData.d === 'string') {
|
||||||
@@ -86,9 +116,10 @@ async function getActivityDetailsRaw(
|
|||||||
logger.error(`Unexpected API response structure for activity ${activityId}.`);
|
logger.error(`Unexpected API response structure for activity ${activityId}.`);
|
||||||
}
|
}
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
|
|
||||||
// Only treat 401 (Unauthorized) and 403 (Forbidden) as authentication errors
|
// Only treat 401 (Unauthorized) and 403 (Forbidden) as authentication errors
|
||||||
// 404 (Not Found) is valid - activity doesn't exist
|
// 404 (Not Found) is valid - activity doesn't exist
|
||||||
// Other 4xx errors should not trigger re-authentication
|
// Other 4xx/5xx errors should not trigger re-authentication
|
||||||
if (error.response && (error.response.status === 401 || error.response.status === 403)) {
|
if (error.response && (error.response.status === 401 || error.response.status === 403)) {
|
||||||
logger.warn(`Authentication error (${error.response.status}) while fetching activity ${activityId}. Cookie may be invalid.`);
|
logger.warn(`Authentication error (${error.response.status}) while fetching activity ${activityId}. Cookie may be invalid.`);
|
||||||
throw new AuthenticationError(`Received ${error.response.status} for activity ${activityId}`, error.response.status);
|
throw new AuthenticationError(`Received ${error.response.status} for activity ${activityId}`, error.response.status);
|
||||||
@@ -97,10 +128,21 @@ async function getActivityDetailsRaw(
|
|||||||
|
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
logger.error(`Status: ${error.response.status}, Data (getActivityDetailsRaw): ${ String(error.response.data).slice(0,100)}...`);
|
logger.error(`Status: ${error.response.status}, Data (getActivityDetailsRaw): ${ String(error.response.data).slice(0,100)}...`);
|
||||||
|
// IMPORTANT: Only 500 is cookie expiration. Other 5xx (502/503/504) are real server outages.
|
||||||
|
// The backend returns 500 when cookie is expired but session not yet invalidated.
|
||||||
|
// 502/503/504 are real server errors (bad gateway, service unavailable, gateway timeout)
|
||||||
|
if (error.response.status === 500) {
|
||||||
|
logger.warn(`Server error 500 - this is cookie expiration. Throwing AuthenticationError to trigger immediate re-login.`);
|
||||||
|
throw new AuthenticationError(`Received 500 for activity ${activityId} - expired cookie`, 500);
|
||||||
|
} else if (error.response.status >= 500 && error.response.status < 600) {
|
||||||
|
// Real server outage (502/503/504), preserve cache and don't re-login
|
||||||
|
logger.error(`Real server outage ${error.response.status} - preserving local cache, not re-login.`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (attempt === maxRetries - 1) {
|
if (attempt === maxRetries - 1) {
|
||||||
logger.error(`All ${maxRetries} retries failed for activity ${activityId}.`);
|
logger.error(`All ${maxRetries} retries failed for activity ${activityId}.`);
|
||||||
throw error;
|
// Don't throw on network/timeout errors, just return null to preserve cache
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
await new Promise(resolve => setTimeout(resolve, 1000 * (attempt + 1)));
|
await new Promise(resolve => setTimeout(resolve, 1000 * (attempt + 1)));
|
||||||
}
|
}
|
||||||
@@ -121,6 +163,7 @@ export async function fetchActivityData(
|
|||||||
userName: string,
|
userName: string,
|
||||||
userPwd: string,
|
userPwd: string,
|
||||||
forceLogin: boolean = false,
|
forceLogin: boolean = false,
|
||||||
|
signal?: AbortSignal
|
||||||
): Promise<any | null> {
|
): Promise<any | null> {
|
||||||
let currentCookie = forceLogin ? null : await getCachedCookieString();
|
let currentCookie = forceLogin ? null : await getCachedCookieString();
|
||||||
|
|
||||||
@@ -130,17 +173,10 @@ export async function fetchActivityData(
|
|||||||
currentCookie = null;
|
currentCookie = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Optimization: Skip pre-validation, directly request data
|
|
||||||
// Only validate/re-login when we get 4xx error (fail-fast strategy)
|
|
||||||
if (!currentCookie) {
|
if (!currentCookie) {
|
||||||
logger.info('No cached cookie found. Attempting login...');
|
logger.info('No cached cookie found. Attempting login...');
|
||||||
try {
|
try {
|
||||||
currentCookie = await getCompleteCookies(userName, userPwd);
|
currentCookie = await getCompleteCookies(userName, userPwd);
|
||||||
|
|
||||||
const cookies = await loadCachedCookies();
|
|
||||||
if (cookies) {
|
|
||||||
await saveCookiesToCache(cookies);
|
|
||||||
}
|
|
||||||
} catch (loginError) {
|
} catch (loginError) {
|
||||||
logger.error(`Login process failed: ${(loginError as Error).message}`);
|
logger.error(`Login process failed: ${(loginError as Error).message}`);
|
||||||
return null;
|
return null;
|
||||||
@@ -152,11 +188,12 @@ export async function fetchActivityData(
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
logger.debug('Using cached cookie for API request.');
|
logger.debug('Using cached cookie for API request.');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
logger.debug(`Calling getActivityDetailsRaw for activity ${activityId}...`);
|
logger.debug(`Calling getActivityDetailsRaw for activity ${activityId}...`);
|
||||||
const rawActivityDetailsString = await getActivityDetailsRaw(activityId, currentCookie);
|
const rawActivityDetailsString = await getActivityDetailsRaw(activityId, currentCookie, 3, 10000, signal);
|
||||||
logger.debug(`getActivityDetailsRaw returned for activity ${activityId}`);
|
logger.debug(`getActivityDetailsRaw returned for activity ${activityId}`);
|
||||||
if (rawActivityDetailsString) {
|
if (rawActivityDetailsString) {
|
||||||
const parsedOuter = JSON.parse(rawActivityDetailsString);
|
const parsedOuter = JSON.parse(rawActivityDetailsString);
|
||||||
@@ -165,22 +202,28 @@ export async function fetchActivityData(
|
|||||||
logger.warn(`No data returned from getActivityDetailsRaw for activity ${activityId}, but no authentication error was thrown.`);
|
logger.warn(`No data returned from getActivityDetailsRaw for activity ${activityId}, but no authentication error was thrown.`);
|
||||||
return null;
|
return null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (signal?.aborted) {
|
||||||
|
logger.debug(`Activity ${activityId} fetch aborted.`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
if (error instanceof AuthenticationError) {
|
if (error instanceof AuthenticationError) {
|
||||||
// Cookie returned 4xx, now validate and re-login
|
// Throttle: prevent thundering herd from multiple 500 errors
|
||||||
logger.warn(`API returned 4xx error (Status: ${error.status}). Cookie may be invalid. Attempting re-login and retry.`);
|
if (!tryAcquireAuthLock()) {
|
||||||
|
logger.info(`Auth throttled for activity ${activityId}. Reusing current cookies — likely still valid.`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Backup cookies before clearing so we can restore on re-login failure
|
||||||
|
backupCookies();
|
||||||
await clearCookieCache();
|
await clearCookieCache();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
logger.info('Attempting re-login due to authentication failure...');
|
logger.info('Attempting re-login due to authentication failure...');
|
||||||
currentCookie = await getCompleteCookies(userName, userPwd);
|
currentCookie = await getCompleteCookies(userName, userPwd);
|
||||||
|
releaseAuthCooldown();
|
||||||
const cookies = await loadCachedCookies();
|
|
||||||
if (cookies) {
|
|
||||||
await saveCookiesToCache(cookies);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info('Re-login successful. Retrying request for activity details...');
|
logger.info('Re-login successful. Retrying request for activity details...');
|
||||||
const rawActivityDetailsStringRetry = await getActivityDetailsRaw(activityId, currentCookie);
|
const rawActivityDetailsStringRetry = await getActivityDetailsRaw(activityId, currentCookie, 1, 10000, signal);
|
||||||
if (rawActivityDetailsStringRetry) {
|
if (rawActivityDetailsStringRetry) {
|
||||||
const parsedOuterRetry = JSON.parse(rawActivityDetailsStringRetry);
|
const parsedOuterRetry = JSON.parse(rawActivityDetailsStringRetry);
|
||||||
return JSON.parse(parsedOuterRetry.d);
|
return JSON.parse(parsedOuterRetry.d);
|
||||||
@@ -188,7 +231,9 @@ export async function fetchActivityData(
|
|||||||
logger.warn(`Still no details for activity ${activityId} after re-login and retry.`);
|
logger.warn(`Still no details for activity ${activityId} after re-login and retry.`);
|
||||||
return null;
|
return null;
|
||||||
} catch (retryLoginOrFetchError) {
|
} catch (retryLoginOrFetchError) {
|
||||||
logger.error(`Error during re-login or retry fetch for activity ${activityId}: ${(retryLoginOrFetchError as Error).message}`);
|
logger.error(`Re-login or retry failed for activity ${activityId}: ${(retryLoginOrFetchError as Error).message}`);
|
||||||
|
// Restore old cookies instead of leaving cache empty
|
||||||
|
await restoreCookieBackup();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ MAX_ACTIVITY_ID_SCAN=8000
|
|||||||
|
|
||||||
# Maximum concurrent API calls during crawling (default: 8)
|
# Maximum concurrent API calls during crawling (default: 8)
|
||||||
# Higher values = faster crawling but more server load
|
# Higher values = faster crawling but more server load
|
||||||
# Set to 1 for sequential processing (slow but safe)
|
|
||||||
CONCURRENT_API_CALLS=8
|
CONCURRENT_API_CALLS=8
|
||||||
|
|
||||||
# Request timeout in milliseconds (default: 25000 = 25 seconds)
|
# Request timeout in milliseconds (default: 25000 = 25 seconds)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import {
|
|||||||
import { uploadImageFromBase64, listS3Objects, constructS3Url } from './s3-service';
|
import { uploadImageFromBase64, listS3Objects, constructS3Url } from './s3-service';
|
||||||
import { extractBase64Image } from '../utils/image-processor';
|
import { extractBase64Image } from '../utils/image-processor';
|
||||||
import { logger } from '../utils/logger';
|
import { logger } from '../utils/logger';
|
||||||
import { BatchProcessor, executeWithConcurrencyAndProgress } from '../utils/semaphore';
|
import { BatchProcessor } from '../utils/semaphore';
|
||||||
|
|
||||||
import type { ActivityData } from '../models/activity';
|
import type { ActivityData } from '../models/activity';
|
||||||
|
|
||||||
@@ -30,37 +30,6 @@ const STAFF_UPDATE_INTERVAL_MINS = parseInt(process.env.STAFF_UPDATE_INTERVAL_MI
|
|||||||
const FIXED_STAFF_ACTIVITY_ID = process.env.FIXED_STAFF_ACTIVITY_ID;
|
const FIXED_STAFF_ACTIVITY_ID = process.env.FIXED_STAFF_ACTIVITY_ID;
|
||||||
const S3_IMAGE_PREFIX = (process.env.S3_PUBLIC_URL_PREFIX || 'files').replace(/\/$/, '');
|
const S3_IMAGE_PREFIX = (process.env.S3_PUBLIC_URL_PREFIX || 'files').replace(/\/$/, '');
|
||||||
|
|
||||||
/**
|
|
||||||
* Extracts S3 object key from a public URL.
|
|
||||||
* Handles both S3_PUBLIC_URL and S3_ENDPOINT formats.
|
|
||||||
*
|
|
||||||
* Examples:
|
|
||||||
* - https://cdn.example.com/bucket/files/abc123.avif → files/abc123.avif
|
|
||||||
* - https://s3.amazonaws.com/bucket/files/abc123.avif → files/abc123.avif
|
|
||||||
*
|
|
||||||
* @param url - The full S3 public URL
|
|
||||||
* @returns The object key (e.g., "files/abc123.avif") or null if parsing fails
|
|
||||||
*/
|
|
||||||
function extractObjectKeyFromUrl(url: string): string | null {
|
|
||||||
try {
|
|
||||||
const urlObj = new URL(url);
|
|
||||||
const path = urlObj.pathname;
|
|
||||||
|
|
||||||
const parts = path.replace(/^\//, '').split('/').filter(p => p);
|
|
||||||
|
|
||||||
if (parts.length >= 2) {
|
|
||||||
const key = parts.slice(1).join('/');
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.warn(`Failed to extract object key from URL: ${url} - insufficient path parts`);
|
|
||||||
return null;
|
|
||||||
} catch (error) {
|
|
||||||
logger.warn(`Failed to parse URL: ${url}`, error);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Crawler concurrency configuration
|
// Crawler concurrency configuration
|
||||||
const CONCURRENT_API_CALLS = parseInt(process.env.CONCURRENT_API_CALLS || '8', 10);
|
const CONCURRENT_API_CALLS = parseInt(process.env.CONCURRENT_API_CALLS || '8', 10);
|
||||||
const CRAWLER_REQUEST_TIMEOUT_MS = parseInt(process.env.CRAWLER_REQUEST_TIMEOUT_MS || '25000', 10);
|
const CRAWLER_REQUEST_TIMEOUT_MS = parseInt(process.env.CRAWLER_REQUEST_TIMEOUT_MS || '25000', 10);
|
||||||
@@ -73,31 +42,61 @@ let skippedCount = 0;
|
|||||||
/**
|
/**
|
||||||
* Process and cache a single activity
|
* Process and cache a single activity
|
||||||
* @param activityId - The activity ID to process
|
* @param activityId - The activity ID to process
|
||||||
|
* @param forceUpdate - If true, update cache even on fetch failure (default: false)
|
||||||
* @returns The processed activity data
|
* @returns The processed activity data
|
||||||
*/
|
*/
|
||||||
async function processAndCacheActivity(activityId: string): Promise<ActivityData> {
|
async function processAndCacheActivity(activityId: string, forceUpdate: boolean = false): Promise<ActivityData> {
|
||||||
logger.debug(`Processing activity ID: ${activityId}`);
|
logger.debug(`Processing activity ID: ${activityId}`);
|
||||||
try {
|
try {
|
||||||
if (!USERNAME || !PASSWORD) {
|
if (!USERNAME || !PASSWORD) {
|
||||||
throw new Error('API username or password not configured');
|
throw new Error('API username or password not configured');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add timeout protection for the entire fetch operation
|
// Add timeout protection via AbortController - properly cancels orphaned fetches
|
||||||
logger.debug(`Fetching activity data for ID: ${activityId}`);
|
logger.debug(`Fetching activity data for ID: ${activityId}`);
|
||||||
const activityJson = await Promise.race([
|
const controller = new AbortController();
|
||||||
fetchActivityData(activityId, USERNAME, PASSWORD, false),
|
const timeoutId = setTimeout(
|
||||||
new Promise((_, reject) =>
|
() => controller.abort(),
|
||||||
setTimeout(() => reject(new Error(`Timeout fetching activity ${activityId} after ${CRAWLER_REQUEST_TIMEOUT_MS}ms`)), CRAWLER_REQUEST_TIMEOUT_MS + 5000)
|
CRAWLER_REQUEST_TIMEOUT_MS + 5000
|
||||||
)
|
);
|
||||||
]);
|
|
||||||
|
let activityJson: any = null;
|
||||||
|
try {
|
||||||
|
activityJson = await fetchActivityData(
|
||||||
|
activityId,
|
||||||
|
USERNAME,
|
||||||
|
PASSWORD,
|
||||||
|
false,
|
||||||
|
controller.signal
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (controller.signal.aborted) {
|
||||||
|
logger.warn(`Request for activity ${activityId} timed out after ${CRAWLER_REQUEST_TIMEOUT_MS + 5000}ms. Cancelling orphaned fetch.`);
|
||||||
|
// Preserve existing cache on timeout
|
||||||
|
const existingData = await getActivityData(activityId);
|
||||||
|
return existingData || { lastCheck: new Date().toISOString(), error: `Timeout after ${CRAWLER_REQUEST_TIMEOUT_MS + 5000}ms` };
|
||||||
|
}
|
||||||
let structuredActivity: ActivityData;
|
let structuredActivity: ActivityData;
|
||||||
|
|
||||||
if (!activityJson) {
|
if (!activityJson) {
|
||||||
logger.info(`No data found for activity ID ${activityId} from engage API. Caching as empty.`);
|
// CRITICAL: Only cache empty data if forceUpdate is true
|
||||||
structuredActivity = {
|
// This prevents 5xx errors from overwriting valid local data
|
||||||
lastCheck: new Date().toISOString(),
|
if (forceUpdate) {
|
||||||
source: 'api-fetch-empty'
|
logger.info(`No data found for activity ID ${activityId} from engage API. Force updating cache.`);
|
||||||
};
|
structuredActivity = {
|
||||||
|
lastCheck: new Date().toISOString(),
|
||||||
|
source: 'api-fetch-empty'
|
||||||
|
};
|
||||||
|
await setActivityData(activityId, structuredActivity);
|
||||||
|
return structuredActivity;
|
||||||
|
} else {
|
||||||
|
logger.warn(`No data for activity ${activityId}. Preserving existing cache - NOT updating.`);
|
||||||
|
const existingData = await getActivityData(activityId);
|
||||||
|
return existingData || { lastCheck: new Date().toISOString(), source: 'cache-preserved' };
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
structuredActivity = await structActivityData(activityJson);
|
structuredActivity = await structActivityData(activityJson);
|
||||||
if (structuredActivity && structuredActivity.photo &&
|
if (structuredActivity && structuredActivity.photo &&
|
||||||
@@ -125,12 +124,19 @@ async function processAndCacheActivity(activityId: string): Promise<ActivityData
|
|||||||
return structuredActivity;
|
return structuredActivity;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`Error processing activity ID ${activityId}:`, error);
|
logger.error(`Error processing activity ID ${activityId}:`, error);
|
||||||
const errorData: ActivityData = {
|
// CRITICAL: On error, preserve existing cache instead of overwriting with error data
|
||||||
lastCheck: new Date().toISOString(),
|
if (forceUpdate) {
|
||||||
error: "Failed to fetch or process"
|
const errorData: ActivityData = {
|
||||||
};
|
lastCheck: new Date().toISOString(),
|
||||||
await setActivityData(activityId, errorData);
|
error: "Failed to fetch or process"
|
||||||
return errorData;
|
};
|
||||||
|
await setActivityData(activityId, errorData);
|
||||||
|
return errorData;
|
||||||
|
} else {
|
||||||
|
logger.warn(`Error fetching activity ${activityId}. Preserving existing cache.`);
|
||||||
|
const existingData = await getActivityData(activityId);
|
||||||
|
return existingData || { lastCheck: new Date().toISOString(), error: (error as Error).message };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,39 @@ let _inMemoryCookies: Cookie[] | null = null;
|
|||||||
// Login lock to prevent concurrent login attempts
|
// Login lock to prevent concurrent login attempts
|
||||||
let _loginLock: Promise<Cookie[]> | null = null;
|
let _loginLock: Promise<Cookie[]> | null = null;
|
||||||
|
|
||||||
|
// Cookie backup: preserved before clearCookieCache, restored on re-login failure
|
||||||
|
let _cookieBackup: Cookie[] | null = null;
|
||||||
|
|
||||||
|
// Auth failure throttle: debounce consecutive re-login triggers from 500 errors
|
||||||
|
// Prevents thundering herd when server is slow and returns many 500s
|
||||||
|
let _authFailureCooldownUntil = 0;
|
||||||
|
const AUTH_FAILURE_COOLDOWN_MS = 15000; // 15s cooldown between re-login cycles
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put all callers to wait during auth cooldown window.
|
||||||
|
* Returns true if auth is allowed (outside cooldown), false if throttled.
|
||||||
|
*/
|
||||||
|
export function tryAcquireAuthLock(): boolean {
|
||||||
|
const now = Date.now();
|
||||||
|
if (now < _authFailureCooldownUntil) {
|
||||||
|
const remaining = _authFailureCooldownUntil - now;
|
||||||
|
logger.warn(
|
||||||
|
`Re-login throttled: ${Math.round(remaining / 1000)}s cooldown remaining. ` +
|
||||||
|
`Existing cookies are likely still valid — server 500 is a temporary slowdown.`
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called after a successful re-login to release the cooldown.
|
||||||
|
*/
|
||||||
|
export function releaseAuthCooldown(): void {
|
||||||
|
_authFailureCooldownUntil = Date.now() + AUTH_FAILURE_COOLDOWN_MS;
|
||||||
|
logger.info(`Auth cooldown set: ${AUTH_FAILURE_COOLDOWN_MS}ms to prevent thundering herd re-logins.`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensure only one login process runs at a time
|
* Ensure only one login process runs at a time
|
||||||
*/
|
*/
|
||||||
@@ -178,8 +211,40 @@ export async function saveCookiesToCache(cookies: Cookie[]): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Backup current cookies before clearing. Restored if re-login fails.
|
||||||
|
*/
|
||||||
|
export function backupCookies(): Cookie[] | null {
|
||||||
|
if (_inMemoryCookies) {
|
||||||
|
_cookieBackup = [..._inMemoryCookies];
|
||||||
|
logger.info('Cookies backed up before clear.');
|
||||||
|
}
|
||||||
|
return _cookieBackup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restore cookies from backup after failed re-login.
|
||||||
|
*/
|
||||||
|
export async function restoreCookieBackup(): Promise<boolean> {
|
||||||
|
if (_cookieBackup) {
|
||||||
|
_inMemoryCookies = _cookieBackup;
|
||||||
|
try {
|
||||||
|
await fs.promises.writeFile(COOKIE_FILE_PATH, JSON.stringify(_cookieBackup, null, 2), 'utf-8');
|
||||||
|
logger.info('Cookies restored from backup successfully.');
|
||||||
|
_cookieBackup = null;
|
||||||
|
return true;
|
||||||
|
} catch (error: any) {
|
||||||
|
logger.error('Failed to restore cookies from backup:', error.message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.warn('No cookie backup available for restore.');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear cookie cache
|
* Clear cookie cache
|
||||||
|
* Prefer backupAndClearCookieCache() instead to preserve old cookies.
|
||||||
*/
|
*/
|
||||||
export async function clearCookieCache(): Promise<void> {
|
export async function clearCookieCache(): Promise<void> {
|
||||||
_inMemoryCookies = null;
|
_inMemoryCookies = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user