diff --git a/types/express-brute-redis/express-brute-redis-tests.ts b/types/express-brute-redis/express-brute-redis-tests.ts index dfbe01bbd5..7d7eba0638 100644 --- a/types/express-brute-redis/express-brute-redis-tests.ts +++ b/types/express-brute-redis/express-brute-redis-tests.ts @@ -2,20 +2,20 @@ import express = require("express"); import expressbrute = require("express-brute"); import expressbruteredis = require("express-brute-redis"); -let store = new expressbruteredis({ +const store: expressbruteredis = new expressbruteredis({ host: "localhost", port: 6379, db: "0" }); -let bruteforce = new expressbrute(store, { - failCallback: (req: express.Request, res: express.Response, next: any, validTime: any) => { +const bruteforce: expressbrute = new expressbrute(store, { + failCallback: (req: express.Request, res: express.Response, next: express.NextFunction, validTime: Date) => { // Don't send a message back to the user in production res.send("You cannot submit a request again until: " + validTime); } }); -let app = express(); +const app: express.Express = express(); app.post("/", bruteforce.prevent, (req, res, next) => { res.send("Success!"); diff --git a/types/express-brute-redis/index.d.ts b/types/express-brute-redis/index.d.ts index 073c616e5a..20927a5c1a 100644 --- a/types/express-brute-redis/index.d.ts +++ b/types/express-brute-redis/index.d.ts @@ -1,52 +1,52 @@ +// Type definitions for express-brute-redis 0.0 // Project: https://github.com/AdamPflug/express-brute-redis // Definitions by: Scott Harwell // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.4.2 -import redis = require("redis"); +import { ClientOpts } from "redis"; /** * @summary Redis store for Express Brute * @class */ -declare class ExpressBruteRedis { +declare class express_brute_redis { /** * Default options for the Redis client */ - public static defaults: redis.ClientOpts; + static defaults: ClientOpts; /** * @summary constructor * @param options Options to configure the Redis client. */ - constructor(options?: redis.ClientOpts, ...args: any[]); + constructor(options?: ClientOpts, ...args: any[]); /** * @summary Sets a key in Redis storage. - * @param key - * @param value - * @param lifetime - * @param callback + * @param key + * @param value + * @param lifetime + * @param callback */ - public set(key: string, value: string, lifetime?: number, callback?: SetCallback): void; + set(key: string, value: string, lifetime?: number, callback?: SetCallback): void; /** * @summary Gets a key in Redis storage. - * @param key - * @param callback + * @param key + * @param callback */ - public get(key: string, callback?: GetCallback): void; + get(key: string, callback?: GetCallback): void; /** * @summary Resets a key in Redis storage. - * @param key - * @param callback + * @param key + * @param callback */ - public reset(key: string, callback?: ResetCallback, ...args: any[]): void; + reset(key: string, callback?: ResetCallback, ...args: any[]): void; } -declare interface SetCallback { (sender?: ExpressBruteRedis): void } -declare interface GetCallback { (err?: Error, data?: any): void } -declare interface ResetCallback { (err?: Error, data?: any): void } +type SetCallback = (sender?: express_brute_redis) => void; +type GetCallback = (err?: Error, data?: any) => void; +type ResetCallback = (err?: Error, data?: any) => void; -export = ExpressBruteRedis; +export = express_brute_redis; diff --git a/types/express-brute-redis/tslint.json b/types/express-brute-redis/tslint.json index f93cf8562a..3db14f85ea 100644 --- a/types/express-brute-redis/tslint.json +++ b/types/express-brute-redis/tslint.json @@ -1,3 +1 @@ -{ - "extends": "dtslint/dt.json" -} +{ "extends": "dtslint/dt.json" }