mirror of
https://github.com/TencentCloud/TencentDB-Agent-Memory
synced 2026-07-29 05:34:31 +00:00
fix(gateway): route local L2 timers to scene extraction (#227)
* fix(gateway): route local L2 timers to scene extraction Signed-off-by: Ziyang Guo <121015044+RerankerGuo@users.noreply.github.com> * Delete src/gateway/timer-routing.test.ts --------- Signed-off-by: Ziyang Guo <121015044+RerankerGuo@users.noreply.github.com> Co-authored-by: honchow <honchow@qq.com>
This commit is contained in:
+6
-55
@@ -67,6 +67,7 @@ import type { TimerScanner } from "../services/timer-scanner.js";
|
|||||||
import type { PipelineWorker } from "../services/pipeline-worker.js";
|
import type { PipelineWorker } from "../services/pipeline-worker.js";
|
||||||
import type { StatefulPipelineManager } from "../utils/stateful-pipeline-manager.js";
|
import type { StatefulPipelineManager } from "../utils/stateful-pipeline-manager.js";
|
||||||
import type { PipelineLogger } from "../utils/pipeline-factory.js";
|
import type { PipelineLogger } from "../utils/pipeline-factory.js";
|
||||||
|
import { createLocalTimerTask } from "./timer-routing.js";
|
||||||
|
|
||||||
const TAG = "[tdai-gateway]";
|
const TAG = "[tdai-gateway]";
|
||||||
const VERSION = "0.1.0";
|
const VERSION = "0.1.0";
|
||||||
@@ -1134,63 +1135,13 @@ export class TdaiGateway {
|
|||||||
type: backendType,
|
type: backendType,
|
||||||
local: backendType === "local" ? {
|
local: backendType === "local" ? {
|
||||||
onTimerExpired: (entry) => {
|
onTimerExpired: (entry) => {
|
||||||
// Parse timer member by prefix: "offload-{type}:{instanceId}:{sessionId}[:{extra}]"
|
|
||||||
// or legacy "session:L2_schedule"
|
|
||||||
const member = entry.member;
|
const member = entry.member;
|
||||||
let taskType: string;
|
const task = createLocalTimerTask({
|
||||||
let instanceId: string;
|
entry,
|
||||||
let sessionId: string;
|
defaultInstanceId: this.config.instanceId ?? "default",
|
||||||
|
});
|
||||||
const firstColon = member.indexOf(":");
|
|
||||||
const prefix = firstColon > 0 ? member.slice(0, firstColon) : member;
|
|
||||||
|
|
||||||
if (prefix === "offload-l1" || prefix === "offload-l15" || prefix === "offload-l2") {
|
|
||||||
taskType = prefix;
|
|
||||||
// Format: "offload-{type}:{instanceId}:{sessionId}[:{mmdFile}]"
|
|
||||||
// instanceId is the segment right after the prefix
|
|
||||||
const rest = member.slice(firstColon + 1);
|
|
||||||
const instanceEnd = rest.indexOf(":");
|
|
||||||
if (instanceEnd > 0) {
|
|
||||||
instanceId = rest.slice(0, instanceEnd);
|
|
||||||
sessionId = rest.slice(instanceEnd + 1);
|
|
||||||
} else {
|
|
||||||
instanceId = this.config.instanceId ?? "default";
|
|
||||||
sessionId = rest;
|
|
||||||
}
|
|
||||||
// For offload-l2: strip trailing ":{mmdFile}" from sessionId
|
|
||||||
// (mmdFile is extracted separately from timerMember in the executor)
|
|
||||||
if (prefix === "offload-l2" && sessionId.endsWith(".mmd")) {
|
|
||||||
const lastColon = sessionId.lastIndexOf(":");
|
|
||||||
if (lastColon > 0) {
|
|
||||||
sessionId = sessionId.slice(0, lastColon);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Legacy format: "sessionId:L2_schedule" or "sessionId:L1_idle"
|
|
||||||
const lastColon = member.lastIndexOf(":");
|
|
||||||
const suffix = lastColon >= 0 ? member.slice(lastColon + 1) : "";
|
|
||||||
sessionId = lastColon >= 0 ? member.slice(0, lastColon) : member;
|
|
||||||
taskType = suffix === "L2_schedule" ? "offload-l2" : suffix === "L1_idle" ? "offload-l1" : "L3";
|
|
||||||
instanceId = this.config.instanceId ?? "default";
|
|
||||||
}
|
|
||||||
const now = Date.now();
|
|
||||||
// Extract targetMmdFile from member for offload-l2 (needed by pipeline-worker lockKey)
|
|
||||||
let targetMmdFile: string | undefined;
|
|
||||||
if (taskType === "offload-l2") {
|
|
||||||
const mmdMatch = member.match(/(\d+-[^:]+\.mmd)$/);
|
|
||||||
if (mmdMatch) targetMmdFile = mmdMatch[1];
|
|
||||||
}
|
|
||||||
const task = {
|
|
||||||
id: `${taskType}-${sessionId}-${now}`,
|
|
||||||
type: taskType as any,
|
|
||||||
instanceId,
|
|
||||||
sessionId,
|
|
||||||
priority: 0,
|
|
||||||
createdAt: now,
|
|
||||||
data: { triggeredBy: "timer_scanner", timerMember: member, instanceId, targetMmdFile },
|
|
||||||
};
|
|
||||||
this.stateBackend!.enqueueTask(task).then(() => {
|
this.stateBackend!.enqueueTask(task).then(() => {
|
||||||
this.logger.info(`[local-timer] Timer fired: ${member} → enqueued ${taskType} task`);
|
this.logger.info(`[local-timer] Timer fired: ${member} → enqueued ${task.type} task`);
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
this.logger.error(`[local-timer] Failed to enqueue task for ${member}: ${err instanceof Error ? err.message : String(err)}`);
|
this.logger.error(`[local-timer] Failed to enqueue task for ${member}: ${err instanceof Error ? err.message : String(err)}`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import type { TaskPayload, TimerEntry } from "../core/state/types.js";
|
||||||
|
|
||||||
|
export interface LocalTimerTaskOptions {
|
||||||
|
entry: TimerEntry;
|
||||||
|
defaultInstanceId: string;
|
||||||
|
now?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createLocalTimerTask(options: LocalTimerTaskOptions): TaskPayload {
|
||||||
|
const member = options.entry.member;
|
||||||
|
const now = options.now ?? Date.now();
|
||||||
|
let taskType: TaskPayload["type"];
|
||||||
|
let instanceId: string;
|
||||||
|
let sessionId: string;
|
||||||
|
|
||||||
|
const firstColon = member.indexOf(":");
|
||||||
|
const prefix = firstColon > 0 ? member.slice(0, firstColon) : member;
|
||||||
|
|
||||||
|
if (prefix === "offload-l1" || prefix === "offload-l15" || prefix === "offload-l2") {
|
||||||
|
taskType = prefix;
|
||||||
|
const rest = member.slice(firstColon + 1);
|
||||||
|
const instanceEnd = rest.indexOf(":");
|
||||||
|
if (instanceEnd > 0) {
|
||||||
|
instanceId = rest.slice(0, instanceEnd);
|
||||||
|
sessionId = rest.slice(instanceEnd + 1);
|
||||||
|
} else {
|
||||||
|
instanceId = options.defaultInstanceId;
|
||||||
|
sessionId = rest;
|
||||||
|
}
|
||||||
|
if (prefix === "offload-l2" && sessionId.endsWith(".mmd")) {
|
||||||
|
const lastColon = sessionId.lastIndexOf(":");
|
||||||
|
if (lastColon > 0) {
|
||||||
|
sessionId = sessionId.slice(0, lastColon);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const lastColon = member.lastIndexOf(":");
|
||||||
|
const suffix = lastColon >= 0 ? member.slice(lastColon + 1) : "";
|
||||||
|
sessionId = lastColon >= 0 ? member.slice(0, lastColon) : member;
|
||||||
|
taskType = suffix === "L2_schedule" ? "L2" : suffix === "L1_idle" ? "L1" : "L3";
|
||||||
|
instanceId = options.defaultInstanceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
let targetMmdFile: string | undefined;
|
||||||
|
if (taskType === "offload-l2") {
|
||||||
|
const mmdMatch = member.match(/(\d+-[^:]+\.mmd)$/);
|
||||||
|
if (mmdMatch) targetMmdFile = mmdMatch[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: `${taskType}-${sessionId}-${now}`,
|
||||||
|
type: taskType,
|
||||||
|
instanceId,
|
||||||
|
sessionId,
|
||||||
|
priority: 0,
|
||||||
|
createdAt: now,
|
||||||
|
data: { triggeredBy: "timer_scanner", timerMember: member, instanceId, targetMmdFile },
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user