fsd-vod 0.9.0 → 0.10.0

package/README.md

@@ -16,7 +16,7 @@ await fsd.write(data);
 
 ```
 
-FSD 文档： https://github.com/maichong/fsd
+FSD 文档： https://github.com/liangxingchen/fsd
 
 适配器初始化选项：
 

package/lib/index.js

@@ -4,7 +4,6 @@ const OSS = require("ali-oss");
 const LRUCache = require("lru-cache");
 const Debugger = require("debug");
 const RPC = require("@alicloud/pop-core");
-const url_1 = require("url");
 const stream_1 = require("stream");
 const akita_1 = require("akita");
 const debug = Debugger('fsd-vod');
@@ -205,23 +204,22 @@ class VODAdapter {
         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.substr(1));
+        let res = await oss.initMultipartUpload(token.path.substring(1));
         let { uploadId } = res;
         let files = [];
         for (let i = 1; i <= partCount; i += 1) {
-            files.push(`task://${uploadId}${token.path}?${i}`);
+            files.push(`task://${uploadId}?${i}`);
         }
         return files;
     }
     async writePart(videoId, partTask, data, size) {
         debug('writePart %s, task: %s', videoId, partTask);
+        if (!partTask.startsWith('task://'))
+            throw new Error('Invalid part task id');
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
         let oss = new OSS(token.auth);
-        let info = new url_1.URL(partTask);
-        if (!info.pathname || info.pathname !== token.path)
-            throw new Error('Invalid part pathname');
-        let uploadId = (info.hostname || '').toUpperCase();
-        let res = await oss._uploadPart(token.path.substr(1), uploadId, info.search.substr(1), {
+        let [uploadId, no] = partTask.replace('task://', '').split('?');
+        let res = await oss._uploadPart(token.path.substring(1), uploadId, parseInt(no), {
             stream: data,
             size
         });
@@ -232,16 +230,13 @@ class VODAdapter {
         debug('completeMultipartUpload %s', videoId);
         let token = await this.createUploadTokenWithAutoRefresh(videoId);
         let oss = new OSS(token.auth);
-        let info = new url_1.URL(parts[0]);
-        if (!info.pathname || info.pathname !== token.path)
-            throw new Error('Invalid part pathname');
-        let uploadId = (info.hostname || '').toUpperCase();
+        let uploadId = parts[0].replace('part://', '').split('?')[0];
         debug('update id: %s, target: %s', uploadId, token.path);
         let datas = parts.map((item, key) => ({
             etag: item.split('#')[1],
             number: key + 1
         }));
-        await oss.completeMultipartUpload(token.path.substr(1), uploadId, datas);
+        await oss.completeMultipartUpload(token.path.substring(1), uploadId, datas);
     }
     async createUrl(videoId, options) {
         debug('createUrl %s', videoId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-vod",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -8,15 +8,15 @@
     "build": "tsc",
     "prepublish": "npm run build"
   },
-  "repository": "https://github.com/maichong/fsd/tree/master/packages/fsd-vod",
-  "author": "Liang <liang@maichong.it> (https://github.com/liangxingchen)",
+  "repository": "https://github.com/liangxingchen/fsd/tree/master/packages/fsd-vod",
+  "author": "Liang <liang@miaomo.cc> (https://github.com/liangxingchen)",
   "license": "MIT",
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "akita": "^0.12.0",
-    "ali-oss": "^6.16.0",
-    "debug": "^4.3.2",
+    "akita": "^0.12.1",
+    "ali-oss": "^6.17.1",
+    "debug": "^4.3.4",
     "lru-cache": "^6.0.0"
   },
-  "gitHead": "1803b2521d07819f8ae55d8ba39c847512061772"
+  "gitHead": "9820fd7263b6791a38e5568396bfac0f2d3e37e9"
 }