@php-wasm/logger 0.6.6 → 0.6.8

package/index.d.ts

@@ -1 +1 @@
-export * from './logger';
+export * from './lib/logger';

package/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class i{constructor(e){this.LOG_PREFIX="Playground",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}`,"fatal")}logUnhandledRejection(e){this.log(`${e.reason.stack}`,"fatal")}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)})}formatLogDate(e){const t=new Intl.DateTimeFormat("en-GB",{year:"numeric",month:"short",day:"2-digit",timeZone:"UTC"}).format(e).replace(/ /g,"-"),n=new Intl.DateTimeFormat("en-GB",{hour:"2-digit",minute:"2-digit",second:"2-digit",hour12:!1,timeZone:"UTC",timeZoneName:"short"}).format(e);return t+" "+n}formatMessage(e,t){return`[${this.formatLogDate(new Date)}] ${this.LOG_PREFIX} ${t}: ${e}`}log(e,t){t===void 0&&(t="info");const n=this.formatMessage(e,t);this.logRaw(n)}logRaw(e){console.debug(e)}}const r=new i;function s(o){o.addWindowErrorListener()}function a(o,e){o.addPlaygroundRequestEndListener(e)}exports.Logger=i;exports.collectPhpLogs=a;exports.collectWindowErrors=s;exports.logger=r;
+"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;

package/index.mjs

@@ -1,6 +1,75 @@
-class i {
+const f = function() {
+  var n;
+  return typeof process < "u" && ((n = process.release) == null ? void 0 : n.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"));
+      };
+    });
+  }, t = function() {
+    const e = new Uint8Array([1, 2, 3, 4]), o = new File([e], "test").stream();
+    try {
+      return o.getReader({ mode: "byob" }), !0;
+    } catch {
+      return !1;
+    }
+  };
+  if (typeof File > "u") {
+    class e extends Blob {
+      constructor(o, s, a) {
+        super(o);
+        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;
+  }
+  typeof Blob.prototype.arrayBuffer > "u" && (Blob.prototype.arrayBuffer = function() {
+    const r = new FileReader();
+    return r.readAsArrayBuffer(this), n(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;
+    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
+        ).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();
+      }
+    });
+  });
+}
+if (f === "NODE" && typeof CustomEvent > "u") {
+  class n extends Event {
+    constructor(e, r = {}) {
+      super(e, r), this.detail = r.detail;
+    }
+    initCustomEvent() {
+    }
+  }
+  globalThis.CustomEvent = n;
+}
+class u extends EventTarget {
   constructor(t) {
-    this.LOG_PREFIX = "Playground", this.windowConnected = !1, this.lastPHPLogLength = 0, this.errorLogPath = "/wordpress/wp-content/debug.log", t && (this.errorLogPath = 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);
   }
   /**
    * Read the WordPress debug.log file and return its content.
@@ -19,7 +88,7 @@ class i {
   logWindowError(t) {
     this.log(
       `${t.message} in ${t.filename} on line ${t.lineno}:${t.colno}`,
-      "fatal"
+      "Error"
     );
   }
   /**
@@ -28,7 +97,7 @@ class i {
    * @param PromiseRejectionEvent event
    */
   logUnhandledRejection(t) {
-    this.log(`${t.reason.stack}`, "fatal");
+    this.log(`${t.reason.stack}`, "Error");
   }
   /**
    * Register a listener for the window error events and log the data.
@@ -50,6 +119,18 @@ class i {
     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()
+          }
+        })
+      ));
     });
   }
   /**
@@ -64,7 +145,7 @@ class i {
       month: "short",
       day: "2-digit",
       timeZone: "UTC"
-    }).format(t).replace(/ /g, "-"), n = new Intl.DateTimeFormat("en-GB", {
+    }).format(t).replace(/ /g, "-"), r = new Intl.DateTimeFormat("en-GB", {
       hour: "2-digit",
       minute: "2-digit",
       second: "2-digit",
@@ -72,44 +153,61 @@ class i {
       timeZone: "UTC",
       timeZoneName: "short"
     }).format(t);
-    return e + " " + n;
+    return e + " " + r;
   }
   /**
    * Format log message and severity and log it.
    * @param string message
    * @param LogSeverity severity
+   * @param string prefix
    */
-  formatMessage(t, e) {
-    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${this.LOG_PREFIX} ${e}: ${t}`;
+  formatMessage(t, e, r) {
+    return `[${this.formatLogDate(/* @__PURE__ */ new Date())}] ${r} ${e}: ${t}`;
   }
   /**
    * Log message with severity and timestamp.
    * @param string message
    * @param LogSeverity severity
+   * @param string prefix
    */
-  log(t, e) {
-    e === void 0 && (e = "info");
-    const n = this.formatMessage(t, e);
-    this.logRaw(n);
+  log(t, e, r) {
+    e === void 0 && (e = "Info");
+    const o = this.formatMessage(
+      t,
+      e,
+      r ?? "Playground"
+    );
+    this.logRaw(o);
   }
   /**
    * Log message without severity and timestamp.
    * @param string log
    */
   logRaw(t) {
-    console.debug(t);
+    this.logs.push(t), console.debug(t);
   }
+  /**
+   * Get all logs.
+   * @returns string[]
+   */
+  getLogs() {
+    return this.logs;
+  }
+}
+const c = new u();
+function h(n) {
+  n.addWindowErrorListener();
 }
-const r = new i();
-function s(o) {
-  o.addWindowErrorListener();
+function g(n, t) {
+  n.addPlaygroundRequestEndListener(t);
 }
-function a(o, t) {
-  o.addPlaygroundRequestEndListener(t);
+function w(n, t) {
+  n.addEventListener(n.fatalErrorEvent, t);
 }
 export {
-  i as Logger,
-  a as collectPhpLogs,
-  s as collectWindowErrors,
-  r as logger
+  u as Logger,
+  w as addFatalErrorListener,
+  g as collectPhpLogs,
+  h as collectWindowErrors,
+  c as logger
 };

package/{logger.d.ts → lib/logger.d.ts}

@@ -1,13 +1,21 @@
-import { UniversalPHP } from '../../universal/src/index.ts/src/lib/universal-php';
+import { UniversalPHP } from '../../../universal/src/index.ts/src/lib/universal-php';
 /**
  * Log severity levels.
  */
-export type LogSeverity = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+export type LogSeverity = 'Debug' | 'Info' | 'Warn' | 'Error' | 'Fatal';
+/**
+ * Log prefix.
+ */
+export type LogPrefix = 'Playground' | 'PHP-WASM';
 /**
  * A logger for Playground.
  */
-export declare class Logger {
-    private readonly LOG_PREFIX;
+export declare class Logger extends EventTarget {
+    readonly fatalErrorEvent = "playground-fatal-error";
+    /**
+     * Log messages
+     */
+    private logs;
     /**
      * Whether the window events are connected.
      */
@@ -60,19 +68,26 @@ export declare class Logger {
      * Format log message and severity and log it.
      * @param string message
      * @param LogSeverity severity
+     * @param string prefix
      */
-    formatMessage(message: string, severity: LogSeverity): string;
+    formatMessage(message: string, severity: LogSeverity, prefix: string): string;
     /**
      * Log message with severity and timestamp.
      * @param string message
      * @param LogSeverity severity
+     * @param string prefix
      */
-    log(message: string, severity?: LogSeverity): void;
+    log(message: string, severity?: LogSeverity, prefix?: LogPrefix): void;
     /**
      * Log message without severity and timestamp.
      * @param string log
      */
     logRaw(log: string): void;
+    /**
+     * Get all logs.
+     * @returns string[]
+     */
+    getLogs(): string[];
 }
 /**
  * The logger instance.
@@ -89,3 +104,12 @@ export declare function collectWindowErrors(loggerInstance: Logger): void;
  * @param loggerInstance The logger instance
  */
 export declare function collectPhpLogs(loggerInstance: Logger, playground: UniversalPHP): void;
+/**
+ * Add a listener for the fatal Playground errors.
+ * These errors include Playground errors like Asyncify errors. PHP errors won't trigger this event.
+ * The callback function will receive an Event object with logs in the detail property.
+ *
+ * @param loggerInstance The logger instance
+ * @param callback The callback function
+ */
+export declare function addFatalErrorListener(loggerInstance: Logger, callback: EventListenerOrEventListenerObject): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/logger",
-	"version": "0.6.6",
+	"version": "0.6.8",
 	"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": "90f82ca946f8573b358c1320be0b6b8674f67cfc"
+	"gitHead": "cb7b1af260489022238495a2fc0d96f767a1294a"
 }