@fails-components/webtransport 0.1.0-macarmbuild.5 → 0.1.0

package/lib/server.js

@@ -11,6 +11,8 @@ import { defer } from './utils.js'
  * @typedef {import('./types').Http3ServerEventHandler} Http3ServerEventHandler
  * @typedef {import('./types').Http3WTServerSessionVisitorEvent} Http3WTServerSessionVisitorEvent
  * @typedef {import('./types').ServerStatusEvent} ServerStatusEvent
+ * @typedef {import('./types').ServerSessionRequestEvent} ServerSessionRequestEvent
+ * @typedef {import('./types').Http3ServerInit} Http3ServerInit
  */
 
 /**
@@ -19,7 +21,7 @@ import { defer } from './utils.js'
 export class Http3Server extends Http3WebTransport {
   /**
    *
-   * @param {*} args
+   * @param {Http3ServerInit} args
    */
   constructor(args) {
     super(args, 'server')
@@ -33,6 +35,10 @@ export class Http3Server extends Http3WebTransport {
     this.port = null
     this.host = null
 
+    // FIX ME TYPE
+    /** @type {any} */
+    this.requestHandler = null
+
     this._ready = defer()
     this.ready = this._ready.promise
 
@@ -69,11 +75,21 @@ export class Http3Server extends Http3WebTransport {
     }
   }
 
+  /**
+   * @param {any} callback
+   */
+  setRequestCallback(callback) {
+    this.requestHandler = callback
+
+    this.transportInt.setJSRequestHandler(!!callback)
+  }
+
   /**
    * @param {string} path
+   * @param {any | undefined} [args=undefined]
    * @returns {ReadableStream<WebTransportSession>}
    */
-  sessionStream(path) {
+  sessionStream(path, args) {
     if (path in this.sessionStreams) {
       return this.sessionStreams[path]
     }
@@ -82,10 +98,30 @@ export class Http3Server extends Http3WebTransport {
         this.sessionController[path] = controller
       }
     })
-    this.transportInt.addPath(path)
+    if (!args || !args.noAutoPaths) this.transportInt.addPath(path)
     return this.sessionStreams[path]
   }
 
+  /**
+   * @param {ServerSessionRequestEvent} args
+   */
+  onSessionRequest(args) {
+    if (args.promise && args.header) {
+      if (!this.requestHandler) throw new Error('Request handler not set')
+      this.requestHandler({ header: args.header }).then(
+        (/** @type {any} */ result) => {
+          console.log('oSR', result)
+          this.transportInt.finishSessionRequest({
+            promise: args.promise,
+            header: args.header,
+            session: args.session,
+            ...result
+          })
+        }
+      )
+    } else throw new Error('onSessionRequest')
+  }
+
   /**
    * @param {Http3WTServerSessionVisitorEvent} args
    */
