ldez/new-manga
1
0
Fork 0
mirror of https://github.com/ld3z/new-manga.git synced 2026-11-09 20:33:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

im tired

Browse source
This commit is contained in:
ld3zian 2025-03-28 21:06:21 -07:00
parent 0dc7c9d348
commit 3e98aeccba
1 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/lib/db.ts
View file

@ -510,16 +510,21 @@ export async function getFeedMapping(
if (compressedData) { if (compressedData) {
console.log(`[getFeedMapping] SUCCESS: Found compressed data for ${feedId} on ${clientName}`); console.log(`[getFeedMapping] SUCCESS: Found compressed data for ${feedId} on ${clientName}`);
try { try {
// Decompress and parse (still needed to return the correct format) // Decompress and parse
const buffer = Buffer.from(compressedData, 'base64'); const buffer = Buffer.from(compressedData, 'base64');
const decompressed = await gunzip(buffer); const decompressed = await gunzip(buffer);
const data = JSON.parse(decompressed.toString()); const data = JSON.parse(decompressed.toString());
// --- Replicate the COMPRESSED data using ensurePrimaryAndReplicate --- // --- Add back direct expire on the source client ---
console.log(`[getFeedMapping] Resetting TTL directly on source ${clientName} for compressed key ${compressedKey}`);
client.expire(compressedKey, DEFAULT_CACHE_TTL)
.catch(err => console.warn(`[getFeedMapping] Failed direct TTL reset on ${clientName} for ${compressedKey}:`, err));
// --- End Add back ---
// Replicate the COMPRESSED data using ensurePrimaryAndReplicate
console.log(`[getFeedMapping] Triggering DATA replication for compressed key ${compressedKey}`); console.log(`[getFeedMapping] Triggering DATA replication for compressed key ${compressedKey}`);
ensurePrimaryAndReplicate(clientUrl, compressedKey, compressedData, DEFAULT_CACHE_TTL) // Pass raw compressedData ensurePrimaryAndReplicate(clientUrl, compressedKey, compressedData, DEFAULT_CACHE_TTL)
.catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${compressedKey}:`, err)); .catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${compressedKey}:`, err));
// --- End Change ---
return { return {
slugs: data.slugs, slugs: data.slugs,
@ -538,12 +543,12 @@ export async function getFeedMapping(
console.log(`[getFeedMapping] Checking for regular key: ${regularKey} on ${clientName}`); console.log(`[getFeedMapping] Checking for regular key: ${regularKey} on ${clientName}`);
let jsonString = await client.get(regularKey); // This is the JSON string let jsonString = await client.get(regularKey); // This is the JSON string
// --- Variables to track source if found on replica --- // Variables to track source if found on replica
let foundOnReplica = false; let foundOnReplica = false;
let replicaUrlSource: string | null = null; let replicaUrlSource: string | null = null;
let replicaClientSource: Redis | null = null; // Store the replica client instance
let valueFromReplica: string | null = null; // Store value found on replica let valueFromReplica: string | null = null; // Store value found on replica
let isValueFromReplicaCompressed = false; // Track if replica value was compressed let isValueFromReplicaCompressed = false; // Track if replica value was compressed
// ---
if (jsonString) { if (jsonString) {
console.log(`[getFeedMapping] SUCCESS: Found regular key ${regularKey} on ${clientName}`); console.log(`[getFeedMapping] SUCCESS: Found regular key ${regularKey} on ${clientName}`);
@ -558,38 +563,42 @@ export async function getFeedMapping(
const replicaName = getRedisName(replicaUrl); const replicaName = getRedisName(replicaUrl);
if (replicaClient.status === "ready") { if (replicaClient.status === "ready") {
try { try {
console.log(`[getFeedMapping] Checking replica ${replicaName} for key ${regularKey}`);
// Check compressed key on replica first // Check compressed key on replica first
const replicaCompressedData = await replicaClient.get(compressedKey); // Base64 string const replicaCompressedData = await replicaClient.get(compressedKey); // Base64 string
if (replicaCompressedData) { if (replicaCompressedData) {
console.log(`[getFeedMapping] SUCCESS: Found COMPRESSED key ${compressedKey} on REPLICA ${replicaName}`); console.log(`[getFeedMapping] SUCCESS: Found COMPRESSED key ${compressedKey} on REPLICA ${replicaName}`);
try { try {
// Decompress for return value, but store the raw compressed data for replication // Decompress for return value
const buffer = Buffer.from(replicaCompressedData, 'base64'); const buffer = Buffer.from(replicaCompressedData, 'base64');
const decompressed = await gunzip(buffer); const decompressed = await gunzip(buffer);
const data = JSON.parse(decompressed.toString()); const data = JSON.parse(decompressed.toString());
// --- Replicate the COMPRESSED data found on replica --- // --- Add back direct expire on the source replica client ---
console.log(`[getFeedMapping] Resetting TTL directly on source ${replicaName} for compressed key ${compressedKey}`);
replicaClient.expire(compressedKey, DEFAULT_CACHE_TTL)
.catch(err => console.warn(`[getFeedMapping] Failed direct TTL reset on ${replicaName} for ${compressedKey}:`, err));
// --- End Add back ---
// Replicate the COMPRESSED data found on replica
console.log(`[getFeedMapping] Triggering DATA replication for compressed key ${compressedKey} (found on replica ${replicaName})`); console.log(`[getFeedMapping] Triggering DATA replication for compressed key ${compressedKey} (found on replica ${replicaName})`);
ensurePrimaryAndReplicate(replicaUrl, compressedKey, replicaCompressedData, DEFAULT_CACHE_TTL) // Pass raw replicaCompressedData ensurePrimaryAndReplicate(replicaUrl, compressedKey, replicaCompressedData, DEFAULT_CACHE_TTL)
.catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${compressedKey}:`, err)); .catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${compressedKey}:`, err));
// --- End Change ---
return { slugs: data.slugs, lang: data.lang }; return { slugs: data.slugs, lang: data.lang };
} catch (error) { } catch (error) {
console.error(`[getFeedMapping] Error decompressing data for ${feedId} from REPLICA ${replicaName}:`, error); console.error(`[getFeedMapping] Error decompressing data for ${feedId} from REPLICA ${replicaName}:`, error);
} }
} else { } else {
console.log(`[getFeedMapping] No compressed key found on replica ${replicaName}. Checking regular key ${regularKey}...`); // Check regular key on replica
const replicaJsonString = await replicaClient.get(regularKey); // JSON string const replicaJsonString = await replicaClient.get(regularKey); // JSON string
if (replicaJsonString) { if (replicaJsonString) {
console.log(`[getFeedMapping] SUCCESS: Found REGULAR key ${regularKey} on REPLICA ${replicaName}`); console.log(`[getFeedMapping] SUCCESS: Found REGULAR key ${regularKey} on REPLICA ${replicaName}`);
foundOnReplica = true; foundOnReplica = true;
replicaUrlSource = replicaUrl; replicaUrlSource = replicaUrl;
replicaClientSource = replicaClient; // Store the client instance
valueFromReplica = replicaJsonString; // Store the value found valueFromReplica = replicaJsonString; // Store the value found
isValueFromReplicaCompressed = false; // Mark as not compressed isValueFromReplicaCompressed = false; // Mark as not compressed
jsonString = replicaJsonString; // Use this value going forward jsonString = replicaJsonString; // Use this value going forward
break; // Found on this replica, stop checking others break; // Found on this replica, stop checking others
} else { } else {
console.log(`[getFeedMapping] No regular key found on replica ${replicaName}.`); console.log(`[getFeedMapping] No regular key found on replica ${replicaName}.`);
@ -611,16 +620,21 @@ export async function getFeedMapping(
return null; return null;
} }
// --- Replicate the REGULAR data using ensurePrimaryAndReplicate --- // --- Add back direct expire on the source client (primary or replica) ---
// This block is reached if the regular key was found (either initially or on a replica) const sourceClientForExpire = foundOnReplica ? replicaClientSource! : client;
// AND the compressed key was not found anywhere. const sourceClientNameForExpire = foundOnReplica ? getRedisName(replicaUrlSource!) : clientName;
console.log(`[getFeedMapping] Resetting TTL directly on source ${sourceClientNameForExpire} for regular key ${regularKey}`);
sourceClientForExpire.expire(regularKey, DEFAULT_CACHE_TTL)
.catch(err => console.warn(`[getFeedMapping] Failed direct TTL reset on ${sourceClientNameForExpire} for ${regularKey}:`, err));
// --- End Add back ---
// Replicate the REGULAR data using ensurePrimaryAndReplicate
console.log(`[getFeedMapping] Triggering DATA replication for regular key ${regularKey}`); console.log(`[getFeedMapping] Triggering DATA replication for regular key ${regularKey}`);
const sourceUrlForReplication = foundOnReplica ? replicaUrlSource! : clientUrl; const sourceUrlForReplication = foundOnReplica ? replicaUrlSource! : clientUrl;
ensurePrimaryAndReplicate(sourceUrlForReplication, regularKey, jsonString, DEFAULT_CACHE_TTL) // Pass the jsonString ensurePrimaryAndReplicate(sourceUrlForReplication, regularKey, jsonString, DEFAULT_CACHE_TTL)
.catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${regularKey}:`, err)); .catch(err => console.error(`[getFeedMapping] Error during background DATA replication for ${regularKey}:`, err));
// --- End Change ---
// Parse the result (jsonString has the data from either initial client or replica) // Parse the result
try { try {
const data = JSON.parse(jsonString); const data = JSON.parse(jsonString);
return { return {