doomistorage 1.0.10 → 2.0.0

package/package.json

@@ -1,28 +1,43 @@
 {
   "name": "doomistorage",
-  "version": "1.0.10",
+  "version": "2.0.0",
   "description": "",
   "main": "./dist/index.js",
-  "types": "./dist/index.d.js",
+  "module": "./dist/index.esm.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc --outDir dist"
+    "build": "rm -rf dist && rollup -c",
+    "build:tsc": "rm -rf dist && tsc --outDir dist"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@types/jest": "^27.5.2",
     "@types/multer": "^1.4.7",
     "@types/node": "^18.15.3",
     "@types/node-uuid": "^0.0.29",
-    "typescript": "^5.0.2"
+    "jest": "^27.3.1",
+    "jest-html-reporters": "^2.1.6",
+    "rollup": "^2.79.2",
+    "rollup-plugin-terser": "^7.0.2",
+    "ts-jest": "^27.0.7",
+    "tslib": "^2.8.1",
+    "typescript": "^4.4.4"
   },
   "dependencies": {
+    "@azure/storage-blob": "^12.29.1",
     "cos-nodejs-sdk-v5": "^2.16.0-beta.8",
     "moment": "^2.29.4",
     "multer": "^1.4.5-lts.1",
+    "tencentcloud-sdk-nodejs-sts": "^4.1.100",
     "uuid": "^11.1.0"
   },
   "peerDependencies": {
-    "axios":"*"
+    "axios": "*"
   }
 }

package/rollup.config.js

@@ -0,0 +1,36 @@
+import json from '@rollup/plugin-json';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import { terser } from "rollup-plugin-terser";
+import typescript from '@rollup/plugin-typescript'; // 若用 TS 则添加
+const packageJson = require("./package.json");
+export default {
+    input: 'src/index.ts', // 入口文件（TS 则为 src/index.ts）
+    output: [
+        {
+            // dir: 'dist', // 输出目录（与 tsconfig.outDir 一致）
+            file: packageJson.main,
+            sourcemap: true,
+            format: 'cjs',
+            compact: true, // 紧凑模式（减少空格）
+            plugins: [terser()], // 压缩代码,
+        },
+        // 输出 ESM 格式（供 import 使用）
+        {
+            file: packageJson.module,
+            format: 'esm',
+            sourcemap: true,
+            compact: true,
+            plugins: [ terser()]
+        }
+    ],
+    plugins: [
+        json(), // 处理 JSON 文件
+        nodeResolve({ preferBuiltins: true }), // 优先使用 Node.js 内置模块
+        commonjs(), // 转换 CommonJS 为 ESM
+        typescript() // 若用 TS，需配置 tsconfig.json
+    ],
+    external: [...Object.keys(packageJson.peerDependencies || {}),
+    ...Object.keys(packageJson.dependencies || {})
+    ] 
+};

package/src/azureblob.ts

