Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-06 19:46:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Update luci-app-podkop package

Browse Source 
* Removed direct package manager calls
* Removed commands related to optional luci package
* Update external global_check call with version pass
* Removed useless external calls in version check cases
* Improved build process support: version will be automatically set at installation time from package metadata and will be readable from JS as constant
This commit is contained in:
SaltyMonkey
2025-10-08 22:09:48 +03:00
parent 6ff543d7fb
commit 28aeb29c51
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ export const STATUS_COLORS = {
WARNING: '#ff9800',
};
export const PODKOP_LUCI_APP_VERSION = '__COMPILED_VERSION_VARIABLE__';
export const FAKEIP_CHECK_DOMAIN = 'fakeip.podkop.fyi';
export const IP_CHECK_DOMAIN = 'ip.podkop.fyi';

10
luci-app-podkop/Makefile
View File

@@ -19,4 +19,12 @@ LUCI_LANGUAGES:=en ru
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)$(HTDOCS)
$(CP) $(PKG_BUILD_DIR)/htdocs/* $(1)$(HTDOCS)/
$(INSTALL_DIR) $(1)/
$(CP) $(PKG_BUILD_DIR)/root/* $(1)/
sed -i -e 's/__COMPILED_VERSION_VARIABLE__/$(PKG_VERSION)/g' $(1)$(HTDOCS)/luci-static/resources/view/podkop/main.js || true
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

20
luci-app-podkop/htdocs/luci-static/resources/view/podkop/diagnosticTab.js
View File

@@ -376,7 +376,7 @@ function showConfigModal(command, title) {
let formattedOutput = '';
if (command === 'global_check') {
safeExec('/usr/bin/podkop', [command], 'P0_PRIORITY', (res) => {
safeExec('/usr/bin/podkop', [command, `${main.PODKOP_LUCI_APP_VERSION}`], 'P0_PRIORITY', (res) => {
formattedOutput = formatDiagnosticOutput(res.stdout || _('No output'));
try {
@@ -918,19 +918,11 @@ async function updateDiagnostics() {
);
});
safeExec(
'/usr/bin/podkop',
['show_luci_version'],
'P2_PRIORITY',
(result) => {
updateTextElement(
'luci-version',
document.createTextNode(
result.stdout ? result.stdout.trim() : _('Unknown'),
),
);
},
);
updateTextElement(
'luci-version',
document.createTextNode(
`${main.PODKOP_LUCI_APP_VERSION}`
),
safeExec(
'/usr/bin/podkop',

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

@@ -592,6 +592,7 @@ var STATUS_COLORS = {
ERROR: "#f44336",
WARNING: "#ff9800"
};
var PODKOP_LUCI_APP_VERSION = "__COMPILED_VERSION_VARIABLE__";
var FAKEIP_CHECK_DOMAIN = "fakeip.podkop.fyi";
var IP_CHECK_DOMAIN = "ip.podkop.fyi";
var REGIONAL_OPTIONS = [
@@ -1913,6 +1914,7 @@ return baseclass.extend({
FETCH_TIMEOUT,
IP_CHECK_DOMAIN,
REGIONAL_OPTIONS,
PODKOP_LUCI_APP_VERSION,
STATUS_COLORS,
TabService,
TabServiceInstance,