@php-wasm/logger 0.6.8 → 0.6.10

package/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=function(){var o;return typeof process<"u"&&((o=process.release)==null?void 0:o.name)==="node"?"NODE":typeof window<"u"?"WEB":typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope?"WORKER":"NODE"}();if(u==="NODE"){let o=function(e){return new Promise(function(r,n){e.onload=e.onerror=function(s){e.onload=e.onerror=null,s.type==="load"?r(e.result):n(new Error("Failed to read the blob/file"))}})},t=function(){const e=new Uint8Array([1,2,3,4]),n=new File([e],"test").stream();try{return n.getReader({mode:"byob"}),!0}catch{return!1}};if(typeof File>"u"){class e extends Blob{constructor(n,s,a){super(n);let i;a!=null&&a.lastModified&&(i=new Date),(!i||isNaN(i.getFullYear()))&&(i=new Date),this.lastModifiedDate=i,this.lastModified=i.getMilliseconds(),this.name=s||""}}global.File=e}typeof Blob.prototype.arrayBuffer>"u"&&(Blob.prototype.arrayBuffer=function(){const r=new FileReader;return r.readAsArrayBuffer(this),o(r)}),typeof Blob.prototype.text>"u"&&(Blob.prototype.text=function(){const r=new FileReader;return r.readAsText(this),o(r)}),(typeof Blob.prototype.stream>"u"||!t())&&(Blob.prototype.stream=function(){let e=0;const r=this;return new ReadableStream({type:"bytes",autoAllocateChunkSize:512*1024,async pull(n){const s=n.byobRequest.view,i=await r.slice(e,e+s.byteLength).arrayBuffer(),d=new Uint8Array(i);new Uint8Array(s.buffer).set(d);const l=d.byteLength;n.byobRequest.respond(l),e+=l,e>=r.size&&n.close()}})})}if(u==="NODE"&&typeof CustomEvent>"u"){class o extends Event{constructor(e,r={}){super(e,r),this.detail=r.detail}initCustomEvent(){}}globalThis.CustomEvent=o}class f extends EventTarget{constructor(t){super(),this.fatalErrorEvent="playground-fatal-error",this.logs=[],this.windowConnected=!1,this.lastPHPLogLength=0,this.errorLogPath="/wordpress/wp-content/debug.log",t&&(this.errorLogPath=t)}async getRequestPhpErrorLog(t){return await t.fileExists(this.errorLogPath)?await t.readFileAsText(this.errorLogPath):""}logWindowError(t){this.log(`${t.message} in ${t.filename} on line ${t.lineno}:${t.colno}`,"Error")}logUnhandledRejection(t){this.log(`${t.reason.stack}`,"Error")}addWindowErrorListener(){this.windowConnected||typeof window>"u"||(window.addEventListener("error",this.logWindowError.bind(this)),window.addEventListener("unhandledrejection",this.logUnhandledRejection.bind(this)),window.addEventListener("rejectionhandled",this.logUnhandledRejection.bind(this)),this.windowConnected=!0)}addPlaygroundRequestEndListener(t){t.addEventListener("request.end",async()=>{const e=await this.getRequestPhpErrorLog(t);e.length>this.lastPHPLogLength&&(this.logRaw(e.substring(this.lastPHPLogLength)),this.lastPHPLogLength=e.length)}),t.addEventListener("request.error",e=>{e=e,e.error&&(this.log(`${e.error.message} ${e.error.stack}`,"Fatal","PHP-WASM"),this.dispatchEvent(new CustomEvent(this.fatalErrorEvent,{detail:{logs:this.getLogs()}})))})}formatLogDate(t){const e=new Intl.DateTimeFormat("en-GB",{year:"numeric",month:"short",day:"2-digit",timeZone:"UTC"}).format(t).replace(/ /g,"-"),r=new Intl.DateTimeFormat("en-GB",{hour:"2-digit",minute:"2-digit",second:"2-digit",hour12:!1,timeZone:"UTC",timeZoneName:"short"}).format(t);return e+" "+r}formatMessage(t,e,r){return`[${this.formatLogDate(new Date)}] ${r} ${e}: ${t}`}log(t,e,r){e===void 0&&(e="Info");const n=this.formatMessage(t,e,r??"Playground");this.logRaw(n)}logRaw(t){this.logs.push(t),console.debug(t)}getLogs(){return this.logs}}const c=new f;function g(o){o.addWindowErrorListener()}function h(o,t){o.addPlaygroundRequestEndListener(t)}function w(o,t){o.addEventListener(o.fatalErrorEvent,t)}exports.Logger=f;exports.addFatalErrorListener=w;exports.collectPhpLogs=h;exports.collectWindowErrors=g;exports.logger=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=function(){var o;return typeof process<"u"&&((o=process.release)==null?void 0:o.name)==="node"?"NODE":typeof window<"u"?"WEB":typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope?"WORKER":"NODE"}();if(u==="NODE"){let o=function(t){return new Promise(function(r,n){t.onload=t.onerror=function(s){t.onload=t.onerror=null,s.type==="load"?r(t.result):n(new Error("Failed to read the blob/file"))}})},e=function(){const t=new Uint8Array([1,2,3,4]),n=new File([t],"test").stream();try{return n.getReader({mode:"byob"}),!0}catch{return!1}};if(typeof File>"u"){class t extends Blob{constructor(n,s,a){super(n);let i;a!=null&&a.lastModified&&(i=new Date),(!i||isNaN(i.getFullYear()))&&(i=new Date),this.lastModifiedDate=i,this.lastModified=i.getMilliseconds(),this.name=s||""}}global.File=t}typeof Blob.prototype.arrayBuffer>"u"&&(Blob.prototype.arrayBuffer=function(){const r=new FileReader;return r.readAsArrayBuffer(this),o(r)}),typeof Blob.prototype.text>"u"&&(Blob.prototype.text=function(){const r=new FileReader;return r.readAsText(this),o(r)}),(typeof Blob.prototype.stream>"u"||!e())&&(Blob.prototype.stream=function(){let t=0;const r=this;return new ReadableStream({type:"bytes",autoAllocateChunkSize:512*1024,async pull(n){const s=n.byobRequest.view,i=await r.slice(t,t+s.byteLength).arrayBuffer(),d=new Uint8Array(i);new Uint8Array(s.buffer).set(d);const l=d.byteLength;n.byobRequest.respond(l),t+=l,t>=r.size&&n.close()}})})}if(u==="NODE"&&typeof CustomEvent>"u"){class o extends Event{constructor(t,r={}){super(t,r),this.detail=r.detail}initCustomEvent(){}}globalThis.CustomEvent=o}class f extends EventTarget{constructor(e){super(),this.fatalErrorEvent="playground-fatal-error",this.logs=[],this.windowConnected=!1,this.lastPHPLogLength=0,this.errorLogPath="/wordpress/wp-content/debug.log",e&&(this.errorLogPath=e)}async getRequestPhpErrorLog(e){return await e.fileExists(this.errorLogPath)?await e.readFileAsText(this.errorLogPath):""}logWindowError(e){this.log(`${e.message} in ${e.filename} on line ${e.lineno}:${e.colno}`,"Error")}logUnhandledRejection(e){if(!(e!=null&&e.reason))return;const t=(e==null?void 0:e.reason.stack)??e.reason;this.log(t,"Error")}addWindowErrorListener(){this.windowConnected||typeof window>"u"||(window.addEventListener("error",this.logWindowError.bind(this)),window.addEventListener("unhandledrejection",this.logUnhandledRejection.bind(this)),window.addEventListener("rejectionhandled",this.logUnhandledRejection.bind(this)),this.windowConnected=!0)}addPlaygroundRequestEndListener(e){e.addEventListener("request.end",async()=>{const t=await this.getRequestPhpErrorLog(e);t.length>this.lastPHPLogLength&&(this.logRaw(t.substring(this.lastPHPLogLength)),this.lastPHPLogLength=t.length)}),e.addEventListener("request.error",t=>{t=t,t.error&&(this.log(`${t.error.message} ${t.error.stack}`,"Fatal","PHP-WASM"),this.dispatchEvent(new CustomEvent(this.fatalErrorEvent,{detail:{logs:this.getLogs(),source:t.source}})))})}formatLogDate(e){const t=new Intl.DateTimeFormat("en-GB",{year:"numeric",month:"short",day:"2-digit",timeZone:"UTC"}).format(e).replace(/ /g,"-"),r=new Intl.DateTimeFormat("en-GB",{hour:"2-digit",minute:"2-digit",second:"2-digit",hour12:!1,timeZone:"UTC",timeZoneName:"short"}).format(e);return t+" "+r}formatMessage(e,t,r){return`[${this.formatLogDate(new Date)}] ${r} ${t}: ${e}`}log(e,t,r){t===void 0&&(t="Info");const n=this.formatMessage(e,t,r??"Playground");this.logRaw(n)}logRaw(e){this.logs.push(e),console.debug(e)}getLogs(){return this.logs}}const c=new f;function g(o){o.addWindowErrorListener()}function h(o,e){o.addPlaygroundRequestEndListener(e)}function w(o,e){o.addEventListener(o.fatalErrorEvent,e)}exports.Logger=f;exports.addFatalErrorListener=w;exports.collectPhpLogs=h;exports.collectWindowErrors=g;exports.logger=c;

