[fix] WebSocket sharing the same session in AdminProxy blocked HEAD requests from pipy workers

Author: pajama-coder

src/admin-proxy.cpp

@@ -161,9 +161,16 @@ void AdminProxy::open(const std::string &ip, int port, const Options &options) {
     ppl_connect = ppl;
   }
 
+  m_session_selector = pjs::Method::make(
+    "admin-proxy-session-selector",
+    [](pjs::Context &, pjs::Object*, pjs::Value &ret) {
+      ret.set(pjs::Object::make());
+    }
+  );
+
   ppl_inbound->append(new http::Demux(nullptr))->add_sub_pipeline(ppl_request);
   ppl_request->append(new AdminProxyHandler(this))->add_sub_pipeline(ppl_forward);
-  ppl_forward->append(new http::Mux(nullptr, nullptr))->add_sub_pipeline(ppl_connect);
+  ppl_forward->append(new http::Mux(pjs::Function::make(m_session_selector), nullptr))->add_sub_pipeline(ppl_connect);
 
   Listener::Options opts;
   auto listener = Listener::get(Port::Protocol::TCP, ip, port);

src/admin-proxy.hpp

@@ -83,6 +83,7 @@ class AdminProxy {
   std::map<std::string, pjs::Ref<http::File>> m_www_file_cache;
   pjs::Ref<http::Directory> m_gui_files;
 
+  pjs::Ref<pjs::Method> m_session_selector;
   pjs::Ref<Message> m_response_not_found;
   pjs::Ref<Message> m_response_method_not_allowed;
 

src/filters/dump.cpp

@@ -100,8 +100,10 @@ void Dump::process(Event *evt) {
   };
 
   db.push(str, Log::format_header(Log::INFO, str, sizeof(str)));
-  db.push(s_prefix_worker);
-  db.push(str, str_fmt( "%d", WorkerThread::current()->index()));
+  if (auto t = WorkerThread::current()) {
+    db.push(s_prefix_worker);
+    db.push(str, str_fmt( "%d", t->index()));
+  }
   db.push(s_prefix_context);
   db.push(str, str_fmt( "%d", context()->id()));
   db.push(']');