1.0.44

.gitlab-ci.yml

@@ -36,6 +36,8 @@ auditProductionDependencies:
     - 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartbucket",
-  "version": "1.0.35",
+  "version": "1.0.44",
   "description": "simple cloud independent object storage",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -12,20 +12,20 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tstest": "^1.0.60",
+    "@pushrocks/tapbundle": "^3.2.15",
     "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",
-    "minio": "^7.0.16"
+    "@types/minio": "^7.0.11",
+    "minio": "^7.0.25"
   },
   "private": false,
   "files": [

test/test.ts

@@ -13,16 +13,16 @@ 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: 's3.eu-central-1.wasabisys.com',
   });
 });
 
 tap.skip.test('should create testbucket', async () => {
-  await testSmartbucket.createBucket('testzone');
+  // await testSmartbucket.createBucket('testzone');
 });
 
 tap.skip.test('should remove testbucket', async () => {
-  await testSmartbucket.removeBucket('testzone');
+  // await testSmartbucket.removeBucket('testzone');
 });
 
 tap.test('should get a bucket', async () => {
@@ -76,18 +76,6 @@ tap.test('should correctly build paths for sub directories', async () => {
   console.log(dir4BasePath);
 });
 
-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 files = await brandfileDirectory.listFiles();
-  const directories = await brandfileDirectory.listDirectories();
-  console.log(files);
-  console.log(directories);
-});
-
 tap.test('clean up directory style tests', async () => {
   await myBucket.fastRemove('dir1/file1.txt');
   await myBucket.fastRemove('dir1/file2.txt');

ts/smartbucket.classes.bucket.ts

@@ -50,7 +50,7 @@ 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())
@@ -63,14 +63,16 @@ 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) => {
         if (completeFile) {
           completeFile = Buffer.concat([completeFile, chunk]);
+        } else {
+          completeFile = chunk;
         }
       },
       (err) => {
@@ -78,6 +80,7 @@ export class Bucket {
       },
       () => {
         done.resolve();
+        subscription.unsubscribe();
       }
     );
     await done.promise;
@@ -95,7 +98,6 @@ export class Bucket {
         return chunk;
       },
       async (cb) => {
-        console.log('stream ended');
         replaySubject.complete();
         return Buffer.from('');
       }

ts/smartbucket.classes.directory.ts

@@ -169,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) {
-    let completeFilePath: string = '';
+  public async createEmptyFile(relativePathArg: 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);
   }
@@ -201,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

@@ -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

@@ -3,6 +3,8 @@ import { Bucket } from './smartbucket.classes.bucket';
 
 export interface ISmartBucketConfig {
   endpoint: string;
+  port?: number;
+  useSsl?: boolean;
   accessKey: string;
   accessSecret: string;
 }
@@ -19,8 +21,8 @@ export class SmartBucket {
     this.config = configArg;
     this.minioClient = new plugins.minio.Client({
       endPoint: this.config.endpoint,
-      port: 443,
-      useSSL: true,
+      port: configArg.port || 443,
+      useSSL: configArg.useSsl !== undefined ? configArg.useSsl : true,
       accessKey: this.config.accessKey,
       secretKey: this.config.accessSecret,
     });