From c383b753369e9a6210aeaf459b6c39c6a8193ef6 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 12 Oct 2020 00:37:50 +0000 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 26 ++++++++++++++++++-------- .vscode/settings.json | 2 +- package.json | 5 ++++- test/test.ts | 6 ++++-- ts/smartbucket.classes.bucket.ts | 18 +++++++++--------- ts/smartbucket.classes.directory.ts | 12 ++++++------ ts/smartbucket.classes.file.ts | 8 ++++---- ts/smartbucket.classes.smartbucket.ts | 2 +- 8 files changed, 47 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ebc8b5..9a4467e 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.vscode/settings.json b/.vscode/settings.json index 01d2b8d..3648eaa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,7 +15,7 @@ "properties": { "projectType": { "type": "string", - "enum": ["website", "element", "service", "npm"] + "enum": ["website", "element", "service", "npm", "wcc"] } } } diff --git a/package.json b/package.json index f4954db..3724334 100644 --- a/package.json +++ b/package.json @@ -39,5 +39,8 @@ "cli.js", "npmextra.json", "readme.md" + ], + "browserslist": [ + "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index d0c4450..b1160c4 100644 --- a/test/test.ts +++ b/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); diff --git a/ts/smartbucket.classes.bucket.ts b/ts/smartbucket.classes.bucket.ts index 655939a..9673d10 100644 --- a/ts/smartbucket.classes.bucket.ts +++ b/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,14 +87,14 @@ export class Bucket { public async fastGetStream(pathArg: string): Promise> { 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(); const duplexStream = plugins.streamfunction.createDuplexStream( - async chunk => { + async (chunk) => { replaySubject.next(chunk); return chunk; }, - async cb => { + async (cb) => { console.log('stream ended'); replaySubject.complete(); return Buffer.from(''); diff --git a/ts/smartbucket.classes.directory.ts b/ts/smartbucket.classes.directory.ts index b7669a6..74e59f5 100644 --- a/ts/smartbucket.classes.directory.ts +++ b/ts/smartbucket.classes.directory.ts @@ -72,7 +72,7 @@ export class Directory { ); const fileArray: File[] = []; const duplexStream = plugins.streamfunction.createDuplexStream( - async bucketItem => { + async (bucketItem) => { if (bucketItem.prefix) { return; } @@ -87,7 +87,7 @@ export class Directory { fileArray.push(new File(this, subtractedPath)); } }, - async tools => { + async (tools) => { done.resolve(); } ); @@ -109,7 +109,7 @@ export class Directory { ); const directoryArray: Directory[] = []; const duplexStream = plugins.streamfunction.createDuplexStream( - async bucketItem => { + async (bucketItem) => { if (bucketItem.name) { return; } @@ -119,13 +119,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 +153,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; }); }; diff --git a/ts/smartbucket.classes.file.ts b/ts/smartbucket.classes.file.ts index 7142e0a..5e670e7 100644 --- a/ts/smartbucket.classes.file.ts +++ b/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( - async chunk => { + async (chunk) => { completeFile = Buffer.concat([chunk]); return chunk; }, - async cb => { + async (cb) => { done.resolve(); return Buffer.from(''); } diff --git a/ts/smartbucket.classes.smartbucket.ts b/ts/smartbucket.classes.smartbucket.ts index efa0d88..c892f78 100644 --- a/ts/smartbucket.classes.smartbucket.ts +++ b/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, }); }