1.0.25

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.13",
+  "version": "1.0.25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -96,7 +96,6 @@
       "version": "3.0.11",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-3.0.11.tgz",
       "integrity": "sha512-SDKRPj9+xBTqozlDPcA7O6BcccM1Tw/sXPVP+OnhNxCubDZ/L2kGNpPpqm43NJUoNxSSo5wdBw4N7MAFYCGdVg==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartdelay": "^2.0.3",
         "@pushrocks/smartpromise": "^3.0.2",
@@ -143,25 +142,22 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.3.tgz",
       "integrity": "sha512-TXKDDqsc7sBTLl+oiYNaF6IdNk1n70i8ur8QfwcUU6tegTnrEkvMWy9h5Zdty/fq1ioCNpKLvuXoA+fgYVwKGQ==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^3.0.2"
       }
     },
     "@pushrocks/smartevent": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartevent/-/smartevent-2.0.3.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartevent/-/smartevent-2.0.3.tgz",
       "integrity": "sha512-x4B1mzzE6LrMATXsRLNuZpMTlB2JodL44MA4bF4FucU3SBBiWhFv3CFJRlO9B23SKZ1fwdJQrk2lT7YTUHXXJQ==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5"
       },
       "dependencies": {
         "@pushrocks/smartpromise": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
-          "dev": true
         }
       }
     },
@@ -279,7 +275,6 @@
       "version": "2.0.5",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrx/-/smartrx-2.0.5.tgz",
       "integrity": "sha512-BOlIJmnCO8pxqu9f18D9UV5rIsyrmKeK/mWNMiAe/NH2OTeRPNLpgmhZBkXSKNVD8tSsD8aazs4BcACgYOg1FQ==",
