fsd-oss 0.13.1 → 0.13.3

package/lib/index.js

@@ -204,8 +204,10 @@ class OSSAdapter {
         }
         const { root } = this._options;
         let p = slash(Path.join(root, path)).substring(1);
-        let results = [];
+        let results = Object.create(null);
         let continuationToken = '';
+        let hasContents = false;
+        let hasCommonPrefixes = false;
         do {
             let list = await this._oss.list({
                 prefix: p,
@@ -216,6 +218,7 @@ class OSSAdapter {
             debug('list: %O', list);
             continuationToken = list.NextContinuationToken;
             if (list.Contents) {
+                hasContents = true;
                 list.Contents.forEach((object) => {
                     let relative = slash(Path.relative(p, object.Key));
                     if (!relative)
@@ -224,17 +227,34 @@ class OSSAdapter {
                         relative += '/';
                     if (pattern && pattern !== '**/*' && !minimatch(relative, pattern))
                         return;
-                    results.push({
+                    results[relative] = {
                         name: relative,
                         metadata: {
                             size: object.Size,
                             lastModified: new Date(object.LastModified)
                         }
-                    });
+                    };
+                });
+            }
+            if (list.CommonPrefixes) {
+                hasCommonPrefixes = true;
+                list.CommonPrefixes.forEach((prefix) => {
+                    let relative = slash(Path.relative(p, prefix.Prefix));
+                    if (!relative)
+                        return;
+                    relative += '/';
+                    results[relative] = {
+                        name: relative
+                    };
                 });
             }
         } while (continuationToken);
-        return results;
+        if (hasContents && hasCommonPrefixes) {
+            return Object.keys(results)
+                .sort()
+                .map((key) => results[key]);
+        }
+        return Object.values(results);
     }
     async createUrl(path, options) {
         debug('createUrl %s', path);

package/lib/simple-oss-client.js

@@ -57,6 +57,7 @@ class SimpleOSSClient {
         let query = {
             'list-type': '2'
         };
+        let subres = {};
         if (options.prefix)
             query.prefix = options.prefix;
         if (options.delimiter)
@@ -64,14 +65,15 @@ class SimpleOSSClient {
         if (options.startAfter)
             query['start-after'] = options.startAfter;
         if (options.continuationToken)
-            query['continuation-token'] = options.continuationToken;
+            subres['continuation-token'] = options.continuationToken;
         if (options.maxKeys)
-            query['max-keys'] = options.maxKeys;
+            query['max-keys'] = String(options.maxKeys);
         if (options.encodingType)
             query['encoding-type'] = options.encodingType;
         if (options.fetchOwner)
-            query['fetch-owner'] = options.fetchOwner;
+            query['fetch-owner'] = String(options.fetchOwner);
         options.query = query;
+        options.subres = subres;
         let res = await this.requestData('GET', '', null, options);
         res.KeyCount = parseInt(res.KeyCount);
         res.MaxKeys = parseInt(res.MaxKeys);
@@ -84,6 +86,10 @@ class SimpleOSSClient {
                 content.Size = parseInt(content.Size);
             });
         }
+        if (res.CommonPrefixes) {
+            if (!Array.isArray(res.CommonPrefixes))
+                res.CommonPrefixes = [res.CommonPrefixes];
+        }
         return res;
     }
     del(name, options) {
@@ -147,12 +153,14 @@ class SimpleOSSClient {
         if (this.config.stsToken) {
             headers['x-oss-security-token'] = this.config.stsToken;
         }
-        headers.authorization = this.getSign(method, `/${this.config.bucket}/${resource}`, headers);
+        let canonicalizedResource = this.createCanonicalizedResource(`/${this.config.bucket}/${resource}`, options.subres);
+        headers.authorization = this.getSign(method, canonicalizedResource, headers);
         let url = `https://${this.config.bucket}.${this.endpoint}/${resource}`;
+        let query = Object.assign({}, options.query, options.subres);
         return client.request(url, {
             method,
             headers,
-            query: options.query,
+            query,
             body,
             timeout: options.timeout || this.config.timeout || 60000
         });
@@ -201,6 +209,17 @@ class SimpleOSSClient {
         query.Expires = expires;
         return `${url}?${qs.stringify(query)}`;
     }
+    createCanonicalizedResource(resource, subres) {
+        if (!subres)
+            return resource;
+        let string = Object.keys(subres)
+            .sort()
+            .map((key) => `${key}=${subres[key]}`)
+            .join('&');
+        if (string)
+            return `${resource}?${string}`;
+        return resource;
+    }
     getSign(method, canonicalizedResource, headers) {
         headers = headers || {};
         let parts = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -15,12 +15,12 @@
     "@alicloud/pop-core": "^1.7.13",
     "akita": "^1.0.4",
     "async": "*",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "debug": "^4.3.4",
     "mime-types": "^2.1.35",
     "minimatch": "^3.1.2",
     "slash": "^3.0.0",
     "xml2js": "^0.6.2"
   },
-  "gitHead": "12ff02bfc634ba84c771ca433d33aae2dc881436"
+  "gitHead": "035c0e59b51166498ce13f66fc1316099fe77566"
 }

package/simple-oss-client.d.ts

@@ -64,6 +64,7 @@ export interface RequestOptions {
   meta?: UserMeta;
   headers?: Record<string, string>;
   query?: Record<string, string>;
+  subres?: Record<string, string>;
 }
 
 export interface Result {
@@ -104,6 +105,7 @@ export interface ListResult extends Result {
   KeyCount: number;
   NextContinuationToken?: string;
   Contents: ListResultContent[];
+  CommonPrefixes: ListResultCommonPrefixes[];
 }
 
 export interface ListResultContent {
@@ -118,6 +120,10 @@ export interface ListResultContent {
   };
 }
 
+export interface ListResultCommonPrefixes {
+  Prefix: string;
+}
+
 export interface DeleteMultiOptions extends RequestOptions {
   quiet?: boolean;
 }