@fails-components/webtransport-transport-http3-quiche 1.0.9 → 1.0.11

package/dist/lib/index.d.ts

@@ -1,11 +1,12 @@
 export const wtrouter: any;
 export const quicheInit: any;
 export function checkQuicheInit(args?: {
-    quicheLogVerbose?: number | undefined;
+    quicheLogVerbose?: import("./types.js").QUICHE_LOG | undefined;
     path?: string | undefined;
 } | undefined): void;
 export const Http3WebTransportClient: any;
 export const Http3WebTransportServer: any;
 export { Http3WebTransportClientSocket } from "./clientsocket.js";
 export { Http3WebTransportServerSocket } from "./serversocket.js";
+export type QUICHE_LOG = import('./types.js').QUICHE_LOG;
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":"AA0BA,2BAAuC;AACvC,6BAA6C;AAOtC;;;qBAON;AAED,0CAAuE;AACvE,0CAAuE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":"AA8BA,2BAAuC;AACvC,6BAA6C;AAOtC;;;qBAON;AAED,0CAAuE;AACvE,0CAAuE;;;yBAxC1D,OAAO,YAAY,EAAE,UAAU"}

package/dist/lib/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AAqEA;IACE;;OAEG;IACH,kBAFW,OAAO,4BAA4B,EAAE,oBAAoB,GAAC,SAAS,EAa7E;IAVC,0CAA0C;IAE1C,WAFW,OAAO,YAAY,EAAE,MAAM,CAEZ;IAE1B,UAAqB;IACrB,oBAAuB;IAgCzB,qBAKC;IA9BD,+BAGC;IAPC,iBAAoB;IACpB,gBAAmB;IAQrB;;OAEG;IAEH,mDAHW,OAAO,SAAS,EAAE,mBAAmB,WAiB/C;CAQF"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AAqEA;IACE;;OAEG;IACH,kBAFW,OAAO,4BAA4B,EAAE,oBAAoB,GAAC,SAAS,EAa7E;IAVC,0CAA0C;IAE1C,WAFW,OAAO,YAAY,EAAE,MAAM,CAEZ;IAE1B,UAAqB;IACrB,oBAAuB;IAgCzB,qBASC;IAlCD,+BAGC;IAPC,iBAAoB;IACpB,gBAAmB;IAQrB;;OAEG;IAEH,mDAHW,OAAO,SAAS,EAAE,mBAAmB,WAiB/C;CAYF"}

package/dist/lib/types.d.ts

@@ -11,10 +11,16 @@ export interface Logger {
     error: (formatter: any, ...args: any[]) => void;
     trace: (formatter: any, ...args: any[]) => void;
 }
+export type QUICHE_LOG_OFF = -1;
+export type QUICHE_LOG_INFO = 0;
+export type QUICHE_LOG_WARNING = 1;
+export type QUICHE_LOG_ERROR = 2;
+export type QUICHE_LOG_FATAL = 3;
+export type QUICHE_LOG = QUICHE_LOG_OFF | QUICHE_LOG_INFO | QUICHE_LOG_WARNING | QUICHE_LOG_ERROR | QUICHE_LOG_FATAL;
 export interface HttpWebTransportInit extends WebTransportOptions {
     host: string;
     port: string | number;
-    quicheLogVerbose?: number;
+    quicheLogVerbose?: QUICHE_LOG;
     forceIpv6?: boolean;
     localPort?: number;
 }

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,uBAAuB,CAAA;AAE9B,MAAM,WAAW,mBAAmB;IAChC,GAAG,EAAG,UAAU,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAC,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,MAAM;IACrB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IACtC,KAAK,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,KAAK,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CAChD;AAED,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,uBAAuB,CAAA;AAE9B,MAAM,WAAW,mBAAmB;IAChC,GAAG,EAAG,UAAU,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAC,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,MAAM;IACrB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IACtC,KAAK,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,KAAK,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CAChD;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,CAAA;AAC/B,MAAM,MAAM,eAAe,GAAG,CAAC,CAAA;AAC/B,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAA;AAClC,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAA;AAChC,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAA;AAChC,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,eAAe,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,gBAAgB,CAAA;AAElH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,gBAAgB,CAAC,EAAE,UAAU,CAAA;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB"}

