feat: add macro processObject

alphasnow · Jun 13, 2024 · 877feec · 877feec
1 parent c391a80
commit 877feec
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 8 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -130,6 +130,8 @@ Storage::disk("oss")->appendObject("dir/path/news.txt", "The last line paragraph
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.001", 0);
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.002", 1024);
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.003", 1024);
+
+Storage::disk("oss")->processObject("dir/path/image.jpg", "image/resize,l_1000");
 ```
 
 ##### 自定义 Macro

diff --git a/README.md b/README.md
@@ -130,6 +130,8 @@ Storage::disk("oss")->appendObject("dir/path/news.txt", "The last line paragraph
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.001", 0);
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.002", 1024);
 Storage::disk("oss")->appendFile("dir/path/file.zip", "dir/path/file.zip.003", 1024);
+
+Storage::disk("oss")->processObject("dir/path/image.jpg", "image/resize,l_1000");
 ```
 
 ##### Add Custom Macro

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,6 +12,7 @@
   <testsuites>
     <testsuite name="Application Test Suite">
       <file>tests/AdapterTest.php</file>
+      <file>tests/MacroTest.php</file>
       <file>tests/ProviderTest.php</file>
       <file>tests/ProviderWithExistConfigTest.php</file>
     </testsuite>

diff --git a/src/AliyunServiceProvider.php b/src/AliyunServiceProvider.php
@@ -58,11 +58,11 @@ public function boot()
         $this->app->make("filesystem")
             ->extend("oss", function (Application $app, array $config) {
                 $config["url_prefixed"] = version_compare($app->version(), "9.33.0", ">=");
-                $client = (new AliyunFactory())->createClient($config);
+                $client = $app->make(AliyunFactory::class)->createClient($config);
                 $adapter = new AliyunAdapter($client, $config["bucket"], $config["prefix"] ?? "", $config);
                 $driver = new Filesystem($adapter);
                 $filesystem = new FilesystemAdapter($driver, $adapter, $config);
-                (new FilesystemMacroManager($filesystem))->defaultRegister()->register($config["macros"] ?? []);
+                (new FilesystemMacroManager($app, $filesystem))->defaultRegister()->register($config["macros"] ?? []);
                 return $filesystem;
             });
     }

diff --git a/src/FilesystemMacroManager.php b/src/FilesystemMacroManager.php
@@ -6,10 +6,16 @@
 use AlphaSnow\LaravelFilesystem\Aliyun\Macros\AliyunMacro;
 use AlphaSnow\LaravelFilesystem\Aliyun\Macros\AppendFile;
 use AlphaSnow\LaravelFilesystem\Aliyun\Macros\AppendObject;
