Compare commits

..

36 Commits

Author SHA1 Message Date
365eea59bd 1.0.31 2020-06-19 01:03:53 +00:00
1a64835510 fix(core): update 2020-06-19 01:03:52 +00:00
b61a86f029 1.0.30 2020-06-19 00:42:26 +00:00
b9d082f07f fix(core): update 2020-06-19 00:42:26 +00:00
4819dd0bc5 1.0.29 2020-05-17 19:23:27 +00:00
7250793f95 fix(core): update 2020-05-17 19:23:26 +00:00
8fb5e89714 1.0.28 2020-05-17 16:19:17 +00:00
9dbd19d1a9 fix(core): update 2020-05-17 16:19:16 +00:00
43d29947c5 1.0.27 2020-05-17 16:09:15 +00:00
d715ed7bb8 fix(core): update 2020-05-17 16:09:14 +00:00
9c2af1931b 1.0.26 2020-05-17 15:57:13 +00:00
c58f465189 fix(core): update 2020-05-17 15:57:12 +00:00
5506db9612 1.0.25 2020-02-21 23:06:48 +00:00
0fcfba2973 fix(core): update 2020-02-21 23:06:47 +00:00
cba7c11eea 1.0.24 2019-10-20 12:27:58 +02:00
51c6b29b58 fix(core): update 2019-10-20 12:27:58 +02:00
1089c8f3ec 1.0.23 2019-10-20 01:19:34 +02:00
789ff96cf0 fix(core): update 2019-10-20 01:19:34 +02:00
1b49699663 1.0.22 2019-10-20 01:18:13 +02:00
aa209e87c1 fix(core): update 2019-10-20 01:18:13 +02:00
9ad70a9942 1.0.21 2019-10-20 00:45:12 +02:00
bc41089925 fix(core): update 2019-10-20 00:45:11 +02:00
ab39809c2a 1.0.20 2019-10-19 22:57:37 +02:00
cede6c7539 fix(core): update 2019-10-19 22:57:36 +02:00
547692ac62 1.0.19 2019-10-18 18:44:55 +02:00
5410df0011 fix(core): update 2019-10-18 18:44:54 +02:00
5b8a55d6d2 1.0.18 2019-10-18 18:37:43 +02:00
61145d5e80 fix(core): update 2019-10-18 18:37:43 +02:00
6596893ee5 1.0.17 2019-10-18 15:43:06 +02:00
514a8407f6 fix(core): update 2019-10-18 15:43:06 +02:00
fcadbe0a44 1.0.16 2019-10-18 12:34:33 +02:00
e6398ebbe3 fix(core): update 2019-10-18 12:34:32 +02:00
8a7824f2d9 1.0.15 2019-10-18 12:22:43 +02:00
b61118c950 fix(core): update 2019-10-18 12:22:42 +02:00
905f7d189f 1.0.14 2019-10-16 19:15:48 +02:00
6d856b3647 fix(core): update 2019-10-16 19:15:48 +02:00
12 changed files with 4221 additions and 741 deletions

4
.gitignore vendored
View File

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

View File

@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache: cache:
paths: paths:
- .npmci_cache/ - .npmci_cache/
key: "$CI_BUILD_STAGE" key: '$CI_BUILD_STAGE'
stages: stages:
- security - security
- test - test
- release - release
- metadata - metadata
# ==================== # ====================
# security stage # security stage
@ -20,17 +20,20 @@ mirror:
script: script:
- npmci git mirror - npmci git mirror
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
snyk: audit:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install -g snyk
- npmci command npm install --ignore-scripts - 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: tags:
- lossless
- docker - docker
- notpriv - notpriv
@ -47,6 +50,7 @@ testStable:
- npmci npm test - npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- priv - priv
@ -59,6 +63,7 @@ testBuild:
- npmci command npm run build - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
@ -70,6 +75,7 @@ release:
only: only:
- tags - tags
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
@ -85,6 +91,7 @@ codequality:
- npmci npm install - npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts" - npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags: tags:
- lossless
- docker - docker
- priv - priv
@ -95,6 +102,7 @@ trigger:
only: only:
- tags - tags
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
@ -107,6 +115,7 @@ pages:
- npmci npm install - npmci npm install
- npmci command tsdoc - npmci command tsdoc
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
only: only:

View File

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

View File

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