package/lib/index.js

@@ -5,6 +5,10 @@ import * as url from 'url'
 import { arch, platform } from 'node:process'
 import { logger } from './utils.js'
 
+/**
+ * @typedef {import('./types.js').QUICHE_LOG} QUICHE_LOG
+ */
+
 const log = logger(`webtransport:native(${process?.pid})`)
 
 const binplatform = platform + '_' + arch
@@ -30,7 +34,7 @@ export const quicheInit = wtrouter.quicheInit
 let quicheInited = false
 
 /**
- * @param {{quicheLogVerbose?: Number, path?: string}} [args]
+ * @param {{quicheLogVerbose?: QUICHE_LOG, path?: string}} [args]
  */
 export const checkQuicheInit = function (args) {
   if (!quicheInited) {

package/lib/socket.js

@@ -110,8 +110,12 @@ export class Http3WebTransportSocket {
   }
 
   packetSendCB() {
-    // @ts-ignore
-    if (this.socketInt.getSendQueueCount() === 0 && this.blocked) {
+    if (
+      !this.closed &&
+      // @ts-ignore
+      this.socketInt.getSendQueueCount() === 0 &&
+      this.blocked
+    ) {
       this.cobj.onCanWrite()
     }
   }

package/lib/types.ts

@@ -16,11 +16,17 @@ export interface UDPServerSocketSend {
     trace: (formatter: any, ...args: any[]) => void
   }
 
+export type QUICHE_LOG_OFF = -1
+export type QUICHE_LOG_INFO = 0
+export type QUICHE_LOG_WARNING = 1
+export type QUICHE_LOG_ERROR = 2
+export type QUICHE_LOG_FATAL = 3
+export type QUICHE_LOG = QUICHE_LOG_OFF | QUICHE_LOG_INFO | QUICHE_LOG_WARNING | QUICHE_LOG_ERROR | QUICHE_LOG_FATAL
+
   export interface HttpWebTransportInit extends WebTransportOptions {
     host: string
     port: string | number
-    quicheLogVerbose?: number
+    quicheLogVerbose?: QUICHE_LOG
     forceIpv6?: boolean
     localPort?: number
   }
-  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {

package/src/http3client.cc

@@ -532,7 +532,7 @@ namespace quic
             if (wait_for_encryption_)
             {
                 if (EncryptionBeingEstablished())
-                    return false;
+                    return true;
                 wait_for_encryption_ = false;
                 ParsedQuicVersion version = UnsupportedQuicVersion();
                 if (session_ != nullptr && !CanReconnectWithDifferentVersion(&version) && !session_->connection()->connected())
@@ -569,11 +569,6 @@ namespace quic
                 recheck = true;
         }
 
-        if (checkSession())
-        {
-            recheck = true;
-        }
-
         return recheck;
     }
 
@@ -826,16 +821,18 @@ namespace quic
 
         if (client_->connectionrecheck_)
         {
-            client_->connectionrecheck_ = !client_->handleConnecting();
+            client_->connectionrecheck_ = client_->handleConnecting();
         }
+        if (client_->needsToCheckForSession()) client_->checkSession();
     }
 
     void Http3ClientJS::onCanWrite(const Napi::CallbackInfo &info)
     {
         if (client_->connectionrecheck_)
         {
-            client_->connectionrecheck_ = !client_->handleConnecting();
+            client_->connectionrecheck_ = client_->handleConnecting();
         }
+        if (client_->needsToCheckForSession()) client_->checkSession();
         client_->OnCanWrite();
     }
 

package/src/http3client.h

@@ -349,6 +349,10 @@ namespace quic
 
         bool checkSession();
 
+        bool needsToCheckForSession() {
+            return finish_stream_open_.size() > 0 && session_->CanOpenNextOutgoingBidirectionalStream();
+        }
+
         // Read oldest received response and remove it from closed_stream_states_.
         // void ReadNextResponse();
 

package/src/http3wtstreamvisitor.cc

@@ -83,34 +83,46 @@ namespace quic
     void Http3WTStream::doCanRead()
     {
         // if (pause_reading_) return ; // back pressure folks!
+        WebTransportStream::PeekResult pr;
+        pr = stream_->PeekNextReadableRegion();
+
+        if (pr.fin_next && pr.peeked_data.size() == 0) {
+            bool fin = stream_->SkipBytes(0);
+            if (fin) {
+                getJS()->signalFinOnly();
+                return;
+            }
+        }
 
         if (pause_reading_ && !drain_reads_)
         {
             can_read_pending_ = true;
             return; // back pressure folks!
         }
-        size_t readable = stream_->ReadableBytes();
         bool read = false;
-        while (readable > 0)
+        while (!pr.peeked_data.empty())
         {
             Http3WTStreamJS::StreamReadBuffer rbuf(js_);
-            rbuf.getBuffer(readable);
+            rbuf.getBuffer(stream_->ReadableBytes());
 
             size_t remainSize = rbuf.bufferSize();
             uint32_t writepos = 0;
 
-            while (readable > 0 && remainSize > 0) {
-                size_t len = remainSize;
-                WebTransportStream::ReadResult result =
-                    stream_->Read(absl::Span<char>(((char *)rbuf.bufferData()) + writepos, len));
+            while (!pr.peeked_data.empty() && remainSize > 0) {
+                size_t len = std::min(remainSize, pr.peeked_data.size());
+                if (len > 0) memcpy(((char *)rbuf.bufferData()) + writepos,pr.peeked_data.data(), len);
+                bool fin = stream_->SkipBytes(len);
                 QUIC_DVLOG(1) << "Attempted reading on WebTransport stream "
-                              << ", bytes read: " << result.bytes_read;
-                writepos += result.bytes_read;
-                remainSize -= result.bytes_read;
-                readable = stream_->ReadableBytes();
-                if (result.fin) rbuf.setFin();
+                              << ", bytes read: " << len;       
+                writepos += len;
+                remainSize -= len;
+                pr =  stream_->PeekNextReadableRegion();
+                if (fin) {
+                    rbuf.setFin();
+                    break;
+                }
             }
-            rbuf.commitBuffer(writepos, readable == 0);
+            rbuf.commitBuffer(writepos, pr.has_data());
         }
     }
 
@@ -142,8 +154,10 @@ namespace quic
         if (send_fin_)
         {
             bool success = stream_->SendFin();
-            if (success)
+            if (success) {
                 fin_was_sent_ = true;
+                getJS()->processStreamNetworkFinish(NetworkTask::streamFinal);
+            }
         }
     }
 
@@ -165,6 +179,17 @@ namespace quic
         }
     }
 
