fix(core): update

This commit is contained in:
Philipp Kunz 2020-10-09 10:14:45 +00:00
parent 547b151ee2
commit 0b53be66f2
7 changed files with 1353 additions and 1079 deletions

View File

@ -19,23 +19,35 @@ 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
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 +62,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 +73,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,6 +93,8 @@ 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 tslint typescript
- npmci npm prepare - npmci npm prepare

View File

@ -15,7 +15,7 @@
"properties": { "properties": {
"projectType": { "projectType": {
"type": "string", "type": "string",
"enum": ["website", "element", "service", "npm"] "enum": ["website", "element", "service", "npm", "wcc"]
} }
} }
} }

2340
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,20 +13,20 @@
"format": "(gitzone format)" "format": "(gitzone format)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.24", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tsbundle": "^1.0.72", "@gitzone/tsbundle": "^1.0.78",
"@gitzone/tstest": "^1.0.38", "@gitzone/tstest": "^1.0.52",
"@pushrocks/smartexpress": "^3.0.73", "@pushrocks/smartexpress": "^3.0.76",
"@pushrocks/tapbundle": "^3.2.7", "@pushrocks/tapbundle": "^3.2.9",
"@types/node": "^14.0.19", "@types/node": "^14.11.8",
"tslint": "^6.1.2", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.9", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartenv": "^4.0.10", "@pushrocks/smartenv": "^4.0.15",
"@pushrocks/smartjson": "^4.0.5", "@pushrocks/smartjson": "^4.0.5",
"node-fetch": "^2.6.0" "node-fetch": "^2.6.1"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

View File

@ -1,15 +1,15 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as webrequest from '../ts/index'; import * as webrequest from '../ts/index';
tap.test('first test', async tools => { tap.test('first test', async (tools) => {
const done = tools.defer(); const done = tools.defer();
const response = await new webrequest.WebRequest().request([ const response = await new webrequest.WebRequest()
'https://lossless.com' .request(['https://lossless.com'], {
], { method: 'GET',
method: 'GET' })
}).catch(e => { .catch((e) => {
done.resolve(); done.resolve();
}); });
await done.promise; await done.promise;
}); });

View File

@ -10,7 +10,7 @@ tap.test('setup test server', async () => {
testServer = new smartexpress.Server({ testServer = new smartexpress.Server({
cors: false, cors: false,
forceSsl: false, forceSsl: false,
port: 2345 port: 2345,
}); });
testServer.addRoute( testServer.addRoute(
@ -34,7 +34,7 @@ tap.test('setup test server', async () => {
new smartexpress.Handler('GET', (req, res) => { new smartexpress.Handler('GET', (req, res) => {
res.status(200); res.status(200);
res.send({ res.send({
hithere: 'hi' hithere: 'hi',
}); });
}) })
); );
@ -42,12 +42,12 @@ tap.test('setup test server', async () => {
await testServer.start(); await testServer.start();
}); });
tap.test('first test', async tools => { tap.test('first test', async (tools) => {
const response = await new webrequest.WebRequest().getJson([ const response = await new webrequest.WebRequest().getJson([
'http://localhost:2345/apiroute1', 'http://localhost:2345/apiroute1',
'http://localhost:2345/apiroute2', 'http://localhost:2345/apiroute2',
'http://localhost:2345/apiroute4', 'http://localhost:2345/apiroute4',
'http://localhost:2345/apiroute3' 'http://localhost:2345/apiroute3',
]); ]);
const response2 = await new webrequest.WebRequest().getJson('http://localhost:2345/apiroute3'); const response2 = await new webrequest.WebRequest().getJson('http://localhost:2345/apiroute3');
@ -55,12 +55,8 @@ tap.test('first test', async tools => {
console.log(response); console.log(response);
console.log(response2); console.log(response2);
expect(response) expect(response).property('hithere').to.equal('hi');
.property('hithere') expect(response2).property('hithere').to.equal('hi');
.to.equal('hi');
expect(response2)
.property('hithere')
.to.equal('hi');
}); });
tap.test('tear down server', async () => { tap.test('tear down server', async () => {

View File

@ -19,7 +19,7 @@ export class WebRequest {
public async getJson(urlArg: string | string[]) { public async getJson(urlArg: string | string[]) {
const response: Response = await this.request(urlArg, { const response: Response = await this.request(urlArg, {
method: 'GET' method: 'GET',
}); });
const responseText = await response.text(); const responseText = await response.text();
const responseResult = plugins.smartjson.parse(responseText); const responseResult = plugins.smartjson.parse(responseText);
@ -32,7 +32,7 @@ export class WebRequest {
public async postJson(urlArg: string, requestBody?: any) { public async postJson(urlArg: string, requestBody?: any) {
const response: Response = await this.request(urlArg, { const response: Response = await this.request(urlArg, {
body: plugins.smartjson.stringify(requestBody), body: plugins.smartjson.stringify(requestBody),
method: 'POST' method: 'POST',
}); });
const responseText = await response.text(); const responseText = await response.text();
const responseResult = plugins.smartjson.parse(responseText); const responseResult = plugins.smartjson.parse(responseText);
@ -45,7 +45,7 @@ export class WebRequest {
public async putJson(urlArg: string, requestBody?: any) { public async putJson(urlArg: string, requestBody?: any) {
const response: Response = await this.request(urlArg, { const response: Response = await this.request(urlArg, {
body: plugins.smartjson.stringify(requestBody), body: plugins.smartjson.stringify(requestBody),
method: 'PUT' method: 'PUT',
}); });
const responseText = await response.text(); const responseText = await response.text();
const responseResult = plugins.smartjson.parse(responseText); const responseResult = plugins.smartjson.parse(responseText);
@ -57,7 +57,7 @@ export class WebRequest {
*/ */
public async deleteJson(urlArg: string) { public async deleteJson(urlArg: string) {
const response: Response = await this.request(urlArg, { const response: Response = await this.request(urlArg, {
method: 'GET' method: 'GET',
}); });
const responseText = await response.text(); const responseText = await response.text();
const responseResult = plugins.smartjson.parse(responseText); const responseResult = plugins.smartjson.parse(responseText);
@ -114,9 +114,9 @@ export class WebRequest {
const response = await fetch(urlToUse, { const response = await fetch(urlToUse, {
method: optionsArg.method, method: optionsArg.method,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json',
}, },
body: optionsArg.body body: optionsArg.body,
}); });
console.log(`${urlToUse} answers with status: ${response.status}`); console.log(`${urlToUse} answers with status: ${response.status}`);