Optimize addCrontab() and addCommand() (#43)

* Optimize addCrontab() and addCommand() * Fix adds Command
hyperf · Jul 5, 2022 · e1fb622 · e1fb622
1 parent 6ebbf76
commit e1fb622
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -179,7 +179,7 @@ $app = AppFactory::create();
 
 $app->addCommand('echo', function(){
     $this->get(StdoutLoggerInterface::class)->info('A new command called echo!');
-});
+})->setDescription('Echo command.');
 
 $app->run();
 ```
@@ -243,7 +243,7 @@ $app = AppFactory::create();
 
 $app->addCrontab('* * * * * *', function(){
     $this->get(StdoutLoggerInterface::class)->info('execute every second!');
-});
+})->setOnOneServer(true)->setMemo('Test crontab.');
 
 $app->run();
 ```

diff --git a/README.md b/README.md
@@ -173,7 +173,7 @@ $app = AppFactory::create();
 
 $app->addCommand('echo', function(){
     $this->get(StdoutLoggerInterface::class)->info('A new command called echo!');
-});
+})->setDescription('Echo command.');
 
 $app->run();
 ```
@@ -234,7 +234,7 @@ $app = AppFactory::create();
 
 $app->addCrontab('* * * * * *', function(){
     $this->get(StdoutLoggerInterface::class)->info('execute every second!');
-});
+})->setOnOneServer(true)->setMemo('Test crontab.');
 
 $app->run();
 ```

diff --git a/src/App.php b/src/App.php
@@ -12,6 +12,7 @@
 namespace Hyperf\Nano;
 
 use Closure;
+use Hyperf\Command\Command;
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Crontab\Crontab;
@@ -182,40 +183,47 @@ public function addGroup($prefix, callable $callback, array $options = [])
      * Add a new command.
      * @param null|callable|string $command
      */
-    public function addCommand(string $name, $command = null)
+    public function addCommand(string $name, $command = null): Command
     {
         if ($command === null) {
             $command = $name;
         }
 
         if (is_string($command)) {
-            $this->appendConfig('command' . $this->serverName, $command);
-            return;
+            $this->appendConfig('commands', $command);
+            return $this->container->get($command);
         }
 
         $command = Closure::fromCallable($command);
+        /** @var CommandFactory $commandFactory */
         $commandFactory = $this->container->get(CommandFactory::class);
         $handler = $commandFactory->create($name, $command->bindTo($this->bound, $this->bound));
-        $handlerId = spl_object_hash($handler);
-        $this->container->set($handlerId, $handler);
-        $this->appendConfig(
-            'commands',
-            $handlerId
+
+        return tap(
+            $handler,
+            function ($handler) {
+                $handlerId = spl_object_hash($handler);
+                $this->container->set($handlerId, $handler);
+                $this->appendConfig(
+                    'commands',
+                    $handlerId
+                );
+            }
         );
     }
 
     /**
      * Add a new crontab.
      * @param callable|string $crontab
      */
-    public function addCrontab(string $rule, $crontab)
+    public function addCrontab(string $rule, $crontab): Crontab
     {
         $this->config->set('crontab.enable', true);
         $this->ensureConfigHasValue('processes', CrontabDispatcherProcess::class);
 
         if ($crontab instanceof Crontab) {
             $this->appendConfig('crontab.crontab', $crontab);
-            return;
+            return $crontab;
         }
 
         $callback = \Closure::fromCallable($crontab);
@@ -225,12 +233,17 @@ public function addCrontab(string $rule, $crontab)
         $this->ensureConfigHasValue('processes', CrontabDispatcherProcess::class);
         $this->config->set('crontab.enable', true);
 
-        $this->appendConfig(
-            'crontab.crontab',
+        return tap(
             (new Crontab())
                 ->setName(uniqid())
                 ->setRule($rule)
-                ->setCallback([CronFactory::class, 'execute', [$callbackId]])
+                ->setCallback([CronFactory::class, 'execute', [$callbackId]]),
+            function ($crontab) {
+                $this->appendConfig(
+                    'crontab.crontab',
+                    $crontab
+                );
+            }
         );
     }