1.0.26

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,24 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -41,37 +44,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -85,18 +91,20 @@ codequality:
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
   stage: metadata
@@ -107,6 +115,7 @@ pages:
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -114,5 +123,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/settings.json

@@ -11,7 +11,13 @@
           },
           "gitzone": {
             "type": "object",
-            "description": "settings for gitzone"
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
           }
         }
       }

npmextra.json

@@ -3,6 +3,7 @@
     "npmGlobalTools": []
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.19",
+  "version": "1.0.26",
   "description": "simple cloud independent object storage",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "UNLICENSED",
   "scripts": {
@@ -12,26 +12,28 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.24",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "tslint": "^5.20.0",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
     "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/smartpath": "^4.0.1",
+    "@pushrocks/smartpath": "^4.0.3",
     "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartrx": "^2.0.5",
     "@pushrocks/streamfunction": "^1.0.24",
-    "@types/minio": "^7.0.3",
-    "minio": "^7.0.12"
+    "@types/minio": "^7.0.5",
+    "minio": "^7.0.16"
   },
   "private": false,
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

readme.md

@@ -8,7 +8,7 @@ simple cloud independent object storage
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartbucket/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartbucket/badges/master/build.svg)](https://gitlab.com/pushrocks/smartbucket/commits/master)
+[![pipeline status](https://gitlab.com/pushrocks/smartbucket/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smartbucket/commits/master)
 [![coverage report](https://gitlab.com/pushrocks/smartbucket/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartbucket/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartbucket.svg)](https://www.npmjs.com/package/@pushrocks/smartbucket)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartbucket/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartbucket)
@@ -18,6 +18,11 @@ simple cloud independent object storage
 
 ## Usage
 
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -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,6 +53,7 @@ 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');
 });
 
@@ -67,11 +69,19 @@ tap.test('should get base directory', async () => {
   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');
 });
 

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) {
@@ -64,18 +65,37 @@ export class Bucket {
    */
   public async fastGet(pathArg: string) {
     const done = plugins.smartpromise.defer();
+    let completeFile: string = '';
+    const replaySubject = await this.fastGetStream(pathArg);
+    replaySubject.subscribe(
+      chunkString => {
+        completeFile += chunkString;
+      },
+      err => {
+        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));
-    let completeFile: string = '';
+    const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<string>();
     const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
       async chunk => {
         const chunkString = chunk.toString();
-        completeFile += chunkString;
+        replaySubject.next(chunkString);
         return chunk;
       },
       async cb => {
-        done.resolve();
+        console.log('stream ended');
+        replaySubject.complete();
         return Buffer.from('');
       }
     );
@@ -85,8 +105,7 @@ export class Bucket {
     }
 
     fileStream.pipe(duplexStream);
-    await done.promise;
-    return completeFile;
+    return replaySubject;
   }
 
   /**

ts/smartbucket.classes.directory.ts

@@ -43,7 +43,11 @@ export class Directory {
     const parentDirectories = this.getParentDirectories();
     let basePath = '';
     for (const parentDir of parentDirectories) {
-      basePath = parentDir.name + '/' + basePath;
+      if (parentDir.name === '') {
+        basePath = this.name;
+        continue;
+      }
+      basePath = parentDir.name + '/' + this.name;
     }
     return basePath;
   }
@@ -60,14 +64,16 @@ export class Directory {
     const fileArray: File[] = [];
     const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
       async bucketItem => {
-        if(!bucketItem.name) {
+        if (!bucketItem.name) {
           return;
         }
-        const subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
-        if (!subtractedPath.includes('/')) {
-          fileArray.push(new File(this, bucketItem.name));
+        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();
@@ -91,9 +97,12 @@ export class Directory {
     const directoryArray: Directory[] = [];
     const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
       async bucketItem => {
-        const subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
+        let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
+        if (subtractedPath.startsWith('/')) {
+          subtractedPath = subtractedPath.substr(1);
+        }
         if (subtractedPath.includes('/')) {
-          const dirName = bucketItem.name.split('/')[0];
+          const dirName = subtractedPath.split('/')[0];
           if (directoryArray.find(directory => directory.name === dirName)) {
             return;
           }
@@ -124,11 +133,20 @@ export class Directory {
    * gets a sub directory
    */
   public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
-    // TODO: make this recursive
-    const directories = await this.listDirectories();
-    return directories.find(directory => {
-      return directory.name === dirNameArg;
-    });
+    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;
   }
 
   /**
@@ -154,7 +172,14 @@ export class Directory {
 
   public async fastGet(pathArg: string) {
     const path = plugins.path.join(this.getBasePath(), pathArg);
-    await this.bucketRef.fastGet(path);
+    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) {

ts/smartbucket.plugins.ts

@@ -5,9 +5,10 @@ export { 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';