doomistorage 1.0.2 → 1.0.4

package/dist/filehelper.d.ts

@@ -44,6 +44,16 @@ declare class FileUtility {
      * @param filePath
      */
     DeleteFile(filePath: string | string[]): void;
+    /**
+     * 批量下载指定的文件并上传到存储中
+     * 替代原来file中的对应方法save2localForRemoteImage
+     * 用于百度UEditor的保存文件
+     * @param urlArray
+     * @param saveOption
+     * @param userInfo
+     * @returns
+     */
+    BatchDownloadImage(urlArray: string[], saveOption: FileConfig, userInfo?: any): Promise<FileResult[]>;
     /**
      * 下载文件并且保存
      * @param saveDestination
@@ -53,7 +63,7 @@ declare class FileUtility {
      * @param allowWebPFormat
      * @returns
      */
-    DownloadFile(fileUrl: string, savefileName: string, savesetting: FileConfig, userInfo?: any, allowWebPFormat?: boolean): Promise<FileResult>;
+    DownloadFile(fileUrl: string, savefileName: string | null, savesetting: FileConfig, userInfo?: any, allowWebPFormat?: boolean): Promise<FileResult>;
     /**
      * 预测生成文件保存后的文件路径
      * @param saveOption

package/dist/filehelper.js

@@ -17,6 +17,19 @@ const cosfile_1 = require("./cosfile");
 const localfile_1 = require("./localfile");
 const axios_1 = __importDefault(require("axios"));
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+/**
+ * 读取系统配置文件的腾讯云设置
+ * @returns
+ */
+function getConfigurationSetting(settingName) {
+    let configfilename = process.env["CONFIGFILE"] || 'configuration.json';
+    let configfile = path_1.default.join(process.cwd(), configfilename);
+    if (!fs_1.default.existsSync(configfile))
+        return null;
+    const config = require(configfile)[settingName || 'tencentCOS'];
+    return config;
+}
 /**
  * 文件处理器类型
  */
@@ -36,6 +49,9 @@ function FileHelper(provider, apiOption) {
             filehandler = new localfile_1.LocalFile();
             break;
         case exports.FileProviderEnum.TENCENTCOS:
+            if (!apiOption || typeof (apiOption) == 'string') {
+                apiOption = getConfigurationSetting(apiOption);
+            }
             filehandler = new cosfile_1.CosFile(apiOption);
             break;
         default: filehandler = new localfile_1.LocalFile();
@@ -84,6 +100,24 @@ class FileUtility {
     DeleteFile(filePath) {
         this.fileHandler.deleteFile(filePath);
     }
+    /**
+     * 批量下载指定的文件并上传到存储中
+     * 替代原来file中的对应方法save2localForRemoteImage
+     * 用于百度UEditor的保存文件
+     * @param urlArray
+     * @param saveOption
+     * @param userInfo
+     * @returns
+     */
+    BatchDownloadImage(urlArray, saveOption, userInfo = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let promiseArr = [];
+            for (const url of urlArray) {
+                promiseArr.push(this.DownloadFile(url, null, saveOption, userInfo));
+            }
+            return yield Promise.all(promiseArr);
+        });
+    }
     /**
      * 下载文件并且保存
      * @param saveDestination

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomistorage",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

package/src/filehelper.ts

@@ -4,7 +4,18 @@ import { FileBase } from "./file";
 import { LocalFile } from "./localfile";
 import axios from 'axios';
 import path from 'path';
-
+import fs from 'fs';
+/**
+ * 读取系统配置文件的腾讯云设置
+ * @returns 
+ */
+function getConfigurationSetting(settingName?:string):any{
+    let configfilename = process.env["CONFIGFILE"] || 'configuration.json'
+    let configfile = path.join(process.cwd(), configfilename);
+    if (!fs.existsSync(configfile)) return null;
+    const config = require(configfile)[settingName || 'tencentCOS'];
+    return config;
+}
 /**
  * 文件处理器类型
  */
@@ -18,12 +29,17 @@ export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProvider
  * @param destination 
  * @returns 
  */
-export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtility {
-    let filehandler:FileBase
+export function FileHelper(provider: FileProviderEnum, apiOption?: any): FileUtility {
+    let filehandler: FileBase
     switch (provider) {
-        case FileProviderEnum.LOCAL: filehandler =  new LocalFile(); break;
-        case FileProviderEnum.TENCENTCOS: filehandler =  new CosFile(apiOption); break;
-        default: filehandler =  new LocalFile();
+        case FileProviderEnum.LOCAL: filehandler = new LocalFile(); break;
+        case FileProviderEnum.TENCENTCOS: 
+            if (!apiOption || typeof (apiOption)=='string'){
+                apiOption = getConfigurationSetting(apiOption)
+            }
+            filehandler = new CosFile(apiOption); 
+        break;
+        default: filehandler = new LocalFile();
     }
     return new FileUtility(filehandler)
 }
@@ -32,7 +48,7 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
 /**
  * 文件帮助工具
  */
- class FileUtility {
+class FileUtility {
     private fileHandler: FileBase;
     constructor(handler: FileBase) {
         this.fileHandler = handler;
@@ -53,7 +69,7 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
         userInfo: any = {}): Promise<FileResult> {
         return await this.fileHandler.saveFileStream(file, fileName, saveOption, userInfo);
     }
-    
+
     /**
      * 保存字符流到对应的存储设备
      * @param bufferData 
@@ -67,15 +83,31 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
         fileName: string,
         saveOption: FileConfig,
         userInfo: any = {}): Promise<FileResult> {
-        return await this.fileHandler.saveString2File(bufferData,fileName,  saveOption, userInfo);
+        return await this.fileHandler.saveString2File(bufferData, fileName, saveOption, userInfo);
     }
     /**
      * 删除指定位置的文件
      * @param filePath 
      */
-    DeleteFile(filePath:string|string[]):void{
+    DeleteFile(filePath: string | string[]): void {
         this.fileHandler.deleteFile(filePath);
     }
+    /**
+     * 批量下载指定的文件并上传到存储中
+     * 替代原来file中的对应方法save2localForRemoteImage
+     * 用于百度UEditor的保存文件
+     * @param urlArray 
+     * @param saveOption 
+     * @param userInfo 
+     * @returns 
+     */
+    async BatchDownloadImage(urlArray: string[], saveOption: FileConfig, userInfo: any = {}): Promise<FileResult[]> {
+        let promiseArr = [];
+        for (const url of urlArray) {
+            promiseArr.push(this.DownloadFile(url, null, saveOption, userInfo))
+        }
+        return await Promise.all(promiseArr);
+    }
     /**
      * 下载文件并且保存
      * @param saveDestination 
@@ -85,17 +117,17 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
      * @param allowWebPFormat 
      * @returns 
      */
-    async DownloadFile(fileUrl: string, savefileName:string, savesetting: FileConfig, userInfo: any = {}, allowWebPFormat = false): Promise<FileResult> {
+    async DownloadFile(fileUrl: string, savefileName: string | null, savesetting: FileConfig, userInfo: any = {}, allowWebPFormat = false): Promise<FileResult> {
         if (!allowWebPFormat && fileUrl.indexOf('&tp=webp') >= 0) fileUrl = fileUrl.replace('&tp=webp', '');
-        let fileName = savefileName ?savefileName:path.basename(fileUrl);
-        try{
+        let fileName = savefileName ? savefileName : path.basename(fileUrl);
+        try {
             const downloadResult = await axios.get(fileUrl, { responseType: 'arraybuffer' });
-            if (downloadResult.data){
-                return this.SaveString2File(downloadResult.data, fileName, savesetting,userInfo);
+            if (downloadResult.data) {
+                return this.SaveString2File(downloadResult.data, fileName, savesetting, userInfo);
             }
             return { successed: false, error: '下载文件中没有任何内容' }
-        }catch(error:any){
-            return { successed: false, error: error}
+        } catch (error: any) {
+            return { successed: false, error: error }
         }
     }
     /**
@@ -104,26 +136,28 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
      * @param fileName 
      * @param userInfo 
      */
-     getSaveFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}):string{
-         return this.fileHandler.getSaveFileName(saveOption, fileName, userInfo);
-     }
+    getSaveFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}): string {
+        return this.fileHandler.getSaveFileName(saveOption, fileName, userInfo);
+    }
+
+    /**
+    * 预测生成文件保存后的文件路径
+    * @param saveOption 
+    * @param fileName 
+    * @param userInfo 
+    */
+    getSaveFolder(saveOption: FileConfig, userInfo: any = {}): string {
+        return this.fileHandler.getSaveFolder(saveOption, userInfo);
+    }
+    /**
+    * 预测生成文件保存后的文件名称
+    * @param saveOption 
+    * @param fileName 
+    * @param userInfo 
+    */
+    getSaveOnlyFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}): string {
+        return this.fileHandler.getSaveOnlyFileName(saveOption, fileName, userInfo);
+    }
+
 
-     /**
-     * 预测生成文件保存后的文件路径
-     * @param saveOption 
-     * @param fileName 
-     * @param userInfo 
-     */
-     getSaveFolder(saveOption: FileConfig,  userInfo: any = {}): string {
-         return this.fileHandler.getSaveFolder(saveOption, userInfo);
-     }
-     /**
-     * 预测生成文件保存后的文件名称
-     * @param saveOption 
-     * @param fileName 
-     * @param userInfo 
-     */
-     getSaveOnlyFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}): string {
-         return this.fileHandler.getSaveOnlyFileName(saveOption,fileName,userInfo);
-     }
 }