fsd-vod 0.7.2 → 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/index.d.ts

@@ -88,7 +88,44 @@ export interface PlayInfoResult {
   };
 }
 
+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 VODAdpter extends Adapter<VODAdapterOptions> {
+  createUploadToken: (videoId: string, meta?: any) => Promise<UploadToken>;
+  createUploadTokenWithAutoRefresh: (
+    videoId: string,
+    meta?: any
+  ) => Promise<UploadTokenWithAutoRefresh>;
+
   getVideoInfo(videoId: string): Promise<null | VideoInfo>;
   getMezzanineInfo(videoId: string, options?: any): Promise<null | MezzanineInfo>;
   getPlayInfo(videoId: string, options?: any): Promise<null | PlayInfoResult>;

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');
@@ -106,6 +105,17 @@ class VODAdapter {
             }
             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 getVideoInfo(videoId) {
         if (videoId[0] === '/')
@@ -152,7 +162,7 @@ class VODAdapter {
     }
     async append(videoId, data) {
         debug('append %s', videoId);
-        let token = await this.createUploadToken(videoId);
+        let token = await this.createUploadTokenWithAutoRefresh(videoId);
         let oss = new OSS(token.auth);
         if (typeof data === 'string') {
             data = Buffer.from(data);
@@ -184,7 +194,7 @@ class VODAdapter {
         debug('createWriteStream %s', videoId);
         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.createUploadToken(videoId);
+        let token = await this.createUploadTokenWithAutoRefresh(videoId);
         let oss = new OSS(token.auth);
         let stream = new stream_1.PassThrough();
         stream.promise = oss.putStream(token.path.substr(1), stream);
@@ -192,25 +202,24 @@ class VODAdapter {
     }
     async initMultipartUpload(videoId, partCount) {
         debug('initMultipartUpload %s, partCount: %d', videoId, partCount);
-        let token = await this.createUploadToken(videoId);
+        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);
-        let token = await this.createUploadToken(videoId);
+        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
         });
@@ -219,18 +228,15 @@ class VODAdapter {
     }
     async completeMultipartUpload(videoId, parts) {
         debug('completeMultipartUpload %s', videoId);
-        let token = await this.createUploadToken(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.7.2",
+  "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.11.4",
-    "ali-oss": "^6.13.2",
-    "debug": "^4.3.1",
+    "akita": "^0.12.1",
+    "ali-oss": "^6.17.1",
+    "debug": "^4.3.4",
     "lru-cache": "^6.0.0"
   },
-  "gitHead": "420bf4f1f91bf92c6b6af750da197692b283ebae"
+  "gitHead": "9820fd7263b6791a38e5568396bfac0f2d3e37e9"
 }

package/tsconfig.json

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