修复进度消息不包含图像时无法匹配任务导致的超时

Author: walkor

src/Discord.php

@@ -171,6 +171,14 @@ public function createWss()
                     Log::debug("DISCORD:{$this->id()} WSS Receive Message " . $data['t'] ?? '');
                 }
             }
+            // White list
+            $titleWhiteList = [
+                'Zoom Out',
+                'Inpaint'
+            ];
+            if (in_array($data['t'] ?? '', [Discord::INTERACTION_MODAL_CREATE, Discord::INTERACTION_IFRAME_MODAL_CREATE]) && !in_array($data['d']['title'] ?? '', $titleWhiteList)) {
+                file_put_contents(runtime_path('logs/midjourney/midjourney.warning.log'), date('Y-m-d H:i:s') . ' ' . ($data['d']['title'] ?? '') . "\n", FILE_APPEND);
+            }
             switch ($code) {
                 case Discord::MESSAGE_OPTION_HELLO:
                     $this->handleHello($data);

src/MessageHandler/Success.php

@@ -36,7 +36,11 @@ public static function handle($message): bool
                 $task = Discord::getRunningTaskByCondition((new TaskCondition())->prompt($finalPrompt)->params([Discord::INTERACTION_FAILURE => true]));
                 if (!$task) {
                     Log::debug("MessageHandler Success no task found messageHash=$messageHash messageId=$messageId nonce=$nonce and no InteractionFailure task found");
-                    return false;
+                    $task = Discord::getRunningTaskByCondition((new TaskCondition())->prompt($finalPrompt));
+                    if (!$task) {
+                        Log::debug("MessageHandler Success no task found messageHash=$messageHash messageId=$messageId nonce=$nonce prompt=$finalPrompt and no task found");
+                        return false;
+                    }
                 }
             }
             $imageUrl = $message['d']['attachments'][0]['url'] ?? '';

src/TaskCondition.php

@@ -116,6 +116,10 @@ public function match(Task $task): bool
         if ($this->messageHash !== null && $this->messageHash !== $task->messageHash()) {
             return false;
         }
+        // 只查找prompt的任务时只查找messageHash为空的任务
+        if ($this->prompt !== null && $this->nonce === null && $this->messageId === null && $this->messageHash === null && $task->messageHash()) {
+            return false;
+        }
         $params = $task->params();
         foreach ($this->params as $key => $value) {
             if (!isset($params[$key]) || $params[$key] != $value) {