UPNP and osinfo compiles

source/stratos/osinfo.d

@@ -10,6 +10,8 @@ struct OS
     string versionID;
     /// The architecture of the processor; eg MIPS, x86_64
     string cpuArch;
+    /// The name of this computer.
+    string hostname;
 }
 
 OS osInfo()

source/stratos/upnp.d

@@ -1,12 +1,12 @@
 module stratos.upnp;
 
-/+
+import vibe.core.log;
+
 /// UPnP handler.
 class UPnP
 {
     import std.datetime : SysTime;
     import std.uuid : UUID;
-    import vibe.core.log;
     import vibe.core.net;
     import vibe.core.sync : ManualEvent, createManualEvent;
 
@@ -20,6 +20,8 @@ class UPnP
         SysTime expires;
         string serviceType;
         string serviceVersion;
+        string nodeName;
+        string[] ips;
 
         ulong bootID;
         ulong configID;
@@ -102,17 +104,17 @@ class UPnP
 
     private void broadcast(string destIP, string[] myIPs)
     {
-        import scriptlike.core : interp;
+        import scriptlike.core : interp, _interp_text;
+        import std.algorithm.iteration : joiner;
         import std.conv : to;
         import std.socket : Socket;
         import std.string : replace;
-        import std.system : os;
         import std.uuid : randomUUID;
         import stratos.osinfo;
 
         if (myIPs.length == 0) return;
 
-        auto name = Socket.hostname;
+        auto name = Socket.hostName;
         auto configID = 1;
         auto msgNumber = 1;
         // So, this is an interesting problem.
@@ -120,7 +122,8 @@ class UPnP
         // For instance, you might have code that should only run on Linux with kernel 2.6 or higher.
         // We want the kernel name. Or maybe the GLIBC version is the issue. Or maybe you want it
         // to run on Ubuntu 16.04 or higher, or SLES 11.x, or something like that.
-        auto osVersion = "4";
+        enum stratosVersion = "0.0.1";
+        auto os = osInfo;
 
         auto packet = mixin(interp!`NOTIFY * HTTP/1.1
 HOST: ${destIP}:1900
@@ -128,7 +131,7 @@ CACHE-CONTROL: max-age=3610
 LOCATION: https://stratos.ikeran.org/upnp
 NT: urn:stratos.ikeran.org:service:stratos:${stratosVersion}
 NTS: keep-alive
-SERVER: ${os().to!string}/${osVersion} UPnP/1.1 stratos/${stratosVersion}
+SERVER: ${os.family}/${os.versionID} UPnP/1.1 stratos/${stratosVersion}
 USN: ${randomUUID()}
 BOOTID.UPNP.ORG: ${msgNumber}
 CONFIGID.UPNP.ORG: ${configID}
@@ -143,28 +146,31 @@ STRATOS-NODENAME: ${name}
 
     private void receivedUPnPPacket(string text)
     {
-        import core.time : seconds;
-        import stratos.util : splitOnce;
-        import std.algorithm.iteration : splitter, chunkBy, map;
-        import std.conv : to;
-        import std.range : drop;
-        import std.string : strip, startsWith;
-        import std.typecons : tuple;
+        import std.algorithm.iteration : splitter;
+        import std.string : strip;
 
         string operation;
         SSDPService service;
-        foreach (line; lines)
+        foreach (line; text.splitter("\n"))
         {
-            readHeader(service, line);
+            readHeader(service, line.strip);
         }
     }
 }
 
 private void readHeader(ref UPnP.SSDPService service, string line)
 {
+    import core.time : seconds;
+    import std.algorithm.iteration : splitter, filter;
+    import std.array : array;
+    import std.conv : to;
+    import std.string : strip;
+    import stratos.util : splitOnce;
+
     auto tag = line.splitter(":").front;
     auto value = line[tag.length + 1 .. $].strip;
     tag = tag.strip;
+    string operation;
     switch (tag)
     {
         case "NT":
@@ -184,7 +190,7 @@ private void readHeader(ref UPnP.SSDPService service, string line)
         case "SERVER":
             auto bits = value
                 .splitter(" ")
-                .where(x => x.length)
+                .filter!(x => x.length)
                 .array;
             auto osInfo = bits[0];
             auto serviceVersionInfo = bits[$-1].splitOnce("/");
@@ -257,5 +263,4 @@ string[] getIPAddresses()
     }
     freeifaddrs(gotten);
     return addresses;
-}
-+/
+}