fsd-oss 0.11.1 → 0.12.0

package/index.d.ts

@@ -50,9 +50,23 @@ export interface UploadTokenWithAutoRefresh {
 }
 
 export default class OSSAdpter extends Adapter<OSSAdapterOptions> {
-  createUploadToken: (videoId: string, meta?: any) => Promise<UploadToken>;
+  /**
+   * 创建上传凭证
+   * @param {string} path 文件路径
+   * @param {any} [meta] 文件元信息
+   * @param {number} [durationSeconds] 上传凭证有效期，单位秒, 默认 3600
+   */
+  createUploadToken: (path: string, meta?: any, durationSeconds?: number) => Promise<UploadToken>;
+
+  /**
+   * 创建带自动刷新的上传凭证
+   * @param {string} path 文件路径
+   * @param {any} [meta] 文件元信息
+   * @param {number} [durationSeconds] 上传凭证有效期，单位秒, 默认 3600
+   */
   createUploadTokenWithAutoRefresh: (
-    videoId: string,
-    meta?: any
+    path: string,
+    meta?: any,
+    durationSeconds?: number
   ) => Promise<UploadTokenWithAutoRefresh>;
 }

package/lib/index.js

@@ -47,7 +47,7 @@ class OSSAdapter {
                 apiVersion: '2015-04-01'
             });
         }
-        this.createUploadToken = async (path, meta) => {
+        this.createUploadToken = async (path, meta, durationSeconds) => {
             if (!options.accountId || !options.roleName)
                 throw new Error('Can not create sts token, missing options: accountId and roleName!');
             path = slash(Path.join(options.root, path)).substring(1);
@@ -64,7 +64,7 @@ class OSSAdapter {
                         }
                     ]
                 }),
-                DurationSeconds: 3600
+                DurationSeconds: durationSeconds || 3600
             };
             let result = await this._rpc.request('AssumeRole', params, { method: 'POST' });
             if (result.Message)
@@ -93,12 +93,12 @@ class OSSAdapter {
             }
             return token;
         };
-        this.createUploadTokenWithAutoRefresh = async (videoId, meta) => {
-            let token = await this.createUploadToken(videoId, meta);
+        this.createUploadTokenWithAutoRefresh = async (path, meta, durationSeconds) => {
+            let token = await this.createUploadToken(path, meta, durationSeconds);
             let auth = token.auth;
             auth = Object.assign({}, auth, {
                 refreshSTSToken: async () => {
-                    let t = await this.createUploadToken(videoId, meta);
+                    let t = await this.createUploadToken(path, meta, durationSeconds);
                     return t.auth;
                 }
             });

package/lib/simple-oss-client.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const qs = require("qs");
-const xmljs = require("xml-js");
+const xml2js = require("xml2js");
 const sha1 = require("crypto-js/hmac-sha1");
 const md5 = require("crypto-js/md5");
 const Base64Encoder = require("crypto-js/enc-base64");
@@ -41,7 +41,6 @@ class SimpleOSSClient {
             options.headers = {};
         options.headers['x-oss-copy-source'] = `/${this.config.bucket}/${from}`;
         let res = await this.requestData('PUT', to, null, options);
-        res = Object.assign({ headers: res.headers }, res.CopyObjectResult);
         return res;
     }
     async head(name, options) {
@@ -74,7 +73,6 @@ class SimpleOSSClient {
             query['fetch-owner'] = options.fetchOwner;
         options.query = query;
         let res = await this.requestData('GET', '', null, options);
-        res = Object.assign({ headers: res.headers }, res.ListBucketResult);
         res.KeyCount = parseInt(res.KeyCount);
         res.MaxKeys = parseInt(res.MaxKeys);
         res.IsTruncated = res.IsTruncated === 'true';
@@ -103,7 +101,6 @@ class SimpleOSSClient {
             options.headers = {};
         options.headers['Content-MD5'] = md5(body).toString(Base64Encoder);
         let res = await this.requestData('POST', '?delete', body, options);
-        res = Object.assign({ headers: res.headers }, res.DeleteResult);
         if (res.Deleted) {
             if (!Array.isArray(res.Deleted))
                 res.Deleted = [res.Deleted];
@@ -118,8 +115,7 @@ class SimpleOSSClient {
         options = options || {};
         if (!options.mime)
             options.mime = mime.lookup(name) || 'application/octet-stream';
-        let res = await this.requestData('POST', `${name}?uploads`, '', options);
-        return Object.assign({ headers: res.headers }, res.InitiateMultipartUploadResult);
+        return await this.requestData('POST', `${name}?uploads`, '', options);
     }
     uploadPart(name, uploadId, partNumber, body, options) {
         options = options || {};
@@ -134,7 +130,7 @@ class SimpleOSSClient {
             .map((part) => `<Part><PartNumber>${part.number}</PartNumber><ETag>${part.etag}</ETag></Part>`)
             .join('')}</CompleteMultipartUpload>`;
         let res = await this.requestData('POST', `${name}?uploadId=${uploadId}`, body, options);
-        return Object.assign({ headers: res.headers }, res.CompleteMultipartUploadResult);
+        return res;
     }
     request(method, resource, body, options) {
         options = options || {};
@@ -164,17 +160,16 @@ class SimpleOSSClient {
     async requestData(method, resource, body, options) {
         let response = await this.request(method, resource, body, options).response();
         let xml = await response.text();
-        if (!xml && response.status === 200) {
+        if (!xml && (response.status === 200 || response.status === 204)) {
             return {
                 headers: response.headers
             };
         }
-        let data = xmljs.xml2js(xml, { compact: true });
-        if (data.Error) {
-            throw new Error(data.Error.Message._text);
+        let data = await xml2data(xml);
+        if (data.Code) {
+            throw new Error(data.Message);
         }
-        let res = Object.assign({ headers: response.headers }, conventXmlObject(data));
-        delete res._declaration;
+        let res = Object.assign({ headers: response.headers }, data);
         return res;
     }
     signatureUrl(name, options) {
@@ -222,18 +217,14 @@ class SimpleOSSClient {
     }
 }
 exports.default = SimpleOSSClient;
-function conventXmlObject(object) {
-    if (Array.isArray(object))
-        return object.map(conventXmlObject);
-    if (object && typeof object === 'object') {
-        let keys = Object.keys(object);
-        if (keys.length === 1 && keys[0] === '_text')
-            return object._text;
-        let res = {};
-        for (let key of keys) {
-            res[key] = conventXmlObject(object[key]);
-        }
-        return res;
-    }
-    return object;
+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.11.1",
+  "version": "0.12.0",
   "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",
-    "xml-js": "^1.6.11"
+    "xml2js": "^0.5.0"
   },
-  "gitHead": "5f39a56e4f5ae28e6f15c7888413561a924b54de"
+  "gitHead": "ad01afd0117496a9b857e566a404f0ececbd723d"
 }