MythEclipse/GMW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(shared): reorder AppError constructor to (message, code, status), add singleton logger, retry and TTL cache utilities

Browse Source
This commit is contained in:
MythEclipse
2026-06-02 21:06:42 +07:00
parent 9045e7e347
commit 2d79d8aefd
50 changed files with 401 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/backend/src/modules/analysis/analysis.routes.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { analysisService } from "./analysis.service.js";
services/backend/src/modules/analysis/analysis.service.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { sql } from "drizzle-orm";
import { config } from "../../shared/config/index.js";
import { getDatabase } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("analysis.service");
services/backend/src/modules/analytics/analytics.controller.ts
+6 -10
View File
@@ -1,18 +1,14 @@
import type { NextFunction, Request, Response } from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { createChildLogger } from "@bete/shared/logger";
import {
asyncHandler,
requireParam,
} from "../../shared/middlewares/index.js";
import { analyticsQuerySchema } from "./analytics.schema.js";
import { analyticsService } from "./analytics.service.js";
const logger = createChildLogger("analytics.controller");
function requireQueryString(value: unknown, name: string): string {
if (typeof value !== "string" || value.length === 0) {
throw new Error(`Missing query parameter: ${name}`);
}
return value;
}
export function handleGetOverview(
req: Request,
res: Response,
@@ -32,7 +28,7 @@ export function handleGetDailyTrend(
next: NextFunction,
) {
return asyncHandler(async (req: Request, res: Response) => {
const guildId = requireQueryString(req.query.guildId, "guildId");
const guildId = requireParam(req.query.guildId, "query parameter", "guildId");
const hours = req.query.hours ? Number(req.query.hours) : 24;
logger.debug({ guildId, hours }, "Handling get daily trend");
const result = await analyticsService.getDailyTrend(guildId, hours);
services/backend/src/modules/analytics/analytics.repository.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { getPool } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("analytics.repository");
services/backend/src/modules/analytics/analytics.service.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { config } from "../../shared/config/index.js";
import { ForbiddenError, ValidationError } from "../../shared/errors/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { ForbiddenError, ValidationError } from "@bete/shared/errors";
import { createChildLogger } from "@bete/shared/logger";
import { analyticsRepository } from "./analytics.repository.js";
import type { AnalyticsQuery } from "./analytics.schema.js";
services/backend/src/modules/auth/auth.routes.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { config } from "../../shared/config/index.js";
import { UnauthorizedError } from "../../shared/errors/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { UnauthorizedError } from "@bete/shared/errors";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
const logger = createChildLogger("auth.routes");
services/backend/src/modules/health/health.repository.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { getPool } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("health.repository");
services/backend/src/modules/health/health.service.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { healthRepository } from "./health.repository.js";
const logger = createChildLogger("health.service");
services/backend/src/modules/media/media.routes.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { queue, skip, stop, setVolume, getStatus } from "./media.service.js";
services/backend/src/modules/media/media.service.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { publishCommand, readRedisStatus } from "../../shared/redis/index.js";
const logger = createChildLogger("media.service");
services/backend/src/modules/messages/messages.controller.ts
+8 -15
View File
@@ -1,21 +1,14 @@
import type { NextFunction, Request, Response } from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { createChildLogger } from "@bete/shared/logger";
import {
asyncHandler,
requireParam,
} from "../../shared/middlewares/index.js";
import { messageQuerySchema } from "./messages.schema.js";
import { messagesService } from "./messages.service.js";
const logger = createChildLogger("messages.controller");
function requireRouteParam(
value: string | string[] | undefined,
name: string,
): string {
if (typeof value !== "string" || value.length === 0) {
throw new Error(`Missing route parameter: ${name}`);
}
return value;
}
export function handleListMessages(
req: Request,
res: Response,
@@ -35,7 +28,7 @@ export function handleGetMessagesByChannel(
next: NextFunction,
) {
return asyncHandler(async (req: Request, res: Response) => {
const channelId = requireRouteParam(req.params.channelId, "channelId");
const channelId = requireParam(req.params.channelId, "route parameter", "channelId");
const query = messageQuerySchema.parse(req.query);
logger.debug({ channelId, query }, "Handling get messages by channel");
const result = await messagesService.getMessagesByChannel(channelId, query);
@@ -49,7 +42,7 @@ export function handleGetMessageById(
next: NextFunction,
) {
return asyncHandler(async (req: Request, res: Response) => {
const id = requireRouteParam(req.params.id, "id");
const id = requireParam(req.params.id, "route parameter", "id");
logger.debug({ id }, "Handling get message by ID");
const result = await messagesService.getMessageById(id);
res.json(result);
@@ -62,7 +55,7 @@ export function handleGetAttachmentsByChannel(
next: NextFunction,
) {
return asyncHandler(async (req: Request, res: Response) => {
const channelId = requireRouteParam(req.params.channelId, "channelId");
const channelId = requireParam(req.params.channelId, "route parameter", "channelId");
const query = messageQuerySchema.parse(req.query);
logger.debug({ channelId, query }, "Handling get attachments by channel");
const result = await messagesService.getAttachmentsByChannel(
services/backend/src/modules/messages/messages.repository.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { getPool } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import type {
MessageCreate,
MessageQuery,
services/backend/src/modules/messages/messages.routes.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { getPool } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
import {
handleGetAttachmentsByChannel,
services/backend/src/modules/messages/messages.service.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { NotFoundError, ValidationError } from "../../shared/errors/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { NotFoundError, ValidationError } from "@bete/shared/errors";
import { createChildLogger } from "@bete/shared/logger";
import { messagesRepository } from "./messages.repository.js";
import type { MessageQuery } from "./messages.schema.js";
services/backend/src/modules/recordings/recordings.routes.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { recordingsService } from "./recordings.service.js";
services/backend/src/modules/recordings/recordings.service.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { sql } from "drizzle-orm";
import { getDatabase } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("recordings.service");
services/backend/src/modules/ui-state/ui-state.routes.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import type { Request, Response, Router } from "express";
import express from "express";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
import { asyncHandler } from "../../shared/middlewares/index.js";
import { uiStateService } from "./ui-state.service.js";
services/backend/src/modules/ui-state/ui-state.service.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { sql } from "drizzle-orm";
import { getDatabase } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("ui-state.service");
services/backend/src/modules/voice/voice.service.ts
+33 -129
View File
@@ -1,7 +1,9 @@
import Redis from "ioredis";
import { config } from "../../shared/config/index.js";
import { getPool } from "../../shared/database/index.js";
import { createChildLogger } from "../../shared/logger/index.js";
import {
publishCommand,
readRedisStatus,
} from "../../shared/redis/index.js";
import { createChildLogger } from "@bete/shared/logger";
const logger = createChildLogger("voice.service");
@@ -24,109 +26,14 @@ export interface VoiceStatus {
activeChannelName: string | null;
}
interface CommandReply {
id: string;
success: boolean;
data: unknown;
error?: string;
}
// --- Redis command client ---
let commandRedis: Redis | null = null;
let statusRedis: Redis | null = null;
function getCommandRedis(): Redis {
if (!commandRedis) {
commandRedis = config.REDIS_URL
? new Redis(config.REDIS_URL, { keyPrefix: "" })
: new Redis({
host: config.REDIS_HOST,
port: config.REDIS_PORT,
keyPrefix: "",
});
}
return commandRedis;
}
function getStatusRedis(): Redis {
if (!statusRedis) {
statusRedis = config.REDIS_URL
? new Redis(config.REDIS_URL, { keyPrefix: "" })
: new Redis({
host: config.REDIS_HOST,
port: config.REDIS_PORT,
keyPrefix: "",
});
}
return statusRedis;
}
async function sendCommand<T = unknown>(
type: string,
payload: Record<string, unknown>,
timeoutMs = 10000,
): Promise<T | null> {
const redis = getCommandRedis();
const id = `${type}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
const replyChannel = `backend:command:reply:${id}`;
return new Promise<T | null>((resolve) => {
const timer = setTimeout(() => {
redis.unsubscribe(replyChannel).catch(() => {});
resolve(null);
}, timeoutMs);
redis.subscribe(replyChannel, (err) => {
if (err) {
clearTimeout(timer);
resolve(null);
return;
}
});
const handler = (_ch: string, msg: string) => {
if (_ch === replyChannel) {
clearTimeout(timer);
redis.unsubscribe(replyChannel).catch(() => {});
try {
const reply: CommandReply = JSON.parse(msg);
resolve(reply.success ? (reply.data as T) : null);
} catch {
resolve(null);
}
}
};
redis.on("message", handler);
redis
.publish(
"backend:command",
JSON.stringify({ id, type, payload, replyChannel }),
)
.catch(() => {
clearTimeout(timer);
resolve(null);
});
});
}
async function readStatus<T>(key: string): Promise<T | null> {
try {
const val = await getStatusRedis().get(key);
return val ? (JSON.parse(val) as T) : null;
} catch {
return null;
}
}
/**
* Get guilds — query from discord-gateway via Redis command for real names.
* Falls back to database (distinct guild_id from messages) if gateway unreachable.
*/
export async function getGuilds(): Promise<Guild[]> {
const fromGateway = await sendCommand<Guild[]>("guilds:list", {});
if (fromGateway && fromGateway.length > 0) return fromGateway;
const reply = await publishCommand<Guild[]>("guilds:list", {});
if (reply?.success && reply.data && reply.data.length > 0)
return reply.data;
// Fallback: Postgres with synthetic names
logger.warn(
@@ -149,10 +56,11 @@ export async function getGuilds(): Promise<Guild[]> {
* Falls back to database if gateway unreachable.
*/
export async function getTextChannels(guildId: string): Promise<Channel[]> {
const fromGateway = await sendCommand<Channel[]>("guilds:text-channels", {
const reply = await publishCommand<Channel[]>("guilds:text-channels", {
guildId,
});
if (fromGateway && fromGateway.length > 0) return fromGateway;
if (reply?.success && reply.data && reply.data.length > 0)
return reply.data;
// Fallback: Postgres with synthetic names
logger.warn(
@@ -176,16 +84,16 @@ export async function getTextChannels(guildId: string): Promise<Channel[]> {
* Get voice channels — query from discord-gateway via Redis command.
*/
export async function getVoiceChannels(guildId: string): Promise<Channel[]> {
const channels = await sendCommand<Channel[]>("voice:channels", { guildId });
return channels ?? [];
const reply = await publishCommand<Channel[]>("voice:channels", { guildId });
return reply?.success && reply.data ? reply.data : [];
}
/**
* Get current voice connection status from Redis cache set by discord-gateway.
*/
export async function getVoiceStatus(): Promise<VoiceStatus> {
const cached = await readStatus<VoiceStatus>("voice:status");
if (cached) return cached;
const cached = await readRedisStatus("voice:status");
if (cached) return cached as unknown as VoiceStatus;
return {
connected: false,
activeGuildId: null,
@@ -201,38 +109,34 @@ export async function connectVoice(
guildId: string,
channelId: string,
): Promise<VoiceStatus> {
const result = await sendCommand<VoiceStatus>("voice:connect", {
const reply = await publishCommand<VoiceStatus>("voice:connect", {
guildId,
channelId,
});
if (result) return result;
if (reply?.success && reply.data) return reply.data;
// Fallback: read from Redis status key
const cached = await readStatus<VoiceStatus>("voice:status");
return (
cached ?? {
connected: false,
activeGuildId: null,
activeChannelId: null,
activeChannelName: null,
}
);
const cached = await readRedisStatus("voice:status");
return (cached as unknown as VoiceStatus) ?? {
connected: false,
activeGuildId: null,
activeChannelId: null,
activeChannelName: null,
};
}
/**
* Disconnect from voice via Redis command to discord-gateway.
*/
export async function disconnectVoice(): Promise<VoiceStatus> {
const result = await sendCommand<VoiceStatus>("voice:disconnect", {});
if (result) return result;
const reply = await publishCommand<VoiceStatus>("voice:disconnect", {});
if (reply?.success && reply.data) return reply.data;
const cached = await readStatus<VoiceStatus>("voice:status");
return (
cached ?? {
connected: false,
activeGuildId: null,
activeChannelId: null,
activeChannelName: null,
}
);
const cached = await readRedisStatus("voice:status");
return (cached as unknown as VoiceStatus) ?? {
connected: false,
activeGuildId: null,
activeChannelId: null,
activeChannelName: null,
};
}