+    
+    void  Http3WTStreamJS::signalFinOnly() {
+        Napi::HandleScope scope(Env());
+        Napi::Object retObj = Napi::Object::New(Env());
+        Napi::Object objVal = Value().Get("jsobj").As<Napi::Object>();
+        retObj.Set("fin", true);
+        Napi::Value bufferVal = objVal.Get("commitReadBuffer").As<Napi::Function>().Call(objVal, {retObj});
+    }
+
+    
+
     void Http3WTStreamJS::processStreamNetworkFinish(NetworkTask task)
     {
         Napi::HandleScope scope(Env());

package/src/http3wtstreamvisitor.h

@@ -317,6 +317,7 @@ namespace quic
         void processStreamWrite(Napi::ObjectReference *bufferhandle, bool success);
         void processStreamNetworkFinish(NetworkTask task);
         void processStreamRecvSignal(WebTransportStreamError error_code, NetworkTask task);
+        void signalFinOnly();
     };
 }
 

package/src/librarymain.cc

@@ -38,7 +38,7 @@ namespace quic
       }
 
       quiche_cmd_line.push_back(std::string("-v"));
-      if (lobj.Has("quicheLogVerbose") && lobj.Get("quicheLogVerbose").IsFunction())
+      if (lobj.Has("quicheLogVerbose") && lobj.Get("quicheLogVerbose").IsNumber())
       {
         Napi::Value verboseValue = (lobj).Get("quicheLogVerbose");
         quiche_cmd_line.push_back(verboseValue.ToString().Utf8Value());