4532
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,37 +1,39 @@
{ {
"name": "@pushrocks/smartbucket", "name": "@pushrocks/smartbucket",
"version": "1.0.13", "version": "1.0.31",
"description": "simple cloud independent object storage", "description": "simple cloud independent object storage",
"main": "dist/index.js", "main": "dist_ts/index.js",
"typings": "dist/index.d.ts", "typings": "dist_ts/index.d.ts",
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "UNLICENSED", "license": "UNLICENSED",
"scripts": { "scripts": {
"test": "tstest test/", "test": "(tstest test/)",
"format": "(gitzone format)", "format": "(gitzone format)",
"build": "echo \"Not needed for now\"" "build": "(tsbuild --web)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.24",
"@gitzone/tstest": "^1.0.28", "@gitzone/tstest": "^1.0.33",
"@pushrocks/tapbundle": "^3.0.13", "@pushrocks/tapbundle": "^3.2.1",
"tslint": "^5.20.0", "tslint": "^6.1.2",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/qenv": "^4.0.6", "@pushrocks/qenv": "^4.0.10",
"@pushrocks/smartpath": "^4.0.1", "@pushrocks/smartpath": "^4.0.3",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.0.6",
"@pushrocks/smartrx": "^2.0.15",
"@pushrocks/streamfunction": "^1.0.24", "@pushrocks/streamfunction": "^1.0.24",
"@types/minio": "^7.0.3", "@types/minio": "^7.0.5",
"minio": "^7.0.12" "minio": "^7.0.16"
}, },
"private": false, "private": false,
"files": [ "files": [
"ts/**/*", "ts/**/*",
"ts_web/**/*", "ts_web/**/*",
"dist/**/*", "dist/**/*",
"dist_web/**/*", "dist_*/**/*",
"dist_ts/**/*",
"dist_ts_web/**/*", "dist_ts_web/**/*",
"assets/**/*", "assets/**/*",
"cli.js", "cli.js",

View File

@ -8,16 +8,29 @@ simple cloud independent object storage
* [docs (typedoc)](https://pushrocks.gitlab.io/smartbucket/) * [docs (typedoc)](https://pushrocks.gitlab.io/smartbucket/)
## Status for master ## Status for master
[![build status](https://gitlab.com/pushrocks/smartbucket/badges/master/build.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) Status Category | Status Badge
[![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) GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartbucket/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartbucket/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartbucket)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartbucket)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartbucket)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartbucket)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartbucket)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
Use TypeScript for best in class intellisense.
## 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. For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

View File

@ -13,22 +13,22 @@ tap.test('should create a valid smartbucket', async () => {
testSmartbucket = new smartbucket.SmartBucket({ testSmartbucket = new smartbucket.SmartBucket({
accessKey: testQenv.getEnvVarOnDemand('S3_KEY'), accessKey: testQenv.getEnvVarOnDemand('S3_KEY'),
accessSecret: testQenv.getEnvVarOnDemand('S3_SECRET'), accessSecret: testQenv.getEnvVarOnDemand('S3_SECRET'),
endpoint: 'ams3.digitaloceanspaces.com' endpoint: 'fra1.digitaloceanspaces.com'
}); });
}); });
tap.skip.test('should create testbucket', async () => { tap.skip.test('should create testbucket', async () => {
await testSmartbucket.createBucket('smartbucket'); await testSmartbucket.createBucket('testzone');
}); });
tap.skip.test('should remove testbucket', async () => { tap.skip.test('should remove testbucket', async () => {
await testSmartbucket.removeBucket('pushrocks-smartbucket'); await testSmartbucket.removeBucket('testzone');
}); });
tap.test('should get a bucket', async () => { 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).to.be.instanceOf(smartbucket.Bucket);
expect(myBucket.name).to.equal('smartbucket'); expect(myBucket.name).to.equal('testzone');
}); });
// Fast operations // Fast operations
@ -38,6 +38,7 @@ tap.test('should store data in bucket fast', async () => {
tap.test('should get data in bucket', async () => { tap.test('should get data in bucket', async () => {
const fileString = await myBucket.fastGet('hithere/socool.txt'); const fileString = await myBucket.fastGet('hithere/socool.txt');
const fileStringStream = await myBucket.fastGetStream('hithere/socool.txt');
console.log(fileString); console.log(fileString);
}); });
@ -52,24 +53,44 @@ tap.test('prepare for directory style tests', async () => {
await myBucket.fastStore('dir1/file2.txt', 'dir1/file2.txt content'); await myBucket.fastStore('dir1/file2.txt', 'dir1/file2.txt content');
await myBucket.fastStore('dir2/file1.txt', 'dir2/file1.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/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'); await myBucket.fastStore('file1.txt', 'file1 content');
}); });
tap.test('should get base directory', async () => { tap.test('should get base directory', async () => {
baseDirectory = await myBucket.getBaseDirectory(); baseDirectory = await myBucket.getBaseDirectory();
const directories = await baseDirectory.listDirectories(); const directories = await baseDirectory.listDirectories();
console.log('Found the following directories:');
console.log(directories);
expect(directories.length).to.equal(3); expect(directories.length).to.equal(3);
const files = await baseDirectory.listFiles(); 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('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 files = servezoneBaseDirectory.listFiles();
console.log(files);
});
tap.test('clean up directory style tests', async () => { tap.test('clean up directory style tests', async () => {
await myBucket.fastRemove('dir1/file1.txt'); await myBucket.fastRemove('dir1/file1.txt');
await myBucket.fastRemove('dir1/file2.txt'); await myBucket.fastRemove('dir1/file2.txt');
await myBucket.fastRemove('dir2/file1.txt'); await myBucket.fastRemove('dir2/file1.txt');
await myBucket.fastRemove('dir3/file1.txt'); await myBucket.fastRemove('dir3/file1.txt');
await myBucket.fastRemove('dir3/dir4/file1.txt');
await myBucket.fastRemove('file1.txt'); await myBucket.fastRemove('file1.txt');
}); });
tap.start(); tap.start();

View File

@ -1,6 +1,7 @@
import * as plugins from './smartbucket.plugins'; import * as plugins from './smartbucket.plugins';
import { SmartBucket } from './smartbucket.classes.smartbucket'; import { SmartBucket } from './smartbucket.classes.smartbucket';
import { Directory } from './smartbucket.classes.directory'; import { Directory } from './smartbucket.classes.directory';
import { Observable } from 'rxjs';
export class Bucket { export class Bucket {
public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string) { public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string) {
@ -10,7 +11,7 @@ export class Bucket {
}); });
if (foundBucket) { 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`); console.log(`Taking this as base for new Bucket instance`);
return new this(smartbucketRef, bucketNameArg); return new this(smartbucketRef, bucketNameArg);
} else { } else {
@ -42,7 +43,6 @@ export class Bucket {
return new Directory(this, null, ''); return new Directory(this, null, '');
} }
// =============== // ===============
// Fast Operations // Fast Operations
// =============== // ===============
@ -52,7 +52,9 @@ export class Bucket {
*/ */
public async fastStore(pathArg: string, fileContent: string) { public async fastStore(pathArg: string, fileContent: string) {
const streamIntake = new plugins.streamfunction.Intake(); 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.pushData(fileContent);
streamIntake.signalEnd(); streamIntake.signalEnd();
await putPromise; await putPromise;
@ -63,30 +65,54 @@ export class Bucket {
*/ */
public async fastGet(pathArg: string) { public async fastGet(pathArg: string) {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const fileStream = await this.smartbucketRef.minioClient.getObject(this.name, pathArg).catch(e => console.log(e)); let completeFile: Buffer;
let completeFile: string = ''; const replaySubject = await this.fastGetStream(pathArg);
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => { replaySubject.subscribe(
const chunkString = chunk.toString(); chunk => {
completeFile += chunkString; if (completeFile) {
return chunk; completeFile = Buffer.concat([completeFile, chunk]);
}, async (cb) => { }
},
err => {
console.log(err);
},
() => {
done.resolve(); done.resolve();
}
);
await done.promise;
return completeFile;
}
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));
const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<Buffer>();
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
async chunk => {
replaySubject.next(chunk);
return chunk;
},
async cb => {
console.log('stream ended');
replaySubject.complete();
return Buffer.from(''); return Buffer.from('');
}); }
);
if (!fileStream) { if (!fileStream) {
return null; return null;
} }
fileStream.pipe(duplexStream); fileStream.pipe(duplexStream);
await done.promise; return replaySubject;
return completeFile;
} }
/** /**
* removeObject * removeObject
*/ */
public async fastRemove (pathArg: string) { public async fastRemove(pathArg: string) {
await this.smartbucketRef.minioClient.removeObject(this.name, pathArg); await this.smartbucketRef.minioClient.removeObject(this.name, pathArg);
} }
} }

View File

@ -4,7 +4,7 @@ import { File } from './smartbucket.classes.file';
export class Directory { export class Directory {
public bucketRef: Bucket; public bucketRef: Bucket;
public parentDirectory: Directory; public parentDirectoryRef: Directory;
public name: string; public name: string;
public tree: string[]; public tree: string[];
@ -13,7 +13,7 @@ export class Directory {
constructor(bucketRefArg: Bucket, parentDiretory: Directory, name: string) { constructor(bucketRefArg: Bucket, parentDiretory: Directory, name: string) {
this.bucketRef = bucketRefArg; this.bucketRef = bucketRefArg;
this.parentDirectory = parentDiretory; this.parentDirectoryRef = parentDiretory;
this.name = name; this.name = name;
} }
@ -22,9 +22,9 @@ export class Directory {
*/ */
public getParentDirectories(): Directory[] { public getParentDirectories(): Directory[] {
let parentDirectories: Directory[] = []; let parentDirectories: Directory[] = [];
if (this.parentDirectory) { if (this.parentDirectoryRef) {
parentDirectories.push(this.parentDirectory); parentDirectories.push(this.parentDirectoryRef);
parentDirectories = parentDirectories.concat(this.parentDirectory.getParentDirectories()); parentDirectories = parentDirectories.concat(this.parentDirectoryRef.getParentDirectories());
} }
return parentDirectories; return parentDirectories;
} }
@ -34,7 +34,7 @@ export class Directory {
*/ */
public getDirectoryLevel(): number { public getDirectoryLevel(): number {
return this.getParentDirectories().length; return this.getParentDirectories().length;
}; }
/** /**
* updates the base path * updates the base path
@ -42,8 +42,12 @@ export class Directory {
public getBasePath(): string { public getBasePath(): string {
const parentDirectories = this.getParentDirectories(); const parentDirectories = this.getParentDirectories();
let basePath = ''; let basePath = '';
for(const parentDir of parentDirectories) { for (const parentDir of parentDirectories) {
basePath = parentDir.name + '/' + basePath; if (parentDir.name === '') {
basePath = this.name + '/';
continue;
}
basePath = parentDir.name + '/' + this.name;
} }
return basePath; return basePath;
} }
@ -55,14 +59,30 @@ export class Directory {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const fileNameStream = await this.bucketRef.smartbucketRef.minioClient.listObjectsV2( const fileNameStream = await this.bucketRef.smartbucketRef.minioClient.listObjectsV2(
this.bucketRef.name, this.bucketRef.name,
this.getBasePath() this.getBasePath(),
false
); );
const fileArray: File[] = []; const fileArray: File[] = [];
const duplexStream = plugins.streamfunction.createDuplexStream<string, void>(async fileName => { const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
fileArray.push(new File(this, fileName)); async bucketItem => {
}, async (tools) => { if (bucketItem.prefix) {
return;
}
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(); done.resolve();
}); }
);
fileNameStream.pipe(duplexStream); fileNameStream.pipe(duplexStream);
await done.promise; await done.promise;
return fileArray; return fileArray;
@ -73,25 +93,34 @@ export class Directory {
*/ */
public async listDirectories(): Promise<Directory[]> { public async listDirectories(): Promise<Directory[]> {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const basePath = this.getBasePath();
const completeDirStream = await this.bucketRef.smartbucketRef.minioClient.listObjectsV2( const completeDirStream = await this.bucketRef.smartbucketRef.minioClient.listObjectsV2(
this.bucketRef.name, this.bucketRef.name,
this.getBasePath(), this.getBasePath(),
true false
); );
const directoryArray: Directory[] = []; const directoryArray: Directory[] = [];
const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(async fileName => { const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
console.log(fileName); async bucketItem => {
const subtractedPath = fileName.name.replace(this.getBasePath(), ''); if (bucketItem.name) {
return;
}
let subtractedPath = bucketItem.prefix.replace(this.getBasePath(), '');
if (subtractedPath.startsWith('/')) {
subtractedPath = subtractedPath.substr(1);
}
if (subtractedPath.includes('/')) { if (subtractedPath.includes('/')) {
const dirName = fileName.name.split('/')[0]; const dirName = subtractedPath.split('/')[0];
if (directoryArray.find(directory => directory.name === dirName)) { if (directoryArray.find(directory => directory.name === dirName)) {
return; return;
} }
directoryArray.push(new Directory(this.bucketRef, this, dirName)); directoryArray.push(new Directory(this.bucketRef, this, dirName));
} }
}, async (tools) => { },
async tools => {
done.resolve(); done.resolve();
}); }
);
completeDirStream.pipe(duplexStream); completeDirStream.pipe(duplexStream);
await done.promise; await done.promise;
return directoryArray; return directoryArray;
@ -111,19 +140,30 @@ export class Directory {
/** /**
* gets a sub directory * gets a sub directory
*/ */
public async getSubDirectory(): Promise<Directory> { public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
return this; const dirNameArray = dirNameArg.split('/');
// TODO
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 * moves the directory
*/ */
public async move () { public async move() {
// TODO // TODO
} }
/** /**
* creates a file within this directory * creates a file within this directory
* @param relativePathArg * @param relativePathArg
@ -131,4 +171,27 @@ export class Directory {
public async createFile(relativePathArg) { public async createFile(relativePathArg) {
let completeFilePath: string = ''; 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 fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<Buffer>> {
const path = plugins.path.join(this.getBasePath(), pathArg);
const result = await this.bucketRef.fastGetStream(path);
return result;
}
public async fastRemove(pathArg: string) {
const path = plugins.path.join(this.getBasePath(), pathArg);
await this.bucketRef.fastRemove(path);
}
} }

View File

@ -14,11 +14,7 @@ export class File {
fileName: string, fileName: string,
fileContent: string fileContent: string
) { ) {
await this.createFileFromBuffer( await this.createFileFromBuffer(dirArg, fileName, Buffer.from(fileContent));
dirArg,
fileName,
Buffer.from(fileContent)
);
} }
public static async createFileFromBuffer( public static async createFileFromBuffer(
@ -37,13 +33,15 @@ export class File {
} }
// INSTANCE // INSTANCE
public directoryRef: Directory; public parentDirectoryRef: Directory;
public name: string;
public path: string; public path: string;
public metaData: IFileMetaData; public metaData: IFileMetaData;
constructor(directoryRefArg: Directory, fileName: string) { constructor(directoryRefArg: Directory, fileName: string) {
this.directoryRef = directoryRefArg; this.parentDirectoryRef = directoryRefArg;
this.name = fileName;
} }
public async getContentAsString() { public async getContentAsString() {
@ -53,15 +51,20 @@ export class File {
public async getContentAsBuffer() { public async getContentAsBuffer() {
const done = plugins.smartpromise.defer(); 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(''); let completeFile = new Buffer('');
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => { const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
async chunk => {
completeFile = Buffer.concat([chunk]); completeFile = Buffer.concat([chunk]);
return chunk; return chunk;
}, async (cb) => { },
async cb => {
done.resolve(); done.resolve();
return Buffer.from(''); return Buffer.from('');
}); }
);
if (!fileStream) { if (!fileStream) {
return null; return null;
@ -80,8 +83,11 @@ export class File {
/** /**
* removes this file * removes this file
*/ */
public async remove () { public async remove() {
await this.directoryRef.bucketRef.smartbucketRef.minioClient.removeObject(this.directoryRef.bucketRef.name, this.path); await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient.removeObject(
await this.directoryRef.listFiles(); this.parentDirectoryRef.bucketRef.name,
this.path
);
await this.parentDirectoryRef.listFiles();
} }
} }

View File

@ -1,19 +1,16 @@
// node native // node native
import * as path from 'path'; import * as path from 'path';
export { export { path };
path
};
import * as smartpath from '@pushrocks/smartpath'; import * as smartpath from '@pushrocks/smartpath';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
import * as smartrx from '@pushrocks/smartrx';
import * as streamfunction from '@pushrocks/streamfunction'; import * as streamfunction from '@pushrocks/streamfunction';
export { smartpath, smartpromise, streamfunction }; export { smartpath, smartpromise, smartrx, streamfunction };
// third party scope // third party scope
import * as minio from 'minio'; import * as minio from 'minio';
export { export { minio };
minio
};