Skip to content

Commit 828dc3b

Browse files
committed
fix(dumb): add temp fix for DUMB
1 parent 9f3a40a commit 828dc3b

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

constants/enums.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
export const SERVICE_KEY = {
22
DMB_API: "dmb_api_service",
33
DMB_FE: "dmb_frontend",
4+
DUMB_API: "dumb_api_service",
5+
DUMB_FE: "dumb_frontend",
46
CLI_DEBRID: "cli_debrid",
57
CLI_BATTERY: "cli_battery",
68
PHALANX_DB: "phalanx_db",
@@ -21,7 +23,7 @@ export const SERVICE_ACTIONS = {
2123
}
2224

2325
export const PROCESS_STATUS = {
24-
RUNNING:'running',
25-
STOPPED:'stopped',
26-
UNKNOWN:'unknown',
26+
RUNNING: 'running',
27+
STOPPED: 'stopped',
28+
UNKNOWN: 'unknown',
2729
}

helper/ServiceTypeLP.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {SERVICE_KEY} from "~/constants/enums.js";
1+
import { SERVICE_KEY } from "~/constants/enums.js";
22

3-
export function serviceTypeLP({logsRaw, serviceKey, processName}) {
3+
export function serviceTypeLP({ logsRaw, serviceKey, processName }) {
44
if (serviceKey === SERVICE_KEY.PGADMIN) return parsepgAdmin4(logsRaw, processName)
55
if (serviceKey === SERVICE_KEY.RCLONE) return parseWebdavLogs(logsRaw, processName)
66
if (serviceKey === SERVICE_KEY.ZURG) return parseZurg(logsRaw, processName)
77
if (serviceKey === SERVICE_KEY.RIVEN_BE) return parseRivenLogs(logsRaw, processName)
8-
if (serviceKey === SERVICE_KEY.DMB_API) return parseDMBLogs(logsRaw, processName)
9-
if (serviceKey === SERVICE_KEY.DMB_FE) return parseDMBLogs(logsRaw, processName)
8+
if (serviceKey === SERVICE_KEY.DMB_API || serviceKey === SERVICE_KEY.DUMB_API) return parseDMBLogs(logsRaw, processName)
9+
if (serviceKey === SERVICE_KEY.DMB_FE || serviceKey === SERVICE_KEY.DUMB_FE) return parseDMBLogs(logsRaw, processName)
1010
if (serviceKey === SERVICE_KEY.CLI_DEBRID) return parseCliDebridLogs(logsRaw, processName)
1111
if (serviceKey === SERVICE_KEY.CLI_BATTERY) return parseCliBatteryLogs(logsRaw, processName)
1212
}
@@ -106,7 +106,7 @@ const parseWebdavLogs = (logText) => {
106106
if (match) {
107107
if (currentEntry) parsedLogs.push(currentEntry);
108108

109-
const [ , timestamp, level, processName, message ] = match;
109+
const [, timestamp, level, processName, message] = match;
110110
currentEntry = {
111111
timestamp: new Date(timestamp),
112112
level: level.trim(),
@@ -134,7 +134,7 @@ const parseCliDebridLogs = (logsRaw, processName) => {
134134
if (match) {
135135
if (currentEntry) parsedLogs.push(currentEntry);
136136

137-
const [ , timestampStr, file, func, lineNum, level, message ] = match;
137+
const [, timestampStr, file, func, lineNum, level, message] = match;
138138
const timePart = timestampStr.split(' ')[1]; // extract HH:MM:SS
139139

140140
currentEntry = {
@@ -166,7 +166,7 @@ const parseCliBatteryLogs = (logsRaw, processName) => {
166166
// Push the previous entry if it exists
167167
if (currentEntry) parsedLogs.push(currentEntry);
168168

169-
const [ , timestampStr, level, message ] = match;
169+
const [, timestampStr, level, message] = match;
170170
const timePart = timestampStr.split(' ')[1]; // extract HH:MM:SS
171171

172172
currentEntry = {
@@ -202,7 +202,7 @@ const parseDMBLogs = (logsRaw, processName) => {
202202
if (match) {
203203
if (currentEntry) parsedLogs.push(currentEntry);
204204

205-
const [ , timestampStr, level, rawProcess, message ] = match;
205+
const [, timestampStr, level, rawProcess, message] = match;
206206
// Remove ANSI codes from message
207207
const cleanMessage = message.replace(ansiRegex, '').trim();
208208
// Parse timestamp and get HH:mm:ss
@@ -212,7 +212,7 @@ const parseDMBLogs = (logsRaw, processName) => {
212212
if (!isNaN(dateObj.getTime())) {
213213
timePart = dateObj.toTimeString().split(' ')[0];
214214
}
215-
} catch (e) {}
215+
} catch (e) { }
216216

217217
currentEntry = {
218218
timestamp: timePart,

server/middleware/proxy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let wsProxy;
55
let uiServiceProxy;
66

77
export default defineEventHandler(async (event) => {
8-
const apiUrl = process.env.DMB_API_URL || 'http://localhost:8000';
8+
const apiUrl = process.env.DMB_API_URL || process.env.DUMB_API_URL || 'http://localhost:8000';
99

1010
if (!apiProxy) {
1111
apiProxy = createProxyMiddleware({

0 commit comments

Comments
 (0)