Http: Remove dependency on Time library

Author: Pagghiu

Documentation/Libraries/Http.md

@@ -7,8 +7,8 @@
 [SaneCppHttp.h](https://github.com/Pagghiu/SaneCppLibraries/releases/latest/download/SaneCppHttp.h) is a library implementing a hand-written http 1.1 parser, client and server.
 
 # Dependencies
-- Dependencies: [Async](@ref library_async), [Containers](@ref library_containers), [Time](@ref library_time)
-- All dependencies: [Async](@ref library_async), [Containers](@ref library_containers), [File](@ref library_file), [FileSystem](@ref library_file_system), [Foundation](@ref library_foundation), [Memory](@ref library_memory), [Socket](@ref library_socket), [Threading](@ref library_threading), [Time](@ref library_time)
+- Dependencies: [Async](@ref library_async), [Containers](@ref library_containers)
+- All dependencies: [Async](@ref library_async), [Containers](@ref library_containers), [File](@ref library_file), [FileSystem](@ref library_file_system), [Foundation](@ref library_foundation), [Memory](@ref library_memory), [Socket](@ref library_socket), [Threading](@ref library_threading)
 
 ![Dependency Graph](Http.svg)
 

Libraries/Http/HttpWebServer.cpp

@@ -2,16 +2,24 @@
 // SPDX-License-Identifier: MIT
 #include "HttpWebServer.h"
 #include "../FileSystem/FileSystem.h"
-#include "../Time/Time.h"
 #include "Internal/HttpStringIterator.h"
 #include <stdio.h>
+#include <time.h>
+#if SC_PLATFORM_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <sys/timeb.h>
+#else
+#include <math.h>
+#endif
 
 struct SC::HttpWebServer::Internal
 {
-    static Result writeGMTHeaderTime(StringSpan headerName, HttpResponse& response,
-                                     const Time::Absolute::ParseResult& local);
+    static Result writeGMTHeaderTime(StringSpan headerName, HttpResponse& response, int64_t millisecondsSinceEpoch);
     static Result readFile(StringSpan initialDirectory, HttpRequest& request, HttpResponse& response);
+    static Result formatHttpDate(int64_t millisecondsSinceEpoch, char* buffer, size_t bufferSize, size_t& outLength);
 
+    static int64_t    getCurrentTimeMilliseconds();
     static StringSpan getContentType(const StringSpan extension);
 };
 
@@ -58,32 +66,13 @@ SC::Result SC::HttpWebServer::Internal::readFile(StringSpan directory, HttpReque
         SC_TRY(response.addHeader("Connection", "Closed"));
         SC_TRY(response.addHeader("Content-Type", Internal::getContentType(extension)));
         SC_TRY(response.addHeader("Server", "SC"));
-        Time::Absolute::ParseResult local;
-        SC_TRY(Time::Realtime::now().parseUTC(local));
-        SC_TRY(Internal::writeGMTHeaderTime("Date", response, local));
-        SC_TRY(Time::Realtime(fileStat.modifiedTime).parseUTC(local));
-        SC_TRY(Internal::writeGMTHeaderTime("Last-Modified", response, local));
+        SC_TRY(Internal::writeGMTHeaderTime("Date", response, Internal::getCurrentTimeMilliseconds()));
+        SC_TRY(Internal::writeGMTHeaderTime("Last-Modified", response, fileStat.modifiedTime.milliseconds));
         SC_TRY(response.end(data.toSpanConst()));
     }
     return Result(true);
 }
 
-SC::Result SC::HttpWebServer::Internal::writeGMTHeaderTime(StringSpan headerName, HttpResponse& response,
-                                                           const Time::Absolute::ParseResult& local)
-{
-    char   bufferData[128];
-    size_t len = static_cast<size_t>(::snprintf(bufferData, sizeof(bufferData), "%s, %02u %s %04u %02u:%02u:%02u GMT",
-                                                local.getDay(), local.dayOfMonth, local.getMonth(), local.year,
-                                                local.hour, local.minutes, local.seconds));
-    if (len == 0 or len >= sizeof(bufferData))
-    {
-        return Result::Error("Failed to format time");
-    }
-
-    SC_TRY(response.addHeader(headerName, {{bufferData, len}, true, StringEncoding::Ascii}));
-    return Result(true);
-}
-
 SC::StringSpan SC::HttpWebServer::Internal::getContentType(const StringSpan extension)
 {
     if (extension == "htm" or extension == "html")
@@ -108,3 +97,60 @@ SC::StringSpan SC::HttpWebServer::Internal::getContentType(const StringSpan exte
     }
     return "text/html";
 }
+
+SC::int64_t SC::HttpWebServer::Internal::getCurrentTimeMilliseconds()
+{
+#if SC_PLATFORM_WINDOWS
+    struct _timeb t;
+    _ftime_s(&t);
+    return static_cast<int64_t>(t.time) * 1000 + t.millitm;
+#else
+    struct timespec nowTimeSpec;
+    clock_gettime(CLOCK_REALTIME, &nowTimeSpec);
+    return static_cast<int64_t>(round(nowTimeSpec.tv_nsec / 1.0e6) + nowTimeSpec.tv_sec * 1000);
+#endif
+}
+
+SC::Result SC::HttpWebServer::Internal::formatHttpDate(int64_t millisecondsSinceEpoch, char* buffer, size_t bufferSize,
+                                                       size_t& outLength)
+{
+    const time_t seconds = static_cast<time_t>(millisecondsSinceEpoch / 1000);
+    struct tm    parsedTm;
+#if SC_PLATFORM_WINDOWS
+    if (_gmtime64_s(&parsedTm, &seconds) != 0)
+    {
+        return Result::Error("Failed to convert time");
+    }
+#else
+    if (gmtime_r(&seconds, &parsedTm) == nullptr)
+    {
+        return Result::Error("Failed to convert time");
+    }
+#endif
+
+    // Format as HTTP date: "Wed, 21 Oct 2015 07:28:00 GMT"
+    const char* days[]   = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+    const char* months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+    outLength = static_cast<size_t>(
+        snprintf(buffer, bufferSize, "%s, %02d %s %04d %02d:%02d:%02d GMT", days[parsedTm.tm_wday], parsedTm.tm_mday,
+                 months[parsedTm.tm_mon], parsedTm.tm_year + 1900, parsedTm.tm_hour, parsedTm.tm_min, parsedTm.tm_sec));
+
+    if (outLength == 0 || outLength >= bufferSize)
+    {
+        return Result::Error("Failed to format time");
+    }
+
+    return Result(true);
+}
+
+SC::Result SC::HttpWebServer::Internal::writeGMTHeaderTime(StringSpan headerName, HttpResponse& response,
+                                                           int64_t millisecondsSinceEpoch)
+{
+    char   bufferData[128];
+    size_t len;
+    SC_TRY(formatHttpDate(millisecondsSinceEpoch, bufferData, sizeof(bufferData), len));
+
+    SC_TRY(response.addHeader(headerName, {{bufferData, len}, true, StringEncoding::Ascii}));
+    return Result(true);
+}

Support/Dependencies/Dependencies.json

@@ -155,13 +155,11 @@
             "FileSystem",
             "Foundation",
             "Memory",
-            "Socket",
-            "Time"
+            "Socket"
         ],
         "minimal_dependencies": [
             "Async",
-            "Containers",
-            "Time"
+            "Containers"
         ],
         "all_dependencies": [
             "Async",
@@ -171,8 +169,7 @@
             "Foundation",
             "Memory",
             "Socket",
-            "Threading",
-            "Time"
+            "Threading"
         ]
     },
     "Memory": {