fix(core): update

This commit is contained in:
Philipp Kunz 2019-07-04 16:56:37 +02:00
parent 85c9a9381a
commit 4d3b6ff3c9
10 changed files with 735 additions and 332 deletions

24
.gitignore vendored
View File

@ -1,4 +1,22 @@
node_modules/
docs/
coverage/
.nogit/ .nogit/
# artifacts
coverage/
public/
pages/
# installs
node_modules/
# caches
.yarn/
.cache/
.rpt2_cache
# builds
dist/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -1,5 +1,5 @@
# gitzone standard # gitzone ci_default
image: hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache: cache:
paths: paths:
@ -34,31 +34,6 @@ snyk:
- docker - docker
- notpriv - notpriv
sast:
stage: security
image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
variables:
DOCKER_DRIVER: overlay2
allow_failure: true
services:
- docker:stable-dind
script:
- npmci npm prepare
- npmci npm install
- npmci command npm run build
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
--volume "$PWD:/code"
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
artifacts:
reports:
sast: gl-sast-report.json
tags:
- docker
- priv
# ==================== # ====================
# test stage # test stage
# ==================== # ====================
@ -75,22 +50,10 @@ testLTS:
- docker - docker
- notpriv - notpriv
testSTABLE:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
release: release:
stage: release stage: release
script: script:
- npmci node install stable - npmci node install lts
- npmci npm publish - npmci npm publish
only: only:
- tags - tags
@ -103,19 +66,11 @@ release:
# ==================== # ====================
codequality: codequality:
stage: metadata stage: metadata
image: docker:stable
allow_failure: true allow_failure: true
services:
- docker:stable-dind
script: script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - npmci command npm install -g tslint typescript
- docker run - npmci npm install
--env SOURCE_CODE="$PWD" - npmci command "tslint -c tslint.json ./ts/**/*.ts"
--volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
artifacts:
paths: [codeclimate.json]
tags: tags:
- docker - docker
- priv - priv
@ -134,10 +89,10 @@ pages:
image: hosttoday/ht-docker-node:npmci image: hosttoday/ht-docker-node:npmci
stage: metadata stage: metadata
script: script:
- npmci command npm install -g typedoc typescript - npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ - npmci command tsdoc
tags: tags:
- docker - docker
- notpriv - notpriv

View File

@ -1,5 +1,5 @@
# @pushrocks/smarthash # @pushrocks/smarthash
simplified access to node hash functions simplifies access to node hash functions
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smarthash) * [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smarthash)
@ -14,7 +14,7 @@ simplified access to node hash functions
[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smarthash/badge.svg)](https://snyk.io/test/npm/@pushrocks/smarthash) [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smarthash/badge.svg)](https://snyk.io/test/npm/@pushrocks/smarthash)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
## Usage ## Usage

826
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -29,15 +29,28 @@
}, },
"homepage": "https://github.com/pushrocks/nodehash#readme", "homepage": "https://github.com/pushrocks/nodehash#readme",
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.8", "@gitzone/tsbuild": "^2.1.11",
"@gitzone/tsrun": "^1.1.17", "@gitzone/tsrun": "^1.2.6",
"@gitzone/tstest": "^1.0.18", "@gitzone/tstest": "^1.0.24",
"@pushrocks/tapbundle": "^3.0.7", "@pushrocks/tapbundle": "^3.0.11",
"@types/node": "^10.12.19" "@types/node": "^12.0.12",
"tslint": "^5.18.0",
"tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartpromise": "^2.0.5", "@pushrocks/smartjson": "^3.0.3",
"@pushrocks/smartpromise": "^3.0.2",
"@types/through2": "^2.0.34", "@types/through2": "^2.0.34",
"through2": "^3.0.0" "through2": "^3.0.1"
} },
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
} }

View File

@ -1,31 +1,50 @@
import { tap, expect } from '@pushrocks/tapbundle'; import { tap, expect } from '@pushrocks/tapbundle';
import fs = require('fs'); import fs = require('fs');
import * as nodehash from '../ts/index'; import * as smarthash from '../ts/index';
tap.test('sha256FromStringSync should convert a String to sha256 hash synchronously', async () => { tap.test('sha256FromStringSync should convert a String to sha256 hash synchronously', async () => {
let testHash = nodehash.sha256FromStringSync('test'); const testHash = smarthash.sha256FromStringSync('test');
let testHash2 = nodehash.sha256FromStringSync('testString'); const testHash2 = smarthash.sha256FromStringSync('testString');
let testHash3 = nodehash.sha256FromStringSync('test'); const testHash3 = smarthash.sha256FromStringSync('test');
expect(testHash).to.equal(testHash3); expect(testHash).to.equal(testHash3);
expect(testHash).to.not.equal('test'); expect(testHash).to.not.equal('test');
}); });
tap.test('sha256fromStringSync should convert a String to sha256 hash synchronously', async () => { tap.test('sha256fromStringSync should convert a String to sha256 hash synchronously', async () => {
const resultString = await nodehash.sha256FromString('test'); const resultString = await smarthash.sha256FromString('test');
let compareString = nodehash.sha256FromStringSync('test'); const compareString = smarthash.sha256FromStringSync('test');
expect(resultString).to.equal(compareString); expect(resultString).to.equal(compareString);
}); });
tap.test('sha256fromStream should convert a Stream to sha256', async tools => { tap.test('sha256fromStream should convert a Stream to sha256', async tools => {
let readStream = fs.createReadStream('./test/testImageForHash.jpg'); const readStream = fs.createReadStream('./test/testImageForHash.jpg');
const resultString: string = await nodehash.sha256FromStream(readStream); const resultString: string = await smarthash.sha256FromStream(readStream);
expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c'); expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
}); });
tap.test('sha256fromFile should convert a Stream to sha256', async () => { tap.test('sha256fromFile should convert a Stream to sha256', async () => {
const resultString = await nodehash.sha256FromFile('./test/testImageForHash.jpg'); const resultString = await smarthash.sha256FromFile('./test/testImageForHash.jpg');
expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c'); expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
}); });
tap.test('should produce reproducible hash from Object', async () => {
const hash1 = await smarthash.sha265FromObject({
'hithere': 1,
'wow': 'two'
});
const hash2 = await smarthash.sha265FromObject({
'wow': 'two',
'hithere': 1,
});
const hash3 = await smarthash.sha265FromObject({
'wow': 'twoe',
'hithere': 1,
});
expect(hash1).to.equal(hash2);
expect(hash1).to.not.equal(hash3);
});
tap.start(); tap.start();

