Merged main

1 files changed, 4 insertions, 75 deletions

diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp
index 242954912..fb1c43537 100644
--- a/zenhttp/httpsys.cpp
+++ b/zenhttp/httpsys.cpp
@@ -1131,83 +1131,12 @@ HttpSysTransaction::InvokeRequestHandler(HttpService& Service, IoBuffer Payload)
 {
 	HttpSysServerRequest& ThisRequest = m_HandlerRequest.emplace(*this, Service, Payload);
 
-	if (ThisRequest.RequestVerb() == HttpVerb::kPost)
-	{
-		if (ThisRequest.RequestContentType() == HttpContentType::kCbPackageOffer)
-		{
-			// The client is presenting us with a package attachments offer, we need
-			// to filter it down to the list of attachments we need them to send in
-			// the follow-up request
-
-			m_PackageHandler = Service.HandlePackageRequest(ThisRequest);
-
-			if (m_PackageHandler)
-			{
-				CbObject OfferMessage = LoadCompactBinaryObject(Payload);
-
-				std::vector<IoHash> OfferCids;
-
-				for (auto& CidEntry : OfferMessage["offer"])
-				{
-					if (!CidEntry.IsHash())
-					{
-						// Should yield bad request response?
-
-						ZEN_WARN("found invalid entry in offer");
-
-						continue;
-					}
-
-					OfferCids.push_back(CidEntry.AsHash());
-				}
-
-				ZEN_TRACE("request #{} -> filtering offer of {} entries", ThisRequest.RequestId(), OfferCids.size());
-
-				m_PackageHandler->FilterOffer(OfferCids);
-
-				ZEN_TRACE("request #{} -> filtered to {} entries", ThisRequest.RequestId(), OfferCids.size());
-
-				CbObjectWriter ResponseWriter;
-				ResponseWriter.BeginArray("need");
-
-				for (const IoHash& Cid : OfferCids)
-				{
-					ResponseWriter.AddHash(Cid);
-				}
-
-				ResponseWriter.EndArray();
-
-				// Emit filter response
-				ThisRequest.WriteResponse(HttpResponseCode::OK, ResponseWriter.Save());
-
-				return ThisRequest;
-			}
-		}
-		else if (ThisRequest.RequestContentType() == HttpContentType::kCbPackage)
-		{
-			// Process chunks in package request
-
-			m_PackageHandler = Service.HandlePackageRequest(ThisRequest);
-
-			// TODO: this should really be done in a streaming fashion, currently this emulates
-			// the intended flow from an API perspective
-
-			if (m_PackageHandler)
-			{
-				m_PackageHandler->OnRequestBegin();
-
-				auto CreateBuffer = [&](const IoHash& Cid, uint64_t Size) -> IoBuffer { return m_PackageHandler->CreateTarget(Cid, Size); };
-
-				CbPackage Package = ParsePackageMessage(ThisRequest.ReadPayload(), CreateBuffer);
-
-				m_PackageHandler->OnRequestComplete();
-			}
-		}
-	}
-
 	// Default request handling
 
-	Service.HandleRequest(ThisRequest);
+	if (!HandlePackageOffers(Service, ThisRequest, m_PackageHandler))
+	{
+		Service.HandleRequest(ThisRequest);
+	}
 
 	return ThisRequest;
 }