feat(super-magic-module): enhance error handling and add new error codes for workspace and task management

Author: liaobw

backend/magic-service/app/ErrorCode/SuperAgentErrorCode.php

@@ -17,6 +17,18 @@ enum SuperAgentErrorCode: int
     #[ErrorMessage('workspace.parameter_check_failure')]
     case VALIDATE_FAILED = 51000;
 
+    #[ErrorMessage('workspace.access_denied')]
+    case WORKSPACE_ACCESS_DENIED = 51001;
+
     #[ErrorMessage('topic.topic_not_found')]
     case TOPIC_NOT_FOUND = 51100;
+
+    #[ErrorMessage('topic.create_topic_failed')]
+    case CREATE_TOPIC_FAILED = 51101;
+
+    #[ErrorMessage('task.not_found')]
+    case TASK_NOT_FOUND = 51200;
+
+    #[ErrorMessage('task.work_dir_not_found')]
+    case WORK_DIR_NOT_FOUND = 51201;
 }

backend/magic-service/config/autoload/error_message.php

@@ -8,6 +8,7 @@
 use App\ErrorCode\AsrErrorCode;
 use App\ErrorCode\AuthenticationErrorCode;
 use App\ErrorCode\ChatErrorCode;
+use App\ErrorCode\EventErrorCode;
 use App\ErrorCode\FlowErrorCode;
 use App\ErrorCode\GenericErrorCode;
 use App\ErrorCode\HttpErrorCode;
@@ -33,6 +34,7 @@
         MagicApiErrorCode::class => [4000, 4100],
         MagicAccountErrorCode::class => [4100, 4300],
         GenericErrorCode::class => [5000, 9000],
+        EventErrorCode::class => [6000, 6999],
         TokenErrorCode::class => [9000, 10000],
         FlowErrorCode::class => [31000, 31999],
         AgentErrorCode::class => [32000, 32999],

backend/super-magic-module/src/Application/Share/Service/ResourceShareAppService.php

@@ -9,12 +9,15 @@
 
 use App\ErrorCode\ShareErrorCode;
 use App\Infrastructure\Core\Exception\BusinessException;
+use App\Infrastructure\Core\Exception\EventException;
 use App\Infrastructure\Core\Exception\ExceptionBuilder;
 use App\Interfaces\Authorization\Web\MagicUserAuthorization;
+use Dtyq\AsyncEvent\AsyncEventUtil;
 use Dtyq\SuperMagic\Application\Share\Factory\ShareableResourceFactory;
 use Dtyq\SuperMagic\Domain\Share\Constant\ResourceType;
 use Dtyq\SuperMagic\Domain\Share\Constant\ShareAccessType;
 use Dtyq\SuperMagic\Domain\Share\Entity\ResourceShareEntity;
+use Dtyq\SuperMagic\Domain\Share\Event\CreateShareBeforeEvent;
 use Dtyq\SuperMagic\Domain\Share\Service\ResourceShareDomainService;
 use Dtyq\SuperMagic\Infrastructure\Utils\AccessTokenUtil;
 use Dtyq\SuperMagic\Infrastructure\Utils\PasswordCrypt;
