doomistorage 1.0.0 → 1.0.2

package/dist/cosfile.d.ts

@@ -22,5 +22,10 @@ export declare class CosFile extends FileBase {
      * @param userInfo
      * @returns
      */
-    saveFileStream(file: any, fileName: any, saveOption: any, userInfo: any): Promise<FileResult>;
+    saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult>;
+    /**
+     * 删除指定位置的文件
+     * @param filepath
+     */
+    deleteFile(filepath: string | string[]): void;
 }

package/dist/cosfile.js

@@ -98,5 +98,32 @@ 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);
+            });
+        }
+        const params = {
+            Bucket: this.bucket,
+            Region: this.region,
+            Key: filepath,
+        };
+        this.cos.deleteObject(params, (err) => {
+            if (err)
+                console.log('delete file error', err);
+        });
+    }
 }
 exports.CosFile = CosFile;

package/dist/file.d.ts

@@ -37,6 +37,11 @@ export declare abstract class FileBase {
      * @param userInfo
      */
     abstract saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo: any): Promise<FileResult>;
+    /**
+     * 删除指定位置的文件
+     * @param filepath
+     */
+    abstract deleteFile(filepath: string | string[]): void;
     /**
      * 创建多级目录
      * @param dirpath

package/dist/file.js

@@ -17,7 +17,7 @@ class FileBase {
      */
     getSaveFileName(saveOption, fileName, userInfo = {}) {
         let saveFolder = this.getSaveFolder(saveOption, userInfo);
-        console.log('getSaveFileName', fileName);
+        // console.log('getSaveFileName', fileName)
         let _fileName = this.getSaveOnlyFileName(saveOption, fileName, userInfo);
         return path_1.default.join(saveFolder, _fileName);
     }

package/dist/filehelper.d.ts

@@ -39,6 +39,11 @@ declare class FileUtility {
      * @returns
      */
     SaveString2File(bufferData: any, fileName: string, saveOption: FileConfig, userInfo?: any): Promise<FileResult>;
+    /**
+     * 删除指定位置的文件
+     * @param filePath
+     */
+    DeleteFile(filePath: string | string[]): void;
     /**
      * 下载文件并且保存
      * @param saveDestination

package/dist/filehelper.js

@@ -77,6 +77,13 @@ class FileUtility {
             return yield this.fileHandler.saveString2File(bufferData, fileName, saveOption, userInfo);
         });
     }
+    /**
+     * 删除指定位置的文件
+     * @param filePath
+     */
+    DeleteFile(filePath) {
+        this.fileHandler.deleteFile(filePath);
+    }
     /**
      * 下载文件并且保存
      * @param saveDestination

package/dist/localfile.d.ts

@@ -19,4 +19,9 @@ export declare class LocalFile extends FileBase {
      * @returns
      */
     saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult>;
+    /**
+     * 删除指定文件
+     * @param filepath
+     */
+    deleteFile(filepath: string | string[]): void;
 }

package/dist/localfile.js

@@ -63,5 +63,25 @@ class LocalFile extends file_1.FileBase {
             return { successed: true, filePath: fullFileName };
         });
     }
+    /**
+     * 删除指定文件
+     * @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);
+            });
+        }
+    }
 }
 exports.LocalFile = LocalFile;

package/package.json

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

package/src/cosfile.ts

@@ -2,12 +2,11 @@ import { FileConfig, FileResult } from "./declare";
 import { FileBase } from "./file";
 import COS from 'cos-nodejs-sdk-v5';
 
-export class CosFile extends FileBase{
-   
-    private bucket : string;        ///存储桶名称
+export class CosFile extends FileBase {
+    private bucket: string;        ///存储桶名称
     private cos: COS;               ///腾讯云COS对象
-    private region : string;        ///存储桶所在的地区
-    constructor(config:any) {
+    private region: string;        ///存储桶所在的地区
+    constructor(config: any) {
         super();
         this.cos = new COS({
             SecretId: config.SecretId,
@@ -23,7 +22,7 @@ export class CosFile extends FileBase{
      * @param saveOption 
      * @param userInfo 
      */
