1.0.41

.gitlab-ci.yml

@@ -19,23 +19,37 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +64,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +75,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +95,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.32",
+  "version": "1.0.41",
   "description": "simple cloud independent object storage",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -13,19 +13,19 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.54",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^3.2.14",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
     "@pushrocks/qenv": "^4.0.10",
     "@pushrocks/smartpath": "^4.0.3",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
     "@pushrocks/smartrx": "^2.0.19",
     "@pushrocks/streamfunction": "^2.0.1",
-    "@types/minio": "^7.0.6",
+    "@types/minio": "^7.0.7",
-    "minio": "^7.0.16"
+    "minio": "^7.0.18"
   },
   "private": false,
   "files": [
@@ -39,5 +39,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

test/test.ts

@@ -13,7 +13,7 @@ tap.test('should create a valid smartbucket', async () => {
   testSmartbucket = new smartbucket.SmartBucket({
     accessKey: testQenv.getEnvVarOnDemand('S3_KEY'),
     accessSecret: testQenv.getEnvVarOnDemand('S3_SECRET'),
-    endpoint: 'fra1.digitaloceanspaces.com'
+    endpoint: 'fra1.digitaloceanspaces.com',
   });
 });
 
@@ -79,7 +79,9 @@ tap.test('should correctly build paths for sub directories', async () => {
 tap.test('should list huge file directory', async () => {
   const servezoneBucket = await smartbucket.Bucket.getBucketByName(testSmartbucket, 'servezone');
   const servezoneBaseDirectory = await servezoneBucket.getBaseDirectory();
-  const brandfileDirectory = await servezoneBaseDirectory.getSubDirectoryByName('public/brandfiles');
+  const brandfileDirectory = await servezoneBaseDirectory.getSubDirectoryByName(
+    'public/brandfiles'
+  );
   const files = await brandfileDirectory.listFiles();
   const directories = await brandfileDirectory.listDirectories();
   console.log(files);

ts/smartbucket.classes.bucket.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 export class Bucket {
   public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string) {
     const buckets = await smartbucketRef.minioClient.listBuckets();
-    const foundBucket = buckets.find(bucket => {
+    const foundBucket = buckets.find((bucket) => {
       return bucket.name === bucketNameArg;
     });
 
@@ -20,12 +20,12 @@ export class Bucket {
   }
 
   public static async createBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
-    await smartbucketRef.minioClient.makeBucket(bucketName, 'ams3').catch(e => console.log(e));
+    await smartbucketRef.minioClient.makeBucket(bucketName, 'ams3').catch((e) => console.log(e));
     return new Bucket(smartbucketRef, bucketName);
   }
 
   public static async removeBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
-    await smartbucketRef.minioClient.removeBucket(bucketName).catch(e => console.log(e));
+    await smartbucketRef.minioClient.removeBucket(bucketName).catch((e) => console.log(e));
   }
 
   public smartbucketRef: SmartBucket;
@@ -50,11 +50,11 @@ export class Bucket {
   /**
    * store file
    */
-  public async fastStore(pathArg: string, fileContent: string) {
+  public async fastStore(pathArg: string, fileContent: string | Buffer): Promise<void> {
     const streamIntake = new plugins.streamfunction.Intake();
     const putPromise = this.smartbucketRef.minioClient
       .putObject(this.name, pathArg, streamIntake.getReadable())
-      .catch(e => console.log(e));
+      .catch((e) => console.log(e));
     streamIntake.pushData(fileContent);
     streamIntake.signalEnd();
     await putPromise;
@@ -63,21 +63,24 @@ export class Bucket {
   /**
    * get file
    */
-  public async fastGet(pathArg: string) {
+  public async fastGet(pathArg: string): Promise<Buffer> {
     const done = plugins.smartpromise.defer();
     let completeFile: Buffer;
     const replaySubject = await this.fastGetStream(pathArg);
-    replaySubject.subscribe(
+    const subscription = replaySubject.subscribe(
-      chunk => {
+      (chunk) => {
         if (completeFile) {
           completeFile = Buffer.concat([completeFile, chunk]);
+        } else {
+          completeFile = chunk;
         }
       },
-      err => {
+      (err) => {
         console.log(err);
       },
       () => {
         done.resolve();
+        subscription.unsubscribe();
       }
     );
     await done.promise;
@@ -87,15 +90,14 @@ export class Bucket {
   public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<Buffer>> {
     const fileStream = await this.smartbucketRef.minioClient
       .getObject(this.name, pathArg)
-      .catch(e => console.log(e));
+      .catch((e) => console.log(e));
     const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<Buffer>();
     const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
-      async chunk => {
+      async (chunk) => {
         replaySubject.next(chunk);
         return chunk;
       },
-      async cb => {
+      async (cb) => {
-        console.log('stream ended');
         replaySubject.complete();
         return Buffer.from('');
       }

ts/smartbucket.classes.directory.ts

@@ -56,7 +56,6 @@ export class Directory {
         continue;
       }
     }
-    console.log(basePath);
     return basePath;
   }
 
@@ -72,7 +71,7 @@ export class Directory {
     );
     const fileArray: File[] = [];
     const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
-      async bucketItem => {
+      async (bucketItem) => {
         if (bucketItem.prefix) {
           return;
         }
@@ -87,7 +86,7 @@ export class Directory {
           fileArray.push(new File(this, subtractedPath));
         }
       },
-      async tools => {
+      async (tools) => {
         done.resolve();
       }
     );
@@ -109,7 +108,7 @@ export class Directory {
     );
     const directoryArray: Directory[] = [];
     const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
-      async bucketItem => {
+      async (bucketItem) => {
         if (bucketItem.name) {
           return;
         }
@@ -119,13 +118,13 @@ export class Directory {
         }
         if (subtractedPath.includes('/')) {
           const dirName = subtractedPath.split('/')[0];
-          if (directoryArray.find(directory => directory.name === dirName)) {
+          if (directoryArray.find((directory) => directory.name === dirName)) {
             return;
           }
           directoryArray.push(new Directory(this.bucketRef, this, dirName));
         }
       },
-      async tools => {
+      async (tools) => {
         done.resolve();
       }
     );
@@ -153,7 +152,7 @@ export class Directory {
 
     const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
       const directories = await directoryArg.listDirectories();
-      return directories.find(directory => {
+      return directories.find((directory) => {
         return directory.name === dirNameToSearch;
       });
     };
@@ -170,18 +169,19 @@ export class Directory {
    */
   public async move() {
     // TODO
+    throw new Error('moving a directory is not yet implemented')
   }
 
   /**
    * creates a file within this directory
    * @param relativePathArg
    */
-  public async createFile(relativePathArg) {
+  public async createEmptyFile(relativePathArg: string) {
-    let completeFilePath: string = '';
+    const emtpyFile = await File.createFileFromString(this, relativePathArg, '');
   }
 
   // file operations
-  public async fastStore(pathArg: string, contentArg: string) {
+  public async fastStore(pathArg: string, contentArg: string | Buffer) {
     const path = plugins.path.join(this.getBasePath(), pathArg);
     await this.bucketRef.fastStore(path, contentArg);
   }
@@ -202,4 +202,25 @@ export class Directory {
     const path = plugins.path.join(this.getBasePath(), pathArg);
     await this.bucketRef.fastRemove(path);
   }
+
+  /**
+   * deletes the directory with all its contents
+   */
+  public async deleteWithAllContents() {
+    const deleteDirectory = async (directoryArg: Directory) => {
+      const childDirectories = await directoryArg.listDirectories();
+      if (childDirectories.length === 0) {
+        console.log('directory empty! Path complete!');
+      } else {
+        for (const childDir of childDirectories) {
+          await deleteDirectory(childDir);
+        }
+      }
+      const files = await directoryArg.listFiles();
+      for (const file of files) {
+        await directoryArg.fastRemove(file.name);
+      }
+    };
+    await deleteDirectory(this);
+  }
 }

ts/smartbucket.classes.file.ts

@@ -26,7 +26,7 @@ export class File {
     const streamIntake = new plugins.streamfunction.Intake();
     const putPromise = directoryRef.bucketRef.smartbucketRef.minioClient
       .putObject(this.name, filePath, streamIntake.getReadable())
-      .catch(e => console.log(e));
+      .catch((e) => console.log(e));
     streamIntake.pushData(fileContent);
     streamIntake.signalEnd();
     await putPromise;
@@ -53,14 +53,14 @@ export class File {
     const done = plugins.smartpromise.defer();
     const fileStream = await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient
       .getObject(this.parentDirectoryRef.bucketRef.name, this.path)
-      .catch(e => console.log(e));
+      .catch((e) => console.log(e));
     let completeFile = new Buffer('');
     const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
-      async chunk => {
+      async (chunk) => {
         completeFile = Buffer.concat([chunk]);
         return chunk;
       },
-      async cb => {
+      async (cb) => {
         done.resolve();
         return Buffer.from('');
       }
@@ -76,8 +76,8 @@ export class File {
   }
 
   public async streamContent() {
-    throw new Error('not yet implemented');
     // TODO
+    throw new Error('not yet implemented');
   }
 
   /**

ts/smartbucket.classes.smartbucket.ts

@@ -22,7 +22,7 @@ export class SmartBucket {
       port: 443,
       useSSL: true,
       accessKey: this.config.accessKey,
-      secretKey: this.config.accessSecret
+      secretKey: this.config.accessSecret,
     });
   }