fix: Fix numBytesRemaining when the request is done (#6653)

shaka-project · May 23, 2024 · 812163a · 812163a
1 parent dda713a
commit 812163a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/net/http_fetch_plugin.js b/lib/net/http_fetch_plugin.js
@@ -167,8 +167,10 @@ shaka.net.HttpFetchPlugin = class {
             // is long enough, or if a whole segment is downloaded, call
             // progressUpdated().
             if (currentTime - lastTime > 100 || readObj.done) {
+              const numBytesRemaining =
+                  readObj.done ? 0 : contentLength - loaded;
               progressUpdated(currentTime - lastTime, loaded - lastLoaded,
-                  contentLength - loaded);
+                  numBytesRemaining);
               lastLoaded = loaded;
               lastTime = currentTime;
             }

diff --git a/lib/net/http_xhr_plugin.js b/lib/net/http_xhr_plugin.js
@@ -67,6 +67,9 @@ shaka.net.HttpXHRPlugin = class {
         const xhrResponse = xhr.response;
 
         try {
+          const currentTime = Date.now();
+          progressUpdated(currentTime - lastTime, event.loaded - lastLoaded,
+              /* numBytesRemaining= */ 0);
           const response = shaka.net.HttpPluginUtils.makeResponse(headers,
               xhrResponse, xhr.status, uri, xhr.responseURL, requestType);
           resolve(response);
@@ -97,8 +100,10 @@ shaka.net.HttpXHRPlugin = class {
         // progressUpdated().
         if (currentTime - lastTime > 100 ||
             (event.lengthComputable && event.loaded == event.total)) {
+          const numBytesRemaining =
+              xhr.readyState == 4 ? 0 : event.total - event.loaded;
           progressUpdated(currentTime - lastTime, event.loaded - lastLoaded,
-              event.total - event.loaded);
+              numBytesRemaining);
           lastLoaded = event.loaded;
           lastTime = currentTime;
         }