fsd-oss 0.7.2 → 0.10.0

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/index.d.ts

@@ -18,4 +18,41 @@ export interface OSSAdapterOptions {
   callbackUrl?: string; // 边缘上传回调地址
 }
 
-export default class OSSAdpter extends Adapter<OSSAdapterOptions> {}
+export interface UploadToken {
+  auth: {
+    accessKeyId: string;
+    accessKeySecret: string;
+    stsToken: string;
+    bucket: string;
+    endpoint: string;
+  };
+  path: string;
+  expiration: number;
+  callback?: any;
+}
+
+export interface UploadTokenWithAutoRefresh {
+  auth: {
+    accessKeyId: string;
+    accessKeySecret: string;
+    stsToken: string;
+    bucket: string;
+    endpoint: string;
+    refreshSTSToken: () => Promise<{
+      accessKeyId: string;
+      accessKeySecret: string;
+      stsToken: string;
+    }>;
+  };
+  path: string;
+  expiration: number;
+  callback?: any;
+}
+
+export default class OSSAdpter extends Adapter<OSSAdapterOptions> {
+  createUploadToken: (videoId: string, meta?: any) => Promise<UploadToken>;
+  createUploadTokenWithAutoRefresh: (
+    videoId: string,
+    meta?: any
+  ) => Promise<UploadTokenWithAutoRefresh>;
+}

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}';
@@ -96,6 +95,17 @@ class OSSAdapter {
             }
             return token;
         };
+        this.createUploadTokenWithAutoRefresh = async (videoId, meta) => {
+            let token = await this.createUploadToken(videoId, meta);
+            let auth = token.auth;
+            auth = Object.assign({}, auth, {
+                refreshSTSToken: async () => {
+                    let t = await this.createUploadToken(videoId, meta);
+                    return t.auth;
+                }
+            });
+            return Object.assign({}, token, { auth });
+        };
     }
     async append(path, data) {
         debug('append %s', path);
@@ -146,6 +156,7 @@ class OSSAdapter {
         return stream;
     }
     async unlink(path) {
+        var _a;
         debug('unlink %s', path);
         const { root } = this._options;
         let p = slash(Path.join(root, path)).substr(1);
@@ -158,10 +169,10 @@ class OSSAdapter {
                     'max-keys': 1000
                 }, {});
                 ({ nextMarker } = list);
-                if (list.objects && list.objects.length) {
+                if ((_a = list.objects) === null || _a === void 0 ? void 0 : _a.length) {
                     let objects = list.objects.map((o) => o.name);
                     await this._oss.deleteMulti(objects, {
-                        quite: true
+                        quiet: true
                     });
                 }
             } while (nextMarker);
@@ -170,10 +181,10 @@ class OSSAdapter {
             await this._oss.delete(p);
         }
     }
-    async mkdir(path, prefix) {
+    async mkdir(path, recursive) {
         debug('mkdir %s', path);
         let parent = Path.dirname(path);
-        if (prefix && parent !== '/') {
+        if (recursive && parent !== '/') {
             parent += '/';
             if (!(await this.exists(parent))) {
                 debug('mkdir prefix: %s', parent);
@@ -190,7 +201,7 @@ class OSSAdapter {
         let delimiter = recursion ? '' : '/';
         let pattern = '';
         if (recursion === true) {
-            pattern = '**/**';
+            pattern = '**/*';
         }
         else if (recursion) {
             pattern = recursion;
@@ -208,13 +219,29 @@ class OSSAdapter {
             }, {});
             debug('list: %O', list);
             ({ nextMarker } = list);
+            if (list.prefixes) {
+                list.prefixes.forEach((name) => {
+                    let relative = slash(Path.relative(p, name));
+                    if (!relative)
+                        return;
+                    results.push({
+                        name: `${relative}/`,
+                        metadata: {
+                            size: 0,
+                            lastModified: null
+                        }
+                    });
+                });
+            }
             if (list.objects) {
                 list.objects.forEach((object) => {
                     let { name } = object;
                     let relative = slash(Path.relative(p, name));
                     if (!relative)
                         return;
-                    if (pattern && !minimatch(relative, pattern))
+                    if (name.endsWith('/'))
+                        relative += '/';
+                    if (pattern && pattern !== '**/*' && !minimatch(relative, pattern))
                         return;
                     results.push({
                         name: relative,
@@ -242,11 +269,10 @@ class OSSAdapter {
         return url;
     }
     async copy(path, dest) {
+        var _a;
         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);
@@ -261,7 +287,7 @@ class OSSAdapter {
                 }, {});
                 debug('list result: %O', list);
                 ({ nextMarker } = list);
-                if (list.objects && list.objects.length) {
+                if ((_a = list.objects) === null || _a === void 0 ? void 0 : _a.length) {
                     await eachLimit(list.objects, 10, async (object) => {
                         let { name } = object;
                         debug(' -> copy %s', name);
@@ -353,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
         });
@@ -373,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.7.2",
+  "version": "0.10.0",
   "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.13.2",
-    "async": "^3.2.0",
-    "debug": "^4.3.1",
-    "minimatch": "^3.0.4",
+    "ali-oss": "^6.17.1",
+    "async": "*",
+    "debug": "^4.3.4",
+    "minimatch": "^3.0.5",
     "slash": "^3.0.0"
   },
-  "gitHead": "420bf4f1f91bf92c6b6af750da197692b283ebae"
+  "gitHead": "9820fd7263b6791a38e5568396bfac0f2d3e37e9"
 }

package/tsconfig.json

@@ -1,29 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "allowSyntheticDefaultImports": true,
-    "noImplicitAny": true,
-    "noImplicitAny": true,
-    "removeComments": true,
-    "preserveConstEnums": true,
-    "outDir": "lib",
-    "moduleResolution": "node",
-    "baseUrl": ".",
-    "paths": {
-      "*": [
-        "../../packages/*",
-        "../../typings/*"
-      ]
-    },
-    "target": "ES2017",
-    "lib": [
-      "ES2017"
-    ]
-  },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}