Compare commits
36 Commits
Author | SHA1 | Date | |
---|---|---|---|
e8cc232fa1 | |||
89f48cea21 | |||
784e54f021 | |||
95065de1b5 | |||
ea9d0f58e9 | |||
9592ab863a | |||
b60ece389c | |||
121c71102a | |||
ec8f320317 | |||
cca3ade103 | |||
caedf37288 | |||
9255875d83 | |||
346269d399 | |||
4bb6e2ef51 | |||
0ec7e1d6c6 | |||
bac986ac85 | |||
476ff5bbce | |||
178c360b89 | |||
191e0b8e05 | |||
7d6bbd289d | |||
3f5461dfe0 | |||
78ec895a39 | |||
0b14904027 | |||
a8ce2f75b7 | |||
c383b75336 | |||
d5d3105a98 | |||
6b69edb3ef | |||
77e69171e2 | |||
365eea59bd | |||
1a64835510 | |||
b61a86f029 | |||
b9d082f07f | |||
4819dd0bc5 | |||
7250793f95 | |||
8fb5e89714 | |||
9dbd19d1a9 |
@ -12,6 +12,9 @@ stages:
|
|||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- npm install -g @shipzone/npmci
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
@ -19,23 +22,36 @@ mirror:
|
|||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci git mirror
|
- npmci git mirror
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
- 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
|
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 --ignore-scripts
|
- npmci command npm install --ignore-scripts
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
- 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:
|
tags:
|
||||||
- lossless
|
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
allow_failure: true
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# test stage
|
# test stage
|
||||||
@ -50,9 +66,7 @@ testStable:
|
|||||||
- npmci npm test
|
- npmci npm test
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
|
||||||
- docker
|
- docker
|
||||||
- priv
|
|
||||||
|
|
||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
@ -63,9 +77,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
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
stage: release
|
stage: release
|
||||||
@ -85,11 +97,12 @@ release:
|
|||||||
codequality:
|
codequality:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g typescript
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -2,28 +2,10 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "current file",
|
"command": "npm test",
|
||||||
"type": "node",
|
"name": "Run npm test",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"args": [
|
"type": "node-terminal"
|
||||||
"${relativeFile}"
|
|
||||||
],
|
|
||||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"internalConsoleOptions": "openOnSessionStart"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "test.ts",
|
|
||||||
"type": "node",
|
|
||||||
"request": "launch",
|
|
||||||
"args": [
|
|
||||||
"test/test.ts"
|
|
||||||
],
|
|
||||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"internalConsoleOptions": "openOnSessionStart"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@ -15,7 +15,7 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"projectType": {
|
"projectType": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": ["website", "element", "service", "npm"]
|
"enum": ["website", "element", "service", "npm", "wcc"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
"gitrepo": "smartbucket",
|
"gitrepo": "smartbucket",
|
||||||
"shortDescription": "simple cloud independent object storage",
|
"description": "simple cloud independent object storage",
|
||||||
"npmPackagename": "@pushrocks/smartbucket",
|
"npmPackagename": "@pushrocks/smartbucket",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
20227
package-lock.json
generated
20227
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
32
package.json
32
package.json
@ -1,31 +1,30 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartbucket",
|
"name": "@pushrocks/smartbucket",
|
||||||
"version": "1.0.27",
|
"version": "2.0.0",
|
||||||
"description": "simple cloud independent object storage",
|
"description": "simple cloud independent object storage",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
|
"type": "module",
|
||||||
"author": "Lossless GmbH",
|
"author": "Lossless GmbH",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/)",
|
"test": "(tstest test/)",
|
||||||
"format": "(gitzone format)",
|
"build": "(tsbuild --web)"
|
||||||
"build": "(tsbuild)"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.24",
|
"@gitzone/tsbuild": "^2.1.61",
|
||||||
"@gitzone/tstest": "^1.0.28",
|
"@gitzone/tstest": "^1.0.70",
|
||||||
"@pushrocks/tapbundle": "^3.2.1",
|
"@pushrocks/tapbundle": "^5.0.3"
|
||||||
"tslint": "^6.1.2",
|
|
||||||
"tslint-config-prettier": "^1.18.0"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/qenv": "^4.0.6",
|
"@pushrocks/qenv": "^4.0.10",
|
||||||
"@pushrocks/smartpath": "^4.0.3",
|
"@pushrocks/smartpath": "^5.0.5",
|
||||||
"@pushrocks/smartpromise": "^3.0.6",
|
"@pushrocks/smartpromise": "^3.1.7",
|
||||||
"@pushrocks/smartrx": "^2.0.5",
|
"@pushrocks/smartrx": "^2.0.25",
|
||||||
"@pushrocks/streamfunction": "^1.0.24",
|
"@pushrocks/smartstream": "^2.0.1",
|
||||||
"@types/minio": "^7.0.5",
|
"@pushrocks/streamfunction": "^3.0.4",
|
||||||
"minio": "7.0.12"
|
"@types/minio": "^7.0.12",
|
||||||
|
"minio": "^7.0.26"
|
||||||
},
|
},
|
||||||
"private": false,
|
"private": false,
|
||||||
"files": [
|
"files": [
|
||||||
@ -39,5 +38,8 @@
|
|||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
|
],
|
||||||
|
"browserslist": [
|
||||||
|
"last 1 chrome versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
22
readme.md
22
readme.md
@ -8,16 +8,24 @@ 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
|
||||||
[](https://gitlab.com/pushrocks/smartbucket/commits/master)
|
|
||||||
[](https://gitlab.com/pushrocks/smartbucket/commits/master)
|
Status Category | Status Badge
|
||||||
[](https://www.npmjs.com/package/@pushrocks/smartbucket)
|
-- | --
|
||||||
[](https://snyk.io/test/npm/@pushrocks/smartbucket)
|
GitLab Pipelines | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
npm | [](https://lossless.cloud)
|
||||||
[](https://prettier.io/)
|
Snyk | [](https://lossless.cloud)
|
||||||
|
TypeScript Support | [](https://lossless.cloud)
|
||||||
|
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
|
Code Style | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
|
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
|
Use TypeScript for best in class intellisense.
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
|
|
||||||
|
20
test/test.ts
20
test/test.ts
@ -1,7 +1,7 @@
|
|||||||
import { expect, tap } from '@pushrocks/tapbundle';
|
import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
|
||||||
import { Qenv } from '@pushrocks/qenv';
|
import { Qenv } from '@pushrocks/qenv';
|
||||||
|
|
||||||
import * as smartbucket from '../ts/index';
|
import * as smartbucket from '../ts/index.js';
|
||||||
|
|
||||||
const testQenv = new Qenv('./', './.nogit/');
|
const testQenv = new Qenv('./', './.nogit/');
|
||||||
|
|
||||||
@ -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: 'fra1.digitaloceanspaces.com'
|
endpoint: 's3.eu-central-1.wasabisys.com',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.skip.test('should create testbucket', async () => {
|
tap.skip.test('should create testbucket', async () => {
|
||||||
await testSmartbucket.createBucket('testzone');
|
// await testSmartbucket.createBucket('testzone');
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.skip.test('should remove testbucket', async () => {
|
tap.skip.test('should remove testbucket', async () => {
|
||||||
await testSmartbucket.removeBucket('testzone');
|
// await testSmartbucket.removeBucket('testzone');
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should get a bucket', async () => {
|
tap.test('should get a bucket', async () => {
|
||||||
myBucket = await testSmartbucket.getBucketByName('testzone');
|
myBucket = await testSmartbucket.getBucketByName('testzone');
|
||||||
expect(myBucket).to.be.instanceOf(smartbucket.Bucket);
|
expect(myBucket).toBeInstanceOf(smartbucket.Bucket);
|
||||||
expect(myBucket.name).to.equal('testzone');
|
expect(myBucket.name).toEqual('testzone');
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fast operations
|
// Fast operations
|
||||||
@ -62,16 +62,16 @@ tap.test('should get base directory', async () => {
|
|||||||
const directories = await baseDirectory.listDirectories();
|
const directories = await baseDirectory.listDirectories();
|
||||||
console.log('Found the following directories:');
|
console.log('Found the following directories:');
|
||||||
console.log(directories);
|
console.log(directories);
|
||||||
expect(directories.length).to.equal(3);
|
expect(directories.length).toEqual(3);
|
||||||
const files = await baseDirectory.listFiles();
|
const files = await baseDirectory.listFiles();
|
||||||
console.log('Found the following files:');
|
console.log('Found the following files:');
|
||||||
console.log(files);
|
console.log(files);
|
||||||
expect(files.length).to.equal(1);
|
expect(files.length).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should correctly build paths for sub directories', async () => {
|
tap.test('should correctly build paths for sub directories', async () => {
|
||||||
const dir4 = await baseDirectory.getSubDirectoryByName('dir3/dir4');
|
const dir4 = await baseDirectory.getSubDirectoryByName('dir3/dir4');
|
||||||
expect(dir4).to.be.instanceOf(smartbucket.Directory);
|
expect(dir4).toBeInstanceOf(smartbucket.Directory);
|
||||||
const dir4BasePath = dir4.getBasePath();
|
const dir4BasePath = dir4.getBasePath();
|
||||||
console.log(dir4BasePath);
|
console.log(dir4BasePath);
|
||||||
});
|
});
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
export * from './smartbucket.classes.smartbucket';
|
export * from './smartbucket.classes.smartbucket.js';
|
||||||
export * from './smartbucket.classes.bucket';
|
export * from './smartbucket.classes.bucket.js';
|
||||||
export * from './smartbucket.classes.directory';
|
export * from './smartbucket.classes.directory.js';
|
||||||
export * from './smartbucket.classes.file';
|
export * from './smartbucket.classes.file.js';
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
import * as plugins from './smartbucket.plugins';
|
import * as plugins from './smartbucket.plugins.js';
|
||||||
import { SmartBucket } from './smartbucket.classes.smartbucket';
|
import { SmartBucket } from './smartbucket.classes.smartbucket.js';
|
||||||
import { Directory } from './smartbucket.classes.directory';
|
import { Directory } from './smartbucket.classes.directory.js';
|
||||||
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) {
|
||||||
const buckets = await smartbucketRef.minioClient.listBuckets();
|
const buckets = await smartbucketRef.minioClient.listBuckets();
|
||||||
const foundBucket = buckets.find(bucket => {
|
const foundBucket = buckets.find((bucket) => {
|
||||||
return bucket.name === bucketNameArg;
|
return bucket.name === bucketNameArg;
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -20,12 +19,12 @@ export class Bucket {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static async createBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
|
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);
|
return new Bucket(smartbucketRef, bucketName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async removeBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
|
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;
|
public smartbucketRef: SmartBucket;
|
||||||
@ -50,11 +49,11 @@ export class Bucket {
|
|||||||
/**
|
/**
|
||||||
* store file
|
* 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 streamIntake = new plugins.streamfunction.Intake();
|
||||||
const putPromise = this.smartbucketRef.minioClient
|
const putPromise = this.smartbucketRef.minioClient
|
||||||
.putObject(this.name, pathArg, streamIntake.getReadable())
|
.putObject(this.name, pathArg, streamIntake.getReadable())
|
||||||
.catch(e => console.log(e));
|
.catch((e) => console.log(e));
|
||||||
streamIntake.pushData(fileContent);
|
streamIntake.pushData(fileContent);
|
||||||
streamIntake.signalEnd();
|
streamIntake.signalEnd();
|
||||||
await putPromise;
|
await putPromise;
|
||||||
@ -63,38 +62,41 @@ export class Bucket {
|
|||||||
/**
|
/**
|
||||||
* get file
|
* get file
|
||||||
*/
|
*/
|
||||||
public async fastGet(pathArg: string) {
|
public async fastGet(pathArg: string): Promise<Buffer> {
|
||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
let completeFile: string = '';
|
let completeFile: Buffer;
|
||||||
const replaySubject = await this.fastGetStream(pathArg);
|
const replaySubject = await this.fastGetStream(pathArg);
|
||||||
replaySubject.subscribe(
|
const subscription = replaySubject.subscribe(
|
||||||
chunkString => {
|
(chunk) => {
|
||||||
completeFile += chunkString;
|
if (completeFile) {
|
||||||
|
completeFile = Buffer.concat([completeFile, chunk]);
|
||||||
|
} else {
|
||||||
|
completeFile = chunk;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
err => {
|
(err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
done.resolve();
|
done.resolve();
|
||||||
|
subscription.unsubscribe();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
await done.promise;
|
await done.promise;
|
||||||
return completeFile;
|
return completeFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<string>> {
|
public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<Buffer>> {
|
||||||
const fileStream = await this.smartbucketRef.minioClient
|
const fileStream = await this.smartbucketRef.minioClient
|
||||||
.getObject(this.name, pathArg)
|
.getObject(this.name, pathArg)
|
||||||
.catch(e => console.log(e));
|
.catch((e) => console.log(e));
|
||||||
const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<string>();
|
const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<Buffer>();
|
||||||
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
|
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
|
||||||
async chunk => {
|
async (chunk) => {
|
||||||
const chunkString = chunk.toString();
|
replaySubject.next(chunk);
|
||||||
replaySubject.next(chunkString);
|
|
||||||
return chunk;
|
return chunk;
|
||||||
},
|
},
|
||||||
async cb => {
|
async (cb) => {
|
||||||
console.log('stream ended');
|
|
||||||
replaySubject.complete();
|
replaySubject.complete();
|
||||||
return Buffer.from('');
|
return Buffer.from('');
|
||||||
}
|
}
|
||||||
@ -104,7 +106,12 @@ export class Bucket {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
fileStream.pipe(duplexStream);
|
const smartstream = new plugins.smartstream.Smartstream([
|
||||||
|
fileStream,
|
||||||
|
duplexStream,
|
||||||
|
plugins.smartstream.cleanPipe(),
|
||||||
|
]);
|
||||||
|
smartstream.run();
|
||||||
return replaySubject;
|
return replaySubject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import * as plugins from './smartbucket.plugins';
|
import * as plugins from './smartbucket.plugins.js';
|
||||||
import { Bucket } from './smartbucket.classes.bucket';
|
import { Bucket } from './smartbucket.classes.bucket.js';
|
||||||
import { File } from './smartbucket.classes.file';
|
import { File } from './smartbucket.classes.file.js';
|
||||||
|
|
||||||
export class Directory {
|
export class Directory {
|
||||||
public bucketRef: Bucket;
|
public bucketRef: Bucket;
|
||||||
@ -43,11 +43,18 @@ export class Directory {
|
|||||||
const parentDirectories = this.getParentDirectories();
|
const parentDirectories = this.getParentDirectories();
|
||||||
let basePath = '';
|
let basePath = '';
|
||||||
for (const parentDir of parentDirectories) {
|
for (const parentDir of parentDirectories) {
|
||||||
if (parentDir.name === '') {
|
if (!parentDir.name && !basePath) {
|
||||||
basePath = this.name;
|
basePath = this.name + '/';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (parentDir.name && !basePath) {
|
||||||
|
basePath = parentDir.name + '/' + this.name + '/';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (parentDir.name && basePath) {
|
||||||
|
basePath = parentDir.name + '/' + basePath;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
basePath = parentDir.name + '/' + this.name;
|
|
||||||
}
|
}
|
||||||
return basePath;
|
return basePath;
|
||||||
}
|
}
|
||||||
@ -59,11 +66,15 @@ 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<plugins.minio.BucketItem, void>(
|
const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
|
||||||
async bucketItem => {
|
async (bucketItem) => {
|
||||||
|
if (bucketItem.prefix) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!bucketItem.name) {
|
if (!bucketItem.name) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -75,7 +86,7 @@ export class Directory {
|
|||||||
fileArray.push(new File(this, subtractedPath));
|
fileArray.push(new File(this, subtractedPath));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async tools => {
|
async (tools) => {
|
||||||
done.resolve();
|
done.resolve();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -89,27 +100,31 @@ 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>(
|
const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
|
||||||
async bucketItem => {
|
async (bucketItem) => {
|
||||||
let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
|
if (bucketItem.name) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let subtractedPath = bucketItem.prefix.replace(this.getBasePath(), '');
|
||||||
if (subtractedPath.startsWith('/')) {
|
if (subtractedPath.startsWith('/')) {
|
||||||
subtractedPath = subtractedPath.substr(1);
|
subtractedPath = subtractedPath.substr(1);
|
||||||
}
|
}
|
||||||
if (subtractedPath.includes('/')) {
|
if (subtractedPath.includes('/')) {
|
||||||
const dirName = subtractedPath.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();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -137,7 +152,7 @@ export class Directory {
|
|||||||
|
|
||||||
const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
|
const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
|
||||||
const directories = await directoryArg.listDirectories();
|
const directories = await directoryArg.listDirectories();
|
||||||
return directories.find(directory => {
|
return directories.find((directory) => {
|
||||||
return directory.name === dirNameToSearch;
|
return directory.name === dirNameToSearch;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@ -154,18 +169,19 @@ export class Directory {
|
|||||||
*/
|
*/
|
||||||
public async move() {
|
public async move() {
|
||||||
// TODO
|
// TODO
|
||||||
|
throw new Error('moving a directory is not yet implemented');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a file within this directory
|
* creates a file within this directory
|
||||||
* @param relativePathArg
|
* @param relativePathArg
|
||||||
*/
|
*/
|
||||||
public async createFile(relativePathArg) {
|
public async createEmptyFile(relativePathArg: string) {
|
||||||
let completeFilePath: string = '';
|
const emtpyFile = await File.createFileFromString(this, relativePathArg, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
// file operations
|
// 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);
|
const path = plugins.path.join(this.getBasePath(), pathArg);
|
||||||
await this.bucketRef.fastStore(path, contentArg);
|
await this.bucketRef.fastStore(path, contentArg);
|
||||||
}
|
}
|
||||||
@ -176,7 +192,7 @@ export class Directory {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<string>> {
|
public async fastGetStream(pathArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<Buffer>> {
|
||||||
const path = plugins.path.join(this.getBasePath(), pathArg);
|
const path = plugins.path.join(this.getBasePath(), pathArg);
|
||||||
const result = await this.bucketRef.fastGetStream(path);
|
const result = await this.bucketRef.fastGetStream(path);
|
||||||
return result;
|
return result;
|
||||||
@ -186,4 +202,25 @@ export class Directory {
|
|||||||
const path = plugins.path.join(this.getBasePath(), pathArg);
|
const path = plugins.path.join(this.getBasePath(), pathArg);
|
||||||
await this.bucketRef.fastRemove(path);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './smartbucket.plugins';
|
import * as plugins from './smartbucket.plugins.js';
|
||||||
import { Directory } from './smartbucket.classes.directory';
|
import { Directory } from './smartbucket.classes.directory.js';
|
||||||
|
|
||||||
export interface IFileMetaData {
|
export interface IFileMetaData {
|
||||||
name: string;
|
name: string;
|
||||||
@ -26,7 +26,7 @@ export class File {
|
|||||||
const streamIntake = new plugins.streamfunction.Intake();
|
const streamIntake = new plugins.streamfunction.Intake();
|
||||||
const putPromise = directoryRef.bucketRef.smartbucketRef.minioClient
|
const putPromise = directoryRef.bucketRef.smartbucketRef.minioClient
|
||||||
.putObject(this.name, filePath, streamIntake.getReadable())
|
.putObject(this.name, filePath, streamIntake.getReadable())
|
||||||
.catch(e => console.log(e));
|
.catch((e) => console.log(e));
|
||||||
streamIntake.pushData(fileContent);
|
streamIntake.pushData(fileContent);
|
||||||
streamIntake.signalEnd();
|
streamIntake.signalEnd();
|
||||||
await putPromise;
|
await putPromise;
|
||||||
@ -53,14 +53,14 @@ export class File {
|
|||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
const fileStream = await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient
|
const fileStream = await this.parentDirectoryRef.bucketRef.smartbucketRef.minioClient
|
||||||
.getObject(this.parentDirectoryRef.bucketRef.name, this.path)
|
.getObject(this.parentDirectoryRef.bucketRef.name, this.path)
|
||||||
.catch(e => console.log(e));
|
.catch((e) => console.log(e));
|
||||||
let completeFile = new Buffer('');
|
let completeFile = new Buffer('');
|
||||||
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
|
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
|
||||||
async chunk => {
|
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('');
|
||||||
}
|
}
|
||||||
@ -76,8 +76,8 @@ export class File {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async streamContent() {
|
public async streamContent() {
|
||||||
throw new Error('not yet implemented');
|
|
||||||
// TODO
|
// TODO
|
||||||
|
throw new Error('not yet implemented');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import * as plugins from './smartbucket.plugins';
|
import * as plugins from './smartbucket.plugins.js';
|
||||||
import { Bucket } from './smartbucket.classes.bucket';
|
import { Bucket } from './smartbucket.classes.bucket.js';
|
||||||
|
|
||||||
export interface ISmartBucketConfig {
|
export interface ISmartBucketConfig {
|
||||||
endpoint: string;
|
endpoint: string;
|
||||||
|
port?: number;
|
||||||
|
useSsl?: boolean;
|
||||||
accessKey: string;
|
accessKey: string;
|
||||||
accessSecret: string;
|
accessSecret: string;
|
||||||
}
|
}
|
||||||
@ -19,10 +21,10 @@ export class SmartBucket {
|
|||||||
this.config = configArg;
|
this.config = configArg;
|
||||||
this.minioClient = new plugins.minio.Client({
|
this.minioClient = new plugins.minio.Client({
|
||||||
endPoint: this.config.endpoint,
|
endPoint: this.config.endpoint,
|
||||||
port: 443,
|
port: configArg.port || 443,
|
||||||
useSSL: true,
|
useSSL: configArg.useSsl !== undefined ? configArg.useSsl : true,
|
||||||
accessKey: this.config.accessKey,
|
accessKey: this.config.accessKey,
|
||||||
secretKey: this.config.accessSecret
|
secretKey: this.config.accessSecret,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,8 +7,9 @@ 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 smartrx from '@pushrocks/smartrx';
|
||||||
import * as streamfunction from '@pushrocks/streamfunction';
|
import * as streamfunction from '@pushrocks/streamfunction';
|
||||||
|
import * as smartstream from '@pushrocks/smartstream';
|
||||||
|
|
||||||
export { smartpath, smartpromise, smartrx, streamfunction };
|
export { smartpath, smartpromise, smartrx, streamfunction, smartstream };
|
||||||
|
|
||||||
// third party scope
|
// third party scope
|
||||||
import * as minio from 'minio';
|
import * as minio from 'minio';
|
||||||
|
9
tsconfig.json
Normal file
9
tsconfig.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"useDefineForClassFields": false,
|
||||||
|
"target": "ES2022",
|
||||||
|
"module": "ES2022",
|
||||||
|
"moduleResolution": "nodenext"
|
||||||
|
}
|
||||||
|
}
|
17
tslint.json
17
tslint.json
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
|
||||||
"rules": {
|
|
||||||
"semicolon": [true, "always"],
|
|
||||||
"no-console": false,
|
|
||||||
"ordered-imports": false,
|
|
||||||
"object-literal-sort-keys": false,
|
|
||||||
"member-ordering": {
|
|
||||||
"options":{
|
|
||||||
"order": [
|
|
||||||
"static-method"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultSeverity": "warning"
|
|
||||||
}
|
|
Reference in New Issue
Block a user