@@ -0,0 +1,83 @@
+/**
+ * 微软Azure Blob存储
+ */
+import { FileConfig, FileResult } from "./declare";
+import { FileBase } from "./file";
+import { StorageSharedKeyCredential, BlobServiceClient, generateBlobSASQueryParameters, ContainerSASPermissions, SASProtocol } from "@azure/storage-blob";
+
+
+export class AzureBlob extends FileBase {
+    
+    private blobServiceClient;
+    private containerClient;
+    /**
+     * account : 账号
+     * accountKey : 密钥
+     * container : 容器名称   相当于腾讯云的存储桶
+     * @param config 
+     */
+    constructor(private config:{ account: string, accountKey:string,container:string }) {
+        super();
+        const sharedKeyCredential = new StorageSharedKeyCredential(config.account, config.accountKey);
+        this.blobServiceClient = new BlobServiceClient(
+            `https://${config.account}.blob.core.windows.net`,
+            sharedKeyCredential,
+        );
+        this.containerClient = this.blobServiceClient.getContainerClient(config.container);
+    }
+    async getTemporaryToken(expiresSeconds?: number, permission?: string): Promise<string> {
+        const sharedKeyCredential = new StorageSharedKeyCredential(this.config.account, this.config.accountKey);
+        expiresSeconds = expiresSeconds  || 86400;  /// 默认一天的有效期
+        permission = permission || "rw";  ///read & write
+        const containerSAS = generateBlobSASQueryParameters(
+            {
+                containerName: this.config.container, // Required
+                permissions: ContainerSASPermissions.parse("rw"), // Required
+                startsOn: new Date(), // Optional   从当前开始计算
+                expiresOn: new Date(new Date().valueOf() + expiresSeconds * 1000), // Required. Date type   
+                // ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, // Optional
+                // protocol: SASProtocol.HttpsAndHttp, // Optional
+                // version: "2016-05-31", // Optional
+            },
+            sharedKeyCredential,
+        ).toString();
+        return containerSAS;
+    }
+    /**
+     * 
+     * @param data 
+     * @param fileName 
+     * @param saveOption 
+     * @param userInfo 
+     */
+    async saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo: any = {}): Promise<FileResult> {
+        if (!data) data = '';
+        const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+        const blockBlobClient = this.containerClient.getBlockBlobClient(destinationFileName);
+        const uploadBlobResponse = await blockBlobClient.upload(data, typeof data === "string"? Buffer.byteLength(data) : data.byteLength);
+        return { successed: !uploadBlobResponse.errorCode, filePath: destinationFileName };
+    }
+    /**
+     * 
+     * @param file 
+     * @param fileName 
+     * @param saveOption 
+     * @param userInfo 
+     * @returns 
+     */
+    async saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult> {
+        const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+        const blockBlobClient = this.containerClient.getBlockBlobClient(destinationFileName);
+        const uploadBlobResponse = await blockBlobClient.upload(file, file.byteCount || file.length);
+        return { successed: !uploadBlobResponse.errorCode, filePath: destinationFileName };
+    }
+    /**
+     * 删除指定位置的文件
+     * @param filepath 
+     */
+    async deleteFile(filepath: string | string[]): Promise<{ successed: boolean,error?:any }> {
+        if (!Array.isArray(filepath)) filepath = [filepath];
+        for(const file of filepath) this.containerClient.deleteBlob(file)
+        return { successed: true }
+    }
+}

package/src/cosfile.ts

@@ -1,12 +1,17 @@
 import { FileConfig, FileResult } from "./declare";
 import { FileBase } from "./file";
 import COS from 'cos-nodejs-sdk-v5';
