npm - dfs-adapter - Versions diffs - 0.0.6 → 1.0.1 - Mend

dfs-adapter 0.0.6 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/README.md CHANGED Viewed

	@@ -1 +1 @@
1	- ###
1	+ ###

package/lib/cos.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { Dfs, CosConfig } from "./declare";
+import { VWebApplicationContext } from "vweb-core";
+export default class CosDfs extends Dfs<'cos'> {
+    private readonly client;
+    constructor(options: CosConfig & {
+        type: 'cos';
+    }, context: VWebApplicationContext);
+    startup(): Promise<void>;
+    private getKey;
+    upload(path: string, buffer: any, options?: any): Promise<string>;
+    download(path: string, options?: any): Promise<Buffer>;
+    getAccess(path: string, options?: any): Promise<string>;
+}

package/lib/cos.js ADDED Viewed

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const declare_1 = require("./declare");
+const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
+const fs_1 = __importDefault(require("fs"));
+class CosDfs extends declare_1.Dfs {
+    client;
+    constructor(options, context) {
+        super(options, context);
+        this.client = new cos_nodejs_sdk_v5_1.default({
+            SecretId: options.accessKeyId,
+            SecretKey: options.accessKeySecret
+        });
+    }
+    async startup() {
+        return super.startup();
+    }
+    getKey(path) {
+        if (path.startsWith('/')) {
+            path = path.substring(1);
+        }
+        return path;
+    }
+    async upload(path, buffer, options = {}) {
+        try {
+            const Key = this.getKey(path);
+            this.timeBegin(`upload ${path}`);
+            let payload = { Body: buffer, ...options };
+            if (typeof buffer === 'string' && fs_1.default.existsSync(buffer)) {
+                payload = {
+                    Body: fs_1.default.createReadStream(path),
+                    ContentLength: fs_1.default.statSync(path).size
+                };
+            }
+            await this.client.putObject({
+                Bucket: this.options.bucket,
+                Region: this.options.region,
+                Key,
+                ...payload
+            });
+            return Key;
+        }
+        finally {
+            this.timeEnd(`upload ${path}`);
+        }
+    }
+    async download(path, options = {}) {
+        try {
+            const Key = this.getKey(path);
+            this.timeBegin(`download ${path}`);
+            const result = await this.client.getObject({
+                Bucket: this.options.bucket,
+                Region: this.options.region,
+                Key,
+                ...options
+            });
+            return result.Body;
+        }
+        finally {
+            this.timeEnd(`download ${path}`);
+        }
+    }
+    async getAccess(path, options = {}) {
+        if (this.options.access) {
+            return this.options.access + path;
+        }
+        const Key = this.getKey(path);
+        return new Promise((resolve, reject) => {
+            this.client.getObjectUrl({
+                Bucket: this.options.bucket,
+                Region: this.options.region,
+                Key,
+                ...options
+            }, (err, result) => {
+                if (err) {
+                    return reject(err);
+                }
+                resolve(result.Url);
+            });
+        });
+    }
+}
+exports.default = CosDfs;

package/lib/declare.d.ts CHANGED Viewed

@@ -45,12 +45,28 @@ export declare interface FastdfsConfig {
     token: string;
     access: string;
 }
+export declare interface ObsConfig {
+    accessKeyId: string;
+    accessKeySecret: string;
+    endpoint: string;
+    bucket: string;
+    access: string;
+}
+export declare interface CosConfig {
+    accessKeyId: string;
+    accessKeySecret: string;
+    region: string;
+    bucket: string;
+    access?: string;
+}
 export declare type ConfigOptionsMap = {
     oss: OssConfig;
     minio: MinioConfig;
     http: HttpConfig;
     native: NativeConfig;
     fastdfs: FastdfsConfig;
+    obs: ObsConfig;
+    cos: CosConfig;
 };
 export declare type ConfigOptionsKey = keyof ConfigOptionsMap;
 type ConfigOptionsOptions<T> = T extends ConfigOptionsKey ? {
@@ -71,6 +87,6 @@ export declare class Dfs<T extends ConfigOptionsKey> {
     startup(): Promise<void>;
     upload(path: string, buffer: any, ...args: any[]): Promise<string>;
     download(path: string, ...args: any[]): Promise<Buffer>;
-    getAccess(path: string): Promise<string>;
+    getAccess(path: string, ...args: any[]): Promise<string>;
 }
 export {};

package/lib/declare.js CHANGED Viewed

@@ -64,7 +64,7 @@ class Dfs {
         }
         return null;
     }
