- Removed time limit on cronard run script

composer.json

@@ -1,12 +1,13 @@
 {
     "name": "mcnd/cronard",
     "description": "A cron library which allows task to be run easily into an application.",
+    "keywords": ["cronard","cron","task","psr15","middleware"],
     "type": "library",
     "license": "MIT",
     "authors": [
         {
             "name": "Dave Mc Nicoll",
-            "email": "mcndave@gmail.com"
+            "email": "info@mcnd.ca"
         }
     ],
     "require": {},
@@ -14,5 +15,14 @@
         "psr-4": {
             "Cronard\\": "src/"
         }
+    },
+    "extra" : {
+        "lean" : {
+            "autoload": {
+                "definitions" : [
+                    "meta/cronard.php"
+                ]
+            }
+        }
     }
 }

meta/cronard.php

@@ -0,0 +1,32 @@
+<?php
+
+use function DI\autowire, DI\create, DI\get;
+
+use Laminas\Diactoros\Response\HtmlResponse;
+
+use Cronard\CronardMiddleware,
+    Notes\Cronard\TaskFetcher;
+
+use Psr\Http\Message\ResponseInterface;
+
+use Lean\Lean;
+
+return [
+    CronardMiddleware::class => function($c) {
+        $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface {
+            return new HtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
+        }, []);
+
+        return $cronardMiddleware->fromAnnotations($c->get(TaskFetcher::class));
+    },
+
+    TaskFetcher::class => function($c) {
+        $fetcher = new TaskFetcher(null, null, $c->get('cronard.caching'));
+
+        $fetcher->setFolderList(array_map(function($item) {
+            return $item;
+        }, $c->get(Lean::class)->getCronard()));
+
+        return $fetcher;
+    },
+];

src/CronardMiddleware.php

@@ -2,7 +2,6 @@
 
 namespace Cronard;
 
-use Notes\Cronard\TaskFetcher;
 use Psr\Http\Message\ResponseFactoryInterface,
     Psr\Container\ContainerInterface,
     Psr\Http\Message\ResponseInterface,
@@ -22,8 +21,6 @@ class CronardMiddleware implements MiddlewareInterface
     
     public $container;
 
-    public ? TaskFetcher $taskFetcher;
-
     public function __construct(ContainerInterface $container, string $cronKey = "", $responseInterface = null, $variables = []) {
         $this->cronKey = $cronKey;
         $this->response = $responseInterface;

src/CronardTrait.php

@@ -18,9 +18,14 @@ trait CronardTrait {
         $cronard = new Cronard();
 
         foreach($this->crontabs as $tab) {
+            try {
                 $cronard->setTab(stripslashes($tab['cron']));
                 $cronard->run(array_merge($this->variables, $variables), $tab['callback']);
             }
+            catch(\Throwable $ex) {
+                error_log($ex->getMessage());
+            }
+        }
     }
 
     public function fromFile(string $filepath) : self
@@ -41,18 +46,29 @@ trait CronardTrait {
 
     public function fromAnnotations(TaskFetcher $fetcher) : self
     {
-        $tasks = [];
+        $launched = [];
 
         foreach($fetcher->compile() as $task) {
             $this->crontabs[] = [
                 'cron' => $task['annotation']->cron,
-                'callback' => function(ServerRequestInterface $request, ResponseInterface $response, ContainerInterface $container) use ($task) {
+                'callback' => function(ServerRequestInterface $request, ResponseInterface $response, ContainerInterface $container) use ($task, & $launched) {
+                    set_time_limit(0);
+
                     if ( $task['annotation']->method ?? false ) {
                         $request = $request->withMethod($task['annotation']->method);
                     }
 
+                    $uid = sprintf("%s::%s", $task['class'], $task['method']);
+
+                    if ( empty($launched[$uid]) ) {
+                        $launched[$uid] = true;
+
                         return $container->make($task['class'])->{$task['method']}($request->withAttribute('lean.cronard', $task['annotation']), []);
                     }
+                    else {
+                        return null;
+                    }
+                }
             ];
         }