fsd-oss 0.13.0 → 0.13.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 郑州脉冲软件科技有限公司
+Copyright (c) 2023 郑州渺漠信息科技有限公司
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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);
@@ -147,12 +149,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
         });
@@ -165,7 +169,11 @@ class SimpleOSSClient {
                 headers: response.headers
             };
         }
-        let data = await xml2data(xml);
+        let data = await xml2js.parseStringPromise(xml, {
+            trim: true,
+            explicitArray: false,
+            explicitRoot: false
+        });
         if (data.Code) {
             throw new Error(data.Message);
         }
@@ -197,6 +205,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 = [
@@ -217,14 +236,3 @@ class SimpleOSSClient {
     }
 }
 exports.default = SimpleOSSClient;
-function xml2data(xml) {
-    return new Promise((resolve, reject) => {
-        const opt = { trim: true, explicitArray: false, explicitRoot: false };
-        xml2js.parseString(xml, opt, (error, result) => {
-            if (error) {
-                return reject(new Error('XMLDataError'));
-            }
-            resolve(result);
-        });
-    });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
     "mime-types": "^2.1.35",
     "minimatch": "^3.1.2",
     "slash": "^3.0.0",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.6.2"
   },
-  "gitHead": "1548128573c0fd22977706a6704029ec3ca3bab6"
+  "gitHead": "f5aaaca713f514d3a8fb65bc2eecd1e8df8fd5c8"
 }

package/simple-oss-client.d.ts

@@ -1,4 +1,4 @@
-import { Request } from 'akita';
+import type { Request } from 'akita';
 
 export default class SimpleOSSClient {
   config: SimpleOSSClientConfig;
@@ -64,6 +64,7 @@ export interface RequestOptions {
   meta?: UserMeta;
   headers?: Record<string, string>;
   query?: Record<string, string>;
+  subres?: Record<string, string>;
 }
 
 export interface Result {