From 2cde307e20b98ef63120b7f744111319618a4451 Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Wed, 30 Nov 2022 21:02:39 -0500
Subject: [PATCH] add news: url support

---
 zefie_wtvp_minisrv/app.js                                 | 2 +-
 zefie_wtvp_minisrv/includes/ServiceVault/news/catchall.js | 5 +++++
 zefie_wtvp_minisrv/includes/config.json                   | 6 ++++++
 zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj             | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/news/catchall.js

diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index b1d484bf..95672578 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -194,7 +194,7 @@ function getServiceString(service, overrides = {}) {
     // used externally by service scripts
     if (service === "all") {
         var out = "";
-        Object.keys(minisrv_config.services).forEach(function (k) {
+        Object.keys(minisrv_config.services).sort().forEach(function (k) {
             if (!isConfiguredService(k)) return true;
             if (minisrv_config.services[k].pc_services) return true;
 
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/news/catchall.js b/zefie_wtvp_minisrv/includes/ServiceVault/news/catchall.js
new file mode 100644
index 00000000..8592b08e
--- /dev/null
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/news/catchall.js
@@ -0,0 +1,5 @@
+var minisrv_service_file = true;
+
+var dest_url = "wtv-news:/news?group=" + request_headers.request_url.split(":")[1];
+headers = `300 Moved
+Location: ${dest_url}`
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index b178cc8d..6e8d404b 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -144,6 +144,12 @@
       ],
       "groupMetaRefreshInterval": 86400 // not yet used
     },
+    "news": {
+      // for news:group.name urls
+      "port": 1605,
+      "nobind": true,
+      "flags": "0x00000004"
+    },
     "wtv-register": {
       // wtv-register
       "port": 1607,
diff --git a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
index f3d834e8..ce4cee72 100644
--- a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
+++ b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
@@ -196,6 +196,9 @@
     <Content Include="includes\ServiceVault\http_pc\favicon.ico" />
     <Content Include="includes\ServiceVault\http_pc\index.js" />
     <Content Include="includes\ServiceVault\http_pc\viewergen\index.js" />
+    <Content Include="includes\ServiceVault\news\catchall.js">
+      <SubType>Code</SubType>
+    </Content>
     <Content Include="includes\ServiceVault\SharedROMCache\AccountBanner.gif" />
     <Content Include="includes\ServiceVault\SharedROMCache\AroundTownIcon2.gif" />
     <Content Include="includes\ServiceVault\SharedROMCache\AT_BannerGradient.gif" />
@@ -2337,6 +2340,7 @@
     <Folder Include="includes\ServiceVault\" />
     <Folder Include="includes\ServiceVault\http_pc\" />
     <Folder Include="includes\ServiceVault\http_pc\viewergen\" />
+    <Folder Include="includes\ServiceVault\news\" />
     <Folder Include="includes\ServiceVault\SharedROMCache\" />
     <Folder Include="includes\ServiceVault\SharedROMCache\help\" />
     <Folder Include="includes\ServiceVault\SharedROMCache\help\common\" />