+import tencentcloud from "tencentcloud-sdk-nodejs-sts";
+
+const DEFAULT_PERMISSON = {
+version:"2.0",statement:[{effect:"allow",action:["name/cos:PutObject","name/cos:DeleteObject"],"resource":"*"}]
+}
 
 export class CosFile extends FileBase {
     private bucket: string;        ///存储桶名称
     private cos: COS;               ///腾讯云COS对象
     private region: string;        ///存储桶所在的地区
-    constructor(config: any) {
+    constructor(private config: any) {
         super();
         this.cos = new COS({
             SecretId: config.SecretId,
@@ -15,6 +20,30 @@ export class CosFile extends FileBase {
         this.bucket = config.bucket;
         this.region = config.region;
     }
+    async getTemporaryToken(expiresSeconds?: number, permission?: string): Promise<any> {
+        const StsClient = tencentcloud.sts.v20180813.Client;
+        permission = permission || JSON.stringify(DEFAULT_PERMISSON);
+        const clientConfig = {
+            credential: {
+                secretId: this.config.SecretId,
+                secretKey: this.config.SecretKey,
+            },
+            region: this.config.region,
+            profile: {
+                httpProfile: {
+                    endpoint: "sts.tencentcloudapi.com",
+                },
+            },
+        };
+        const client = new StsClient(clientConfig);
+        const params = {
+            "Name": "TemporaryToken",
+            "Policy": permission,
+            "DurationSeconds": expiresSeconds? expiresSeconds : 7200,
+        };
+        const token = await client.GetFederationToken(params);
+        return token;
+    }
     /**
      * 
      * @param data 
@@ -74,7 +103,7 @@ export class CosFile extends FileBase {
                 const fileParam = {
                     Bucket: this.bucket,
                     Region: this.region,
-                    // ContentDisposition: "form-data; name=\"file\"; filename=\"" + encodeURIComponent(destinationFileName) + "\"",
+                    // ContentDisposition: "form-data; name="file"; filename="" + encodeURIComponent(destinationFileName) + """,
                     Key: destinationFileName,
                     Body: file,
                     ContentLength: file.byteCount || file.length

package/src/file.ts

@@ -88,7 +88,10 @@ export abstract class FileBase {
      * @param filepath 
      */
     abstract deleteFile(filepath: string | string[]): Promise<{ successed: boolean, error?: any }>;
-
+    /**
+     * 获取到临时操作的token
+     */
+    abstract getTemporaryToken(expiresSeconds?:number,permission?:string):Promise<any>;
     /**
      * 创建多级目录
      * @param dirpath 
@@ -114,114 +117,4 @@ export abstract class FileBase {
         }
         return true;
     }
-
-    /**
-     * 删除文件夹
-     * @param {*} path 
-     */
-    // deleteFolder(path:string) {
-    //     if( fs.existsSync(path) ) {
-    //         const files = fs.readdirSync(path);
-    //         files.forEach(function(file,index){
-    //             var curPath = path + "/" + file;
-    //             if(fs.statSync(curPath).isDirectory()) { // recurse
-    //                 fileUtility.deleteFolder(curPath);
-    //             } else { // delete file
-    //                 fs.unlinkSync(curPath);
-    //             }
-    //         });
-    //         fs.rmdirSync(path);
-    //     }
-    // };
-
-
-
-    /**
-     * 从远程下载文件并保存到腾讯云本地
-     * @param {*} saveDestination
-     * @param {*} fileUrl
-     * @param {*} savesetting
-     * @param {*} keyid
-     */
-    // static downloadFile4upload(saveDestination,fileUrl,savesetting,userinfo,allowWebPFormat = false) {
-    //     let originUrl = fileUrl;
-    //     ///是否允许WebP格式的文件被下载
-    //     if(!allowWebPFormat &&fileUrl.indexOf('&tp=webp')>=0) fileUrl = fileUrl.replace('&tp=webp','');
-    //     let fileOption      = urlUtility.parse(fileUrl);
-    //     let filename        = path.basename(fileOption.path);
-    //     if(filename.indexOf('?')>=0) filename=filename.substr(0,filename.indexOf('?'));
-    //     if (path.extname(filename)==''){
-    //         let param =  querystring.parse(fileOption.query)
-    //         if (param.wx_fmt) 
-    //             filename=filename+"."+param.wx_fmt;
-    //         else
-    //             filename=filename+".jpeg";
-    //     } 
-    //     const http =fileOption.protocol==='https:'? require('https'):require('http'); //require("../rpc/rpcUtility");
-    //     return new Promise((resolve, reject) => {
-    //         try{
-    //             http.get(fileUrl,(res) => {
-    //                 var dataArr = [], len = 0;
-    //                 res.on('data',(chunk)=>{
-    //                     dataArr.push(chunk);
-    //                     len += chunk.length;
-    //                 })
-    //                 res.on("end", function (err) {
-    //                     File.uploadFile(saveDestination, filename, Buffer.concat(dataArr, len),savesetting,userinfo, function (file, result) {
-    //                         result.source = originUrl;
-    //                         if (result.successed) result.state = "SUCCESS";
-    //                         resolve(result);
-    //                     });
-    //                 });
-    //             })
-    //         }
-    //         catch(err){
-    //             console.log('download file error :',err);
-    //             reject({successed:false,error:err});
-    //         }
-    //     })
-    // }
-    // static save2localForRemoteImage(sourceUrlArr, saveOption, userInfo, callback) {
-    //     File.promiseAll(sourceUrlArr, saveOption, userInfo).then(function (values) {
-    //         callback(null, values);
-    //     }).catch(function (err) {
-    //         callback(new Error("抓取报错"));
-    //     });
-    // }
-    // static promiseAll(urlArr, saveOption, userInfo) {
-    //     let promiseArr = [];
-    //     for (let url of urlArr) {
-    //         try {
-    //             promiseArr.push(File.downloadFile4upload('tencentcos',url,saveOption,userInfo))
-    //         } catch (error) {
-    //             console.log('error happened',error)
-    //         }
-    //     }
-    //     return Promise.all(promiseArr);
-    // }
-    /**
-     * 上传本地目录至远程服务器
-     * @param {*} localFile
-     * @param {*} saveDestination
-     * @param {*} savesetting
-     * @param {*} keyid
-     */
-    // uploadlocalFolder(path,saveDestination,savesetting,keyParam){
-    //     if( fs.existsSync(path) ) {
-    //         const files = fs.readdirSync(path);
-    //         files.forEach(function(file,index){
-    //             var curPath = path + "/" + file;
-    //             if(fs.statSync(curPath).isDirectory()) { // recurse
-    //                 this.uploadlocalFolder(curPath);
-    //             } else { // delete file
-    //                 //fs.unlinkSync(curPath);
-    //                 let data = fs.readFileSync(curPath);
-    //                 File.uploadFile(saveDestination, path.basename(curPath), data,savesetting,keyParam,function (file, result) {
-    //                     resolve(result);
-    //                 });
-    //             }
-    //         });
-    //         fs.rmdirSync(path);
-    //     }
-    // }
 }

package/src/filehelper.ts

@@ -1,4 +1,5 @@
 import { CosFile } from "./cosfile";
+import { AzureBlob } from "./azureblob";
 import { FileConfig, FileResult } from "./declare";
 import { FileBase } from "./file";
 import { LocalFile } from "./localfile";
@@ -27,6 +28,7 @@ function getConfigurationSetting(settingName?:string,isSection:boolean=true):any
 export const FileProviderEnum = {
     LOCAL: 'local',
     TENCENTCOS: 'tencentcos',
+    Azure:'azure'
 } as const;
 export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProviderEnum];
 /**
@@ -45,6 +47,12 @@ export function FileHelper(provider?: FileProviderEnum, apiOption?: any): FileUt
             }
             filehandler = new CosFile(apiOption); 
         break;
+        case FileProviderEnum.Azure:
+            if (!apiOption || typeof (apiOption) == 'string') {
+                apiOption = getConfigurationSetting('azurestorge')
+            }    
+            filehandler = new AzureBlob(apiOption);
+        break;
         default: filehandler = new LocalFile();
     }
     return new FileUtility(filehandler)
@@ -59,6 +67,13 @@ class FileUtility {
     constructor(handler: FileBase) {
         this.fileHandler = handler;
     }
+
+    /**
+     * 获取文件存储的临时token
+     */
+    async getTemporaryToken(expiresSeconds: number=0, permission?: string):Promise<any>{
+        return await this.fileHandler.getTemporaryToken(expiresSeconds, permission);
+    }
     /**
      * 读取文件并保存至目标路径
      * @param file 文件对象
@@ -76,6 +91,7 @@ class FileUtility {
         return await this.fileHandler.saveFileStream(file, fileName, saveOption, userInfo);
     }
 
+
     /**
      * 保存字符流到对应的存储设备
      * @param bufferData 

package/src/localfile.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { FileConfig, FileResult } from "./declare";
 export class LocalFile extends FileBase {
+    
 
     /**
      * 直接保存字符串
@@ -19,11 +20,15 @@ export class LocalFile extends FileBase {
         ///创建本地文件夹
         if (!this.mkdirsSync(_saveDir)) return { successed: false };
         return new Promise(resolve => {
-            fs.writeFile(fullFileName, data, (error) => {
+            fs.writeFile(fullFileName, data as any, (error) => {
                 return resolve({ successed: error == null, filePath: fullFileName })
             })
         });
     }
+
+    async getTemporaryToken(expiresSeconds?: number, permission?: string): Promise<string> {
+        throw new Error("Method not implemented.");
+    }
     /**
      * 读取文件对象并保存至本地存储
      * @param file 

package/tsconfig-tsc.json

@@ -0,0 +1,31 @@
+{
+    "files": [
+        "src/index.ts"
+    ],
+    "compilerOptions": {
+        "target": "es2015",
+        "module": "commonjs",
+        "declaration": true,
+        "outDir": "./dist",
+        "noEmit": false,
+        "strict": true,
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "strictBindCallApply": true,
+        "strictPropertyInitialization": true,
+        "noImplicitThis": true,
+        "alwaysStrict": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "noUncheckedIndexedAccess": true,
+        "noImplicitOverride": true,
+        "moduleResolution": "node",
+        "noPropertyAccessFromIndexSignature": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true,
+        "skipLibCheck": true
+    }
+}

package/tsconfig.json

@@ -1,31 +1,19 @@
 {
-    "files": [
-        "src/index.ts"
-    ],
-    "compilerOptions": {
-        "target": "es2015",
-        "module": "commonjs",
-        "declaration": true,
-        "outDir": "./dist",
-        "noEmit": false,
-        "strict": true,
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "strictBindCallApply": true,
-        "strictPropertyInitialization": true,
-        "noImplicitThis": true,
-        "alwaysStrict": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noImplicitReturns": true,
-        "noFallthroughCasesInSwitch": true,
-        "noUncheckedIndexedAccess": true,
-        "noImplicitOverride": true,
-        "moduleResolution": "node",
-        "noPropertyAccessFromIndexSignature": true,
-        "esModuleInterop": true,
-        "forceConsistentCasingInFileNames": true,
-        "skipLibCheck": true
-    }
-}
+  "compilerOptions": {
+    "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "ESNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+    "declaration": true /* Generates corresponding '.d.ts' file. */,
+    "declarationMap": true /* Generates a sourcemap for each corresponding '.d.ts' file. */,
+    "sourceMap": true /* Generates corresponding '.map' file. */,
+    "outDir": "dist" /* Redirect output structure to the directory. */,
+    "declarationDir": "./dist/types",
+    "noEmit": false,
+    "emitDeclarationOnly": false,
+    "strict": true /* Enable all strict type-checking options. */,
+    "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+  },
+  "include": ["src"]
+}

package/dist/cosfile.d.ts

@@ -1,34 +0,0 @@
-/// <reference types="node" />
-import { FileConfig, FileResult } from "./declare";
-import { FileBase } from "./file";
-export declare class CosFile extends FileBase {
-    private bucket;
-    private cos;
-    private region;
-    constructor(config: any);
-    /**
-     *
-     * @param data
-     * @param fileName
-     * @param saveOption
-     * @param userInfo
-     */
-    saveString2File(data: string | Buffer, fileName: string, saveOption: FileConfig, userInfo?: any): Promise<FileResult>;
-    /**
-     *
-     * @param file
-     * @param fileName
-     * @param saveOption
-     * @param userInfo
-     * @returns
-     */
-    saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult>;
-    /**
-     * 删除指定位置的文件
-     * @param filepath
-     */
-    deleteFile(filepath: string | string[]): Promise<{
-        successed: boolean;
-        error?: any;
-    }>;
-}