@@ -94,6 +130,7 @@ export class Http3Server extends Http3WebTransport {
     if (args.object) {
       const sesobj = new Http3WTSession({
         object: args.session,
+        header: args.header,
         parentobj: this
       })
       if (this.sessionController[args.path])
@@ -143,12 +180,15 @@ export class Http3Server extends Http3WebTransport {
   }
 
   /**
-   * @param {Http3WTServerSessionVisitorEvent | ServerStatusEvent} args
+   * @param {Http3WTServerSessionVisitorEvent | ServerStatusEvent | ServerSessionRequestEvent} args
    */
   customCallback(args) {
     // console.log('incoming callback server', args)
     if (args.purpose) {
       switch (args.purpose) {
+        case 'SessionRequest':
+          this.onSessionRequest(args)
+          break
         case 'Http3WTSessionVisitor':
           this.onHttp3WTSessionVisitor(args)
           break

package/lib/session.js

@@ -35,6 +35,7 @@ export class Http3WTSession {
    * @param {object} args
    * @param {import('./types').NativeHttp3WTSession} [args.object]
    * @param {Http3Server | Http3Client} args.parentobj
+   * @param {any | undefined} [args.header= undefined]
    */
   constructor(args) {
     if (args.object) {
@@ -49,6 +50,8 @@ export class Http3WTSession {
     this.readyResolve = null
     /** @type {(() => void) | null | undefined} */
     this.closeHook = null
+    /** @type {(any | null | undefined)} */
+    this.header = args.header
 
     /** @type {Promise<void>} */
     this.ready = new Promise((resolve, reject) => {

package/lib/types.ts

@@ -129,6 +129,14 @@ export interface Http3ClientEventHandler {
 export interface Http3WTServerSessionVisitorEvent extends Http3WTSessionVisitorEvent {
   path: string
   object: any
+  header?: any
+}
+
+export interface ServerSessionRequestEvent {
+  purpose: 'SessionRequest'
+  header: Object
+  promise: any
+  session: any
 }
 
 /**
@@ -171,3 +179,11 @@ export type WebTransportSessionState = 'connected' | 'closed' | 'failed'
 export interface WebTransportSession extends WebTransport {
   state: WebTransportSessionState
 }
+
+export interface Http3ServerInit {
+  port: number
+  host: string
+  secret: string
+  cert: string
+  privKey: string
+}

package/lib/utils.js

@@ -1,9 +1,8 @@
-
 /**
  * @template {unknown} T
  * @returns {import('./types').Deferred<T>}
  */
-export function defer () {
+export function defer() {
   /** @type {(value?: T) => void} */
   let res = () => {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport",
-  "version": "0.1.0-macarmbuild.5",
+  "version": "0.1.0",
   "description": "A component to add webtransport support (server and client) to node.js using libquiche",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -18,7 +18,8 @@
     "rebuild": "node build.js rebuild",
     "rebuild-debug": "node build.js rebuild-debug -D",
     "build-debug": "node build.js build-debug",
-    "types": "tsc"
+    "types": "tsc",
+    "lint": "eslint lib test"
   },
   "repository": {
     "type": "git",
@@ -42,10 +43,12 @@
     "@babel/core": "^7.17.10",
     "@babel/eslint-parser": "^7.17.0",
     "@types/chai": "^4.3.3",
+    "@types/dirty-chai": "^2.0.2",
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.11.5",
     "chai": "^4.3.6",
     "cmake-js": "^6.3.2",
+    "dirty-chai": "^2.0.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-config-standard": "^16.0.2",

package/src/http3eventloop.cc

@@ -253,12 +253,25 @@ namespace quic
       progress_->Send(&report, 1);
   }
 
-  void Http3EventLoop::informAboutNewSession(Http3Server *server, Http3WTSession *session, absl::string_view path)
+  void Http3EventLoop::informAboutNewSessionRequest(Http3Server *server, WebTransportSession *session, spdy::Http2HeaderBlock *reqheadcopy, WebTransportRespPromisePtr promise)
+  {
+    struct Http3ProgressReport report;
+    report.type = Http3ProgressReport::NewSessionRequest;
+    report.webtsession = session;
+    report.serverobj = server;
+    report.headerblock = reqheadcopy;
+    report.promise = new WebTransportRespPromisePtr(promise);
+    if (progress_)
+      progress_->Send(&report, 1);
+  }
+
+  void Http3EventLoop::informAboutNewSession(Http3Server *server, Http3WTSession *session, absl::string_view path, Napi::Reference<Napi::Value> *header)
   {
     struct Http3ProgressReport report;
     report.type = Http3ProgressReport::NewSession;
     report.serverobj = server;
     report.session = session;
+    report.header = header;
     report.para = new std::string(path);
     if (progress_)
       progress_->Send(&report, 1);
@@ -295,7 +308,7 @@ namespace quic
       progress_->Send(&report, 1);
   }
 
-  void Http3EventLoop::informServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails* details)
+  void Http3EventLoop::informServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails *details)
   {
     struct Http3ProgressReport report;
     report.type = Http3ProgressReport::ServerStatus;
@@ -314,7 +327,8 @@ namespace quic
 
   void Http3EventLoop::processClientConnected(Http3Client *clientobj, bool success)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
     auto client = clientobj->getJS();
 
@@ -330,7 +344,8 @@ namespace quic
 
   void Http3EventLoop::processClientWebtransportSupport(Http3Client *clientobj)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     auto client = clientobj->getJS();
@@ -345,7 +360,8 @@ namespace quic
 
   void Http3EventLoop::processStream(bool incom, bool bidi, Http3WTSession *sessionobj, Http3WTStream *stream)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     Http3Constructors *constr = qw_->Env().GetInstanceData<Http3Constructors>();
@@ -369,7 +385,8 @@ namespace quic
 
   void Http3EventLoop::processStreamRecvSignal(Http3WTStream *streamobj, WebTransportStreamError error_code, NetworkTask task)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
     auto stream = streamobj->getJS();
     if (!stream)
@@ -409,7 +426,8 @@ namespace quic
 
   void Http3EventLoop::processStreamRead(Http3WTStream *streamobj, std::string *data, bool fin)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     Napi::Object dataVal =
@@ -435,7 +453,8 @@ namespace quic
 
   void Http3EventLoop::processStreamWrite(Http3WTStream *streamobj, Napi::ObjectReference *bufferhandle, bool success)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     auto stream = streamobj->getJS();
@@ -456,7 +475,8 @@ namespace quic
 
   void Http3EventLoop::processStreamReset(Http3WTStream *streamobj)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     auto stream = streamobj->getJS();
@@ -474,7 +494,8 @@ namespace quic
 
   void Http3EventLoop::processStreamNetworkFinish(Http3WTStream *streamobj, NetworkTask task)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     auto stream = streamobj->getJS();
@@ -520,7 +541,8 @@ namespace quic
 
   void Http3EventLoop::processDatagramReceived(Http3WTSession *sessionobj, std::string *datagram)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
     Napi::Object datagramVal =
         Napi::Uint8Array::New(qw_->Env(),
@@ -544,7 +566,8 @@ namespace quic
 
   void Http3EventLoop::processDatagramSend(Http3WTSession *sessionobj)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
     auto session = sessionobj->getJS();
     if (!session)
@@ -558,9 +581,55 @@ namespace quic
     cbsession_.Call({retObj});
   }
 
-  void Http3EventLoop::processNewSession(Http3Server *serverobj, Http3WTSession *session, const std::string &path)
+  void Http3EventLoop::processNewSessionRequest(Http3Server *serverobj, WebTransportSession *session, spdy::Http2HeaderBlock *reqheadcopy, WebTransportRespPromisePtr *promise)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
+    HandleScope scope(qw_->Env());
+
+    Napi::Object objVal = serverobj->getJS()->Value();
+
+    Napi::Object retObj = Napi::Object::New(qw_->Env());
+
+    retObj.Set("purpose", "SessionRequest");
+    // header
+
+    Napi::Object headObj = Napi::Object::New(qw_->Env());
+    for (auto pair : *reqheadcopy)
+    {
+      // we iterate over all header fields
+      headObj.Set(std::string(pair.first), std::string(pair.second));
+    }
+    retObj.Set("header", headObj);
+    delete reqheadcopy; // we own it and must free it!
+
+    // promise
+    Napi::External<WebTransportRespPromisePtr> promObj =
+        Napi::External<WebTransportRespPromisePtr>::New(qw_->Env(), promise,
+                                                        [](Napi::Env /*env*/, WebTransportRespPromisePtr *ref)
+                                                        {
+                                                          delete ref; // we own it and must delete it
+                                                        });
+    retObj.Set("promise", promObj);
+
+    Napi::External<WebTransportSession> wtsObj =
+        Napi::External<WebTransportSession>::New(qw_->Env(), session,
+                                                 [](Napi::Env /*env*/, WebTransportSession *ref)
+                                                 {
+                                                   // we do not own it! And do not delete it.
+                                                   // does it outlife everything?
+                                                 });
+    retObj.Set("session", wtsObj);
+
+    retObj.Set("object", objVal);
+
+    cbtransport_.Call({retObj});
+  }
+
+  void Http3EventLoop::processNewSession(Http3Server *serverobj, Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header)
+  {
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     Http3Constructors *constr = qw_->Env().GetInstanceData<Http3Constructors>();
@@ -577,13 +646,20 @@ namespace quic
     retObj.Set("session", sessionobj);
     retObj.Set("path", path);
     retObj.Set("object", objVal);
+    if (header)
+    {
+      retObj.Set("header", header->Value());
+      header->Unref();
+      delete header;
+    }
 
     cbtransport_.Call({retObj});
   }
 
   void Http3EventLoop::processNewClientSession(Http3Client *clientobj, Http3WTSession *session)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     Napi::Object retObj = Napi::Object::New(qw_->Env());
@@ -607,7 +683,8 @@ namespace quic
 
   void Http3EventLoop::processSessionReady(Http3WTSession *sessionobj)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
     auto session = sessionobj->getJS();
     if (!session)
@@ -623,7 +700,8 @@ namespace quic
 
   void Http3EventLoop::processSessionClose(Http3WTSession *sessionobj, uint32_t errorcode, const std::string &error)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     auto session = sessionobj->getJS();
@@ -642,9 +720,10 @@ namespace quic
     cbsession_.Call({retObj});
   }
 
-  void Http3EventLoop::processServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails * details)
+  void Http3EventLoop::processServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails *details)
   {
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     HandleScope scope(qw_->Env());
 
     Napi::Object objVal = serverobj->getJS()->Value();
@@ -660,19 +739,27 @@ namespace quic
     delete details; // we own it and must throw it away
     switch (status)
     {
-      case NetError: {
+    case NetError:
+    {
       retObj.Set("status", "error");
-      } break;
-      case NetListening: {
+    }
+    break;
+    case NetListening:
+    {
       retObj.Set("status", "listening");
-      } break;
-      case NetClose: {
+    }
+    break;
+    case NetClose:
+    {
       retObj.Set("status", "close");
-      } break;
-      default: {
-         Napi::Error::New(Env(), "Unknown status from server").ThrowAsJavaScriptException();
-        return;
-      } break;
+    }
+    break;
+    default:
+    {
+      Napi::Error::New(Env(), "Unknown status from server").ThrowAsJavaScriptException();
+      return;
+    }
+    break;
     };
     cbtransport_.Call({retObj});
   }
@@ -699,9 +786,14 @@ namespace quic
         processNewClientSession(cur.clientobj, cur.session);
       }
       break;
+      case Http3ProgressReport::NewSessionRequest:
+      {
+        processNewSessionRequest(cur.serverobj, cur.webtsession, cur.headerblock, cur.promise);
+      }
+      break;
       case Http3ProgressReport::NewSession:
       {
-        processNewSession(cur.serverobj, cur.session, *cur.para);
+        processNewSession(cur.serverobj, cur.session, *cur.para, cur.header);
       }
       break;
       case Http3ProgressReport::SessionReady:
@@ -791,7 +883,6 @@ namespace quic
       if (cur.para)
         delete cur.para;
     }
-
   }
 
   Http3EventLoop::Http3EventLoop(const Napi::CallbackInfo &info)
@@ -866,7 +957,8 @@ namespace quic
     // got the object we can now start the server
     Ref(); // do not garbage collect
     // epoll_server_.set_timeout_in_us(-1); // negative values would mean wait forever
-    if (!checkQw()) return;
+    if (!checkQw())
+      return;
     qw_->Queue(); // from asyncprogressqueue worker
   }
 

package/src/http3eventloop.h

@@ -33,6 +33,7 @@ namespace quic
     class Http3WTSession;
     class Http3WTStream;
     class Http3EventLoop;
+    class WebTransportRespPromise;
 
     class LifetimeHelper
     {
@@ -58,10 +59,10 @@ namespace quic
     {
         Napi::FunctionReference stream;
         Napi::FunctionReference session;
-
     };
 
-    struct ServerStatusDetails {
+    struct ServerStatusDetails
+    {
         std::string host;
         int port;
     };
@@ -69,12 +70,15 @@ namespace quic
     class Http3ProgressReport // actually struct would be a better fit but make napi happy
     {
     public:
+        using WebTransportRespPromise = JSlikePromise<Http3ServerBackend::WebTransportResponse>;
+        using WebTransportRespPromisePtr = std::shared_ptr<Http3ServerBackend::WebTransportRespPromise>;
         enum
         {
             ClientConnected,
             ClientWebTransportSupport,
             NewClientSession,
             NewSession,
+            NewSessionRequest,
             SessionReady,
             SessionClosed,
             IncomBiDiStream,
@@ -105,23 +109,27 @@ namespace quic
             WebTransportSessionError wtecode;
             NetworkTask nettask;
             NetworkStatus status;
+            WebTransportSession *webtsession;
         };
         union
         {
             Http3WTStream *stream;               // unowned
             Http3WTSession *session;             // unowned
+            spdy::Http2HeaderBlock *headerblock; // we own it and must delete it after return from js
             Napi::ObjectReference *bufferhandle; // we own it and must delete it if present
             bool fin;
             WebTransportStreamError wtscode;
         };
         union
         {
-            bool success;
-        };
-        union {
-
             std::string *para = nullptr; // for session and others, we own it, and must delete it
-            ServerStatusDetails * details;
+            ServerStatusDetails *details;
+        };
+        union
+        {
+            bool success;
+            WebTransportRespPromisePtr *promise;
+            Napi::Reference<Napi::Value> *header;
         };
     };
 
@@ -162,8 +170,6 @@ namespace quic
                 eventloop_->Destroy();
             }
 
-
-
         protected:
             Http3EventLoop *eventloop_;
         };
@@ -192,11 +198,15 @@ namespace quic
         void informClientWebtransportSupport(Http3Client *client);
         void informNewClientSession(Http3Client *client, Http3WTSession *session);
 
-        void informAboutNewSession(Http3Server *server, Http3WTSession *session, absl::string_view path);
+        using WebTransportRespPromise = JSlikePromise<Http3ServerBackend::WebTransportResponse>;
+        using WebTransportRespPromisePtr = std::shared_ptr<Http3ServerBackend::WebTransportRespPromise>;
+
+        void informAboutNewSessionRequest(Http3Server *server, WebTransportSession *session, spdy::Http2HeaderBlock *reqheadcopy, WebTransportRespPromisePtr promise);
+        void informAboutNewSession(Http3Server *server, Http3WTSession *session, absl::string_view path, Napi::Reference<Napi::Value> *header);
         void informSessionClosed(Http3WTSession *sessionobj, WebTransportSessionError error_code, absl::string_view error_message);
         void informSessionReady(Http3WTSession *sessionobj);
 
-        void informServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails* details);
+        void informServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails *details);
 
         void informAboutStream(bool incom, bool bidir, Http3WTSession *sessionobj, Http3WTStream *stream);
         void informStreamRecvSignal(Http3WTStream *streamobj, WebTransportStreamError error_code, NetworkTask task);
@@ -219,15 +229,18 @@ namespace quic
     private:
         QueueWorker *qw_;
 
-        bool checkQw() {
-            if (!qw_) {
+        bool checkQw()
+        {
+            if (!qw_)
+            {
                 Napi::Error::New(Env(), "Queueworker gone").ThrowAsJavaScriptException();
                 return false;
             }
             return true;
         }
 
-        void removeQw() {
+        void removeQw()
+        {
             qw_ = nullptr;
         }
 
@@ -254,11 +267,12 @@ namespace quic
         void processClientWebtransportSupport(Http3Client *client);
         void processNewClientSession(Http3Client *client, Http3WTSession *session);
 
-        void processNewSession(Http3Server *serverobj, Http3WTSession *session, const std::string &path);
+        void processNewSessionRequest(Http3Server *server, WebTransportSession *session, spdy::Http2HeaderBlock *reqheadcopy, WebTransportRespPromisePtr *promise);
+        void processNewSession(Http3Server *serverobj, Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header);
         void processSessionClose(Http3WTSession *sessionobj, uint32_t errorcode, const std::string &path);
         void processSessionReady(Http3WTSession *sessionobj);
 
-        void processServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails * details);
+        void processServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails *details);
 
         void processStream(bool incom, bool bidi, Http3WTSession *sessionobj, Http3WTStream *stream);
         void processStreamRecvSignal(Http3WTStream *streamobj, WebTransportStreamError error_code, NetworkTask task);
@@ -279,7 +293,6 @@ namespace quic
         Napi::FunctionReference cbsession_;
         Napi::FunctionReference cbtransport_;
 
-
         bool loop_running_;
     };
 }