Parse URL path manually

Author: Gold856

.github/workflows/upstream-utils.yml

@@ -109,6 +109,12 @@ jobs:
           ./libuv.py clone
           ./libuv.py copy-src
           ./libuv.py format-patch
+      - name: Run llhttp.py
+        run: |
+          cd upstream_utils
+          ./llhttp.py clone
+          ./llhttp.py copy-src
+          ./llhttp.py format-patch
       - name: Run llvm.py
         run: |
           cd upstream_utils

ThirdPartyNotices.txt

@@ -21,6 +21,7 @@ LLVM                  wpiutil/src/main/native/thirdparty/llvm
                       wpiutil/src/test/native/cpp/llvm/
 JSON for Classic C++  wpiutil/src/main/native/thirdparty/json
 libuv                 wpinet/src/main/native/thirdparty/libuv/
+llhttp                wpinet/src/main/native/thirdparty/llhttp
 sigslot               wpiutil/src/main/native/thirdparty/sigslot
 tcpsockets            wpinet/src/main/native/thirdparty/tcpsockets
 MPack                 wpiutil/src/main/native/thirdparty/mpack
@@ -407,6 +408,33 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
 
+==============
+llhttp License
+==============
+MIT License
+
+Copyright © 2018 Fedor Indutny
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ==============================================================================
 sigslot License
 ==============================================================================

ntcore/src/main/native/cpp/NetworkServer.cpp

@@ -15,8 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include <ada.h>
-
 #include "IConnectionList.hpp"
 #include "InstanceImpl.hpp"
 #include "Log.hpp"
@@ -126,23 +124,9 @@ void NetworkServer::ServerConnection::ConnectionClosed() {
 
 void NetworkServer::ServerConnection4::ProcessRequest() {
   DEBUG1("HTTP request: '{}'", m_request.GetUrl());
-  auto url = ada::parse(m_request.GetUrl());
-  if (!url) {
-    // failed to parse URL
-    SendError(400);
-    return;
-  }
-
-  std::string_view path;
-  if (url->get_pathname_length() > 0) {
-    path = url->get_pathname();
-  }
+  auto [path, query] = wpi::util::split(m_request.GetUrl(), "?");
   DEBUG4("path: \"{}\"", path);
 
-  std::string_view query;
-  if (url->has_search()) {
-    query = url->get_search();
-  }
   DEBUG4("query: \"{}\"\n", query);
 
   const bool isGET = m_request.GetMethod() == HTTP_GET;
@@ -162,11 +146,7 @@ void NetworkServer::ServerConnection4::ProcessRequest() {
 
 void NetworkServer::ServerConnection4::ProcessWsUpgrade() {
   // get name from URL
-  auto url = ada::parse(m_request.GetUrl());
-  std::string_view path;
-  if (url->get_pathname_length() > 0) {
-    path = url->get_pathname();
-  }
+  auto [path, query] = wpi::util::split(m_request.GetUrl(), "?");
   DEBUG4("path: '{}'", path);
 
   wpi::util::SmallString<128> nameBuf;

shared/bazel/rules/cc_rules.bzl

@@ -189,8 +189,8 @@ def third_party_cc_lib_helper(
         include_root,
         src_root = None,
         src_excludes = [],
-        visibility = None,
-        **kwargs):
+        defines = [],
+        visibility = None):
     """
     Helper for src / headers pairs that aren't directly compiled, but rather pulled into a bigger library.
 
@@ -213,9 +213,9 @@ def third_party_cc_lib_helper(
             include_root + "/**",
         ]),
         includes = [include_root],
+        defines = defines,
         strip_include_prefix = include_root,
         visibility = visibility,
-        **kwargs
     )
 
     pkg_files(

simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp

@@ -9,7 +9,6 @@
 #include <string>
 #include <string_view>
 
-#include <ada.h>
 #include <llhttp.h>
 #include <uv.h>
 
@@ -150,17 +149,7 @@ void HALSimHttpConnection::SendFileResponse(int code, std::string_view codeText,
 }
 
 void HALSimHttpConnection::ProcessRequest() {
-  auto url = ada::parse(m_request.GetUrl());
-  if (!url) {
-    // failed to parse URL
-    MySendError(400, "Invalid URL");
-    return;
-  }
-
-  std::string_view path;
-  if (url->get_pathname_length() > 0) {
-    path = url->get_pathname();
-  }
+  auto [path, query] = wpi::util::split(m_request.GetUrl(), "?");
 
   if (m_request.GetMethod() == HTTP_GET && wpi::util::starts_with(path, '/') &&
       !wpi::util::contains(path, "..") && !wpi::util::contains(path, "//")) {

upstream_utils/ada.py

@@ -18,8 +18,8 @@ def copy_upstream_src(wpilib_root: Path):
         shutil.rmtree(wpinet / d, ignore_errors=True)
         (wpinet / d).mkdir(parents=True, exist_ok=True)
 
-    subprocess.check_call(["npm", "i"], shell=True)
-    subprocess.check_call(["npm", "run", "build"], shell=True)
+    subprocess.check_call("npm i", shell=True)
+    subprocess.check_call("npm run build", shell=True)
     # Copy files into allwpilib
     shutil.copyfile(
         "build/llhttp.h",