package/index.mjs

@@ -1,75 +1,75 @@
-const f = function() {
-  var n;
-  return typeof process < "u" && ((n = process.release) == null ? void 0 : n.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
+const u = function() {
+  var o;
+  return typeof process < "u" && ((o = process.release) == null ? void 0 : o.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
     // @ts-ignore
     typeof WorkerGlobalScope < "u" && // @ts-ignore
     self instanceof WorkerGlobalScope ? "WORKER" : "NODE"
   );
 }();
-if (f === "NODE") {
-  let n = function(e) {
-    return new Promise(function(r, o) {
-      e.onload = e.onerror = function(s) {
-        e.onload = e.onerror = null, s.type === "load" ? r(e.result) : o(new Error("Failed to read the blob/file"));
+if (u === "NODE") {
+  let o = function(t) {
+    return new Promise(function(r, n) {
+      t.onload = t.onerror = function(s) {
+        t.onload = t.onerror = null, s.type === "load" ? r(t.result) : n(new Error("Failed to read the blob/file"));
       };
     });
-  }, t = function() {
-    const e = new Uint8Array([1, 2, 3, 4]), o = new File([e], "test").stream();
+  }, e = function() {
+    const t = new Uint8Array([1, 2, 3, 4]), n = new File([t], "test").stream();
     try {
-      return o.getReader({ mode: "byob" }), !0;
+      return n.getReader({ mode: "byob" }), !0;
     } catch {
       return !1;
     }
   };
   if (typeof File > "u") {
-    class e extends Blob {
-      constructor(o, s, a) {
-        super(o);
+    class t extends Blob {
+      constructor(n, s, a) {
+        super(n);
         let i;
         a != null && a.lastModified && (i = /* @__PURE__ */ new Date()), (!i || isNaN(i.getFullYear())) && (i = /* @__PURE__ */ new Date()), this.lastModifiedDate = i, this.lastModified = i.getMilliseconds(), this.name = s || "";
       }
     }
-    global.File = e;
+    global.File = t;
   }
   typeof Blob.prototype.arrayBuffer > "u" && (Blob.prototype.arrayBuffer = function() {
     const r = new FileReader();
-    return r.readAsArrayBuffer(this), n(r);
+    return r.readAsArrayBuffer(this), o(r);
   }), typeof Blob.prototype.text > "u" && (Blob.prototype.text = function() {
     const r = new FileReader();
-    return r.readAsText(this), n(r);
-  }), (typeof Blob.prototype.stream > "u" || !t()) && (Blob.prototype.stream = function() {
-    let e = 0;
+    return r.readAsText(this), o(r);
+  }), (typeof Blob.prototype.stream > "u" || !e()) && (Blob.prototype.stream = function() {
+    let t = 0;
     const r = this;
     return new ReadableStream({
       type: "bytes",
       // 0.5 MB seems like a reasonable chunk size, let's adjust
       // this if needed.
       autoAllocateChunkSize: 512 * 1024,
-      async pull(o) {
-        const s = o.byobRequest.view, i = await r.slice(
-          e,
-          e + s.byteLength
+      async pull(n) {
+        const s = n.byobRequest.view, i = await r.slice(
+          t,
+          t + s.byteLength
         ).arrayBuffer(), d = new Uint8Array(i);
         new Uint8Array(s.buffer).set(d);
         const l = d.byteLength;
-        o.byobRequest.respond(l), e += l, e >= r.size && o.close();
+        n.byobRequest.respond(l), t += l, t >= r.size && n.close();
       }
     });
   });
 }
-if (f === "NODE" && typeof CustomEvent > "u") {
-  class n extends Event {
-    constructor(e, r = {}) {
-      super(e, r), this.detail = r.detail;
+if (u === "NODE" && typeof CustomEvent > "u") {
+  class o extends Event {
+    constructor(t, r = {}) {
+      super(t, r), this.detail = r.detail;
     }
     initCustomEvent() {
     }
   }
-  globalThis.CustomEvent = n;
+  globalThis.CustomEvent = o;
 }
-class u extends EventTarget {
-  constructor(t) {
-    super(), this.fatalErrorEvent = "playground-fatal-error", this.logs = [], this.windowConnected = !1, this.lastPHPLogLength = 0, this.errorLogPath = "/wordpress/wp-content/debug.log", t && (this.errorLogPath = t);
+class f extends EventTarget {
+  constructor(e) {
+    super(), this.fatalErrorEvent = "playground-fatal-error", this.logs = [], this.windowConnected = !1, this.lastPHPLogLength = 0, this.errorLogPath = "/wordpress/wp-content/debug.log", e && (this.errorLogPath = e);
   }
   /**
    * Read the WordPress debug.log file and return its content.
@@ -77,17 +77,17 @@ class u extends EventTarget {
    * @param UniversalPHP playground instance
    * @returns string The content of the debug.log file
    */
-  async getRequestPhpErrorLog(t) {
-    return await t.fileExists(this.errorLogPath) ? await t.readFileAsText(this.errorLogPath) : "";
+  async getRequestPhpErrorLog(e) {
+    return await e.fileExists(this.errorLogPath) ? await e.readFileAsText(this.errorLogPath) : "";
   }
   /**
    * Log Windows errors.
    *
    * @param ErrorEvent event
    */
-  logWindowError(t) {
+  logWindowError(e) {
     this.log(
-      `${t.message} in ${t.filename} on line ${t.lineno}:${t.colno}`,
+      `${e.message} in ${e.filename} on line ${e.lineno}:${e.colno}`,
       "Error"
     );
   }
@@ -96,8 +96,11 @@ class u extends EventTarget {
    *
    * @param PromiseRejectionEvent event
    */
-  logUnhandledRejection(t) {
-    this.log(`${t.reason.stack}`, "Error");
+  logUnhandledRejection(e) {
+    if (!(e != null && e.reason))
+      return;
+    const t = (e == null ? void 0 : e.reason.stack) ?? e.reason;
+    this.log(t, "Error");
   }
   /**
    * Register a listener for the window error events and log the data.
@@ -115,19 +118,20 @@ class u extends EventTarget {
    * Register a listener for the request.end event and log the data.
    * @param UniversalPHP playground instance
    */
-  addPlaygroundRequestEndListener(t) {
-    t.addEventListener("request.end", async () => {
-      const e = await this.getRequestPhpErrorLog(t);
-      e.length > this.lastPHPLogLength && (this.logRaw(e.substring(this.lastPHPLogLength)), this.lastPHPLogLength = e.length);
-    }), t.addEventListener("request.error", (e) => {
-      e = e, e.error && (this.log(
-        `${e.error.message} ${e.error.stack}`,
+  addPlaygroundRequestEndListener(e) {
+    e.addEventListener("request.end", async () => {
+      const t = await this.getRequestPhpErrorLog(e);
+      t.length > this.lastPHPLogLength && (this.logRaw(t.substring(this.lastPHPLogLength)), this.lastPHPLogLength = t.length);
+    }), e.addEventListener("request.error", (t) => {
+      t = t, t.error && (this.log(
+        `${t.error.message} ${t.error.stack}`,
         "Fatal",
         "PHP-WASM"
       ), this.dispatchEvent(
         new CustomEvent(this.fatalErrorEvent, {
           detail: {
-            logs: this.getLogs()
+            logs: this.getLogs(),
+            source: t.source
           }
         })
       ));
@@ -139,21 +143,21 @@ class u extends EventTarget {
    * @param date
    * @returns string
    */
-  formatLogDate(t) {
-    const e = new Intl.DateTimeFormat("en-GB", {
+  formatLogDate(e) {
+    const t = new Intl.DateTimeFormat("en-GB", {
       year: "numeric",
       month: "short",
       day: "2-digit",
       timeZone: "UTC"
-    }).format(t).replace(/ /g, "-"), r = new Intl.DateTimeFormat("en-GB", {
+    }).format(e).replace(/ /g, "-"), r = new Intl.DateTimeFormat("en-GB", {
       hour: "2-digit",
       minute: "2-digit",
       second: "2-digit",
       hour12: !1,
       timeZone: "UTC",
       timeZoneName: "short"
-    }).format(t);
-    return e + " " + r;
+    }).format(e);
+    return t + " " + r;
   }
   /**
    * Format log message and severity and log it.
@@ -161,8 +165,8 @@ class u extends EventTarget {
    * @param LogSeverity severity
    * @param string prefix
    */
-  formatMessage(t, e, r) {
-    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${r} ${e}: ${t}`;
+  formatMessage(e, t, r) {
+    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${r} ${t}: ${e}`;
   }
   /**
    * Log message with severity and timestamp.
@@ -170,21 +174,21 @@ class u extends EventTarget {
    * @param LogSeverity severity
    * @param string prefix
    */
-  log(t, e, r) {
-    e === void 0 && (e = "Info");
-    const o = this.formatMessage(
-      t,
+  log(e, t, r) {
+    t === void 0 && (t = "Info");
+    const n = this.formatMessage(
       e,
+      t,
       r ?? "Playground"
     );
-    this.logRaw(o);
+    this.logRaw(n);
   }
   /**
    * Log message without severity and timestamp.
    * @param string log
    */
-  logRaw(t) {
-    this.logs.push(t), console.debug(t);
+  logRaw(e) {
+    this.logs.push(e), console.debug(e);
   }
   /**
    * Get all logs.
@@ -194,18 +198,18 @@ class u extends EventTarget {
     return this.logs;
   }
 }
-const c = new u();
-function h(n) {
-  n.addWindowErrorListener();
+const c = new f();
+function h(o) {
+  o.addWindowErrorListener();
 }
-function g(n, t) {
-  n.addPlaygroundRequestEndListener(t);
+function g(o, e) {
+  o.addPlaygroundRequestEndListener(e);
 }
-function w(n, t) {
-  n.addEventListener(n.fatalErrorEvent, t);
+function w(o, e) {
+  o.addEventListener(o.fatalErrorEvent, e);
 }
 export {
-  u as Logger,
+  f as Logger,
   w as addFatalErrorListener,
   g as collectPhpLogs,
   h as collectWindowErrors,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/logger",
-	"version": "0.6.8",
+	"version": "0.6.10",
 	"description": "A logger for PHP-wasm clients like Playground and WP-now.",
 	"repository": {
 		"type": "git",
@@ -25,5 +25,5 @@
 		"node": ">=18.18.2",
 		"npm": ">=8.11.0"
 	},
-	"gitHead": "cb7b1af260489022238495a2fc0d96f767a1294a"
+	"gitHead": "a678c93cecd1c7fd5c8279ad8454a83225edd2aa"
 }