- Added setBCC and setCC methods to interface.

.gitignore

@@ -1,2 +1,2 @@
-composer.lock
-/vendor/
+composer.lock
+/vendor/

LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Dave Mc Nicoll
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2019 Dave Mc Nicoll
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,3 +1,3 @@
-# thebugs
-A PSR-15 compliant library helping to trace errors in development and production environment.
-
+# thebugs
+A PSR-15 compliant library helping to trace errors in development and production environment.
+

composer.json

@@ -1,14 +1,19 @@
-{
-    "name": "mcnd/thebugs",
-    "description": "A PSR-15 compliant library helping to trace errors in development and production environment",
-    "keywords" : ["debug","error","bug"],
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Dave Mc Nicoll",
-            "email": "info@mcnd.ca"
-        }
-    ],
-    "require": {}
-}
+{
+    "name": "mcnd/thebugs",
+    "description": "A PSR-15 compliant library helping to trace errors in development and production environment",
+    "keywords" : ["debug","error","bug"],
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Dave Mc Nicoll",
+            "email": "info@mcnd.ca"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "TheBugs\\": "src/"
+        }
+    }
+}

src/Email/EmailConfiguration.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace TheBugs\Email;
+
+class EmailConfiguration
+{
+    const AUTH_TYPE_SMTP = 1;
+    
+    protected $type;
+    
+    public $smtpHost = "";
+    
+    public $smtpUsername = "";
+    
+    public $smtpPassword = "";
+    
+    public $smtpPort = 25;
+    
+    public $smtpUseTLS = false;
+    
+    public $toAddress = "";
+    
+    public $fromAddress = "";
+    
+    public $fromName = "";
+
+    public $smtpVerifyPeer = false;
+    
+    public function __construct($type = self::AUTH_TYPE_SMTP)
+    {
+        $this->type = $type;
+    }
+
+}

src/Email/EmailInfoTrait.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace TheBugs\Email;
+
+trait EmailInfoTrait
+{
+    protected /*stringable*/ $from;
+
+    protected string|\Stringable|array $to;
+
+    protected string|\Stringable|array $cc;
+
+    protected string|\Stringable|array $bcc;
+
+    protected array $attachments = [];
+
+    protected EmailConfiguration $emailConfiguration;
+
+    public function setFrom(string|\Stringable|array $from) : MailerInterface
+    {
+        $this->from = $from;
+
+        return $this;
+    }
+
+    public function setTo(string|\Stringable|array $to) : MailerInterface
+    {
+        $this->to = $to;
+
+        return $this;
+    }
+
+    public function setCC(string|\Stringable|array $cc) : MailerInterface
+    {
+        $this->cc = $cc;
+
+        return $this;
+    }
+
+    public function setBCC(string|\Stringable|array $bcc) : MailerInterface
+    {
+        $this->bcc = $bcc;
+
+        return $this;
+    }
+}

src/Email/MailerInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace TheBugs\Email;
+
+interface MailerInterface
+{     
+    public function send(string $subject, string $message, bool $html = true) : bool;
+    
+    public function setFrom(string|\Stringable|array $from) : self;
+    
+    public function attach(mixed $attachment) : self;
+
+    public function setTo(string|\Stringable|array $to) : self;
+
+    public function setBCC(string|\Stringable|array $bcc) : self;
+
+    public function setCC(string|\Stringable|array $cc) : self;
+}

src/Email/SwiftMailer.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace TheBugs\Email;
+
+class SwiftMailer implements MailerInterface
+{
+    use EmailInfoTrait;
+    
+    protected $transport;
+    
+    public function __construct(EmailConfiguration $configuration) {
+        $this->emailConfiguration = $configuration;
+        
+        $this->transport = ( new \Swift_SmtpTransport($this->emailConfiguration->smtpHost, $this->emailConfiguration->smtpPort) )
+            ->setUsername($this->emailConfiguration->smtpUsername)
+            ->setPassword($this->emailConfiguration->smtpPassword);
+    }
+    
+    public function send(string $subject, string $message, bool $html = true) : bool
+    {
+        $swiftObj = ( new \Swift_Message($subject) )
+            ->setFrom( $this->from )
+            ->setTo( $this->to )
+            ->setCC($this->cc ?? [])
+            ->setBCC($this->bcc ?? [])
+            ->setBody( $message, $html ? 'text/html' : 'text/plain' );
+
+        foreach ($this->attachments as $attachment) {
+            $swiftObj->attach($attachment);
+        }
+
+        $this->attachments = [];
+
+        return ( new \Swift_Mailer($this->transport) )->send($swiftObj);
+    }
+
+    public function attach(mixed $attachment) : self
+    {
+        $this->attachments[] = $attachment;
+
+        return $this;
+    }
+}

