refactor: optimize provider

Author: alphasnow

.php-cs-fixer.php

@@ -42,6 +42,6 @@
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('vendor')
-            ->in([__DIR__.'/src/',__DIR__.'/tests/'])
+            ->in([__DIR__.'/src/',__DIR__.'/tests/',__DIR__.'/config/'])
     )
     ;

CHANGELOG.md

@@ -127,7 +127,7 @@ $client->appendObject($adapter->getBucket(), $adapter->applyPathPrefix('dir/path
 ```
 
 ## Documentation
-- [Object storage OSS-aliyun](https://help.aliyun.com/product/31815.html)
+- [Object storage OSS-aliyun](https://www.alibabacloud.com/help/en/object-storage-service)
 
 ## Issues
 [Opening an Issue](https://github.com/alphasnow/aliyun-oss-laravel/issues/new)

README.md

@@ -0,0 +1,17 @@
+<?php
+
+return [
+    "driver" => "aliyun",
+    "access_id" => env("ALIYUN_OSS_ACCESS_ID"), // AccessKey ID, For example: LTAI4**************qgcsA
+    "access_key" => env("ALIYUN_OSS_ACCESS_KEY"), // AccessKey Secret, For example: PkT4F********************Bl9or
+    "bucket" => env("ALIYUN_OSS_BUCKET"), // For example: my-storage
+    "endpoint" => env("ALIYUN_OSS_ENDPOINT"), // For example: oss-cn-shanghai.aliyuncs.com
+    "internal" => env("ALIYUN_OSS_INTERNAL", null), // For example: oss-cn-shanghai-internal.aliyuncs.com
+    "domain" => env("ALIYUN_OSS_DOMAIN", null), // For example: oss.my-domain.com
+    "use_ssl" => env("ALIYUN_OSS_USE_SSL", false), // Whether to use https
+    "prefix" => env("ALIYUN_OSS_PREFIX", null), // The prefix of the store path
+    "security_token" => env("ALIYUN_OSS_TOKEN", null),// Used by \OSS\OssClient
+    "request_proxy" => env("ALIYUN_OSS_PROXY", null),// Used by \OSS\OssClient
+    "use_domain_endpoint" => env("ALIYUN_OSS_USE_DOMAIN_ENDPOINT", false), // Whether to upload using domain
+    "signature_expires" => env("ALIYUN_OSS_SIGNATURE_EXPIRES", "+60 minutes"), // The valid time of the temporary url
+];

config/config.php

@@ -5,5 +5,6 @@ parameters:
         - src
 
     ignoreErrors:
+        - '~Right side of && is always false.~'
 
     checkMissingIterableValueType: false

phpstan.neon

@@ -18,7 +18,6 @@
             <directory suffix=".php">src/</directory>
             <exclude>
                 <directory suffix="ServiceProvider.php">src/</directory>
-                <directory suffix="Exception.php">src/</directory>
             </exclude>
         </whitelist>
     </filter>

phpunit.xml.dist

@@ -23,7 +23,7 @@ class Adapter extends BaseAdapter
     public function __construct(OssClient $ossClient, Config $ossConfig)
     {
         $this->ossConfig = $ossConfig;
-        parent::__construct($ossClient, $ossConfig->get('bucket'), ltrim($ossConfig->get('prefix', null), '/'), $ossConfig->get('options', []));
+        parent::__construct($ossClient, $ossConfig->get("bucket"), ltrim($ossConfig->get("prefix", null), "/"), $ossConfig->get("options", []));
     }
 
     /**
@@ -36,7 +36,7 @@ public function __construct(OssClient $ossClient, Config $ossConfig)
     public function getUrl($path)
     {
         $object = $this->applyPathPrefix($path);
-        return $this->ossConfig->getUrlDomain() . '/' . ltrim($object, '/');
+        return $this->ossConfig->getUrlDomain() . "/" . ltrim($object, "/");
     }
 
     /**
@@ -56,9 +56,9 @@ public function getTemporaryUrl($path, $expiration = null, array $options = [])
         $clientOptions = $this->getOptionsFromConfig(new FlysystemConfig($options));
 
         if (is_null($expiration)) {
-            $expiration = new \DateTime($this->ossConfig->get('signature_expires'));
+            $expiration = new \DateTime($this->ossConfig->get("signature_expires", "+60 minutes"));
         }
-        $timeout = $expiration->getTimestamp() - (new \DateTime('now'))->getTimestamp();
+        $timeout = $expiration->getTimestamp() - (new \DateTime("now"))->getTimestamp();
 
         $url = $this->client->signUrl($this->bucket, $object, $timeout, OssClient::OSS_HTTP_GET, $clientOptions);
         return $this->ossConfig->correctUrl($url);

src/Adapter.php

@@ -14,8 +14,8 @@ class Config extends Collection
      */
     public function getUrlDomain()
     {
-        if ($this->get('domain')) {
-            return $this->getProtocol().'://'.$this->get('domain');
+        if ($this->get("domain")) {
+            return $this->getProtocol()."://".$this->get("domain");
         }
         return $this->getEndpointDomain();
     }
@@ -25,44 +25,45 @@ public function getUrlDomain()
      */
     protected function getEndpointDomain()
     {
-        return $this->getProtocol().'://'.$this->get('bucket').'.'.$this->get('endpoint');
+        return $this->getProtocol()."://".$this->get("bucket").".".$this->get("endpoint");
     }
+
     /**
      * @return string
      */
     protected function getInternalDomain()
     {
-        return $this->getProtocol().'://'.$this->get('bucket').'.'.$this->get('internal');
+        return $this->getProtocol()."://".$this->get("bucket").".".$this->get("internal");
     }
 
     /**
      * @return string
      */
     protected function getProtocol()
     {
-        return $this->get('use_ssl', false) ? 'https' : 'http';
+        return $this->get("use_ssl", false) ? "https" : "http";
     }
 
     /**
      * @return string
      */
     public function getOssEndpoint()
     {
-        if ($internal = $this->get('internal')) {
+        if ($internal = $this->get("internal")) {
             return $internal;
         }
         if ($this->isCName()) {
-            return $this->get('domain');
+            return $this->get("domain");
         }
-        return $this->get('endpoint');
+        return $this->get("endpoint");
     }
 
     /**
      * @return bool
      */
-    protected function isCName()
+    public function isCName()
     {
-        return $this->get('use_domain_endpoint') && $this->get('domain');
+        return $this->get("use_domain_endpoint", false) && $this->get("domain");
     }
 
     /**
@@ -71,11 +72,12 @@ protected function isCName()
     public function getOssClientParameters()
     {
         return [
-            'accessKeyId' => $this->get('access_id'),
-            'accessKeySecret' => $this->get('access_key'),
-            'endpoint' => $this->getOssEndpoint(),
-            'isCName' => $this->isCName(),
-            'securityToken' => $this->get('security_token', null)
+            "accessKeyId" => $this->get("access_id"),
+            "accessKeySecret" => $this->get("access_key"),
+            "endpoint" => $this->getOssEndpoint(),
+            "isCName" => $this->isCName(),
+            "securityToken" => $this->get("security_token", null),
+            "requestProxy" => $this->get("request_proxy", null)
         ];
     }
 
@@ -85,13 +87,11 @@ public function getOssClientParameters()
      */
     public function correctUrl($url)
     {
-        // correct internal domain
-        if ($this->get('internal')) {
+        if ($this->get("internal")) {
             return str_replace($this->getInternalDomain(), $this->getUrlDomain(), $url);
         }
 
-        // correct domain
-        if ($this->get('domain') && $this->get('use_domain_endpoint') == false) {
+        if ($this->get("domain") && $this->get("use_domain_endpoint") == false) {
             return str_replace($this->getEndpointDomain(), $this->getUrlDomain(), $url);
         }
 

src/Config.php

@@ -20,9 +20,21 @@ class ServiceProvider extends BaseServiceProvider
      */
     public function boot()
     {
-        $this->app->make('filesystem')
-            ->extend('aliyun', function ($app, array $config) {
-                return $app->make('aliyun-oss.oss-filesystem', $config);
+        $this->app->make("filesystem")
+            ->extend("aliyun", function ($app, array $config) {
+                $ossConfig = new Config($config);
+
+                $ossClient = new OssClient($ossConfig->get("access_id"), $ossConfig->get("access_key"), $ossConfig->getOssEndpoint(), $ossConfig->isCName(), $ossConfig->get("security_token"), $ossConfig->get("request_proxy"));
+                $ossConfig->has("use_ssl") && $ossClient->setUseSSL($ossConfig->get("use_ssl"));
+                $ossConfig->has("max_retries") && $ossClient->setMaxTries($ossConfig->get("max_retries"));
+                $ossConfig->has("enable_sts_in_url") && $ossClient->setSignStsInUrl($ossConfig->get("enable_sts_in_url"));
+                $ossConfig->has("timeout") && $ossClient->setTimeout($ossConfig->get("timeout"));
+                $ossConfig->has("connect_timeout") && $ossClient->setConnectTimeout($ossConfig->get("connect_timeout"));
+
+                $filesystem = new Filesystem(new Adapter($ossClient, $ossConfig), new FlysystemConfig(["disable_asserts" => true]));
+                $filesystem->addPlugin(new AppendContent());
+
+                return $filesystem;
             });
     }
 
@@ -31,46 +43,32 @@ public function boot()
      */
     public function register()
     {
-        $this->registerConfig();
-
-        $this->app->bind('aliyun-oss.oss-client', function ($app, array $config) {
-            $ossConfig = new Config($config);
-
-            $client = $app->make(OssClient::class, $ossConfig->getOssClientParameters());
-            $client->setUseSSL($ossConfig->get('use_ssl', false));
-            return $client;
-        });
-
-        $this->app->bind('aliyun-oss.oss-adapter', function ($app, array $config) {
-            $client = $app->make('aliyun-oss.oss-client', $config);
-
-            return new Adapter($client, new Config($config));
-        });
-
-        $this->app->bind('aliyun-oss.oss-filesystem', function ($app, array $config) {
-            $adapter = $app->make('aliyun-oss.oss-adapter', $config);
+        if (get_class($this->app) == "Laravel\Lumen\Application") {
+            return;
+        }
 
-            $filesystem = new Filesystem($adapter, new FlysystemConfig(['disable_asserts' => true]));
-            $filesystem->addPlugin(new AppendContent());
-            return $filesystem;
-        });
+        $this->registerConfig();
     }
 
+    /**
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     * @return void
+     */
     protected function registerConfig()
     {
         if ($this->app instanceof CachesConfiguration && $this->app->configurationIsCached()) {
             return;
         }
 
-        $config = $this->app->make('config');
+        $config = $this->app->make("config");
         $disks = $config->get("filesystems.disks", []);
         $drivers = array_column($disks, "driver");
         if (in_array("aliyun", $drivers)) {
             return;
         }
 
         $config->set("filesystems.disks.aliyun", array_merge(
-            require __DIR__ . "/config/config.php",
+            require __DIR__ . "/../config/config.php",
             $config->get("filesystems.disks.aliyun", [])
         ));
     }