+use AlphaSnow\LaravelFilesystem\Aliyun\Macros\ProcessObject;
 use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Contracts\Foundation\Application;
 
 class FilesystemMacroManager
 {
+    /**
+     * @var Application
+     */
+    protected $app;
     /**
      * @var FilesystemAdapter
      */
@@ -21,13 +27,16 @@ class FilesystemMacroManager
     protected array $defaultMacros = [
         AppendFile::class,
         AppendObject::class,
+        ProcessObject::class,
     ];
 
     /**
+     * @param Application $app
      * @param FilesystemAdapter $filesystemAdapter
      */
-    public function __construct(FilesystemAdapter $filesystemAdapter)
+    public function __construct(Application $app, FilesystemAdapter $filesystemAdapter)
     {
+        $this->app = $app;
         $this->filesystemAdapter = $filesystemAdapter;
     }
 
@@ -47,7 +56,7 @@ public function defaultRegister(): FilesystemMacroManager
     public function register(array $macros): FilesystemMacroManager
     {
         foreach ($macros as $macro) {
-            $filesystemMacro = new $macro();
+            $filesystemMacro = $this->app->make($macro);
             if (!$filesystemMacro instanceof AliyunMacro) {
                 throw new AliyunException("FilesystemMacroManager register want AliyunMacro, But got ".$filesystemMacro::class, 0);
             }

diff --git a/src/Macros/ProcessObject.php b/src/Macros/ProcessObject.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace AlphaSnow\LaravelFilesystem\Aliyun\Macros;
+
+use AlphaSnow\Flysystem\Aliyun\AliyunException;
+use AlphaSnow\LaravelFilesystem\Aliyun\OssClientAdapter;
+use Closure;
+use Illuminate\Filesystem\FilesystemAdapter;
+use OSS\Core\OssException;
+
+class ProcessObject implements AliyunMacro
+{
+    /**
+     * @return string
+     */
+    public function name(): string
+    {
+        return "processObject";
+    }
+
+    /**
+     * @return Closure
+     */
+    public function macro(): Closure
+    {
+        $base64UrlEncode = function ($data): string {
+            return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+        };
+
+        return function (string $path, string $process, string $save = "", array $options = []) use ($base64UrlEncode) {
+            /**
+             * @var FilesystemAdapter $this
+             */
+            $adapter = new OssClientAdapter($this);
+
+            if($save == "") {
+                $save = $path;
+            }
+            $process .= "|sys/saveas,o_".$base64UrlEncode($adapter->path($save)).',b_'.$base64UrlEncode($adapter->bucket());
+
+            try {
+                return $adapter->client()->processObject(
+                    $adapter->bucket(),
+                    $adapter->path($path),
+                    $process,
+                    $adapter->options($options)
+                );
+            } catch (OssException $exception) {
+                throw new AliyunException($exception->getErrorMessage(), 0, $exception);
+            }
+        };
+    }
+}
diff --git a/src/OssClientAdapter.php b/src/OssClientAdapter.php
@@ -5,7 +5,6 @@
 use AlphaSnow\Flysystem\Aliyun\AliyunAdapter;
 use AlphaSnow\Flysystem\Aliyun\AliyunException;
 use Illuminate\Filesystem\FilesystemAdapter;
-use JetBrains\PhpStorm\Pure;
 use League\Flysystem\Config;
 use OSS\OssClient;
 
@@ -32,15 +31,15 @@ public function __construct(FilesystemAdapter $filesystemAdapter)
     /**
      * @return OssClient
      */
-    #[Pure] public function client(): OssClient
+    public function client(): OssClient
     {
         return $this->adapter->getClient();
     }
 
     /**
      * @return string
      */
-    #[Pure] public function bucket(): string
+    public function bucket(): string
     {
         return $this->adapter->getBucket();
     }
@@ -49,7 +48,7 @@ public function __construct(FilesystemAdapter $filesystemAdapter)
      * @param string $path
      * @return string
      */
-    #[Pure] public function path(string $path = ""): string
+    public function path(string $path = ""): string
     {
         return $this->adapter->getPrefixer()->prefixPath($path);
     }

diff --git a/tests/MacroTest.php b/tests/MacroTest.php
@@ -51,4 +51,17 @@ public function append_object()
         $position = Storage::disk("oss")->appendObject("stubs/file.txt", "contents", 0, ["options" => ["checkmd5" => false]]);
         $this->assertSame($position, 8);
     }
+
+    /**
+     * @test
+     */
+    public function process_object()
+    {
+        $this->ossClient->shouldReceive("processObject")
+            ->with("bucket", "tests/stubs/file.jpg", "image/resize,l_1000|sys/saveas,o_dGVzdHMvc3R1YnMvZmlsZS5qcGc,b_YnVja2V0", [])
+            ->once()
+            ->andReturn('{"bucket":"bucket","fileSize":1024,"object":"tests/stubs/file.jpg","status":"OK"}');
+        $result = Storage::disk("oss")->processObject("stubs/file.jpg", "image/resize,l_1000");
+        $this->assertSame($result, '{"bucket":"bucket","fileSize":1024,"object":"tests/stubs/file.jpg","status":"OK"}');
+    }
 }