src/Email/SymfonyMailer.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace TheBugs\Email;
+
+use Symfony\Component\Mailer\{ Mailer, Transport };
+use Symfony\Component\Mime\Email;
+
+class SymfonyMailer implements MailerInterface
+{
+    use EmailInfoTrait;
+
+    public Mailer $mailer;
+
+    public function __construct(EmailConfiguration $configuration) {
+        $this->emailConfiguration = $configuration;
+
+        if ($this->emailConfiguration->smtpUsername) {
+            $this->mailer = new Mailer(Transport::fromDsn(sprintf("smtp://%s:%s@%s:%d?verify_peer=%s", $this->emailConfiguration->smtpUsername, $this->emailConfiguration->smtpPassword, $this->emailConfiguration->smtpHost, $this->emailConfiguration->smtpPort, $this->emailConfiguration->smtpVerifyPeer ? 'true' : 'false')));
+        }
+        else {
+            $this->mailer = new Mailer(Transport::fromDsn(sprintf("smtp://%s:%d?verify_peer=%s", $this->emailConfiguration->smtpHost, $this->emailConfiguration->smtpPort, $this->emailConfiguration->smtpVerifyPeer ? 'true' : 'false')));
+        }
+    }
+
+    public function send(string $subject, string $message, bool $html = true) : bool
+    {
+        $email = ( new Email() )
+            ->subject($subject)
+            ->from(...$this->from())
+            ->to(...$this->to())
+            ->cc(...$this->cc())
+            ->bcc(...$this->bcc());
+
+        if ($html) {
+            $email->html($message);
+        }
+        else {
+            $email->text($message);
+        }
+
+        foreach ($this->attachments as $path) {
+            $email->attachFromPath($path);
+        }
+
+        $this->attachments = [];
+
+        try {
+            $this->mailer->send($email);
+        }
+        catch(\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function attach(mixed $attachment) : self
+    {
+        $this->attachments[] = $attachment;
+
+        return $this;
+    }
+
+    protected function from() : array
+    {
+        return $this->arrayToAddress($this->from);
+    }
+
+    protected function to() : array
+    {
+        return $this->arrayToAddress($this->to);
+    }
+
+    protected function cc() : array
+    {
+        return $this->arrayToAddress($this->cc ?? []);
+    }
+
+    protected function bcc() : array
+    {
+        return $this->arrayToAddress($this->bcc ?? []);
+    }
+
+    protected function arrayToAddress(string|\Stringable|array $array) : array
+    {
+        $list = [];
+
+        foreach((array) $array as $addr => $name) {
+            if (is_numeric($addr)) {
+                $list[] = $name;
+            }
+            else {
+                $list[] = "$name <$addr>";
+            }
+        }
+
+        return $list;
+    }
+}

src/EmailErrorMiddleware.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace TheBugs;
+
+use Psr\Http\Message\ResponseInterface,
+    Psr\Http\Message\ServerRequestInterface,
+    Psr\Http\Server\MiddlewareInterface,
+    Psr\Http\Server\RequestHandlerInterface;
+
+class EmailErrorMiddleware implements MiddlewareInterface
+{
+    protected /* EmailConfiguration */ $emailConfiguration;
+    
+    protected /* Callable */ $callable;
+    
+    protected /* Mailer */ $mailer;
+    
+    public function __construct(Email\EmailConfiguration $emailConfiguration, Email\MailerInterface $mailer, Callable $callable)
+    {
+        $this->emailConfiguration = $emailConfiguration;
+        $this->callable = $callable;
+        $this->mailer = $mailer;
+    }
+    
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    {
+        $response = $handler->handle($request);
+        
+        if ( $response->getStatusCode() === 500 ) {
+            $this->mailer->setTo($this->emailConfiguration->toAddress);
+            $this->mailer->setFrom([$this->emailConfiguration->fromAddress => $this->emailConfiguration->fromName]);
+
+            $bugReport = $response->getBody()->__toString();
+            
+            if ( false === ( $this->mailer->send(error_get_last()['message'], $bugReport, true) ) ) {
+                error_log("Impossile to send an email bug report from " . static::class);
+            }
+            
+            return $this->callable->call($this);
+        }
+        
+        return $response;
+    }
+}

src/Exception/JavascriptException.php

@@ -1,26 +1,26 @@
-<?php
-
-namespace TheBugs\Exception;
-
-class JavascriptException extends \Exception {
-
-    protected $url;
-
-    protected $stacktrace;
-
-    public function __construct(string $message, int $code, Exception $previous = null, string $file, int $line, string $url, array $trace)
-    {
-        $this->message = $message;
-        $this->code = $code;
-        $this->previous = $previous;
-        $this->file = $file;
-        $this->line = $line;
-        $this->url = $url;
-        $this->stacktrace = $trace;
-    }
-
-    public function __toString() {
-        return __CLASS__ . ": [{$this->url}:{$this->code}]: {$this->message}\n" . json_encode($this->stacktrace);
-    }
-
-}
+<?php
+
+namespace TheBugs\Exception;
+
+class JavascriptException extends \Exception {
+
+    protected $url;
+
+    protected $stacktrace;
+
+    public function __construct(string $message, int $code, Exception $previous = null, string $file, int $line, string $url, array $trace)
+    {
+        $this->message = $message;
+        $this->code = $code;
+        $this->previous = $previous;
+        $this->file = $file;
+        $this->line = $line;
+        $this->url = $url;
+        $this->stacktrace = $trace;
+    }
+
+    public function __toString() {
+        return __CLASS__ . ": [{$this->url}:{$this->code}]: {$this->message}\n" . json_encode($this->stacktrace);
+    }
+
+}

src/JavascriptMiddleware.php

@@ -1,62 +1,70 @@
-<?php
-
-namespace TheBugs;
-
-use Psr\Http\Message\ResponseFactoryInterface,
-    Psr\Container\ContainerInterface,
-    Psr\Http\Message\ResponseInterface,
-    Psr\Http\Message\ServerRequestInterface,
-    Psr\Http\Server\MiddlewareInterface,
-    Psr\Http\Server\RequestHandlerInterface;
-
-use Zend\Diactoros\Response,
-    Zend\Diactoros\ServerRequest,
-    Zend\Diactoros\Stream,
-    Zend\Diactoros\Uri;
-
-class JavascriptMiddleware implements MiddlewareInterface
-{
-    const FILTERS = [
-        "code" => null,
-        "headers" => [
-            "User-Agent" => "TheBugs/1.0",
-        ],
-    ];
-
-    /**
-     * Filter list, allows custom invokable
-     * @var array
-     */
-    protected $filters = [];
-
-    public function __construct($options = [])
-    {
-        foreach(static::FILTERS as $key => $default) {
-            $this->filters[$key] = ( $options[$key] ?? false ) ? $options[$key] : $default;
-        }
-    }
-
-    public function throwError($errorDetails)
-    {
-        throw new Exception\JavascriptException($errorDetails['message'], 0, null, $errorDetails['location'], $errorDetails['line'], $errorDetails['url'], (array) $errorDetails['stack']);
-    }
-
-    /**
-     * Process a server request and return a response.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        if ( ( $this->filters['code'] ?? false ) && ($this->filters['code'] !== $request->getCode())) {
-            return $handler->handle($request);
-        }
-
-        foreach($this->filters['headers'] as $key => $value) {
-            if ( ! in_array($value, $request->getHeader($key)) ) {
-                return $handler->handle($request);
-            }
-        }
-
-        $this->throwError(json_decode($request->getBody(), true));
-    }
-
-}
+<?php
+
+namespace TheBugs;
+
+use Psr\Http\Message\ResponseFactoryInterface,
+    Psr\Container\ContainerInterface,
+    Psr\Http\Message\ResponseInterface,
+    Psr\Http\Message\ServerRequestInterface,
+    Psr\Http\Server\MiddlewareInterface,
+    Psr\Http\Server\RequestHandlerInterface;
+
+use Laminas\Diactoros\Response,
+    Laminas\Diactoros\ServerRequest,
+    Laminas\Diactoros\Stream,
+    Laminas\Diactoros\Uri;
+
+class JavascriptMiddleware implements MiddlewareInterface
+{
+    const FILTERS = [
+        "code" => null,
+        "headers" => [
+            "User-Agent" => "TheBugs/1.0",
+        ],
+        # Callable functions
+        "functions" => []
+    ];
+
+    /**
+     * Filter list, allows custom invokable too
+     * @var array
+     */
+    protected $filters = [];
+
+    public function __construct($options = [])
+    {
+        foreach(static::FILTERS as $key => $default) {
+            $this->filters[$key] = ( $options[$key] ?? false ) ? $options[$key] : $default;
+        }
+    }
+
+    public function throwError($errorDetails)
+    {
+        throw new Exception\JavascriptException($errorDetails['message'], 0, null, $errorDetails['location'], $errorDetails['line'], $errorDetails['url'], (array) $errorDetails['stack']);
+    }
+
+    /**
+     * Process a server request and return a response.
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+       # if ( ( $this->filters['code'] ?? false ) && ($this->filters['code'] !== $request->getCode())) {
+       #     return $handler->handle($request);
+       # }
+
+        foreach($this->filters['headers'] as $key => $value) {
+            if ( ! in_array($value, $request->getHeader($key)) ) {
+                return $handler->handle($request);
+            }
+        }
+
+        foreach($this->filters['functions'] as $func) {
+            if ( $func->call($this) ) {
+                return $handler->handle($request);
+            }
+        }
+
+        $this->throwError(json_decode($request->getBody(), true));
+    }
+
+}

src/WhoopsHandler.php

@@ -1,15 +0,0 @@
-<?php
-
-use Whoops\Run as Whoops;
-use Whoops\Handler\PrettyPageHandler as Handler;
-
-$whoops = new Whoops();
-$whoops->allowQuit(false);
-$whoops->writeToOutput(false);
-$whoops->pushHandler(new Handler());
-
-IF CLI {
-    $handler->handleUnconditionally(true);
-}
-
-$body = $whoops->handleException($this->exception);

templates/js_debug.js

@@ -0,0 +1,46 @@
+
+class ErrorHandler
+{
+    constructor(options) {
+        if ( options ) {
+            if ( "url" in options ) {
+                this.url = options['url'];
+            }
+        }
+
+        this.catchError();
+    }
+
+    catchError() {
+        window.onerror = function(message, url, line, column, error) {
+            fetch(this.url ? this.url : window.location.href, {
+                method: "post",
+                headers: {
+                    'Accept': "application/json",
+                    'Content-Type': "application/json",
+                    'User-Agent': "TheBugs/1.0"
+                },
+                body: JSON.stringify({
+                    message: message,
+                    url: url,
+                    line: line,
+                    column: column,
+                    stack: error.stack,
+                    location: window.location.toString()
+                })
+            }).then( response => response ).then(data => {
+                console.info("Error reported", data);
+            });
+
+            return false;
+        }.bind(this);
+    }
+
+    get url() {
+        return this._url;
+    }
+
+    set url(set) {
+        return this._url = set;
+    }
+}

templates/xhr_debug.php

@@ -0,0 +1,34 @@
+<script>
+    (send => {
+        XMLHttpRequest.prototype.send = function() {
+            this.addEventListener('load', function(e) {
+                switch(this.status) {
+                    case 500:
+                        let response = JSON.parse(this.response),
+                            content = JSON.stringify(response.error.trace, null, 2),
+                            element = document.createElement('div'),
+                            body = document.querySelector("body");
+
+                        body.appendChild(element);
+                        element.outerHTML = `
+                            <div ondblclick="this.parentNode.removeChild(this);">
+                                <dialog style="top:10vh;width:75%;z-index:1500;background:#444;color:#444;border:0px solid #2f2a2a;padding:2px;position:fixed; max-height:80vh;">
+                                    <div style="background:#fff">
+                                        <div style="padding:15px; color:#fff; border-bottom:2px solid #444;background:#c61f1f;font-weight:bold">${response.error.message}</div>
+                                        <pre style="overflow-y:auto;max-height:65vh;padding:15px;">${content}</pre>
+                                        <div style="padding:8px 15px; color:#fff; border-top:2px solid #444;text-align:right;background:#c61f1f;font-weight:bold">${response.error.file}:${response.error.line}</div>
+                                    </div>
+                                </dialog>
+                                <div style="position:fixed;top:0;left:0;width:100vw;height:100vh;background:#000;opacity:0.5"></div>
+                            </div>
+                        `.trim();
+
+                        body.querySelector("dialog").showModal();
+                        break;
+                }
+            });
+
+            send.apply(this, arguments);
+        };
+    })(XMLHttpRequest.prototype.send);
+</script>