System Touch

Author: mearvk

configuration/nwe-config.xml

@@ -252,4 +252,21 @@
         <description>Production Bitcoin remote target.</description>
     </remote-server>
 
+    <!-- ═══════════════════════════════════════════════════════════════════
+         OBJECT HASHCODE OVERRIDES
+         Admins may set fixed Object IDs for well-known classes.
+         These appear in the [Object ID: XXXXXXXXXX] field of system output.
+         Format: <entry class="SimpleClassName">integer_value</entry>
+    ════════════════════════════════════════════════════════════════════ -->
+    <hashcodes>
+        <entry class="NitroWebExpress">0195600860</entry>
+        <entry class="MessageQueueSorter">1343441044</entry>
+        <entry class="MessageQueue">0762660330</entry>
+        <entry class="HeuristicClassifier">0481230099</entry>
+        <entry class="ConnectionPoller">0553219871</entry>
+        <entry class="Communicator">0617340022</entry>
+        <entry class="BinaryHttpServer">0889912345</entry>
+        <entry class="WeatherServer">0721100456</entry>
+    </hashcodes>
+
 </nwe-config>

source/commons/printing/ComponentPrinter.java

@@ -18,7 +18,8 @@ public static void print(Object owner, int hash, String line) {
         String simple = owner.getClass().getSimpleName();
         String padded = padClassname(simple);
 
-        String hashStr = String.format("%010d", hash);
+        int resolvedHash = configuration.HashCodeRegistry.resolve(owner);
+        String hashStr = String.format("%010d", resolvedHash);
         String coloredHash = ColorResolver.resolveCategoryColor(simple) + hashStr + ColorPalette.OID_DEFAULT;
 
         String date = timestamp();

source/configuration/HashCodeRegistry.java

@@ -0,0 +1,73 @@
+package configuration;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * HashCodeRegistry — loads admin-defined hashcodes from nwe-config.xml.
+ *
+ * Config format:
+ *   <hashcodes>
+ *     <entry class="NitroWebExpress">1234567890</entry>
+ *     <entry class="MessageQueueSorter">9876543210</entry>
+ *   </hashcodes>
+ *
+ * Call HashCodeRegistry.resolve(object) instead of object.hashCode()
+ * to get the admin-overridden value (or default if not configured).
+ */
+public final class HashCodeRegistry
+{
+    private static final String CONFIG_FILE = "configuration/nwe-config.xml";
+    private static Map<String, Integer> OVERRIDES;
+
+    private HashCodeRegistry() {}
+
+    public static int resolve(Object owner)
+    {
+        if (OVERRIDES == null) load();
+        String name = owner.getClass().getSimpleName();
+        Integer override = OVERRIDES.get(name);
+        return override != null ? override : owner.hashCode();
+    }
+
+    private static synchronized void load()
+    {
+        OVERRIDES = new HashMap<>();
+        try
+        {
+            File file = new File(CONFIG_FILE);
+            if (!file.exists()) return;
+
+            Document doc = DocumentBuilderFactory.newInstance()
+                .newDocumentBuilder().parse(file);
+            doc.getDocumentElement().normalize();
+
+            NodeList hcNodes = doc.getElementsByTagName("hashcodes");
+            if (hcNodes.getLength() == 0) return;
+
+            Element hcEl = (Element) hcNodes.item(0);
+            NodeList entries = hcEl.getElementsByTagName("entry");
+            for (int i = 0; i < entries.getLength(); i++)
+            {
+                Element entry = (Element) entries.item(i);
+                String className = entry.getAttribute("class");
+                String value = entry.getTextContent().trim();
+                if (!className.isEmpty() && !value.isEmpty())
+                {
+                    try { OVERRIDES.put(className, Integer.parseUnsignedInt(value)); }
+                    catch (NumberFormatException ignored) {}
+                }
+            }
+        }
+        catch (Exception ignored) {}
+    }
+
+    /** Force reload (e.g. after config change). */
+    public static void reload() { OVERRIDES = null; }
+}

source/national/NationalFinanceIDFeeder.java

@@ -191,6 +191,9 @@ private static void financePrompt(final Connection CONN, final NationalFinanceID
                 write(CONN, "  ║  Your effort today builds a better tomorrow.             ║");
                 write(CONN, "  ╚══════════════════════════════════════════════════════════╝");
                 write(CONN, "");
+                // Close the telnet session
+                try { if (CONN.SOCKET != null && !CONN.SOCKET.isClosed()) CONN.SOCKET.close(); }
+                catch (Exception ignored) {}
                 break;
             }
 
@@ -277,8 +280,10 @@ private static String enterProxyMode(final Connection CONN, final NationalFinanc
                     break;
                 }
 
-                // Send to proxy
-                proxyOut.write((userInput + "\r\n").getBytes());
+                // Send to proxy — wrap in protocol framing if well-known port
+                String toSend = configuration.ProtocolHandlerRegistry.wrapMessage(
+                    port, userInput, java.util.Map.of("host", host, "path", "/"));
+                proxyOut.write(toSend.getBytes());
                 proxyOut.flush();
 
                 // Read response (up to 4096 bytes, with timeout)
@@ -375,6 +380,18 @@ private static String handleSetProxy(final Connection CONN, final String INPUT,
             return "✗  Cannot connect to " + host + ":" + port + " — " + e.getMessage() + ". Keeping default.";
         }
 
+        // Verify the remote is running the expected protocol for well-known ports
+        configuration.ProtocolHandlerRegistry.ProtocolHandler ph =
+            configuration.ProtocolHandlerRegistry.get(port);
+        if (ph != null)
+        {
+            boolean protocolOk = configuration.ProtocolHandlerRegistry.verify(host, port);
+            if (protocolOk)
+                write(CONN, "  ✔  Protocol verified: " + ph.protocol + " on port " + port);
+            else
+                write(CONN, "  ⚠  Port " + port + " connected but did not confirm " + ph.protocol + " protocol.");
+        }
+
         // Store selection
         N21Store.storeProxySelection(NFID.nationalId, host, port);