luci-app-https-dns-proxy: add status->overview include file

* add status->overview include file
* sync version to principal package
* minor code formatting/styling fixes for js files
* improve HTTP/2 and HTTP/3 detection in RPCD script

Signed-off-by: Stan Grishin <stangri@melmac.ca>

1 files changed, 152 insertions, 0 deletions

diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js
new file mode 100644
index 0000000000..1f22f6d6d7
--- /dev/null
+++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js
@@ -0,0 +1,152 @@
+"require ui";
+"require rpc";
+"require uci";
+"require form";
+"require baseclass";
+
+var pkg = {
+	get Name() {
+		return "https-dns-proxy";
+	},
+	get URL() {
+		return "https://docs.openwrt.melmac.net/" + pkg.Name + "/";
+	},
+	templateToRegexp: function (template) {
+		return RegExp(
+			"^" +
+				template
+					.split(/(\{\w+\})/g)
+					.map((part) => {
+						let placeholder = part.match(/^\{(\w+)\}$/);
+						if (placeholder) return `(?<${placeholder[1]}>.*?)`;
+						else return part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+					})
+					.join("") +
+				"$"
+		);
+	},
+};
+
+var getInitStatus = rpc.declare({
+	object: "luci." + pkg.Name,
+	method: "getInitStatus",
+	params: ["name"],
+});
+
+var getPlatformSupport = rpc.declare({
+	object: "luci." + pkg.Name,
+	method: "getPlatformSupport",
+	params: ["name"],
+});
+
+var getProviders = rpc.declare({
+	object: "luci." + pkg.Name,
+	method: "getProviders",
+	params: ["name"],
+});
+
+var getRuntime = rpc.declare({
+	object: "luci." + pkg.Name,
+	method: "getRuntime",
+	params: ["name"],
+});
+
+return baseclass.extend({
+	title: _("HTTPS DNS Proxy Instances"),
+
+	load: function () {
+		return Promise.all([
+			getInitStatus(pkg.Name),
+			getProviders(pkg.Name),
+			getRuntime(pkg.Name),
+		]);
+	},
+
+	render: function (data) {
+		var reply = {
+			status: (data[0] && data[0][pkg.Name]) || {
+				enabled: null,
+				running: null,
+				force_dns_active: null,
+				version: null,
+			},
+			providers: (data[1] && data[1][pkg.Name]) || { providers: [] },
+			runtime: (data[2] && data[2][pkg.Name]) || { instances: [] },
+		};
+		reply.providers.sort(function (a, b) {
+			return _(a.title).localeCompare(_(b.title));
+		});
+		reply.providers.push({
+			title: "Custom",
+			template: "{option}",
+			params: { option: { type: "text" } },
+		});
+
+		var forceDnsText = "";
+		if (reply.status.force_dns_active) {
+			reply.status.force_dns_ports.forEach((element) => {
+				forceDnsText += element + " ";
+			});
+		} else {
+			forceDnsText = "-";
+		}
+
+		var table = E(
+			"table",
+			{ class: "table", id: "https-dns-proxy_status_table" },
+			[
+				E("tr", { class: "tr table-titles" }, [
+					E("th", { class: "th" }, _("Name / Type")),
+					E("th", { class: "th" }, _("Listen Address")),
+					E("th", { class: "th" }, _("Listen Port")),
+					E("th", { class: "th" }, _("Force DNS Ports")),
+				]),
+			]
+		);
+
+		var rows = [];
+		Object.values(reply.runtime.instances).forEach((element) => {
+			var resolver;
+			var address;
+			var port;
+			var name;
+			var option;
+			var found;
+			element.command.forEach((param, index, arr) => {
+				if (param === "-r") resolver = arr[index + 1];
+				if (param === "-a") address = arr[index + 1];
+				if (param === "-p") port = arr[index + 1];
+			});
+			resolver = resolver || "Unknown";
+			address = address || "127.0.0.1";
+			port = port || "Unknown";
+			reply.providers.forEach((prov) => {
+				let regexp = pkg.templateToRegexp(prov.template);
+				if (!found && regexp.test(resolver)) {
+					found = true;
+					name = _(prov.title);
+					let match = resolver.match(regexp);
+					if (match[1] != null) {
+						if (
+							prov.params &&
+							prov.params.option &&
+							prov.params.option.options
+						) {
+							prov.params.option.options.forEach((opt) => {
+								if (opt.value === match[1]) option = _(opt.description);
+							});
+							name += " (" + option + ")";
+						} else {
+							if (match[1] !== "") name += " (" + match[1] + ")";
+						}
+					}
+				}
+			});
+			rows.push([name, address, port, forceDnsText]);
+		});
+
+		cbi_update_table(table, rows, E("em", _("There are no active instances.")));
+
+		return table;
+	},
+});