dfs-adapter 0.0.1 → 0.0.3

package/lib/mdfs.js

@@ -35,11 +35,9 @@ class MDFSHttpListenerWrapper {
         };
     }
     get(filename, res) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { name, ext } = require('path').parse(filename);
-            res.attachment(`${name}${ext}`);
-            return this.dfs.download(filename);
-        });
+        let { name, ext } = require('path').parse(filename);
+        res.attachment(`${name}${ext}`);
+        return this.dfs.download(filename);
     }
 }
 class Mdfs extends declare_1.Dfs {

package/lib/minio.js

@@ -54,7 +54,7 @@ class MinioDfs extends declare_1.Dfs {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.timeBegin(`upload ${path}`);
-                this.client.putObject(this.options.bucketName, path, buffer, ...args);
+                yield this.client.putObject(this.options.bucketName, path, buffer, ...args);
                 return _super.upload.call(this, path, buffer, ...args);
             }
             finally {

package/lib/native.d.ts

@@ -6,7 +6,7 @@ export default class NativeDfs extends Dfs<'native'> {
         type: 'native';
     }, context: VWebApplicationContext);
     startup(): Promise<void>;
-    upload(path: string, buffer: any, ...args: any[]): Promise<string>;
-    download(path: string, ...args: any[]): Promise<Buffer>;
+    upload(path: string, buffer: any): Promise<string>;
+    download(path: string): Promise<Buffer>;
     getAccess(path: string): Promise<string>;
 }

package/lib/native.js

@@ -31,9 +31,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+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 vweb_core_1 = require("vweb-core");
 const fs = __importStar(require("fs"));
+const path_1 = __importDefault(require("path"));
 class NativeDfs extends declare_1.Dfs {
     constructor(options, context) {
         super(options, context);
@@ -43,32 +48,36 @@ class NativeDfs extends declare_1.Dfs {
             startup: { get: () => super.startup }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            vweb_core_1.util.file.forceMkDirSync(this.options.storage);
             return _super.startup.call(this);
         });
     }
-    upload(path, buffer, ...args) {
+    upload(path, buffer) {
         const _super = Object.create(null, {
             upload: { get: () => super.upload }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.timeBegin(`upload ${path}`);
-                fs.writeFileSync(`${this.options.storage}${path}`, buffer);
-                return _super.upload.call(this, path, buffer, ...args);
+                let file = `${this.options.storage}${path}`;
+                let { dir } = path_1.default.parse(file);
+                vweb_core_1.util.file.forceMkDirSync(dir);
+                fs.writeFileSync(file, buffer);
+                return _super.upload.call(this, path, buffer);
             }
             finally {
                 this.timeEnd(`upload ${path}`);
             }
         });
     }
-    download(path, ...args) {
+    download(path) {
         const _super = Object.create(null, {
             download: { get: () => super.download }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.timeBegin(`download ${path}`);
-                yield _super.download.call(this, path, ...args);
+                yield _super.download.call(this, path);
                 return fs.readFileSync(`${this.options.storage}${path}`);
             }
             finally {

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "dfs-adapter",
-  "version": "0.0.1",
-  "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": "0.0.3",
+  "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"
+}