dfs-adapter 0.0.5 → 1.0.0

package/lib/fastdfs.js

@@ -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

@@ -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

@@ -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

@@ -44,7 +44,7 @@ class NativeDfs extends declare_1.Dfs {
     async upload(path, buffer) {
         try {
             this.timeBegin(`upload ${path}`);
-            let file = `${this.options.storage}${path}`;
+            let file = path_1.default.join(this.options.storage, path);
             let { dir } = path_1.default.parse(file);
             if (this.logger.isDebugEnabled()) {
                 this.logger.debug(`upload ${path} storage ${file}`);
@@ -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/oss.js

@@ -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

@@ -1,7 +1,7 @@
 {
   "name": "dfs-adapter",
-  "version": "0.0.5",
-  "description": "oss minio dfs native",
+  "version": "1.0.0",
+  "description": "oss minio fastdfs native",
   "main": "./lib/index",
   "files": [
     "lib/"
@@ -30,7 +30,7 @@
     "axios": "^1.6.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "form-data": "^4.0.0",
-    "minio": "^7.1.3",
+    "minio": "^8.0.0",
     "vweb-core": "^3.0.14",
     "vweb-mvc": "^1.2.18"
   },