View File

@ -1,12 +1,12 @@
import * as plugins from './nodehash.plugins'; import * as plugins from './nodehash.plugins';
export let hashStreamPipeStop = resolveFuntion => { export const hashStreamPipeStop = resolveFuntion => {
let forEach = (chunk: Buffer, enc, cb) => { const forEach = (chunk: Buffer, enc, cb) => {
resolveFuntion(chunk.toString('utf8')); resolveFuntion(chunk.toString('utf8'));
cb(null, chunk); cb(null, chunk);
}; };
let atEnd = cb => { const atEnd = cb => {
cb(); cb();
}; };

View File

@ -1,6 +1,28 @@
export import crypto = require('crypto'); // node native scope
export import fs = require('fs'); import crypto from 'crypto';
export import path = require('path'); import * as fs from 'fs';
export import q = require('@pushrocks/smartpromise'); import * as path from 'path';
export import stream = require('stream'); import * as stream from 'stream';
export import through2 = require('through2');
export {
crypto,
fs,
path,
stream
};
// pushrocks scope
import * as smartpromise from '@pushrocks/smartpromise';
import * as smartjson from '@pushrocks/smartjson';
export {
smartpromise,
smartjson
};
// thirdparty scope
import through2 from 'through2';
export {
through2
};

View File

@ -4,11 +4,11 @@ import * as helpers from './nodehash.helpers';
/** /**
* creates sha256 Hash from Stream * creates sha256 Hash from Stream
*/ */
export let sha256FromStream = (input): Promise<string> => { export const sha256FromStream = (input: plugins.stream.Stream): Promise<string> => {
let done = plugins.q.defer<string>(); const done = plugins.smartpromise.defer<string>();
let hash = plugins.crypto.createHash('sha256'); const hash = plugins.crypto.createHash('sha256');
hash['setEncoding']('hex'); hash.setEncoding('hex');
input.pipe(hash).pipe(helpers.hashStreamPipeStop(done.resolve)); input.pipe(hash).pipe(helpers.hashStreamPipeStop(done.resolve));
return done.promise; return done.promise;
}; };
@ -16,21 +16,18 @@ export let sha256FromStream = (input): Promise<string> => {
/** /**
* creates sha256 Hash from File; * creates sha256 Hash from File;
*/ */
export let sha256FromFile = (filePath: string) => { export const sha256FromFile = async (filePath: string): Promise<string> => {
let done = plugins.q.defer(); const absolutePath = plugins.path.resolve(filePath);
let absolutePath = plugins.path.resolve(filePath); const readableStream = plugins.fs.createReadStream(absolutePath);
let readableStream = plugins.fs.createReadStream(absolutePath); const hashResult = sha256FromStream(readableStream);
sha256FromStream(readableStream).then(resultHashString => { return hashResult;
done.resolve(resultHashString);
});
return done.promise;
}; };
/** /**
* Computes sha256 Hash from String synchronously * Computes sha256 Hash from String synchronously
*/ */
export let sha256FromStringSync = stringArg => { export let sha256FromStringSync = (stringArg): string => {
let hash = plugins.crypto.createHash('sha256'); const hash = plugins.crypto.createHash('sha256');
hash.update(stringArg); hash.update(stringArg);
return hash.digest('hex'); return hash.digest('hex');
}; };
@ -38,11 +35,18 @@ export let sha256FromStringSync = stringArg => {
/** /**
* Computes sha256 Hash from String * Computes sha256 Hash from String
*/ */
export let sha256FromString = stringArg => { export const sha256FromString = async(stringArg: string): Promise<string> => {
let done = plugins.q.defer(); const hash = plugins.crypto.createHash('sha256');
let hash = plugins.crypto.createHash('sha256');
hash.update(stringArg); hash.update(stringArg);
let hashResult = hash.digest('hex'); const hashResult = hash.digest('hex');
done.resolve(hashResult); return hashResult;
return done.promise; };
/**
* computes sha265 Hash from Object
*/
export const sha265FromObject = async (objectArg: any): Promise<string> => {
const stringifiedObject = plugins.smartjson.Smartjson.stringify(objectArg, {});
const hashResult = await sha256FromString(stringifiedObject);
return hashResult;
}; };