fsd-oss 0.9.0 → 0.10.1

package/README.md

@@ -15,7 +15,7 @@ let content = await fsd.read();
 
 ```
 
-FSD 文档： https://github.com/maichong/fsd
+FSD 文档： https://github.com/liangxingchen/fsd
 
 适配器初始化选项：
 

package/lib/index.js

@@ -7,7 +7,6 @@ const minimatch = require("minimatch");
 const Debugger = require("debug");
 const eachLimit = require("async/eachLimit");
 const RPC = require("@alicloud/pop-core");
-const url_1 = require("url");
 const stream_1 = require("stream");
 const debug = Debugger('fsd-oss');
 const CALLBACK_BODY = 'bucket=${bucket}&path=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&format=${imageInfo.format}';
@@ -274,8 +273,6 @@ class OSSAdapter {
         debug('copy %s to %s', path, dest);
         if (!(await this.exists(path)))
             throw new Error('The source path is not exists!');
-        if (await this.exists(dest))
-            throw new Error('The dest path is already exists!');
         const { root } = this._options;
         let from = slash(Path.join(root, path)).substr(1);
         let to = slash(Path.join(root, dest)).substr(1);
@@ -382,18 +379,17 @@ class OSSAdapter {
         let { uploadId } = res;
         let files = [];
         for (let i = 1; i <= partCount; i += 1) {
-            files.push(`task://${uploadId}${path}?${i}`);
+            files.push(`task://${uploadId}?${i}`);
         }
         return files;
     }
     async writePart(path, partTask, data, size) {
         debug('writePart %s, task: %s', path, partTask);
-        let p = slash(Path.join(this._options.root, path)).substr(1);
-        let info = new url_1.URL(partTask);
-        if (!info.pathname || info.pathname !== path)
-            throw new Error('Invalid part pathname');
-        let uploadId = (info.hostname || '').toUpperCase();
-        let res = await this._oss._uploadPart(p, uploadId, info.search.substr(1), {
+        let p = slash(Path.join(this._options.root, path)).substring(1);
+        if (!partTask.startsWith('task://'))
+            throw new Error('Invalid part task id');
+        let [uploadId, no] = partTask.replace('task://', '').split('?');
+        let res = await this._oss._uploadPart(p, uploadId, parseInt(no), {
             stream: data,
             size
         });
@@ -402,11 +398,8 @@ class OSSAdapter {
     }
     async completeMultipartUpload(path, parts) {
         debug('completeMultipartUpload %s', path);
-        let info = new url_1.URL(parts[0]);
-        if (!info.pathname || info.pathname !== path)
-            throw new Error('Invalid part pathname');
-        let uploadId = (info.hostname || '').toUpperCase();
-        let p = slash(Path.join(this._options.root, path)).substr(1);
+        let uploadId = parts[0].replace('part://', '').split('?')[0];
+        let p = slash(Path.join(this._options.root, path)).substring(1);
         debug('update id: %s, target: %s', uploadId, p);
         let datas = parts.map((item, key) => ({
             etag: item.split('#')[1],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -8,16 +8,16 @@
     "build": "tsc",
     "prepublish": "npm run build"
   },
-  "repository": "https://github.com/maichong/fsd/tree/master/packages/fsd-oss",
-  "author": "Liang <liang@maichong.it> (https://github.com/liangxingchen)",
+  "repository": "https://github.com/liangxingchen/fsd/tree/master/packages/fsd-oss",
+  "author": "Liang <liang@miaomo.cc> (https://github.com/liangxingchen)",
   "license": "MIT",
   "dependencies": {
-    "@alicloud/pop-core": "^1.7.10",
-    "ali-oss": "^6.16.0",
+    "@alicloud/pop-core": "^1.7.12",
+    "ali-oss": "^6.17.1",
     "async": "*",
-    "debug": "^4.3.2",
-    "minimatch": "^3.0.4",
+    "debug": "^4.3.4",
+    "minimatch": "^3.1.2",
     "slash": "^3.0.0"
   },
-  "gitHead": "1803b2521d07819f8ae55d8ba39c847512061772"
+  "gitHead": "0e15db87212337e709c07bdc9c855132bb347db9"
 }