Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2026-01-27 12:50:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add skip next checks if sb is not running

Browse Source
This commit is contained in:
divocat
2025-10-15 21:24:56 +03:00
parent c0b35c865d
commit d8b7e12c4d
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe-app-podkop/src/podkop/methods/shell/index.ts
View File

@@ -80,4 +80,6 @@ export const PodkopShellMethods = {
callBaseMethod<unknown>(Podkop.AvailableMethods.SHOW_SING_BOX_CONFIG), callBaseMethod<unknown>(Podkop.AvailableMethods.SHOW_SING_BOX_CONFIG),
checkLogs: async () => checkLogs: async () =>
callBaseMethod<unknown>(Podkop.AvailableMethods.CHECK_LOGS), callBaseMethod<unknown>(Podkop.AvailableMethods.CHECK_LOGS),
getSystemInfo: async () =>
callBaseMethod<unknown>(Podkop.AvailableMethods.GET_SYSTEM_INFO),
}; };

2
fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts
View File

@@ -101,7 +101,7 @@ export async function runSingBoxCheck() {
], ],
}); });
if (!atLeastOneGood) { if (!atLeastOneGood || !data.sing_box_process_running) {
throw new Error('Sing-box checks failed'); throw new Error('Sing-box checks failed');
} }
} }

3
fe-app-podkop/src/podkop/tabs/diagnostic/initController.ts
View File

@@ -68,6 +68,7 @@ async function handleRestart() {
restart: { loading: false }, restart: { loading: false },
}, },
}); });
store.reset(['diagnosticsChecks']);
}, 5000); }, 5000);
} }
} }
@@ -93,6 +94,7 @@ async function handleStop() {
stop: { loading: false }, stop: { loading: false },
}, },
}); });
store.reset(['diagnosticsChecks']);
} }
} }
@@ -118,6 +120,7 @@ async function handleStart() {
start: { loading: false }, start: { loading: false },
}, },
}); });
store.reset(['diagnosticsChecks']);
}, 5000); }, 5000);
} }
} }

1
fe-app-podkop/src/podkop/types.ts
View File

@@ -67,6 +67,7 @@ export namespace Podkop {
GLOBAL_CHECK = 'global_check', GLOBAL_CHECK = 'global_check',
SHOW_SING_BOX_CONFIG = 'show_sing_box_config', SHOW_SING_BOX_CONFIG = 'show_sing_box_config',
CHECK_LOGS = 'check_logs', CHECK_LOGS = 'check_logs',
GET_SYSTEM_INFO = 'get_system_info',
} }
export enum AvailableClashAPIMethods { export enum AvailableClashAPIMethods {

9
luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js
View File

@@ -449,6 +449,7 @@ var Podkop;
AvailableMethods2["GLOBAL_CHECK"] = "global_check"; AvailableMethods2["GLOBAL_CHECK"] = "global_check";
AvailableMethods2["SHOW_SING_BOX_CONFIG"] = "show_sing_box_config"; AvailableMethods2["SHOW_SING_BOX_CONFIG"] = "show_sing_box_config";
AvailableMethods2["CHECK_LOGS"] = "check_logs"; AvailableMethods2["CHECK_LOGS"] = "check_logs";
AvailableMethods2["GET_SYSTEM_INFO"] = "get_system_info";
})(AvailableMethods = Podkop2.AvailableMethods || (Podkop2.AvailableMethods = {})); })(AvailableMethods = Podkop2.AvailableMethods || (Podkop2.AvailableMethods = {}));
let AvailableClashAPIMethods; let AvailableClashAPIMethods;
((AvailableClashAPIMethods2) => { ((AvailableClashAPIMethods2) => {
@@ -520,7 +521,8 @@ var PodkopShellMethods = {
), ),
globalCheck: async () => callBaseMethod(Podkop.AvailableMethods.GLOBAL_CHECK), globalCheck: async () => callBaseMethod(Podkop.AvailableMethods.GLOBAL_CHECK),
showSingBoxConfig: async () => callBaseMethod(Podkop.AvailableMethods.SHOW_SING_BOX_CONFIG), showSingBoxConfig: async () => callBaseMethod(Podkop.AvailableMethods.SHOW_SING_BOX_CONFIG),
checkLogs: async () => callBaseMethod(Podkop.AvailableMethods.CHECK_LOGS) checkLogs: async () => callBaseMethod(Podkop.AvailableMethods.CHECK_LOGS),
getSystemInfo: async () => callBaseMethod(Podkop.AvailableMethods.GET_SYSTEM_INFO)
}; };
// src/podkop/methods/custom/getDashboardSections.ts // src/podkop/methods/custom/getDashboardSections.ts
@@ -2172,7 +2174,7 @@ async function runSingBoxCheck() {
} }
] ]
}); });
if (!atLeastOneGood) { if (!atLeastOneGood || !data.sing_box_process_running) {
throw new Error("Sing-box checks failed"); throw new Error("Sing-box checks failed");
} }
} }
@@ -3244,6 +3246,7 @@ async function handleRestart() {
restart: { loading: false } restart: { loading: false }
} }
}); });
store.reset(["diagnosticsChecks"]);
}, 5e3); }, 5e3);
} }
} }
@@ -3267,6 +3270,7 @@ async function handleStop() {
stop: { loading: false } stop: { loading: false }
} }
}); });
store.reset(["diagnosticsChecks"]);
} }
} }
async function handleStart() { async function handleStart() {
@@ -3290,6 +3294,7 @@ async function handleStart() {
start: { loading: false } start: { loading: false }
} }
}); });
store.reset(["diagnosticsChecks"]);
}, 5e3); }, 5e3);
} }
} }