-    async getAccess(path) {
+    async getAccess(path, ...args) {
         if (this.logger.isDebugEnabled()) {
             this.logger.info(`${this.constructor.name} access ${path}`);
         }

package/lib/fastdfs.js CHANGED Viewed

@@ -76,7 +76,7 @@ class HttpDfs extends declare_1.Dfs {
     }
     async getAccess(path) {
         if (this.options.access) {
-            return `${this.options.access}/dfs/get?filename=${path}`;
+            return this.options.access + path;
         }
         const { domain, group } = this.options;
         return `${domain}/${group}${path}`;

package/lib/http.js CHANGED Viewed

@@ -77,7 +77,7 @@ class HttpDfs extends declare_1.Dfs {
     }
     async getAccess(path) {
         if (this.options.access) {
-            return `${this.options.access}/dfs/get?filename=${path}`;
+            return this.options.access + path;
         }
         return `${this.options.url}?filename=${path}`;
     }

package/lib/minio.js CHANGED Viewed

@@ -25,10 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const declare_1 = require("./declare");
 const minio = __importStar(require("minio"));
+const net = __importStar(require("net"));
 class MinioDfs extends declare_1.Dfs {
     client;
     constructor(options, context) {
-        super({ accessKey: '', secretKey: '', ...options }, context);
+        super({ accessKey: '', secretKey: '', useSSL: false, ...options }, context);
         this.client = new minio.Client(this.options);
     }
     async startup() {
@@ -60,9 +61,13 @@ class MinioDfs extends declare_1.Dfs {
     }
     async getAccess(path) {
         if (this.options.access) {
-            return `${this.options.access}/dfs/get?filename=${path}`;
+            return `${this.options.access}${path}`;
         }
-        return `http://${this.options.endPoint}:${this.options.port}/${this.options.bucketName}${path}`;
+        let hostname = this.options.endPoint;
+        if (net.isIPv6(hostname)) {
+            hostname = `[${hostname}]`;
+        }
+        return `${this.options.useSSL ? 'https' : 'http'}://${hostname}:${this.options.port}/${this.options.bucketName}${path}`;
     }
 }
 exports.default = MinioDfs;

package/lib/native.js CHANGED Viewed

@@ -68,7 +68,7 @@ class NativeDfs extends declare_1.Dfs {
         }
     }
     async getAccess(path) {
-        return `${this.options.access}/dfs/get?filename=${path}`;
+        return this.options.access + path;
     }
 }
 exports.default = NativeDfs;

package/lib/obs.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { Dfs, ObsConfig } from "./declare";
+import { VWebApplicationContext } from "vweb-core";
+export default class ObsDfs extends Dfs<'obs'> {
+    private readonly client;
+    constructor(options: ObsConfig & {
+        type: 'obs';
+    }, context: VWebApplicationContext);
+    startup(): Promise<void>;
+    private getKey;
+    upload(path: string, buffer: any, options?: any): Promise<string>;
+    download(path: string, options?: any): Promise<Buffer>;
+    getAccess(path: string, options?: any): Promise<string>;
+}

package/lib/obs.js ADDED Viewed

@@ -0,0 +1,92 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const declare_1 = require("./declare");
+const esdk_obs_nodejs_1 = __importDefault(require("esdk-obs-nodejs"));
+const fs_1 = __importDefault(require("fs"));
+class ObsDfs extends declare_1.Dfs {
+    client;
+    constructor(options, context) {
+        super(options, context);
+        this.client = new esdk_obs_nodejs_1.default({
+            access_key_id: options.accessKeyId,
+            secret_access_key: options.accessKeySecret,
+            server: options.endpoint
+        });
+    }
+    async startup() {
+        return super.startup();
+    }
+    getKey(path) {
+        if (path.startsWith('/')) {
+            path = path.substring(1);
+        }
+        return path;
+    }
+    async upload(path, buffer, options = {}) {
+        try {
+            const Key = this.getKey(path);
+            this.timeBegin(`upload ${path}`);
+            let payload = { Bucket: this.options.bucket, Key, ...options };
+            if (typeof buffer === 'string' && fs_1.default.existsSync(buffer)) {
+                payload.SourceFile = buffer;
+            }
+            else {
+                payload.Body = buffer;
+            }
+            await new Promise((resolve, reject) => {
+                this.client.putObject(payload, (err, result) => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    this.logger.debug(`文件【${Key}】上传完成, Status：${result.CommonMsg.Status} Code: ${result.CommonMsg.Code} Message: ${result.CommonMsg.Message}`);
+                    resolve(result);
+                });
+            });
+            return Key;
+        }
+        finally {
+            this.timeEnd(`upload ${path}`);
+        }
+    }
+    async download(path, options = {}) {
+        try {
+            const Key = this.getKey(path);
+            this.timeBegin(`download ${path}`);
+            return await new Promise((resolve, reject) => {
+                this.client.getObject({
+                    Bucket: this.options.bucket,
+                    Key,
+                    SaveAsStream: true,
+                    ...options
+                }, (err, result) => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    this.logger.debug(`文件【${Key}】下载完成, Status：${result.CommonMsg.Status} Code: ${result.CommonMsg.Code} Message: ${result.CommonMsg.Message}`);
+                    if (result.CommonMsg.Status < 300 && result.InterfaceResult) {
+                        console.log(result);
+                        result.InterfaceResult.Content.on('data', resolve);
+                    }
+                    else {
+                        reject(result.CommonMsg.Status);
+                    }
+                });
+            });
+        }
+        finally {
+            this.timeEnd(`download ${path}`);
+        }
+    }
+    async getAccess(path, options = {}) {
+        if (this.options.access) {
+            return this.options.access + path;
+        }
+        const Key = this.getKey(path);
+        const { SignedUrl } = this.client.createSignedUrlSync({ Method: "GET", Bucket: this.options.bucket, Key, Expires: 86400, ...options });
+        return SignedUrl;
+    }
+}
+exports.default = ObsDfs;

