diff --git a/package-lock.json b/package-lock.json index f968e74..3a18107 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,20 +15,6 @@ "@pushrocks/webrequest": "^2.0.9" }, "dependencies": { - "@pushrocks/lik": { - "version": "4.0.13", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-4.0.13.tgz", - "integrity": "sha512-Nde8rq1DjaDCREKlGGY/zS8g+eFu4zSU2jrbO4DdtYD+9oiauBMz2jzao3fr8401XpNW1Ex8T8FPdjUW8lUMow==", - "requires": { - "@pushrocks/smartdelay": "^2.0.9", - "@pushrocks/smartmatch": "^1.0.7", - "@pushrocks/smartpromise": "^3.0.6", - "@pushrocks/smartrx": "^2.0.15", - "@pushrocks/smarttime": "^3.0.18", - "@types/minimatch": "^3.0.3", - "symbol-tree": "^3.2.4" - } - }, "@pushrocks/smartdelay": { "version": "2.0.9", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.9.tgz", @@ -36,36 +22,6 @@ "requires": { "@pushrocks/smartpromise": "^3.0.6" } - }, - "@pushrocks/smartrx": { - "version": "2.0.17", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrx/-/smartrx-2.0.17.tgz", - "integrity": "sha512-jzekKE+Wi/OoRPz/RyBL2LNTQCjb7NizFP3NuST/pl8xQWEu9omGVHNFQEzUDBYQS3D8fSV2tecDf7tKU/kggg==", - "requires": { - "@pushrocks/lik": "^4.0.13", - "@pushrocks/smartpromise": "^3.0.6", - "rxjs": "^6.5.5" - } - }, - "@pushrocks/smarttime": { - "version": "3.0.18", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.18.tgz", - "integrity": "sha512-G5Tx3etWRQNfNMrwX9gT3LGUAqIDwJ+7TitJsKPZcRGTuPoObhO8lXYkNQj9YuVxFVGmE+4xZaszYQO4xcLaPA==", - "requires": { - "@pushrocks/smartdelay": "^2.0.9", - "@pushrocks/smartpromise": "^3.0.2", - "croner": "^1.1.23", - "dayjs": "^1.8.27", - "is-nan": "^1.3.0" - } - }, - "rxjs": { - "version": "6.6.0", - "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.6.0.tgz", - "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", - "requires": { - "tslib": "^1.9.0" - } } } }, @@ -1224,7 +1180,6 @@ "version": "4.0.13", "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-4.0.13.tgz", "integrity": "sha512-Nde8rq1DjaDCREKlGGY/zS8g+eFu4zSU2jrbO4DdtYD+9oiauBMz2jzao3fr8401XpNW1Ex8T8FPdjUW8lUMow==", - "dev": true, "requires": { "@pushrocks/smartdelay": "^2.0.9", "@pushrocks/smartmatch": "^1.0.7", @@ -1239,7 +1194,6 @@ "version": "2.0.9", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.9.tgz", "integrity": "sha512-aVZJit1wq4fBG6ft2LJSPEnNbLSbRUuwNYggSeDqLtY7mXvAQmu4SIsXx18gfOtf69CoZR36RY3ff/IJv62C7w==", - "dev": true, "requires": { "@pushrocks/smartpromise": "^3.0.6" } @@ -1512,7 +1466,6 @@ "version": "2.0.17", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrx/-/smartrx-2.0.17.tgz", "integrity": "sha512-jzekKE+Wi/OoRPz/RyBL2LNTQCjb7NizFP3NuST/pl8xQWEu9omGVHNFQEzUDBYQS3D8fSV2tecDf7tKU/kggg==", - "dev": true, "requires": { "@pushrocks/lik": "^4.0.13", "@pushrocks/smartpromise": "^3.0.6", @@ -1561,7 +1514,6 @@ "version": "3.0.18", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.18.tgz", "integrity": "sha512-G5Tx3etWRQNfNMrwX9gT3LGUAqIDwJ+7TitJsKPZcRGTuPoObhO8lXYkNQj9YuVxFVGmE+4xZaszYQO4xcLaPA==", - "dev": true, "requires": { "@pushrocks/smartdelay": "^2.0.9", "@pushrocks/smartpromise": "^3.0.2", @@ -1574,7 +1526,6 @@ "version": "2.0.9", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.9.tgz", "integrity": "sha512-aVZJit1wq4fBG6ft2LJSPEnNbLSbRUuwNYggSeDqLtY7mXvAQmu4SIsXx18gfOtf69CoZR36RY3ff/IJv62C7w==", - "dev": true, "requires": { "@pushrocks/smartpromise": "^3.0.6" } @@ -4167,7 +4118,6 @@ "version": "6.6.0", "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.6.0.tgz", "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", - "dev": true, "requires": { "tslib": "^1.9.0" } diff --git a/test/test.ts b/test/test.ts index c522789..cf41ed3 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,15 +1,13 @@ import { expect, tap } from '@pushrocks/tapbundle'; import * as sdk from '../ts/index'; import { ISimpleRequest } from '@tsclass/tsclass/dist_ts/network'; +import { TypedRouter } from '@apiglobal/typedrequest'; + tap.test('should create a valid Handler', async () => { class MyHandler extends sdk.AAgHandler { - slug: 'testapi'; - public async handleRequest(authInfo: sdk.AuthInfo, request: ISimpleRequest) { - // this.authenticationHandler - let response: any; - return response; - } + public slug: 'testapi'; + public typedrouter = new TypedRouter(); public async checkReqirements() { return { allOk: true, diff --git a/ts/sdk.classes.aghandler.ts b/ts/sdk.classes.aghandler.ts index eb2ec53..b63161d 100644 --- a/ts/sdk.classes.aghandler.ts +++ b/ts/sdk.classes.aghandler.ts @@ -11,11 +11,7 @@ export abstract class AAgHandler { * a slug that separates the handler from other handlers */ public abstract slug: string; - - public abstract handleRequest( - authInfoArg: AuthInfo, - request: plugins.tsclass.network.ISimpleRequest - ): Promise; + public abstract typedrouter: plugins.typedrequest.TypedRouter; public abstract checkReqirements(): Promise; /** diff --git a/ts/sdk.plugins.ts b/ts/sdk.plugins.ts index 792ad8a..9f4bf08 100644 --- a/ts/sdk.plugins.ts +++ b/ts/sdk.plugins.ts @@ -1,6 +1,13 @@ // node native scope import * as path from 'path'; +// @apiglobal scope +import * as typedrequest from '@apiglobal/typedrequest'; + +export { + typedrequest +}; + // @tsclass scope import * as tsclass from '@tsclass/tsclass';