fsd-oss 0.12.0 → 0.13.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 郑州脉冲软件科技有限公司
+Copyright (c) 2023 郑州渺漠信息科技有限公司
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/index.d.ts

@@ -3,6 +3,9 @@ import { Adapter } from 'fsd';
 export interface OSSAdapterOptions {
   root?: string;
   urlPrefix?: string;
+  /**
+   * 是否公开读，默认为false
+   */
   publicRead?: boolean;
   // 以下为OSS驱动配置
   accessKeyId: string;
@@ -16,6 +19,13 @@ export interface OSSAdapterOptions {
   accountId?: string;
   roleName?: string;
   callbackUrl?: string; // 边缘上传回调地址
+  /**
+   * 缩略图配置
+   */
+  thumbs?: {
+    // name -> ?x-oss-process=style/stylename
+    [name: string]: string;
+  };
 }
 
 export interface UploadToken {

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Path = require("path");
+const qs = require("qs");
 const slash = require("slash");
 const minimatch = require("minimatch");
 const Debugger = require("debug");
@@ -237,10 +238,25 @@ class OSSAdapter {
     }
     async createUrl(path, options) {
         debug('createUrl %s', path);
+        options = Object.assign({}, options);
         const { root, urlPrefix, publicRead } = this._options;
         let p = slash(Path.join(root, path));
+        let suffix = '';
+        if (options.thumb) {
+            if (options.thumb in this._options.thumbs) {
+                suffix = this._options.thumbs[options.thumb];
+            }
+            else {
+                throw new Error(`Unkown thumb name ${options.thumb}`);
+            }
+        }
         if (urlPrefix && publicRead) {
-            return urlPrefix + p;
+            return urlPrefix + p + suffix;
+        }
+        if (suffix) {
+            if (suffix[0] === '?')
+                suffix = suffix.substring(1);
+            options.query = qs.parse(suffix);
         }
         let url = this._oss.signatureUrl(p.substring(1), options);
         if (urlPrefix) {

package/lib/simple-oss-client.js

@@ -165,7 +165,11 @@ class SimpleOSSClient {
                 headers: response.headers
             };
         }
-        let data = await xml2data(xml);
+        let data = await xml2js.parseStringPromise(xml, {
+            trim: true,
+            explicitArray: false,
+            explicitRoot: false
+        });
         if (data.Code) {
             throw new Error(data.Message);
         }
@@ -177,7 +181,7 @@ class SimpleOSSClient {
         let expires = parseInt((Date.now() / 1000 + (options.expires || 3600)));
         let response = options.response || {};
         let url = `https://${this.config.bucket}.${this.endpoint}/${name}`;
-        let query = {};
+        let query = Object.assign({}, options.query);
         if (options.trafficLimit) {
             query['x-oss-traffic-limit'] = options.trafficLimit;
         }
@@ -217,14 +221,3 @@ class SimpleOSSClient {
     }
 }
 exports.default = SimpleOSSClient;
-function xml2data(xml) {
-    return new Promise((resolve, reject) => {
-        const opt = { trim: true, explicitArray: false, explicitRoot: false };
-        xml2js.parseString(xml, opt, (error, result) => {
-            if (error) {
-                return reject(new Error('XMLDataError'));
-            }
-            resolve(result);
-        });
-    });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
   "author": "Liang <liang@miaomo.cc> (https://github.com/liangxingchen)",
   "license": "MIT",
   "dependencies": {
-    "@alicloud/pop-core": "^1.7.12",
+    "@alicloud/pop-core": "^1.7.13",
     "akita": "^1.0.4",
     "async": "*",
     "crypto-js": "^4.1.1",
@@ -20,7 +20,7 @@
     "mime-types": "^2.1.35",
     "minimatch": "^3.1.2",
     "slash": "^3.0.0",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.6.2"
   },
-  "gitHead": "ad01afd0117496a9b857e566a404f0ececbd723d"
+  "gitHead": "12ff02bfc634ba84c771ca433d33aae2dc881436"
 }

package/simple-oss-client.d.ts

@@ -1,4 +1,4 @@
-import { Request } from 'akita';
+import type { Request } from 'akita';
 
 export default class SimpleOSSClient {
   config: SimpleOSSClientConfig;
@@ -163,5 +163,13 @@ export interface SignatureUrlOptions {
   /**
    * 返回头信息
    */
-  response?: Record<string, string>;
+  response?: {
+    [key: string]: string;
+  };
+  /**
+   * 其他查询参数
+   */
+  query?: {
+    [key: string]: string;
+  };
 }