fsd-vod 0.10.1 → 0.11.1

package/lib/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const OSS = require("ali-oss");
 const LRUCache = require("lru-cache");
 const Debugger = require("debug");
 const RPC = require("@alicloud/pop-core");
 const stream_1 = require("stream");
 const akita_1 = require("akita");
+const simple_oss_client_1 = require("fsd-oss/simple-oss-client");
 const debug = Debugger('fsd-vod');
 const client = akita_1.default.resolve('fsd-vod');
 const CALLBACK_BODY = 'bucket=${bucket}&path=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&format=${imageInfo.format}';
@@ -79,7 +79,7 @@ class VODAdapter {
         };
         this.createUploadToken = async (videoId, meta) => {
             if (videoId[0] === '/')
-                videoId = videoId.substr(1);
+                videoId = videoId.substring(1);
             let token = this._authCache.get(videoId);
             debug('getAuth', videoId, token);
             if (!token) {
@@ -119,7 +119,7 @@ class VODAdapter {
     }
     async getVideoInfo(videoId) {
         if (videoId[0] === '/')
-            videoId = videoId.substr(1);
+            videoId = videoId.substring(1);
         let cache = this._videoCache.get(videoId);
         if (cache)
             return cache;
@@ -138,7 +138,7 @@ class VODAdapter {
     }
     async getMezzanineInfo(videoId, options) {
         if (videoId[0] === '/')
-            videoId = videoId.substr(1);
+            videoId = videoId.substring(1);
         let params = Object.assign({
             VideoId: videoId,
             OutputType: 'cdn'
@@ -154,7 +154,7 @@ class VODAdapter {
     }
     async getPlayInfo(videoId, options) {
         if (videoId[0] === '/')
-            videoId = videoId.substr(1);
+            videoId = videoId.substring(1);
         let params = Object.assign({
             VideoId: videoId
         }, options || {});
@@ -163,12 +163,11 @@ class VODAdapter {
     async append(videoId, data) {
         debug('append %s', videoId);
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
-        let oss = new OSS(token.auth);
+        let oss = new simple_oss_client_1.default(token.auth);
         if (typeof data === 'string') {
             data = Buffer.from(data);
         }
-        let options = {};
-        await oss.put(token.path.substr(1), data, options);
+        await oss.put(token.path.substring(1), data);
     }
     async createReadStream(videoId, options) {
         debug('createReadStream %s options: %o', videoId, options);
@@ -195,20 +194,19 @@ class VODAdapter {
         if (options === null || options === void 0 ? void 0 : options.start)
             throw new Error('fsd-vod read stream does not support start options');
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
-        let oss = new OSS(token.auth);
+        let oss = new simple_oss_client_1.default(token.auth);
         let stream = new stream_1.PassThrough();
-        stream.promise = oss.putStream(token.path.substr(1), stream);
+        oss.put(token.path.substring(1), stream);
         return stream;
     }
     async initMultipartUpload(videoId, partCount) {
         debug('initMultipartUpload %s, partCount: %d', videoId, partCount);
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
-        let oss = new OSS(token.auth);
-        let res = await oss.initMultipartUpload(token.path.substring(1));
-        let { uploadId } = res;
+        let oss = new simple_oss_client_1.default(token.auth);
+        let { UploadId } = await oss.initMultipartUpload(token.path.substring(1));
         let files = [];
         for (let i = 1; i <= partCount; i += 1) {
-            files.push(`task://${uploadId}?${i}`);
+            files.push(`task://${UploadId}?${i}`);
         }
         return files;
     }
@@ -217,19 +215,20 @@ class VODAdapter {
         if (!partTask.startsWith('task://'))
             throw new Error('Invalid part task id');
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
-        let oss = new OSS(token.auth);
+        let oss = new simple_oss_client_1.default(token.auth);
         let [uploadId, no] = partTask.replace('task://', '').split('?');
-        let res = await oss._uploadPart(token.path.substring(1), uploadId, parseInt(no), {
-            stream: data,
-            size
+        let res = await oss.uploadPart(token.path.substring(1), uploadId, parseInt(no), data, {
+            headers: {
+                'Content-Length': String(size)
+            }
         });
-        let etag = res.etag.replace(/"/g, '');
+        let etag = res.headers.get('ETag').replace(/"/g, '');
         return `${partTask.replace('task://', 'part://')}#${etag}`;
     }
     async completeMultipartUpload(videoId, parts) {
         debug('completeMultipartUpload %s', videoId);
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
-        let oss = new OSS(token.auth);
+        let oss = new simple_oss_client_1.default(token.auth);
         let uploadId = parts[0].replace('part://', '').split('?')[0];
         debug('update id: %s, target: %s', uploadId, token.path);
         let datas = parts.map((item, key) => ({
@@ -248,7 +247,7 @@ class VODAdapter {
     async unlink(videoId) {
         debug('unlink %s', videoId);
         if (videoId[0] === '/')
-            videoId = videoId.substr(1);
+            videoId = videoId.substring(1);
         let params = {
             VideoIds: videoId
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-vod",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -13,10 +13,10 @@
   "license": "MIT",
   "dependencies": {
     "@alicloud/pop-core": "^1.7.12",
-    "akita": "^1.0.0",
-    "ali-oss": "^6.17.1",
+    "akita": "^1.0.4",
     "debug": "^4.3.4",
+    "fsd-oss": "^0.11.1",
     "lru-cache": "^6.0.0"
   },
-  "gitHead": "0e15db87212337e709c07bdc9c855132bb347db9"
+  "gitHead": "5f39a56e4f5ae28e6f15c7888413561a924b54de"
 }