fix s3 get object url when custom s3 domain (#37)

bachue · May 8, 2024 · 452e18d · 452e18d
1 parent 41b855f
commit 452e18d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/kodo.ts b/kodo.ts
@@ -293,7 +293,11 @@ export class Kodo implements Adapter {
         if (bucketResponse.data.perm && bucketResponse.data.perm > 0) {
             const defautDomainData = defaultDomainQuery.data;
             const domains: Domain[] = [];
-            if (defautDomainData.domain && defautDomainData.protocol) {
+            if (
+                defautDomainData.domain &&
+                defautDomainData.protocol &&
+                defautDomainData.isAvailable
+            ) {
                 domains.push({
                     name: defautDomainData.domain,
                     protocol: defautDomainData.protocol,
@@ -319,12 +323,18 @@ export class Kodo implements Adapter {
         }
         const result: Domain[] = [];
         domainResponse.data.forEach((domain: any) => {
+            if (
+                domain.domain === defaultDomainQuery.data.domain &&
+                !defaultDomainQuery.data.isAvailable
+            ) {
+                return
+            }
             const resultItem: Domain = {
                 name: domain.domain,
                 protocol: domainShouldHttps[domain.domain] ? 'https' : 'http',
                 type: 'others',
                 apiScope: domain.api_scope === 0 ? 'kodo' : 's3',
-                private: bucketResponse.data.private != 0,
+                private: bucketResponse.data.private != 0 || domain.api_scope === 1,
                 protected: bucketResponse.data.protected != 0,
             };
             if (!domain.domain_types?.length) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kodo-s3-adapter-sdk",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Adapter for Kodo & S3 API",
   "main": "dist/index.js",
   "repository": "github.com/bachue/kodo-s3-adapter-sdk",

diff --git a/s3.ts b/s3.ts
@@ -608,9 +608,23 @@ export class S3 extends Kodo {
         );
     }
 
-    async getObjectURL(s3RegionId: string, object: StorageObject, _domain?: Domain, deadline?: Date): Promise<URL> {
+    async getObjectURL(s3RegionId: string, object: StorageObject, domain?: Domain, deadline?: Date): Promise<URL> {
+        // if domain is not undefined, use the domain, else use the default s3 endpoint
+        const s3Promise: Promise<AWS.S3> = domain
+            ? Promise.resolve(new AWS.S3({
+                apiVersion: '2006-03-01',
+                region: s3RegionId,
+                endpoint: `${domain.protocol}://${domain.name}`,
+                credentials: {
+                    accessKeyId: this.adapterOption.accessKey,
+                    secretAccessKey: this.adapterOption.secretKey,
+                },
+                signatureVersion: 'v4',
+                s3BucketEndpoint: true,
+            }))
+            : this.getClient(s3RegionId);
         const [s3, bucketId] = await Promise.all([
-            this.getClient(s3RegionId),
+            s3Promise,
             this.fromKodoBucketNameToS3BucketId(object.bucket),
         ]);
         const expires = deadline