-    saveString2File(data: string|Buffer, fileName: string, saveOption: FileConfig, userInfo: any = {}): Promise<FileResult> {
+    saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo: any = {}): Promise<FileResult> {
         if (!data) data = '';
         let destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
         const streamBuffer = data instanceof Buffer ? data : Buffer.from(data, "utf-8");
@@ -35,8 +34,8 @@ export class CosFile extends FileBase{
             ContentLength: streamBuffer.byteLength
         };
         return new Promise((success) => {
-            this.cos.putObject(fileParam, (err:any)=> {
-                return success({ successed: err == null, filePath: destinationFileName});
+            this.cos.putObject(fileParam, (err: any) => {
+                return success({ successed: err == null, filePath: destinationFileName });
             });
         });
     }
@@ -48,17 +47,17 @@ export class CosFile extends FileBase{
      * @param userInfo 
      * @returns 
      */
-    async saveFileStream(file: any, fileName: any, saveOption: any, userInfo: any): Promise<FileResult> {
+    async saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult> {
         const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
         return new Promise((resolve) => {
             if (saveOption.reRead) {
-                let dataArr:any =[],//存储读取的结果集合  
+                let dataArr: any = [],//存储读取的结果集合  
                     len = 0;
-                file.on('data',  (chunk:any)=> {
+                file.on('data', (chunk: any) => {
                     dataArr.push(chunk);
                     len += chunk.length;
                 });
-                file.on('end',  ()=> {
+                file.on('end', () => {
                     const fileParam = {
                         Bucket: this.bucket,
                         Region: this.region,
@@ -66,9 +65,9 @@ export class CosFile extends FileBase{
                         Body: Buffer.concat(dataArr, len), //file,
                         ContentLength: len// file.byteCount ||  saveOption.contentLength 
                     };
-                    this.cos.putObject(fileParam,  (err)=> {
+                    this.cos.putObject(fileParam, (err) => {
                         return resolve({ successed: err == null, filePath: destinationFileName })
-                        
+
                     })
                 });
             } else {
@@ -87,5 +86,30 @@ export class CosFile extends FileBase{
             }
         });
     }
+    /**
+     * 删除指定位置的文件
+     * @param filepath 
+     */
     
+    deleteFile(filepath: string|string[]): void {
+        ///如果是数组，则一次性删除多个文件
+        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)=>{
+                if (err) console.log('delete file 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

@@ -12,7 +12,7 @@ export abstract class FileBase {
      */
     getSaveFileName(saveOption: FileConfig, fileName:string, userInfo:any = {}):string {
         let saveFolder = this.getSaveFolder(saveOption,userInfo)
-        console.log('getSaveFileName', fileName)
+        // console.log('getSaveFileName', fileName)
         let _fileName = this.getSaveOnlyFileName(saveOption, fileName, userInfo);
         return path.join(saveFolder, _fileName);
     }
@@ -83,6 +83,11 @@ export abstract class FileBase {
      */
     abstract saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo: any): Promise<FileResult>;
 
+    /**
+     * 删除指定位置的文件
+     * @param filepath 
+     */
+    abstract deleteFile(filepath: string | string[]):void;
     
     /**
      * 创建多级目录

package/src/filehelper.ts

@@ -69,7 +69,13 @@ export function FileHelper(provider: FileProviderEnum, apiOption?:any): FileUtil
         userInfo: any = {}): Promise<FileResult> {
         return await this.fileHandler.saveString2File(bufferData,fileName,  saveOption, userInfo);
     }
-
+    /**
+     * 删除指定位置的文件
+     * @param filePath 
+     */
+    DeleteFile(filePath:string|string[]):void{
+        this.fileHandler.deleteFile(filePath);
+    }
     /**
      * 下载文件并且保存
      * @param saveDestination 

package/src/localfile.ts

@@ -2,7 +2,8 @@ import { FileBase } from "./file";
 import fs from 'fs';
 import path from 'path';
 import { FileConfig, FileResult } from "./declare";
-export class LocalFile extends FileBase{
+export class LocalFile extends FileBase {
+
     /**
      * 直接保存字符串
      * @param data 
@@ -10,15 +11,15 @@ export class LocalFile extends FileBase{
      * @param saveOption 
      * @param userInfo 
      */
-    async saveString2File(data: string|Buffer, fileName: string, saveOption: FileConfig, userInfo: any = {}): Promise<FileResult> {
+    async saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo: any = {}): Promise<FileResult> {
         let baseFileName = this.getSaveFileName(saveOption, fileName, userInfo);
         if (!baseFileName) return { successed: false };
         let fullFileName = path.resolve(saveOption.basefolder || '', baseFileName);
         let _saveDir = path.dirname(fullFileName);
         ///创建本地文件夹
         if (!this.mkdirsSync(_saveDir)) return { successed: false };
-        return new Promise(resolve=>{
-            fs.writeFile(fullFileName, data,(error)=>{
+        return new Promise(resolve => {
+            fs.writeFile(fullFileName, data, (error) => {
                 return resolve({ successed: error == null, filePath: fullFileName })
             })
         });
@@ -34,12 +35,29 @@ export class LocalFile extends FileBase{
     async saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult> {
         let baseFileName = this.getSaveFileName(saveOption, fileName, userInfo);
         if (!baseFileName) return { successed: false };
-        let fullFileName = path.resolve(saveOption.basefolder||'', baseFileName);
+        let fullFileName = path.resolve(saveOption.basefolder || '', baseFileName);
         let _saveDir = path.dirname(fullFileName);
         ///创建本地文件夹
-        if (!this.mkdirsSync(_saveDir))   return { successed: false };
+        if (!this.mkdirsSync(_saveDir)) return { successed: false };
         file.pipe(fs.createWriteStream(fullFileName));
         return { successed: true, filePath: fullFileName };
     }
-    
+    /**
+     * 删除指定文件
+     * @param filepath 
+     */
+    deleteFile(filepath: string | string[]) {
+        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)
+            })
+        }
+
+    }
 }