From f536957bbdcb2c332149c9dd0d130a0507638016 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sat, 30 Nov 2019 16:25:24 +0000 Subject: [PATCH] fix(core): update --- package-lock.json | 3 +- package.json | 4 +- test/test.ts | 3 +- ts/index.ts | 4 +- ts/ul-interfaces.checkrequest.ts | 68 +++++++++++++++++++++++++++++++- ts/ul-interfaces.pagechecks.ts | 7 ---- ts/ul-interfaces.plugins.ts | 5 +++ 7 files changed, 79 insertions(+), 15 deletions(-) delete mode 100644 ts/ul-interfaces.pagechecks.ts create mode 100644 ts/ul-interfaces.plugins.ts diff --git a/package-lock.json b/package-lock.json index 645aef1..b8bfec1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,8 +7,7 @@ "@apiglobal/typedrequest-interfaces": { "version": "1.0.10", "resolved": "https://verdaccio.lossless.one/@apiglobal%2ftypedrequest-interfaces/-/typedrequest-interfaces-1.0.10.tgz", - "integrity": "sha512-RGG7s/mP7MGVz3g+y/kvH0ZrVWY/vJy3BignsUv3DLtoFvfWnvxqT2WWqSJhyXCOSeR/nzVsGxFgKAI/ZVZKdg==", - "dev": true + "integrity": "sha512-RGG7s/mP7MGVz3g+y/kvH0ZrVWY/vJy3BignsUv3DLtoFvfWnvxqT2WWqSJhyXCOSeR/nzVsGxFgKAI/ZVZKdg==" }, "@babel/code-frame": { "version": "7.5.5", diff --git a/package.json b/package.json index 0eb2373..7dd6b4c 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0" }, - "dependencies": {}, + "dependencies": { + "@apiglobal/typedrequest-interfaces": "^1.0.10" + }, "files": [ "ts/**/*", "ts_web/**/*", diff --git a/test/test.ts b/test/test.ts index e0c42d0..8e00642 100644 --- a/test/test.ts +++ b/test/test.ts @@ -2,7 +2,8 @@ import { expect, tap } from '@pushrocks/tapbundle'; import * as interfaces from '../ts/index'; tap.test('first test', async () => { - console.log(interfaces.standardExport); + console.log('hi' as interfaces.pagechecks.IRequest_PageCheck_Assumption['request']['domain']); + }); tap.start(); diff --git a/ts/index.ts b/ts/index.ts index 6750f6b..c1d0fe4 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,5 +1,5 @@ -import * as pagechecks from './ul-interfaces.pagechecks'; +import * as checkRequests from './ul-interfaces.checkrequest'; export { - pagechecks + checkRequests as pagechecks }; diff --git a/ts/ul-interfaces.checkrequest.ts b/ts/ul-interfaces.checkrequest.ts index a910b87..a963daf 100644 --- a/ts/ul-interfaces.checkrequest.ts +++ b/ts/ul-interfaces.checkrequest.ts @@ -1,3 +1,67 @@ -export interface IPageCheckRequest { - +import * as plugins from './ul-interfaces.plugins'; + +export type TCheckResultStatus = 'ok' | 'not ok' | 'timed out'; + +export interface IRequest_PageCheck_PWA { + method: 'pwa'; + request: { + intervalMs: number, + domain: string; + }; + response: { + timeStarted: number; + timeEnded: number; + duration: number; + status: TCheckResultStatus; + data: { + lhr: any; + reports: any[]; + }; + checkLog: string[]; + }; +} + +export interface IRequest_PageCheck_Function { + method: 'checkPwa'; + request: { + intervalMs: number, + domain: string; + functionDef: string; + }; + response: { + timeStarted: number; + timeEnded: number; + duration: number; + status: TCheckResultStatus; + data: any; + checkLog: string[]; + }; +} + +export interface IRequest_PageCheck_Assumption { + method: 'assumption'; + request: { + intervalMs: number, + domain: string; + title?: string; + statusCode?: string; + description?: string; + dnsRecordMx?: string; + dnsRecordTxt?: string; + }; + response: { + timeStarted: number; + timeEnded: number; + duration: number; + status: TCheckResultStatus; + data: { + domain: string; + title?: string; + statusCode?: string; + description?: string; + dnsRecordMx?: string; + dnsRecordTxt?: string; + }; + checkLog: string[]; + }; } \ No newline at end of file diff --git a/ts/ul-interfaces.pagechecks.ts b/ts/ul-interfaces.pagechecks.ts deleted file mode 100644 index 6a62cab..0000000 --- a/ts/ul-interfaces.pagechecks.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface IPageCheckSimple {}; - -export interface IPageCheckAdvanced {}; - -export interface IPageCheckPWA { - -} \ No newline at end of file diff --git a/ts/ul-interfaces.plugins.ts b/ts/ul-interfaces.plugins.ts new file mode 100644 index 0000000..677bece --- /dev/null +++ b/ts/ul-interfaces.plugins.ts @@ -0,0 +1,5 @@ +import * as typedRequestInterfaces from '@apiglobal/typedrequest-interfaces'; + +export { + typedRequestInterfaces +};