Zipping on the fly

src/Domain/Zip/Controllers/VisitorZipFilesController.php

@@ -3,12 +3,13 @@ namespace Domain\Zip\Controllers;
 
 use Illuminate\Http\Request;
 use Domain\Files\Models\File;
-use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 use Domain\Zip\Actions\ZipFilesAction;
+use Domain\Traffic\Actions\RecordDownloadAction;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
+use STS\ZipStream\ZipStream;
 
 /**
  * Guest download multiple files via zip
@@ -18,6 +19,7 @@ class VisitorZipFilesController extends Controller
     public function __construct(
         private ProtectShareRecordAction $protectShareRecord,
         private VerifyAccessToItemAction $verifyAccessToItem,
+        private RecordDownloadAction $recordDownload,
         private ZipFilesAction $zipFiles,
     ) {
     }
@@ -25,7 +27,7 @@ class VisitorZipFilesController extends Controller
     public function __invoke(
         Request $request,
         Share $shared,
-    ): Response {
+    ): ZipStream {
         // Check ability to access protected share record
         ($this->protectShareRecord)($shared);
 
@@ -46,10 +48,11 @@ class VisitorZipFilesController extends Controller
         // Create zip
         $zip = ($this->zipFiles)($files, $shared);
 
-        // Get file
-        return response([
-            'url'  => url("/zip/{$zip->id}/public/{$shared->token}"),
-            'name' => $zip->basename,
-        ], 201);
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: $shared->user_id,
+        );
+
+        return $zip;
     }
 }

src/Domain/Zip/Controllers/VisitorZipFolderController.php

@@ -1,11 +1,12 @@
 <?php
 namespace Domain\Zip\Controllers;
 
-use Illuminate\Http\Response;
+use STS\ZipStream\ZipStream;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Domain\Zip\Actions\ZipFolderAction;
+use Domain\Traffic\Actions\RecordDownloadAction;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
 
@@ -17,6 +18,7 @@ class VisitorZipFolderController extends Controller
     public function __construct(
         private ProtectShareRecordAction $protectShareRecord,
         private VerifyAccessToItemAction $verifyAccessToItem,
+        private RecordDownloadAction $recordDownload,
         private ZipFolderAction $zipFolder,
     ) {
     }
@@ -24,7 +26,7 @@ class VisitorZipFolderController extends Controller
     public function __invoke(
         string $id,
         Share $shared,
-    ): Response {
+    ): ZipStream {
         // Check ability to access protected share record
         ($this->protectShareRecord)($shared);
 
@@ -36,16 +38,17 @@ class VisitorZipFolderController extends Controller
             ->where('id', $id);
 
         if (! $folder->exists()) {
-            abort(404, 'Requested folder doesn\'t exists.');
+            abort(404, "Requested folder doesn't exists.");
         }
 
         // Create zip
         $zip = ($this->zipFolder)($id, $shared);
 
-        // Get file
-        return response([
-            'url'  => url("/zip/{$zip->id}/public/{$shared->token}"),
-            'name' => $zip->basename,
-        ], 201);
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: $shared->user_id,
+        );
+
+        return $zip;
     }
 }

src/Domain/Zip/Controllers/ZipFilesController.php

@@ -2,31 +2,35 @@
 namespace Domain\Zip\Controllers;
 
 use Illuminate\Http\Request;
+use STS\ZipStream\ZipStream;
 use Domain\Files\Models\File;
-use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Zip\Actions\ZipFilesAction;
+use Domain\Traffic\Actions\RecordDownloadAction;
 
 class ZipFilesController extends Controller
 {
     public function __construct(
         private ZipFilesAction $zipFiles,
+        private RecordDownloadAction $recordDownload,
     ) {
     }
 
     public function __invoke(
         Request $request,
-    ): Response {
+    ): ZipStream {
         $files = File::whereUserId(Auth::id())
-            ->whereIn('id', $request->input('items'))
+            ->whereIn('id', explode(',', $request->get('ids')))
             ->get();
 
         $zip = ($this->zipFiles)($files);
 
-        return response([
-            'url'  => route('zip', $zip->id),
-            'name' => $zip->basename,
-        ], 201);
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: Auth::id(),
+        );
+
+        return $zip;
     }
 }

src/Domain/Zip/Controllers/ZipFolderController.php

@@ -1,34 +1,38 @@
 <?php
 namespace Domain\Zip\Controllers;
 
-use Illuminate\Http\Response;
+use STS\ZipStream\ZipStream;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Zip\Actions\ZipFolderAction;
+use Domain\Traffic\Actions\RecordDownloadAction;
 
 class ZipFolderController extends Controller
 {
     public function __construct(
         private ZipFolderAction $zipFolder,
+        private RecordDownloadAction $recordDownload,
     ) {
     }
 
     public function __invoke(
         string $id,
-    ): Response {
+    ): ZipStream {
         $folder = Folder::whereUserId(Auth::id())
             ->where('id', $id);
 
         if (! $folder->exists()) {
-            abort(404, "Requested folder doesn't exists.");
+            response("Requested folder doesn't exists.", 404);
         }
 
         $zip = ($this->zipFolder)($id);
 
-        return response([
-            'url'  => route('zip', $zip->id),
-            'name' => $zip->basename,
-        ], 201);
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: Auth::id(),
+        );
+
+        return $zip;
     }
 }