Handling "about:home"; GmRequest decoupling

GmRequest is given a pointer to the GmCerts to use. Also, timeouts are handled via a posted command so they get processed in the main thread.

7 files changed, 98 insertions, 35 deletions

diff --git a/src/app.c b/src/app.c
index e88abe20..fa7311c6 100644
--- a/src/app.c
+++ b/src/app.c
@@ -56,7 +56,6 @@ struct Impl_App {
     iSortedArray tickers;
     iBool        pendingRefresh;
     iGmCerts *   certs;
-//    iHistory *   history;
     iVisited *   visited;
     /* Preferences: */
     iBool        retainWindowSize;
@@ -185,6 +184,10 @@ const iString *execPath_App(void) {
     return executablePath_CommandLine(&app_.args);
 }
 
+const iString *dataDir_App(void) {
+    return collect_String(cleanedCStr_Path(dataDir_App_));
+}
+
 void processEvents_App(enum iAppEventMode eventMode) {
     iApp *d = &app_;
     SDL_Event ev;
@@ -423,12 +426,7 @@ iBool handleCommand_App(const char *cmd) {
         SDL_SetWindowPosition(d->window->win, pos.x, pos.y);
     }
     else if (equal_Command(cmd, "navigate.home")) {
-        iString *homePath = newCStr_String(dataDir_App_);
-        clean_Path(homePath);
-        append_Path(homePath, &iStringLiteral("home.gmi"));
-        prependCStr_String(homePath, "file://");
-        postCommandf_App("open url:%s", cstr_String(homePath));
-        delete_String(homePath);
+        postCommand_App("open url:about:home");
         return iTrue;
     }
     else if (equal_Command(cmd, "font.setfactor")) {
diff --git a/src/app.h b/src/app.h
index d10da7c3..e40c5b2e 100644
--- a/src/app.h
+++ b/src/app.h
@@ -21,6 +21,7 @@ enum iUserEventCode {
 };
 
 const iString *execPath_App     (void);
+const iString *dataDir_App      (void);
 
 int         run_App             (int argc, char **argv);
 void        processEvents_App   (enum iAppEventMode mode);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 7cc8b897..1a6476ba 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -1,11 +1,12 @@
 #include "gmrequest.h"
 #include "gmutil.h"
 #include "gmcerts.h"
-#include "app.h"
+#include "app.h" /* dataDir_App() */
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/tlsrequest.h>
 #include <the_Foundation/mutex.h>
+#include <the_Foundation/path.h>
 
 #include <SDL_timer.h>
 
@@ -62,30 +63,35 @@ enum iGmRequestState {
 };
 
 struct Impl_GmRequest {
-    iObject object;
-    iMutex mutex;
-    enum iGmRequestState state;
-    iString url;
-    iTlsRequest *req;
-    iGmResponse resp;
-    uint32_t timeoutId; /* in case server doesn't close the connection */
-    iAudience *updated;
-    iAudience *finished;
+    iObject               object;
+    iMutex                mutex;
+    iGmCerts *            certs; /* not owned */
+    enum iGmRequestState  state;
+    iString               url;
+    iTlsRequest *         req;
+    iGmResponse           resp;
+    uint32_t              timeoutId; /* in case server doesn't close the connection */
+    iAudience *           updated;
+    iAudience *           timeout;
+    iAudience *           finished;
 };
 
-iDefineObjectConstruction(GmRequest)
+iDefineObjectConstructionArgs(GmRequest, (iGmCerts *certs), certs)
 iDefineAudienceGetter(GmRequest, updated)
+iDefineAudienceGetter(GmRequest, timeout)
 iDefineAudienceGetter(GmRequest, finished)
 
-void init_GmRequest(iGmRequest *d) {
+void init_GmRequest(iGmRequest *d, iGmCerts *certs) {
     init_Mutex(&d->mutex);
-    d->state = initialized_GmRequestState;
     init_GmResponse(&d->resp);
     init_String(&d->url);
-    d->req = NULL;
-    d->timeoutId = 0;
-    d->updated = NULL;
-    d->finished = NULL;
+    d->certs           = certs;
+    d->timeoutId       = 0;
+    d->req             = NULL;
+    d->state           = initialized_GmRequestState;
+    d->updated         = NULL;
+    d->timeout         = NULL;
+    d->finished        = NULL;
 }
 
 void deinit_GmRequest(iGmRequest *d) {
@@ -107,6 +113,7 @@ void deinit_GmRequest(iGmRequest *d) {
     }
     iRelease(d->req);
     d->req = NULL;
+    delete_Audience(d->timeout);
     delete_Audience(d->finished);
     delete_Audience(d->updated);
     deinit_GmResponse(&d->resp);
@@ -121,7 +128,9 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
 
 static uint32_t timedOutWhileReceivingBody_GmRequest_(uint32_t interval, void *obj) {
     /* Note: Called from SDL's timer thread. */
-    postCommandf_App("gmrequest.timeout request:%p", obj);
+    iGmRequest *d = obj;
+    //postCommandf_App("gmrequest.timeout request:%p", obj);
+    iNotifyAudience(d, timeout, GmRequestTimeout);
     iUnused(interval);
     return 0;
 }
@@ -142,7 +151,6 @@ static void checkServerCertificate_GmRequest_(iGmRequest *d) {
     const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
     d->resp.certFlags = 0;
     if (cert) {
-        iGmCerts *     certDb = certs_App();
         const iRangecc domain = urlHost_String(&d->url);
         d->resp.certFlags |= available_GmCertFlag;
         if (!isExpired_TlsCertificate(cert)) {
@@ -151,7 +159,7 @@ static void checkServerCertificate_GmRequest_(iGmRequest *d) {
         if (verifyDomain_TlsCertificate(cert, domain)) {
             d->resp.certFlags |= domainVerified_GmCertFlag;
         }
-        if (checkTrust_GmCerts(certDb, domain, cert)) {
+        if (checkTrust_GmCerts(d->certs, domain, cert)) {
             d->resp.certFlags |= trusted_GmCertFlag;
         }
         validUntil_TlsCertificate(cert, &d->resp.certValidUntil);
@@ -243,7 +251,39 @@ void submit_GmRequest(iGmRequest *d) {
     clear_GmResponse(&d->resp);
     iUrl url;
     init_Url(&url, &d->url);
-    if (equalCase_Rangecc(&url.protocol, "file")) {
+    /* Check for special protocols. */
+    /* TODO: If this were a library, these could be handled via callbacks. */
+    if (equalCase_Rangecc(&url.protocol, "about")) {
+        if (equalCase_Rangecc(&url.path, "home")) {
+            d->resp.statusCode = success_GmStatusCode;
+            setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8");
+            setCStr_Block(&d->resp.body,
+"```\n"
+"ooooo                                                                                 \n"
+"`888'                                                                                 \n"
+" 888          .oooo.    .oooooooo oooo d8b  .oooo.   ooo. .oo.    .oooooooo  .ooooo.  \n"
+" 888         `P  )88b  888' `88b  `888\"\"8P `P  )88b  `888P\"Y88b  888' `88b  d88' `88b \n"
+" 888          .oP\"888  888   888   888      .oP\"888   888   888  888   888  888ooo888 \n"
+" 888       o d8(  888  `88bod8P'   888     d8(  888   888   888  `88bod8P'  888    .o \n"
+"o888ooooood8 `Y888\"\"8o `8oooooo.  d888b    `Y888\"\"8o o888o o888o `8oooooo.  `Y8bod8P' \n"
+"                       d\"     YD                                 d\"     YD            \n"
+"                       \"Y88888P'                                 \"Y88888P'            \n"
+"```\n"
+"# A Beautiful Gemini Browser\n"
+"## Version " LAGRANGE_APP_VERSION "\n\n"
+"=> https://skyjake.fi/@jk by Jaakko Keränen <code@iki.fi>\n"
+"Crafted with \u2615 in Finland\n");
+            d->state = receivingBody_GmRequestState;
+            iNotifyAudience(d, updated, GmRequestUpdated);
+        }
+        else {
+            d->resp.statusCode = invalidLocalResource_GmStatusCode;
+        }
+        d->state = finished_GmRequestState;
+        iNotifyAudience(d, finished, GmRequestFinished);
+        return;
+    }
+    else if (equalCase_Rangecc(&url.protocol, "file")) {
         iString *path = collect_String(urlDecode_String(collect_String(newRange_String(url.path))));
         iFile *  f    = new_File(path);
         if (open_File(f, readOnly_FileMode)) {
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 3b2ee3b3..05290128 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -5,6 +5,7 @@
 
 #include "gmutil.h"
 
+iDeclareType(GmCerts)
 iDeclareType(GmResponse)
 
 enum iGmCertFlags {
@@ -30,11 +31,13 @@ iGmResponse *       copy_GmResponse             (const iGmResponse *);
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareClass(GmRequest)
-iDeclareObjectConstruction(GmRequest)
+iDeclareObjectConstructionArgs(GmRequest, iGmCerts *)
 
 iDeclareNotifyFunc(GmRequest, Updated)
+iDeclareNotifyFunc(GmRequest, Timeout)
 iDeclareNotifyFunc(GmRequest, Finished)
 iDeclareAudienceGetter(GmRequest, updated)
+iDeclareAudienceGetter(GmRequest, timeout)
 iDeclareAudienceGetter(GmRequest, finished)
 
 void                setUrl_GmRequest            (iGmRequest *, const iString *url);
diff --git a/src/gmutil.c b/src/gmutil.c
index 0caadd32..4b49e1d0 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -2,6 +2,7 @@
 
 #include <the_Foundation/regexp.h>
 #include <the_Foundation/object.h>
+#include <the_Foundation/path.h>
 
 void init_Url(iUrl *d, const iString *text) {
     iRegExp *absPat =
@@ -142,6 +143,13 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
     return absolute;
 }
 
+iString *makeFileUrl_String(const iString *localFilePath) {
+    iString *url = cleaned_Path(localFilePath);
+    replace_Block(&url->chars, '\\', '/'); /* in case it's a Windows path */
+    prependCStr_String(url, "file://");
+    return url;
+}
+
 void urlEncodeSpaces_String(iString *d) {
     for (;;) {
         const size_t pos = indexOfCStr_String(d, " ");
@@ -166,6 +174,10 @@ static const struct {
         "Failed to Open File",
         "The requested file does not exist or is inaccessible. "
         "Please check the file path." } },
+    { invalidLocalResource_GmStatusCode,
+      { 0,
+        "Invalid Resource",
+        "The requested resource does not exist." } },
     { unsupportedMimeType_GmStatusCode,
       { 0x1f47d, /* alien */
         "Unsupported MIME Type",
@@ -178,7 +190,7 @@ static const struct {
         "Perhaps the server is malfunctioning or you tried to contact a "
         "non-Gemini server." } },
     { invalidRedirect_GmStatusCode,
-      { 0, /*  */
+      { 0x27a0, /* dashed arrow */
         "Invalid Redirect",
         "The server responded with a redirect but did not provide a valid destination URL. "
         "Perhaps the server is malfunctioning." } },
@@ -226,7 +238,7 @@ static const struct {
       { 0x1f44e, /* thumbs down */
         "Bad Request",
         "The server was unable to parse your request, presumably due to the "
-        "request being malformed. Likely a bug in Lagrange." } },
+        "request being malformed." } },
     { clientCertificateRequired_GmStatusCode,
       { 0x1f511, /* key */
         "Certificate Required",
diff --git a/src/gmutil.h b/src/gmutil.h
index d0ed4581..8dda84d0 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -3,7 +3,8 @@
 #include <the_Foundation/range.h>
 #include <the_Foundation/string.h>
 
-iDeclareType(GmError) iDeclareType(Url)
+iDeclareType(GmError)
+iDeclareType(Url)
 
 /* Response status codes. */
 enum iGmStatusCode {
@@ -14,6 +15,7 @@ enum iGmStatusCode {
     unsupportedMimeType_GmStatusCode,
     failedToOpenFile_GmStatusCode,
     unknownStatusCode_GmStatusCode,
+    invalidLocalResource_GmStatusCode,
     none_GmStatusCode                      = 0,
     /* general status code categories */
     categoryInput_GmStatusCode             = 1,
@@ -70,4 +72,5 @@ void            init_Url                (iUrl *, const iString *text);
 
 iRangecc        urlHost_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
+iString *       makeFileUrl_String      (const iString *localFilePath);
 void            urlEncodeSpaces_String  (iString *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8cc47e2a..a789a759 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -55,7 +55,7 @@ static void finished_MediaRequest_(iAnyObject *obj) {
 void init_MediaRequest(iMediaRequest *d, iDocumentWidget *doc, iGmLinkId linkId, const iString *url) {
     d->doc    = doc;
     d->linkId = linkId;
-    d->req    = new_GmRequest();
+    d->req    = new_GmRequest(certs_App());
     setUrl_GmRequest(d->req, url);
     iConnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
     iConnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
@@ -202,6 +202,11 @@ static void requestUpdated_DocumentWidget_(iAnyObject *obj) {
     }
 }
 
+static void requestTimedOut_DocumentWidget_(iAnyObject *obj) {
+    iDocumentWidget *d = obj;
+    postCommandf_App("document.request.timeout doc:%p request:%p", d, d->request);
+}
+
 static void requestFinished_DocumentWidget_(iAnyObject *obj) {
     iDocumentWidget *d = obj;
     postCommand_Widget(obj, "document.request.finished doc:%p request:%p", d, d->request);
@@ -402,9 +407,10 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
     d->certFlags = 0;
     d->state = fetching_DocumentState;
     set_Atomic(&d->isRequestUpdated, iFalse);
-    d->request = new_GmRequest();
+    d->request = new_GmRequest(certs_App());
     setUrl_GmRequest(d->request, d->url);
     iConnect(GmRequest, d->request, updated, d, requestUpdated_DocumentWidget_);
+    iConnect(GmRequest, d->request, timeout, d, requestTimedOut_DocumentWidget_);
     iConnect(GmRequest, d->request, finished, d, requestFinished_DocumentWidget_);
     submit_GmRequest(d->request);
 }
@@ -792,7 +798,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         postCommandf_App("document.changed url:%s", cstr_String(d->url));
         return iFalse;
     }
-    else if (equal_Command(cmd, "gmrequest.timeout") &&
+    else if (equal_Command(cmd, "document.request.timeout") &&
              pointerLabel_Command(cmd, "request") == d->request) {
         cancel_GmRequest(d->request);
         return iFalse;