1.0.23

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.13",
+  "version": "1.0.23",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.13",
+  "version": "1.0.23",
   "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",

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
@@ -52,24 +52,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

@@ -10,7 +10,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 +42,6 @@ export class Bucket {
     return new Directory(this, null, '');
   }
 
-  
   // ===============
   // Fast Operations
   // ===============
@@ -52,7 +51,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,16 +64,21 @@ 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));
+    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 chunkString = chunk.toString();
-      completeFile += chunkString;
-      return chunk;
-    }, async (cb) => {
-      done.resolve();
-      return Buffer.from('');
-    });
+    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
+      async chunk => {
+        const chunkString = chunk.toString();
+        completeFile += chunkString;
+        return chunk;
+      },
+      async cb => {
+        done.resolve();
+        return Buffer.from('');
+      }
+    );
 
     if (!fileStream) {
       return null;
@@ -86,7 +92,7 @@ export class Bucket {
   /**
    * 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) {
-      parentDirectories.push(this.parentDirectory);
-      parentDirectories = parentDirectories.concat(this.parentDirectory.getParentDirectories());
+    if (this.parentDirectoryRef) {
+      parentDirectories.push(this.parentDirectoryRef);
+      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) {
-      basePath = parentDir.name + '/' + basePath;
+    for (const parentDir of parentDirectories) {
+      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 => {
-      fileArray.push(new File(this, fileName));
-    }, async (tools) => {
-      done.resolve();
-    });
+    const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
+      async bucketItem => {
+        if(!bucketItem.name) {
+          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 => {
-      console.log(fileName);
-      const subtractedPath = fileName.name.replace(this.getBasePath(), '');
-      if (subtractedPath.includes('/')) {
-        const dirName = fileName.name.split('/')[0];
-        if (directoryArray.find(directory => directory.name === dirName)) {
-          return;
+    const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
+      async bucketItem => {
+        let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
+        if (subtractedPath.startsWith('/')) {
+          subtractedPath = subtractedPath.substr(1);
         }
-        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,24 +133,52 @@ export class Directory {
   /**
    * gets a sub directory
    */
-  public async getSubDirectory(): Promise<Directory> {
-    return this;
-    // TODO
+  public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
+    const dirNameArray = dirNameArg.split('/');
+
+    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 
+   * @param relativePathArg
    */
   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 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(
-      dirArg,
-      fileName,
-      Buffer.from(fileContent)
-    );
+    await this.createFileFromBuffer(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) => {
-      completeFile = Buffer.concat([chunk]);
-      return chunk;
-    }, async (cb) => {
-      done.resolve();
-      return Buffer.from('');
-    });
+    const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
+      async chunk => {
+        completeFile = Buffer.concat([chunk]);
+        return chunk;
+      },
+      async cb => {
+        done.resolve();
+        return Buffer.from('');
+      }
+    );
 
     if (!fileStream) {
       return null;
@@ -80,8 +83,11 @@ export class File {
   /**
    * removes this file
    */
-  public async remove () {
-    await this.directoryRef.bucketRef.smartbucketRef.minioClient.removeObject(this.directoryRef.bucketRef.name, this.path);
-    await this.directoryRef.listFiles();
+  public async remove() {
+    await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient.removeObject(
+      this.parentDirectoryRef.bucketRef.name,
+      this.path
+    );
+    await this.parentDirectoryRef.listFiles();
   }
 }

ts/smartbucket.plugins.ts

@@ -1,9 +1,7 @@
 // node native
 import * as path from 'path';
 
-export {
-  path
-};
+export { path };
 
 import * as smartpath from '@pushrocks/smartpath';
 import * as smartpromise from '@pushrocks/smartpromise';
@@ -14,6 +12,4 @@ export { smartpath, smartpromise, streamfunction };
 // third party scope
 import * as minio from 'minio';
 
-export {
-  minio
-};
+export { minio };