-      "dev": true,
       "requires": {
         "@pushrocks/lik": "^3.0.11",
         "@pushrocks/smartevent": "^2.0.3",
@@ -304,7 +299,6 @@
       "version": "3.0.12",
       "resolved": "https://registry.npmjs.org/@pushrocks/smarttime/-/smarttime-3.0.12.tgz",
       "integrity": "sha512-NoMt1NUhNqcF5y7fCTHoC3d/+MobzgNUg6yHbSGxFRaentQzCrMPNahQIVLbrAStf03LUUBePUjSRdPYucP1gw==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^3.0.2",
         "@types/cron": "^1.7.1",
@@ -364,7 +358,6 @@
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz",
       "integrity": "sha512-48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==",
-      "dev": true,
       "requires": {
         "@types/node": "*",
         "moment": ">=2.14.0"
@@ -411,14 +404,12 @@
     "@types/luxon": {
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-1.15.2.tgz",
-      "integrity": "sha512-zHPoyVrLvNaiMRYdhmh88Rn489ZgAgbc6iLxR5Yi0VCNfeNYHcszbhJV2vDHLNrVGy35BPtWBRn4OP2F9BBvFw==",
+      "integrity": "sha512-zHPoyVrLvNaiMRYdhmh88Rn489ZgAgbc6iLxR5Yi0VCNfeNYHcszbhJV2vDHLNrVGy35BPtWBRn4OP2F9BBvFw=="
-      "dev": true
     },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
-      "dev": true
     },
     "@types/minio": {
       "version": "7.0.3",
@@ -703,7 +694,6 @@
       "version": "1.7.2",
       "resolved": "https://verdaccio.lossless.one/cron/-/cron-1.7.2.tgz",
       "integrity": "sha512-+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==",
-      "dev": true,
       "requires": {
         "moment-timezone": "^0.5.x"
       }
@@ -1122,8 +1112,7 @@
     "luxon": {
       "version": "1.19.3",
       "resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.19.3.tgz",
-      "integrity": "sha512-YwTDjGRQC0QC9Iya2g2eKZfgEFqRId4ZoLHORQcfTMB/5xrTx427V7ZPjQJ1vzvhA2vJfG2bh1Kv8V8IFMWCUA==",
+      "integrity": "sha512-YwTDjGRQC0QC9Iya2g2eKZfgEFqRId4ZoLHORQcfTMB/5xrTx427V7ZPjQJ1vzvhA2vJfG2bh1Kv8V8IFMWCUA=="
-      "dev": true
     },
     "make-error": {
       "version": "1.3.5",
@@ -1214,14 +1203,12 @@
     "moment": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-      "dev": true
     },
     "moment-timezone": {
       "version": "0.5.26",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
       "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
-      "dev": true,
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -1478,7 +1465,6 @@
       "version": "6.5.3",
       "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.5.3.tgz",
       "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
-      "dev": true,
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -1618,8 +1604,7 @@
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-      "dev": true
     },
     "through2": {
       "version": "3.0.1",
@@ -1645,8 +1630,7 @@
     "tslib": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
-      "dev": true
     },
     "tslint": {
       "version": "5.20.0",

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.13",
+  "version": "1.0.25",
   "description": "simple cloud independent object storage",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "author": "Lossless GmbH",
   "license": "UNLICENSED",
   "scripts": {
-    "test": "tstest test/",
+    "test": "(tstest test/)",
     "format": "(gitzone format)",
-    "build": "echo \"Not needed for now\""
+    "build": "(tsbuild)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
@@ -22,6 +22,7 @@
     "@pushrocks/qenv": "^4.0.6",
     "@pushrocks/smartpath": "^4.0.1",
     "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartrx": "^2.0.5",
     "@pushrocks/streamfunction": "^1.0.24",
     "@types/minio": "^7.0.3",
     "minio": "^7.0.12"

test/test.ts

@@ -13,22 +13,22 @@ tap.test('should create a valid smartbucket', async () => {
   testSmartbucket = new smartbucket.SmartBucket({
     accessKey: testQenv.getEnvVarOnDemand('S3_KEY'),
     accessSecret: testQenv.getEnvVarOnDemand('S3_SECRET'),
-    endpoint: 'ams3.digitaloceanspaces.com'
+    endpoint: 'fra1.digitaloceanspaces.com'
   });
 });
 
 tap.skip.test('should create testbucket', async () => {
-  await testSmartbucket.createBucket('smartbucket');
+  await testSmartbucket.createBucket('testzone');
 });
 
 tap.skip.test('should remove testbucket', async () => {
-  await testSmartbucket.removeBucket('pushrocks-smartbucket');
+  await testSmartbucket.removeBucket('testzone');
 });
 
 tap.test('should get a bucket', async () => {
-  myBucket = await testSmartbucket.getBucketByName('smartbucket');
+  myBucket = await testSmartbucket.getBucketByName('testzone');
   expect(myBucket).to.be.instanceOf(smartbucket.Bucket);
-  expect(myBucket.name).to.equal('smartbucket');
+  expect(myBucket.name).to.equal('testzone');
 });
 
 // Fast operations
@@ -38,6 +38,7 @@ tap.test('should store data in bucket fast', async () => {
 
 tap.test('should get data in bucket', async () => {
   const fileString = await myBucket.fastGet('hithere/socool.txt');
+  const fileStringStream = await myBucket.fastGetStream('hithere/socool.txt');
   console.log(fileString);
 });
 
@@ -52,24 +53,36 @@ tap.test('prepare for directory style tests', async () => {
   await myBucket.fastStore('dir1/file2.txt', 'dir1/file2.txt content');
   await myBucket.fastStore('dir2/file1.txt', 'dir2/file1.txt content');
   await myBucket.fastStore('dir3/file1.txt', 'dir3/file1.txt content');
+  await myBucket.fastStore('dir3/dir4/file1.txt', 'dir3/dir4/file1.txt content');
   await myBucket.fastStore('file1.txt', 'file1 content');
 });
 
 tap.test('should get base directory', async () => {
   baseDirectory = await myBucket.getBaseDirectory();
   const directories = await baseDirectory.listDirectories();
+  console.log('Found the following directories:');
+  console.log(directories);
   expect(directories.length).to.equal(3);
   const files = await baseDirectory.listFiles();
+  console.log('Found the following files:');
+  console.log(files);
+  expect(files.length).to.equal(1);
 });
 
+tap.test('should correctly build paths for sub directories', async () => {
+  const dir4 = await baseDirectory.getSubDirectoryByName('dir3/dir4');
+  expect(dir4).to.be.instanceOf(smartbucket.Directory);
+  const dir4BasePath = dir4.getBasePath();
+  console.log(dir4BasePath);
+});
 
 tap.test('clean up directory style tests', async () => {
   await myBucket.fastRemove('dir1/file1.txt');
   await myBucket.fastRemove('dir1/file2.txt');
   await myBucket.fastRemove('dir2/file1.txt');
   await myBucket.fastRemove('dir3/file1.txt');
+  await myBucket.fastRemove('dir3/dir4/file1.txt');
   await myBucket.fastRemove('file1.txt');
 });
 
-
 tap.start();

ts/smartbucket.classes.bucket.ts

@@ -1,6 +1,7 @@
 import * as plugins from './smartbucket.plugins';
 import { SmartBucket } from './smartbucket.classes.smartbucket';
 import { Directory } from './smartbucket.classes.directory';
+import { Observable } from 'rxjs';
 
 export class Bucket {
   public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string) {
@@ -10,7 +11,7 @@ export class Bucket {
     });
 
     if (foundBucket) {
-      console.log(`bucket with name ${bucketNameArg} exists.`)
+      console.log(`bucket with name ${bucketNameArg} exists.`);
       console.log(`Taking this as base for new Bucket instance`);
       return new this(smartbucketRef, bucketNameArg);
     } else {
@@ -42,7 +43,6 @@ export class Bucket {
     return new Directory(this, null, '');
   }
 
-  
   // ===============
   // Fast Operations
   // ===============
@@ -52,7 +52,9 @@ export class Bucket {
    */
   public async fastStore(pathArg: string, fileContent: string) {
     const streamIntake = new plugins.streamfunction.Intake();
-    const putPromise = this.smartbucketRef.minioClient.putObject(this.name, pathArg, streamIntake.getReadable()).catch(e => console.log(e));
+    const putPromise = this.smartbucketRef.minioClient
+      .putObject(this.name, pathArg, streamIntake.getReadable())
+      .catch(e => console.log(e));
     streamIntake.pushData(fileContent);
     streamIntake.signalEnd();
     await putPromise;
@@ -63,30 +65,53 @@ export class Bucket {
    */
   public async fastGet(pathArg: string) {
     const done = plugins.smartpromise.defer();
-    const fileStream = await this.smartbucketRef.minioClient.getObject(this.name, pathArg).catch(e => console.log(e));
     let completeFile: string = '';
-    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => {
+    const replaySubject = await this.fastGetStream(pathArg);
-      const chunkString = chunk.toString();
+    replaySubject.subscribe(
-      completeFile += chunkString;
+      chunkString => {
-      return chunk;
+        completeFile += chunkString;
-    }, async (cb) => {
+      },
-      done.resolve();
+      err => {
-      return Buffer.from('');
+        console.log(err);
-    });
+      },
+      () => {
+        done.resolve();
+      }
+    );
+    await done.promise;
+    return completeFile;
+  }
+
+  public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<string>> {
+    const fileStream = await this.smartbucketRef.minioClient
+      .getObject(this.name, pathArg)
+      .catch(e => console.log(e));
+    const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<string>();
+    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
+      async chunk => {
+        const chunkString = chunk.toString();
+        replaySubject.next(chunkString);
+        return chunk;
+      },
+      async cb => {
+        console.log('stream ended');
+        replaySubject.complete();
+        return Buffer.from('');
+      }
+    );
 
     if (!fileStream) {
       return null;
     }
 
     fileStream.pipe(duplexStream);
-    await done.promise;
+    return replaySubject;
-    return completeFile;
   }
 
   /**
    * removeObject
    */
-  public async fastRemove (pathArg: string) {
+  public async fastRemove(pathArg: string) {
     await this.smartbucketRef.minioClient.removeObject(this.name, pathArg);
   }
 }

ts/smartbucket.classes.directory.ts

@@ -4,7 +4,7 @@ import { File } from './smartbucket.classes.file';
 
 export class Directory {
   public bucketRef: Bucket;
-  public parentDirectory: Directory;
+  public parentDirectoryRef: Directory;
   public name: string;
 
   public tree: string[];
@@ -13,7 +13,7 @@ export class Directory {
 
   constructor(bucketRefArg: Bucket, parentDiretory: Directory, name: string) {
     this.bucketRef = bucketRefArg;
-    this.parentDirectory = parentDiretory;
+    this.parentDirectoryRef = parentDiretory;
     this.name = name;
   }
 
@@ -22,9 +22,9 @@ export class Directory {
    */
   public getParentDirectories(): Directory[] {
     let parentDirectories: Directory[] = [];
-    if (this.parentDirectory) {
+    if (this.parentDirectoryRef) {
-      parentDirectories.push(this.parentDirectory);
+      parentDirectories.push(this.parentDirectoryRef);
-      parentDirectories = parentDirectories.concat(this.parentDirectory.getParentDirectories());
+      parentDirectories = parentDirectories.concat(this.parentDirectoryRef.getParentDirectories());
     }
     return parentDirectories;
   }
@@ -34,7 +34,7 @@ export class Directory {
    */
   public getDirectoryLevel(): number {
     return this.getParentDirectories().length;
-  };
+  }
 
   /**
    * updates the base path
@@ -42,8 +42,12 @@ export class Directory {
   public getBasePath(): string {
     const parentDirectories = this.getParentDirectories();
     let basePath = '';
-    for(const parentDir of parentDirectories) {
+    for (const parentDir of parentDirectories) {
-      basePath = parentDir.name + '/' + basePath;
+      if (parentDir.name === '') {
+        basePath = this.name;
+        continue;
+      }
+      basePath = parentDir.name + '/' + this.name;
     }
     return basePath;
   }
@@ -58,11 +62,24 @@ export class Directory {
       this.getBasePath()
     );
     const fileArray: File[] = [];
-    const duplexStream = plugins.streamfunction.createDuplexStream<string, void>(async fileName => {
+    const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
-      fileArray.push(new File(this, fileName));
+      async bucketItem => {
-    }, async (tools) => {
+        if(!bucketItem.name) {
-      done.resolve();
+          return;
-    });
+        }
+        let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
+        if (subtractedPath.startsWith('/')) {
+          subtractedPath = subtractedPath.substr(1);
+        }
+        if (!subtractedPath.includes('/')) {
+          fileArray.push(new File(this, subtractedPath));
+        }
+        
+      },
+      async tools => {
+        done.resolve();
+      }
+    );
     fileNameStream.pipe(duplexStream);
     await done.promise;
     return fileArray;
@@ -79,19 +96,24 @@ export class Directory {
       true
     );
     const directoryArray: Directory[] = [];
-    const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(async fileName => {
+    const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
-      console.log(fileName);
+      async bucketItem => {
-      const subtractedPath = fileName.name.replace(this.getBasePath(), '');
+        let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
-      if (subtractedPath.includes('/')) {
+        if (subtractedPath.startsWith('/')) {
-        const dirName = fileName.name.split('/')[0];
+          subtractedPath = subtractedPath.substr(1);
-        if (directoryArray.find(directory => directory.name === dirName)) {
-          return;
         }
-        directoryArray.push(new Directory(this.bucketRef, this, dirName));
+        if (subtractedPath.includes('/')) {
+          const dirName = subtractedPath.split('/')[0];
+          if (directoryArray.find(directory => directory.name === dirName)) {
+            return;
+          }
+          directoryArray.push(new Directory(this.bucketRef, this, dirName));
+        }
+      },
+      async tools => {
+        done.resolve();
       }
-    }, async (tools) => {
+    );
-      done.resolve();
-    });
     completeDirStream.pipe(duplexStream);
     await done.promise;
     return directoryArray;
@@ -111,19 +133,30 @@ export class Directory {
   /**
    * gets a sub directory
    */
-  public async getSubDirectory(): Promise<Directory> {
+  public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
-    return this;
+    const dirNameArray = dirNameArg.split('/');
-    // TODO
+
+    const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
+      const directories = await directoryArg.listDirectories();
+      return directories.find(directory => {
+        return directory.name === dirNameToSearch;
+      });
+    };
+    let wantedDirectory: Directory;
+    for (const dirNameToSearch of dirNameArray) {
+      const directoryToSearchIn = wantedDirectory ? wantedDirectory : this;
+      wantedDirectory = await getDirectory(directoryToSearchIn, dirNameToSearch);
+    }
+    return wantedDirectory;
   }
 
   /**
    * moves the directory
    */
-  public async move () {
+  public async move() {
     // TODO
   }
 
-
   /**
    * creates a file within this directory
    * @param relativePathArg
@@ -131,4 +164,27 @@ export class Directory {
   public async createFile(relativePathArg) {
     let completeFilePath: string = '';
   }
+
+  // file operations
+  public async fastStore(pathArg: string, contentArg: string) {
+    const path = plugins.path.join(this.getBasePath(), pathArg);
+    await this.bucketRef.fastStore(path, contentArg);
+  }
+
+  public async fastGet(pathArg: string) {
+    const path = plugins.path.join(this.getBasePath(), pathArg);
+    const result = await this.bucketRef.fastGet(path);
+    return result;
+  }
+
+  public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<string>> {
+    const path = plugins.path.join(this.getBasePath(), pathArg);
+    const result = await this.bucketRef.fastGetStream(path);
+    return result;
+  }
+
+  public async fastRemove(pathArg: string) {
+    const path = plugins.path.join(this.getBasePath(), pathArg);
+    await this.bucketRef.fastRemove(path);
+  }
 }

ts/smartbucket.classes.file.ts

@@ -14,11 +14,7 @@ export class File {
     fileName: string,
     fileContent: string
   ) {
-    await this.createFileFromBuffer(
+    await this.createFileFromBuffer(dirArg, fileName, Buffer.from(fileContent));
-      dirArg,
-      fileName,
-      Buffer.from(fileContent)
-    );
   }
 
   public static async createFileFromBuffer(
@@ -37,13 +33,15 @@ export class File {
   }
 
   // INSTANCE
-  public directoryRef: Directory;
+  public parentDirectoryRef: Directory;
+  public name: string;
 
   public path: string;
   public metaData: IFileMetaData;
 
   constructor(directoryRefArg: Directory, fileName: string) {
-    this.directoryRef = directoryRefArg;
+    this.parentDirectoryRef = directoryRefArg;
+    this.name = fileName;
   }
 
   public async getContentAsString() {
@@ -53,15 +51,20 @@ export class File {
 
   public async getContentAsBuffer() {
     const done = plugins.smartpromise.defer();
-    const fileStream = await this.directoryRef.bucketRef.smartbucketRef.minioClient.getObject(this.directoryRef.bucketRef.name, this.path).catch(e => console.log(e));
+    const fileStream = await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient
+      .getObject(this.parentDirectoryRef.bucketRef.name, this.path)
+      .catch(e => console.log(e));
     let completeFile = new Buffer('');
-    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => {
+    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
-      completeFile = Buffer.concat([chunk]);
+      async chunk => {
-      return chunk;
+        completeFile = Buffer.concat([chunk]);
-    }, async (cb) => {
+        return chunk;
-      done.resolve();
+      },
-      return Buffer.from('');
+      async cb => {
-    });
+        done.resolve();
+        return Buffer.from('');
+      }
+    );
 
     if (!fileStream) {
       return null;
@@ -80,8 +83,11 @@ export class File {
   /**
    * removes this file
    */
-  public async remove () {
+  public async remove() {
-    await this.directoryRef.bucketRef.smartbucketRef.minioClient.removeObject(this.directoryRef.bucketRef.name, this.path);
+    await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient.removeObject(
-    await this.directoryRef.listFiles();
+      this.parentDirectoryRef.bucketRef.name,
+      this.path
+    );
+    await this.parentDirectoryRef.listFiles();
   }
 }

ts/smartbucket.plugins.ts

@@ -1,19 +1,16 @@
 // node native
 import * as path from 'path';
 
-export {
+export { path };
-  path
-};
 
 import * as smartpath from '@pushrocks/smartpath';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrx from '@pushrocks/smartrx';
 import * as streamfunction from '@pushrocks/streamfunction';
 
-export { smartpath, smartpromise, streamfunction };
+export { smartpath, smartpromise, smartrx, streamfunction };
 
 // third party scope
 import * as minio from 'minio';
 
-export {
+export { minio };
-  minio
-};