@php-wasm/progress 0.1.28 → 0.1.31

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=5*1024*1024;class f extends EventTarget{#e={};#t={};constructor(e=[]){super(),this.setModules(e),this.#s()}getEmscriptenOptions(){return{dataFileDownloads:this.#i()}}setModules(e){this.#e=e.reduce((t,s)=>{if(s.dependenciesTotalSize>0){const r="http://example.com/",n=new URL(s.dependencyFilename,r).pathname.split("/").pop();t[n]=Math.max(n in t?t[n]:0,s.dependenciesTotalSize)}return t},{}),this.#t=Object.fromEntries(Object.entries(this.#e).map(([t])=>[t,0]))}#s(){const e=WebAssembly.instantiateStreaming;WebAssembly.instantiateStreaming=async(t,...s)=>{const r=await t,i=r.url.substring(new URL(r.url).origin.length+1),n=u(r,({detail:{loaded:a,total:l}})=>this.#r(i,a,l));return e(n,...s)}}#i(){const e=this,t={};return new Proxy(t,{set(s,r,i){return e.#r(r,i.loaded,i.total),s[r]=new Proxy(JSON.parse(JSON.stringify(i)),{set(n,a,l){return n[a]=l,e.#r(r,n.loaded,n.total),!0}}),!0}})}#r(e,t,s){const r=new URL(e,"http://example.com").pathname.split("/").pop();s||(s=this.#e[r]),r in this.#t||console.warn(`Registered a download #progress of an unregistered file "${r}". This may cause a sudden **decrease** in the #progress percentage as the total number of bytes increases during the download.`),this.#t[e]=t,this.dispatchEvent(new CustomEvent("progress",{detail:{loaded:g(this.#t),total:g(this.#e)}}))}}function g(o){return Object.values(o).reduce((e,t)=>e+t,0)}function u(o,e){const t=o.headers.get("content-length")||"",s=parseInt(t,10)||c;function r(i,n){e(new CustomEvent("progress",{detail:{loaded:i,total:n}}))}return new Response(new ReadableStream({async start(i){if(!o.body){i.close();return}const n=o.body.getReader();let a=0;for(;;)try{const{done:l,value:h}=await n.read();if(h&&(a+=h.byteLength),l){r(a,a),i.close();break}else r(a,s),i.enqueue(h)}catch(l){console.error({e:l}),i.error(l);break}}}),{status:o.status,statusText:o.statusText,headers:o.headers})}class p extends EventTarget{constructor(){super(...arguments),this.#e={},this.#t=0,this.progress=0,this.mode="REAL_TIME",this.caption=""}#e;#t;partialObserver(e,t=""){const s=++this.#t;return this.#e[s]=0,r=>{const{loaded:i,total:n}=r?.detail||{};this.#e[s]=i/n*e,this.#s(this.totalProgress,"REAL_TIME",t)}}slowlyIncrementBy(e){const t=++this.#t;this.#e[t]=e,this.#s(this.totalProgress,"SLOWLY_INCREMENT")}get totalProgress(){return Object.values(this.#e).reduce((e,t)=>e+t,0)}#s(e,t,s){this.dispatchEvent(new CustomEvent("progress",{detail:{progress:e,mode:t,caption:s}}))}}class d extends EventTarget{constructor({weight:e=1,caption:t="",fillTime:s=4}={}){super(),this._selfWeight=1,this._selfProgress=0,this._selfCaption="",this._isFilling=!1,this._subTrackers=[],this._weight=e,this._selfCaption=t,this._fillTime=s}stage(e,t=""){if(e||(e=this._selfWeight),this._selfWeight-e<-Number.EPSILON)throw new Error(`Cannot add a stage with weight ${e} as the total weight of registered stages would exceed 1.`);this._selfWeight-=e;const s=new d({caption:t,weight:e,fillTime:this._fillTime});return this._subTrackers.push(s),s.addEventListener("progress",()=>this.notifyProgress()),s.addEventListener("done",()=>{this.done&&this.notifyDone()}),s}fillSlowly({stopBeforeFinishing:e=!0}={}){if(this._isFilling)return;this._isFilling=!0;const t=100,s=this._fillTime/t;this._fillInterval=setInterval(()=>{this.set(this._selfProgress+1),e&&this._selfProgress>=99&&clearInterval(this._fillInterval)},s)}set(e){this._selfProgress=Math.min(e,100),this.notifyProgress(),this._selfProgress+Number.EPSILON>=100&&this.finish()}finish(){this._fillInterval&&clearInterval(this._fillInterval),this._selfProgress=100,this._isFilling=!1,this._fillInterval=void 0,this.notifyProgress(),this.notifyDone()}get caption(){for(let e=this._subTrackers.length-1;e>=0;e--)if(!this._subTrackers[e].done){const t=this._subTrackers[e].caption;if(t)return t}return this._selfCaption}setCaption(e){this._selfCaption=e,this.notifyProgress()}get done(){return this.progress+Number.EPSILON>=100}get progress(){return this._subTrackers.reduce((e,t)=>e+t.progress*t.weight,this._selfProgress*this._selfWeight)}get weight(){return this._weight}get observer(){return this._progressObserver||(this._progressObserver=e=>{this.set(e)}),this._progressObserver}get loadingListener(){return this._loadingListener||(this._loadingListener=e=>{this.set(e.detail.loaded/e.detail.total*100)}),this._loadingListener}pipe(e){this.addEventListener("progress",t=>{e.setProgress({progress:t.detail.progress,caption:t.detail.caption})}),this.addEventListener("done",()=>{e.setLoaded()})}addEventListener(e,t){super.addEventListener(e,t)}removeEventListener(e,t){super.removeEventListener(e,t)}notifyProgress(){const e=this;this.dispatchEvent(new CustomEvent("progress",{detail:{get progress(){return e.progress},get caption(){return e.caption}}}))}notifyDone(){this.dispatchEvent(new CustomEvent("done"))}}exports.EmscriptenDownloadMonitor=f;exports.ProgressObserver=p;exports.ProgressTracker=d;exports.cloneResponseMonitorProgress=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=5*1024*1024;class p extends EventTarget{#e={};#t={};constructor(e=[]){super(),this.setModules(e),this.#s()}getEmscriptenOptions(){return{dataFileDownloads:this.#i()}}setModules(e){this.#e=e.reduce((t,s)=>{if(s.dependenciesTotalSize>0){const r="http://example.com/",n=new URL(s.dependencyFilename,r).pathname.split("/").pop();t[n]=Math.max(n in t?t[n]:0,s.dependenciesTotalSize)}return t},{}),this.#t=Object.fromEntries(Object.entries(this.#e).map(([t])=>[t,0]))}#s(){const e=WebAssembly.instantiateStreaming;WebAssembly.instantiateStreaming=async(t,...s)=>{const r=await t,i=r.url.substring(new URL(r.url).origin.length+1),n=u(r,({detail:{loaded:a,total:l}})=>this.#r(i,a,l));return e(n,...s)}}#i(){const e=this,t={};return new Proxy(t,{set(s,r,i){return e.#r(r,i.loaded,i.total),s[r]=new Proxy(JSON.parse(JSON.stringify(i)),{set(n,a,l){return n[a]=l,e.#r(r,n.loaded,n.total),!0}}),!0}})}#r(e,t,s){const r=new URL(e,"http://example.com").pathname.split("/").pop();s||(s=this.#e[r]),r in this.#t||console.warn(`Registered a download #progress of an unregistered file "${r}". This may cause a sudden **decrease** in the #progress percentage as the total number of bytes increases during the download.`),this.#t[e]=t,this.dispatchEvent(new CustomEvent("progress",{detail:{loaded:c(this.#t),total:c(this.#e)}}))}}function c(o){return Object.values(o).reduce((e,t)=>e+t,0)}function u(o,e){const t=o.headers.get("content-length")||"",s=parseInt(t,10)||f;function r(i,n){e(new CustomEvent("progress",{detail:{loaded:i,total:n}}))}return new Response(new ReadableStream({async start(i){if(!o.body){i.close();return}const n=o.body.getReader();let a=0;for(;;)try{const{done:l,value:h}=await n.read();if(h&&(a+=h.byteLength),l){r(a,a),i.close();break}else r(a,s),i.enqueue(h)}catch(l){console.error({e:l}),i.error(l);break}}}),{status:o.status,statusText:o.statusText,headers:o.headers})}class _ extends EventTarget{constructor(){super(...arguments),this.#e={},this.#t=0,this.progress=0,this.mode="REAL_TIME",this.caption=""}#e;#t;partialObserver(e,t=""){const s=++this.#t;return this.#e[s]=0,r=>{const{loaded:i,total:n}=r?.detail||{};this.#e[s]=i/n*e,this.#s(this.totalProgress,"REAL_TIME",t)}}slowlyIncrementBy(e){const t=++this.#t;this.#e[t]=e,this.#s(this.totalProgress,"SLOWLY_INCREMENT")}get totalProgress(){return Object.values(this.#e).reduce((e,t)=>e+t,0)}#s(e,t,s){this.dispatchEvent(new CustomEvent("progress",{detail:{progress:e,mode:t,caption:s}}))}}const d=1e-5;class g extends EventTarget{constructor({weight:e=1,caption:t="",fillTime:s=4}={}){super(),this._selfWeight=1,this._selfProgress=0,this._selfCaption="",this._isFilling=!1,this._subTrackers=[],this._weight=e,this._selfCaption=t,this._fillTime=s}stage(e,t=""){if(e||(e=this._selfWeight),this._selfWeight-e<-d)throw new Error(`Cannot add a stage with weight ${e} as the total weight of registered stages would exceed 1.`);this._selfWeight-=e;const s=new g({caption:t,weight:e,fillTime:this._fillTime});return this._subTrackers.push(s),s.addEventListener("progress",()=>this.notifyProgress()),s.addEventListener("done",()=>{this.done&&this.notifyDone()}),s}fillSlowly({stopBeforeFinishing:e=!0}={}){if(this._isFilling)return;this._isFilling=!0;const t=100,s=this._fillTime/t;this._fillInterval=setInterval(()=>{this.set(this._selfProgress+1),e&&this._selfProgress>=99&&clearInterval(this._fillInterval)},s)}set(e){this._selfProgress=Math.min(e,100),this.notifyProgress(),this._selfProgress+d>=100&&this.finish()}finish(){this._fillInterval&&clearInterval(this._fillInterval),this._selfProgress=100,this._isFilling=!1,this._fillInterval=void 0,this.notifyProgress(),this.notifyDone()}get caption(){for(let e=this._subTrackers.length-1;e>=0;e--)if(!this._subTrackers[e].done){const t=this._subTrackers[e].caption;if(t)return t}return this._selfCaption}setCaption(e){this._selfCaption=e,this.notifyProgress()}get done(){return this.progress+d>=100}get progress(){const e=this._subTrackers.reduce((t,s)=>t+s.progress*s.weight,this._selfProgress*this._selfWeight);return Math.round(e*1e4)/1e4}get weight(){return this._weight}get observer(){return this._progressObserver||(this._progressObserver=e=>{this.set(e)}),this._progressObserver}get loadingListener(){return this._loadingListener||(this._loadingListener=e=>{this.set(e.detail.loaded/e.detail.total*100)}),this._loadingListener}pipe(e){this.addEventListener("progress",t=>{e.setProgress({progress:t.detail.progress,caption:t.detail.caption})}),this.addEventListener("done",()=>{e.setLoaded()})}addEventListener(e,t){super.addEventListener(e,t)}removeEventListener(e,t){super.removeEventListener(e,t)}notifyProgress(){const e=this;this.dispatchEvent(new CustomEvent("progress",{detail:{get progress(){return e.progress},get caption(){return e.caption}}}))}notifyDone(){this.dispatchEvent(new CustomEvent("done"))}}exports.EmscriptenDownloadMonitor=p;exports.ProgressObserver=_;exports.ProgressTracker=g;exports.cloneResponseMonitorProgress=u;

package/index.js

@@ -1,4 +1,4 @@
-class c extends EventTarget {
+class f extends EventTarget {
   #e = {};
   #t = {};
   constructor(e = []) {
@@ -6,13 +6,13 @@ class c extends EventTarget {
   }
   getEmscriptenOptions() {
     return {
-      dataFileDownloads: this.#i()
+      dataFileDownloads: this.#r()
     };
   }
   setModules(e) {
     this.#e = e.reduce((t, s) => {
       if (s.dependenciesTotalSize > 0) {
-        const r = "http://example.com/", n = new URL(s.dependencyFilename, r).pathname.split("/").pop();
+        const i = "http://example.com/", n = new URL(s.dependencyFilename, i).pathname.split("/").pop();
         t[n] = Math.max(
           n in t ? t[n] : 0,
           s.dependenciesTotalSize
@@ -30,11 +30,11 @@ class c extends EventTarget {
   #s() {
     const e = WebAssembly.instantiateStreaming;
     WebAssembly.instantiateStreaming = async (t, ...s) => {
-      const r = await t, i = r.url.substring(
-        new URL(r.url).origin.length + 1
+      const i = await t, r = i.url.substring(
+        new URL(i.url).origin.length + 1
       ), n = u(
-        r,
-        ({ detail: { loaded: a, total: l } }) => this.#r(i, a, l)
+        i,
+        ({ detail: { loaded: a, total: l } }) => this.#i(r, a, l)
       );
       return e(n, ...s);
     };
@@ -44,13 +44,13 @@ class c extends EventTarget {
    * to `startPHP` to monitor the download #progress of the data
    * dependencies.
    */
-  #i() {
+  #r() {
     const e = this, t = {};
     return new Proxy(t, {
-      set(s, r, i) {
-        return e.#r(r, i.loaded, i.total), s[r] = new Proxy(JSON.parse(JSON.stringify(i)), {
+      set(s, i, r) {
+        return e.#i(i, r.loaded, r.total), s[i] = new Proxy(JSON.parse(JSON.stringify(r)), {
           set(n, a, l) {
-            return n[a] = l, e.#r(r, n.loaded, n.total), !0;
+            return n[a] = l, e.#i(i, n.loaded, n.total), !0;
           }
         }), !0;
       }
@@ -63,30 +63,30 @@ class c extends EventTarget {
    * @param  loaded The number of bytes of that file loaded so far.
    * @param  fileSize  The total number of bytes in the loaded file.
    */
-  #r(e, t, s) {
-    const r = new URL(e, "http://example.com").pathname.split("/").pop();
-    s || (s = this.#e[r]), r in this.#t || console.warn(
-      `Registered a download #progress of an unregistered file "${r}". This may cause a sudden **decrease** in the #progress percentage as the total number of bytes increases during the download.`
+  #i(e, t, s) {
+    const i = new URL(e, "http://example.com").pathname.split("/").pop();
+    s || (s = this.#e[i]), i in this.#t || console.warn(
+      `Registered a download #progress of an unregistered file "${i}". This may cause a sudden **decrease** in the #progress percentage as the total number of bytes increases during the download.`
     ), this.#t[e] = t, this.dispatchEvent(
       new CustomEvent("progress", {
         detail: {
-          loaded: d(this.#t),
-          total: d(this.#e)
+          loaded: g(this.#t),
+          total: g(this.#e)
         }
       })
     );
   }
 }
-function d(o) {
+function g(o) {
   return Object.values(o).reduce((e, t) => e + t, 0);
 }
 function u(o, e) {
   const t = o.headers.get("content-length") || "", s = parseInt(t, 10) || 5242880;
-  function r(i, n) {
+  function i(r, n) {
     e(
       new CustomEvent("progress", {
         detail: {
-          loaded: i,
+          loaded: r,
           total: n
         }
       })
@@ -94,9 +94,9 @@ function u(o, e) {
   }
   return new Response(
     new ReadableStream({
-      async start(i) {
+      async start(r) {
         if (!o.body) {
-          i.close();
+          r.close();
           return;
         }
         const n = o.body.getReader();
@@ -105,12 +105,12 @@ function u(o, e) {
           try {
             const { done: l, value: h } = await n.read();
             if (h && (a += h.byteLength), l) {
-              r(a, a), i.close();
+              i(a, a), r.close();
               break;
             } else
-              r(a, s), i.enqueue(h);
+              i(a, s), r.enqueue(h);
           } catch (l) {
-            console.error({ e: l }), i.error(l);
+            console.error({ e: l }), r.error(l);
             break;
           }
       }
@@ -122,7 +122,7 @@ function u(o, e) {
     }
   );
 }
-class f extends EventTarget {
+class p extends EventTarget {
   constructor() {
     super(...arguments), this.#e = {}, this.#t = 0, this.progress = 0, this.mode = "REAL_TIME", this.caption = "";
   }
@@ -130,9 +130,9 @@ class f extends EventTarget {
   #t;
   partialObserver(e, t = "") {
     const s = ++this.#t;
-    return this.#e[s] = 0, (r) => {
-      const { loaded: i, total: n } = r?.detail || {};
-      this.#e[s] = i / n * e, this.#s(this.totalProgress, "REAL_TIME", t);
+    return this.#e[s] = 0, (i) => {
+      const { loaded: r, total: n } = i?.detail || {};
+      this.#e[s] = r / n * e, this.#s(this.totalProgress, "REAL_TIME", t);
     };
   }
   slowlyIncrementBy(e) {
@@ -157,7 +157,8 @@ class f extends EventTarget {
     );
   }
 }
-class g extends EventTarget {
+const d = 1e-5;
+class c extends EventTarget {
   constructor({
     weight: e = 1,
     caption: t = "",
@@ -201,12 +202,12 @@ class g extends EventTarget {
    * ```
    */
   stage(e, t = "") {
-    if (e || (e = this._selfWeight), this._selfWeight - e < -Number.EPSILON)
+    if (e || (e = this._selfWeight), this._selfWeight - e < -d)
       throw new Error(
         `Cannot add a stage with weight ${e} as the total weight of registered stages would exceed 1.`
       );
     this._selfWeight -= e;
-    const s = new g({
+    const s = new c({
       caption: t,
       weight: e,
       fillTime: this._fillTime
@@ -243,7 +244,7 @@ class g extends EventTarget {
     }, s);
   }
   set(e) {
-    this._selfProgress = Math.min(e, 100), this.notifyProgress(), this._selfProgress + Number.EPSILON >= 100 && this.finish();
+    this._selfProgress = Math.min(e, 100), this.notifyProgress(), this._selfProgress + d >= 100 && this.finish();
   }
   finish() {
     this._fillInterval && clearInterval(this._fillInterval), this._selfProgress = 100, this._isFilling = !1, this._fillInterval = void 0, this.notifyProgress(), this.notifyDone();
@@ -261,13 +262,14 @@ class g extends EventTarget {
     this._selfCaption = e, this.notifyProgress();
   }
   get done() {
-    return this.progress + Number.EPSILON >= 100;
+    return this.progress + d >= 100;
   }
   get progress() {
-    return this._subTrackers.reduce(
-      (e, t) => e + t.progress * t.weight,
+    const e = this._subTrackers.reduce(
+      (t, s) => t + s.progress * s.weight,
       this._selfProgress * this._selfWeight
     );
+    return Math.round(e * 1e4) / 1e4;
   }
   get weight() {
     return this._weight;
@@ -318,8 +320,8 @@ class g extends EventTarget {
   }
 }
 export {
-  c as EmscriptenDownloadMonitor,
-  f as ProgressObserver,
-  g as ProgressTracker,
+  f as EmscriptenDownloadMonitor,
+  p as ProgressObserver,
+  c as ProgressTracker,
   u as cloneResponseMonitorProgress
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/progress",
-  "version": "0.1.28",
+  "version": "0.1.31",
   "description": "PHP.wasm – loading progress monitoring",
   "repository": {
     "type": "git",
@@ -29,6 +29,6 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "883860eacc7c37377f772a26919e700749020e4c",
+  "gitHead": "04b86f80526a6fa630226ba2416163ffeed6b43d",
   "dependencies": {}
 }