doomistorage 1.0.4 → 1.0.6

package/dist/cosfile.d.ts

@@ -27,5 +27,8 @@ export declare class CosFile extends FileBase {
      * 删除指定位置的文件
      * @param filepath
      */
-    deleteFile(filepath: string | string[]): void;
+    deleteFile(filepath: string | string[]): Promise<{
+        successed: boolean;
+        error?: any;
+    }>;
 }

package/dist/cosfile.js

@@ -61,6 +61,7 @@ class CosFile extends file_1.FileBase {
     saveFileStream(file, fileName, saveOption, userInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+            console.log('InStorage saveFileStream', saveOption);
             return new Promise((resolve) => {
                 if (saveOption.reRead) {
                     let dataArr = [], //存储读取的结果集合  
@@ -103,26 +104,28 @@ class CosFile extends file_1.FileBase {
      * @param filepath
      */
     deleteFile(filepath) {
-        ///如果是数组，则一次性删除多个文件
-        if (Array.isArray(filepath)) {
-            const params = {
-                Bucket: this.bucket,
-                Region: this.region,
-                Objects: filepath.map(item => { return { Key: item }; }),
-            };
-            return this.cos.deleteMultipleObject(params, (err) => {
-                if (err)
-                    console.log('delete file error', err);
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise(reslove => {
+                ///如果是数组，则一次性删除多个文件
+                if (Array.isArray(filepath)) {
+                    const params = {
+                        Bucket: this.bucket,
+                        Region: this.region,
+                        Objects: filepath.map(item => { return { Key: item }; }),
+                    };
+                    return this.cos.deleteMultipleObject(params, (err) => {
+                        return reslove({ successed: err == null, error: err });
+                    });
+                }
+                const params = {
+                    Bucket: this.bucket,
+                    Region: this.region,
+                    Key: filepath,
+                };
+                this.cos.deleteObject(params, (err) => {
+                    return reslove({ successed: err == null, error: err });
+                });
             });
-        }
-        const params = {
-            Bucket: this.bucket,
-            Region: this.region,
-            Key: filepath,
-        };
-        this.cos.deleteObject(params, (err) => {
-            if (err)
-                console.log('delete file error', err);
         });
     }
 }

package/dist/file.d.ts

@@ -41,7 +41,10 @@ export declare abstract class FileBase {
      * 删除指定位置的文件
      * @param filepath
      */
-    abstract deleteFile(filepath: string | string[]): void;
+    abstract deleteFile(filepath: string | string[]): Promise<{
+        successed: boolean;
+        error?: any;
+    }>;
     /**
      * 创建多级目录
      * @param dirpath

package/dist/filehelper.d.ts

@@ -13,7 +13,7 @@ export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProvider
  * @param destination
  * @returns
  */
-export declare function FileHelper(provider: FileProviderEnum, apiOption?: any): FileUtility;
+export declare function FileHelper(provider?: FileProviderEnum, apiOption?: any): FileUtility;
 /**
  * 文件帮助工具
  */
@@ -43,7 +43,9 @@ declare class FileUtility {
      * 删除指定位置的文件
      * @param filePath
      */
-    DeleteFile(filePath: string | string[]): void;
+    DeleteFile(filePath: string | string[]): Promise<{
+        successed: boolean;
+    }>;
     /**
      * 批量下载指定的文件并上传到存储中
      * 替代原来file中的对应方法save2localForRemoteImage

package/dist/filehelper.js

@@ -18,17 +18,24 @@ const localfile_1 = require("./localfile");
 const axios_1 = __importDefault(require("axios"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+let config;
 /**
  * 读取系统配置文件的腾讯云设置
  * @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))
+function getConfigurationSetting(settingName, isSection = true) {
+    var _a;
+    if (!config) {
+        let configfilename = process.env["CONFIGFILE"] || 'configuration.json';
+        let configfile = path_1.default.join(process.cwd(), configfilename);
+        if (!fs_1.default.existsSync(configfile))
+            return null;
+        config = require(configfile);
+    }
+    if (!config)
         return null;
-    const config = require(configfile)[settingName || 'tencentCOS'];
-    return config;
+    //const config = require(configfile)[settingName || 'tencentCOS'];
+    return isSection ? config[settingName || 'tencentCOS'] : ((_a = config.appsetting[settingName || 'destination']) !== null && _a !== void 0 ? _a : 'tencentcos');
 }
 /**
  * 文件处理器类型
@@ -43,6 +50,8 @@ exports.FileProviderEnum = {
  * @returns
  */
 function FileHelper(provider, apiOption) {
+    if (!provider)
+        provider = getConfigurationSetting('destination', false);
     let filehandler;
     switch (provider) {
         case exports.FileProviderEnum.LOCAL:
@@ -98,7 +107,9 @@ class FileUtility {
      * @param filePath
      */
     DeleteFile(filePath) {
-        this.fileHandler.deleteFile(filePath);
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.fileHandler.deleteFile(filePath);
+        });
     }
     /**
      * 批量下载指定的文件并上传到存储中

package/dist/localfile.d.ts

@@ -23,5 +23,8 @@ export declare class LocalFile extends FileBase {
      * 删除指定文件
      * @param filepath
      */
-    deleteFile(filepath: string | string[]): void;
+    deleteFile(filepath: string | string[]): Promise<{
+        successed: boolean;
+        error?: any;
+    }>;
 }

package/dist/localfile.js

@@ -68,20 +68,25 @@ class LocalFile extends file_1.FileBase {
      * @param filepath
      */
     deleteFile(filepath) {
-        if (Array.isArray(filepath)) {
-            for (const f of filepath) {
-                fs_1.default.unlink(f, (err) => {
-                    if (err)
-                        console.log('delete file error', err);
-                });
-            }
-        }
-        else {
-            fs_1.default.unlink(filepath, (err) => {
-                if (err)
-                    console.log('delete file error', err);
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise(reslove => {
+                if (Array.isArray(filepath)) {
+                    for (const f of filepath) {
+                        fs_1.default.unlink(f, (err) => {
+                            if (err)
+                                console.log('delete file error', err);
+                        });
+                    }
+                }
+                else {
+                    fs_1.default.unlink(filepath, (err) => {
+                        if (err)
+                            console.log('delete file error', err);
+                    });
+                }
+                return reslove({ successed: true });
             });
-        }
+        });
     }
 }
 exports.LocalFile = LocalFile;

package/package.json

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

package/src/cosfile.ts

@@ -49,6 +49,7 @@ export class CosFile extends FileBase {
      */
     async saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult> {
         const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+        console.log('InStorage saveFileStream', saveOption)
         return new Promise((resolve) => {
             if (saveOption.reRead) {
                 let dataArr: any = [],//存储读取的结果集合  
@@ -90,26 +91,28 @@ export class CosFile extends FileBase {
      * 删除指定位置的文件
      * @param filepath 
      */
-    
-    deleteFile(filepath: string|string[]): void {
-        ///如果是数组，则一次性删除多个文件
-        if (Array.isArray(filepath)){
+    async deleteFile(filepath: string | string[]): Promise<{ successed: boolean,error?:any }> {
+        return new Promise(reslove => {
+            ///如果是数组，则一次性删除多个文件
+            if (Array.isArray(filepath)) {
+                const params = {
+                    Bucket: this.bucket,
+                    Region: this.region,
+                    Objects: filepath.map(item => { return { Key: item } }),
+                };
+                return this.cos.deleteMultipleObject(params, (err: any) => {
+                    return reslove({ successed: err == null, error: err })
+                })
+            }
             const params = {
                 Bucket: this.bucket,
                 Region: this.region,
-                Objects: filepath.map(item => { return { Key: item }}),
+                Key: filepath,
             };
-            return this.cos.deleteMultipleObject(params,(err:any)=>{
-                if (err) console.log('delete file error', err)
+            this.cos.deleteObject(params, (err: any) => {
+                return reslove({ successed: err == null, error: err })
             })
-        }
-        const params = {
-            Bucket: this.bucket,
-            Region: this.region,
-            Key: filepath,
-        };
-        this.cos.deleteObject(params, (err: any) => {
-            if (err) console.log('delete file error', err)
         })
+
     }
 }

package/src/file.ts

@@ -10,8 +10,8 @@ export abstract class FileBase {
      * @param {*} fileName 
      * @param {*} userInfo 
      */
-    getSaveFileName(saveOption: FileConfig, fileName:string, userInfo:any = {}):string {
-        let saveFolder = this.getSaveFolder(saveOption,userInfo)
+    getSaveFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}): string {
+        let saveFolder = this.getSaveFolder(saveOption, userInfo)
         // console.log('getSaveFileName', fileName)
         let _fileName = this.getSaveOnlyFileName(saveOption, fileName, userInfo);
         return path.join(saveFolder, _fileName);
@@ -21,7 +21,7 @@ export abstract class FileBase {
      * @param {*} saveOption 
      * @param {*} userInfo 
      */
-    getSaveFolder(saveOption: FileConfig,userInfo:any ={}):string {
+    getSaveFolder(saveOption: FileConfig, userInfo: any = {}): string {
         let subFolder = '';
         ///分目录存储
         switch ((saveOption.subFolder || '').toLowerCase()) {
@@ -30,21 +30,21 @@ export abstract class FileBase {
             ///按日建造多级目录
             case 'mutilbydate': subFolder = Moment().year() + path.sep + Moment().month() + path.sep + Moment().day(); break;
             ///用自己的id(当前登录的id)建造目录
-            case 'identity': subFolder =  userInfo.id??UUIDV4(); break;
+            case 'identity': subFolder = userInfo.id ?? UUIDV4(); break;
         }
-        let saveFolder = path.join(saveOption.saveDir, subFolder+'');
+        let saveFolder = path.join(saveOption.saveDir, subFolder + '');
         if (userInfo && userInfo.subfolder) saveFolder = path.join(saveFolder, userInfo.subfolder);
         ///如果包含当前调用用户的信息，则替换整个路径中的@@关键字
-        if (userInfo){
-            const matched=saveFolder.match(/@.*?@/g);
-            if (matched && matched.length>0)
-            matched.forEach(ele=>{
-                const matchValue  = ele.substring(1,ele.length-1);
-                if (matchValue.indexOf(' ')>=0 || matchValue.indexOf(':')>=0 || matchValue.indexOf('=')>=0) return;
-                let keyName     = ele.substring(1,ele.length-1);
-                const keyValue  = userInfo[keyName] || ''
-                saveFolder      = saveFolder.replace(ele,keyValue);
-            });
+        if (userInfo) {
+            const matched = saveFolder.match(/@.*?@/g);
+            if (matched && matched.length > 0)
+                matched.forEach(ele => {
+                    const matchValue = ele.substring(1, ele.length - 1);
+                    if (matchValue.indexOf(' ') >= 0 || matchValue.indexOf(':') >= 0 || matchValue.indexOf('=') >= 0) return;
+                    let keyName = ele.substring(1, ele.length - 1);
+                    const keyValue = userInfo[keyName] || ''
+                    saveFolder = saveFolder.replace(ele, keyValue);
+                });
         }
         return saveFolder;
     }
@@ -55,7 +55,7 @@ export abstract class FileBase {
      * @param {*} userInfo 
      */
     getSaveOnlyFileName(saveOption: FileConfig, fileName: string, userInfo: any = {}): string {
-        let _fileName='';
+        let _fileName = '';
         switch ((saveOption.fileName || 'keep').toLowerCase()) {
             ///保持和原有文件一致的文件名
             case "keep": _fileName = fileName; break;
@@ -87,20 +87,20 @@ export abstract class FileBase {
      * 删除指定位置的文件
      * @param filepath 
      */
-    abstract deleteFile(filepath: string | string[]):void;
-    
+    abstract deleteFile(filepath: string | string[]): Promise<{ successed: boolean, error?: any }>;
+
     /**
      * 创建多级目录
      * @param dirpath 
      * @param mode 
      * @returns 
      */
-    mkdirsSync(dirpath:string, mode:any=null):boolean {
+    mkdirsSync(dirpath: string, mode: any = null): boolean {
         if (!fs.existsSync(dirpath)) {
             let pathtmp = '', splitPath = dirpath.split(path.sep);
-            for (const dirname of splitPath){
-                if (dirname.length==0) {
-                    pathtmp=path.sep; 
+            for (const dirname of splitPath) {
+                if (dirname.length == 0) {
+                    pathtmp = path.sep;
                     continue;
                 }
                 if (pathtmp)

package/src/filehelper.ts

@@ -5,16 +5,21 @@ import { LocalFile } from "./localfile";
 import axios from 'axios';
 import path from 'path';
 import fs from 'fs';
+let config:any;
 /**
  * 读取系统配置文件的腾讯云设置
  * @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;
+function getConfigurationSetting(settingName?:string,isSection:boolean=true):any{
+    if (!config){
+        let configfilename = process.env["CONFIGFILE"] || 'configuration.json'
+        let configfile = path.join(process.cwd(), configfilename);
+        if (!fs.existsSync(configfile)) return null;
+        config = require(configfile);
+    }
+    if (!config) return null;
+    //const config = require(configfile)[settingName || 'tencentCOS'];
+    return isSection ? config[settingName || 'tencentCOS'] : (config.appsetting[settingName ||'destination']??'tencentcos') ;
 }
 /**
  * 文件处理器类型
@@ -29,7 +34,8 @@ export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProvider
  * @param destination 
  * @returns 
  */
-export function FileHelper(provider: FileProviderEnum, apiOption?: any): FileUtility {
+export function FileHelper(provider?: FileProviderEnum, apiOption?: any): FileUtility {
+    if (!provider) provider = getConfigurationSetting('destination',false)
     let filehandler: FileBase
     switch (provider) {
         case FileProviderEnum.LOCAL: filehandler = new LocalFile(); break;
@@ -89,8 +95,8 @@ class FileUtility {
      * 删除指定位置的文件
      * @param filePath 
      */
-    DeleteFile(filePath: string | string[]): void {
-        this.fileHandler.deleteFile(filePath);
+    async DeleteFile(filePath: string | string[]): Promise<{ successed: boolean}> {
+       return await  this.fileHandler.deleteFile(filePath);
     }
     /**
      * 批量下载指定的文件并上传到存储中

package/src/localfile.ts

@@ -46,18 +46,22 @@ export class LocalFile extends FileBase {
      * 删除指定文件
      * @param filepath 
      */
-    deleteFile(filepath: string | string[]) {
-        if (Array.isArray(filepath)) {
-            for (const f of filepath) {
-                fs.unlink(f, (err: any) => {
+    async deleteFile(filepath: string | string[]): Promise<{ successed: boolean, error?: any }> {
+        return new Promise(reslove=>{
+            if (Array.isArray(filepath)) {
+                for (const f of filepath) {
+                    fs.unlink(f, (err: any) => {
+                        if (err) console.log('delete file error', err)
+                    })
+                }
+            } else {
+                fs.unlink(filepath, (err: any) => {
                     if (err) console.log('delete file error', err)
                 })
             }
-        } else {
-            fs.unlink(filepath, (err: any) => {
-                if (err) console.log('delete file error', err)
-            })
-        }
+            return reslove({ successed: true })
+        })
+        
 
     }
 }