1.0.36

.gitlab-ci.yml

@@ -19,23 +19,35 @@ 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
+
+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 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,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.31",
+  "version": "1.0.36",
   "description": "simple cloud independent object storage",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -12,19 +12,19 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "tslint": "^6.1.2",
+    "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/smartrx": "^2.0.15",
+    "@pushrocks/smartrx": "^2.0.19",
-    "@pushrocks/streamfunction": "^1.0.24",
+    "@pushrocks/streamfunction": "^2.0.1",
-    "@types/minio": "^7.0.5",
+    "@types/minio": "^7.0.6",
     "minio": "^7.0.16"
   },
   "private": false,
@@ -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,9 +79,13 @@ 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();
-  this.brandfileDirectory = await servezoneBaseDirectory.getSubDirectoryByName('brandfiles');
+  const brandfileDirectory = await servezoneBaseDirectory.getSubDirectoryByName(
-  const files = servezoneBaseDirectory.listFiles();
+    'public/brandfiles'
+  );
+  const files = await brandfileDirectory.listFiles();
+  const directories = await brandfileDirectory.listDirectories();
   console.log(files);
+  console.log(directories);
 });
 
 tap.test('clean up directory style tests', async () => {

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;
@@ -54,7 +54,7 @@ export class Bucket {
     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;
@@ -68,12 +68,12 @@ export class Bucket {
     let completeFile: Buffer;
     const replaySubject = await this.fastGetStream(pathArg);
     replaySubject.subscribe(
-      chunk => {
+      (chunk) => {
         if (completeFile) {
           completeFile = Buffer.concat([completeFile, chunk]);
         }
       },
-      err => {
+      (err) => {
         console.log(err);
       },
       () => {
@@ -87,15 +87,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

@@ -43,11 +43,18 @@ export class Directory {
     const parentDirectories = this.getParentDirectories();
     let basePath = '';
     for (const parentDir of parentDirectories) {
-      if (parentDir.name === '') {
+      if (!parentDir.name && !basePath) {
         basePath = this.name + '/';
         continue;
       }
-      basePath = parentDir.name + '/' + this.name;
+      if (parentDir.name && !basePath) {
+        basePath = parentDir.name + '/' + this.name + '/';
+        continue;
+      }
+      if (parentDir.name && basePath) {
+        basePath = parentDir.name + '/' + basePath;
+        continue;
+      }
     }
     return basePath;
   }
@@ -64,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;
         }
@@ -79,7 +86,7 @@ export class Directory {
           fileArray.push(new File(this, subtractedPath));
         }
       },
-      async tools => {
+      async (tools) => {
         done.resolve();
       }
     );
@@ -101,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;
         }
@@ -111,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();
       }
     );
@@ -145,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;
       });
     };

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('');
       }

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,
     });
   }