@@ -65,6 +68,11 @@ public function createShare(MagicUserAuthorization $userAuthorization, CreateSha
         // 1. 获取对应类型的资源工厂
         try {
             $factory = $this->resourceFactory->create($resourceType);
+
+            // 发送创建分享事件
+            AsyncEventUtil::dispatch(new CreateShareBeforeEvent($userAuthorization->getOrganizationCode(), $userAuthorization->getId(), $dto->getResourceId(), $dto->getResourceType()->value));
+        } catch (EventException $e) {
+            ExceptionBuilder::throw(ShareErrorCode::PERMISSION_DENIED, $e->getMessage());
         } catch (RuntimeException $e) {
             // 使用 ExceptionBuilder 抛出不支持的资源类型异常
             ExceptionBuilder::throw(ShareErrorCode::RESOURCE_TYPE_NOT_SUPPORTED, 'share.resource_type_not_supported', [$resourceType->name]);

backend/super-magic-module/src/Application/SuperAgent/Crontab/CheckTaskStatusTask.php

@@ -7,7 +7,9 @@
 
 namespace Dtyq\SuperMagic\Application\SuperAgent\Crontab;
 
+use Dtyq\AsyncEvent\AsyncEventUtil;
 use Dtyq\SuperMagic\Domain\SuperAgent\Entity\ValueObject\TaskStatus;
+use Dtyq\SuperMagic\Domain\SuperAgent\Event\RunTaskAfterEvent;
 use Dtyq\SuperMagic\Domain\SuperAgent\Service\TaskDomainService;
 use Dtyq\SuperMagic\Domain\SuperAgent\Service\TopicDomainService;
 use Dtyq\SuperMagic\Infrastructure\ExternalAPI\Sandbox\SandboxInterface;
@@ -104,6 +106,9 @@ private function checkTasksStatus(): void
 
                 // 更新话题状态
                 $this->topicDomainService->updateTopicStatus($topic->getId(), $taskId, TaskStatus::ERROR);
+
+                // 触发完成事件
+                AsyncEventUtil::dispatch(new RunTaskAfterEvent($topic->getUserOrganizationCode(), $topic->getUserId(), $topic->getId(), $taskId, TaskStatus::ERROR->value, null));
                 ++$updatedToErrorCount;
             }
 

backend/super-magic-module/src/Application/SuperAgent/Event/Subscribe/TopicTaskMessageSubscriber.php

@@ -77,6 +77,7 @@ public function consumeMessage($data, AMQPMessage $message): Result
             $applicationHeaders = $messageProperties['application_headers'] ?? new AMQPTable([]);
             // 直接从原生数据中获取，如果不存在则为 null
             $originalTimestampFromHeader = $applicationHeaders->getNativeData()['x-original-timestamp'] ?? null;
+
             $currentTimeForLog = time(); // 当前处理时间，主要用于日志和可能的本地逻辑
             $actualOriginalTimestamp = null; // 初始化变量以避免 linter 警告
 
@@ -98,9 +99,6 @@ public function consumeMessage($data, AMQPMessage $message): Result
             // 验证消息格式
             $this->validateMessageFormat($data);
 
-            // 打印消息详情，用于测试和验证 (根据需要取消注释)
-            // $this->logMessageDetails($data);
-
             // 创建DTO
             $messageDTO = TopicTaskMessageDTO::fromArray($data);
 
@@ -140,6 +138,7 @@ public function consumeMessage($data, AMQPMessage $message): Result
                 date('Y-m-d H:i:s', $actualOriginalTimestamp),
                 $messageDTO->getPayload()?->getMessageId()
             ));
+
             try {
                 $this->superAgentAppService->handleTopicTaskMessage($messageDTO);
                 return Result::ACK;

backend/super-magic-module/src/Application/SuperAgent/Service/FileProcessAppService.php

@@ -10,8 +10,8 @@
 use App\Application\Chat\Service\MagicChatFileAppService;
 use App\Application\File\Service\FileAppService;
 use App\Domain\Contact\Entity\ValueObject\DataIsolation;
-use App\Domain\File\Service\FileDomainService;
 use App\ErrorCode\GenericErrorCode;
+use App\ErrorCode\SuperAgentErrorCode;
 use App\Infrastructure\Core\Exception\ExceptionBuilder;
 use App\Infrastructure\Core\ValueObject\StorageBucketType;
 use App\Interfaces\Authorization\Web\MagicUserAuthorization;
@@ -22,7 +22,6 @@
 use Hyperf\Codec\Json;
 use Hyperf\Logger\LoggerFactory;
 use Psr\Log\LoggerInterface;
-use Psr\SimpleCache\CacheInterface;
 use Throwable;
 
 /**
@@ -349,11 +348,11 @@ public function refreshStsToken(RefreshStsTokenRequestDTO $requestDTO): array
             // 获取 task 表中的 work_dir 目录作为工作目录
             $taskEntity = $this->taskDomainService->getTaskById((int) $requestDTO->getSuperMagicTaskId());
             if (empty($taskEntity)) {
-                ExceptionBuilder::throw(GenericErrorCode::SystemError, 'task.not_found');
+                ExceptionBuilder::throw(SuperAgentErrorCode::TASK_NOT_FOUND, 'task.not_found');
             }
             $workDir = $taskEntity->getWorkDir();
             if (empty($workDir)) {
-                ExceptionBuilder::throw(GenericErrorCode::SystemError, 'task.work_dir.not_found');
+                ExceptionBuilder::throw(SuperAgentErrorCode::WORK_DIR_NOT_FOUND, 'task.work_dir.not_found');
             }
 
             // 获取STS临时凭证