package/lib/oss.js CHANGED Viewed

@@ -51,7 +51,7 @@ class OssDfs extends declare_1.Dfs {
     }
     async getAccess(path) {
         if (this.options.access) {
-            return `${this.options.access}/dfs/get?filename=${path}`;
+            return this.options.access + path;
         }
         return this.client.getObjectUrl(path, this.options.access);
     }

package/package.json CHANGED Viewed

@@ -1,39 +1,43 @@
-{
-  "name": "dfs-adapter",
-  "version": "0.0.6",
-  "description": "oss minio dfs native",
-  "main": "./lib/index",
-  "files": [
-    "lib/"
-  ],
-  "scripts": {
-    "test": "node bin/app.js",
-    "build": "tsc --build tsconfig.json",
-    "run": "npm run build && node bin/app.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@codeup.aliyun.com:60b0836844816b8ed2335ed6/vweb/modules/mq-adapter.git"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-decorators": "^7.16.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.16.4",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/register": "^7.16.0",
-    "@babel/runtime": "^7.16.3",
-    "@types/ali-oss": "^6.16.3",
-    "@types/node": "^16.11.12",
-    "ali-oss": "^6.18.1",
-    "axios": "^1.6.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "form-data": "^4.0.0",
-    "minio": "^7.1.3",
-    "vweb-core": "^3.0.14",
-    "vweb-mvc": "^1.2.18"
-  },
-  "author": "",
-  "license": "ISC"
-}
+{
+  "name": "dfs-adapter",
+  "version": "1.0.1",
+  "description": "oss minio fastdfs native",
+  "main": "./lib/index",
+  "files": [
+    "lib/"
+  ],
+  "scripts": {
+    "test": "node bin/app.js",
+    "build": "tsc --build tsconfig.json",
+    "run": "npm run build && node bin/app.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@codeup.aliyun.com:60b0836844816b8ed2335ed6/vweb/modules/mq-adapter.git"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-decorators": "^7.16.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/register": "^7.16.0",
+    "@babel/runtime": "^7.16.3",
+    "@types/ali-oss": "^6.16.3",
+    "@types/node": "^16.11.12",
+    "ali-oss": "^6.18.1",
+    "axios": "^1.6.1",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
+    "esdk-obs-nodejs": "^3.24.3",
+    "form-data": "^4.0.0",
+    "minio": "^8.0.0",
+    "vweb-core": "^3.0.14",
+    "vweb-mvc": "^1.2.18"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cos-nodejs-sdk-v5": "^2.14.4"
+  }
+}