Skip to content

Commit d30e82a

Browse files
committed
chore: update code to new linter version
1 parent de2608c commit d30e82a

5 files changed

Lines changed: 35 additions & 27 deletions

File tree

src/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ process.env.BOTVIEW_WAIT_UNTIL ||= "networkidle"; // load | domcontentloaded | n
77

88
export const config = {
99
basicAuth: process.env.BOTVIEW_BASIC_AUTHS,
10-
navTimeout: JSON.parse(process.env.BOTVIEW_NAV_TIMEOUT),
11-
defaultTimeout: JSON.parse(process.env.BOTVIEW_DEFAULT_TIMEOUT),
10+
navTimeout: Number(process.env.BOTVIEW_NAV_TIMEOUT),
11+
defaultTimeout: Number(process.env.BOTVIEW_DEFAULT_TIMEOUT),
1212
waitUntil: process.env.BOTVIEW_WAIT_UNTIL,
1313
};

src/controllers/metrics/metrics.controller.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ describe("MetricsController", () => {
88
beforeEach(async () => {
99
const app: TestingModule = await Test.createTestingModule({
1010
controllers: [MetricsController],
11-
providers: [PrometheusService]
11+
providers: [PrometheusService],
1212
}).compile();
1313

1414
appController = app.get<MetricsController>(MetricsController);
1515
});
1616

1717
describe("root", () => {
1818
it('should return "Hello World!"', () => {
19+
expect(appController).not.toBeNull();
1920
expect("Hello World!").toBe("Hello World!");
2021
});
2122
});

src/controllers/render-controller/render.controller.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ describe("RenderController", () => {
1515

1616
describe("root", () => {
1717
it('should return "Hello World!"', () => {
18+
expect(renderController).not.toBeNull();
1819
expect("Hello World!").toBe("Hello World!");
1920
});
2021
});

src/services/json-logger.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,48 @@ export class JsonLogger implements LoggerService {
1616
/**
1717
* Write a 'log' level log.
1818
*/
19-
public log(message: any) {
19+
public log(message: string) {
2020
this.writeJson(message, LogLevels.INFO);
2121
}
2222

2323
/**
2424
* Write an 'error' level log.
2525
*/
26-
public error(message: any) {
26+
public error(message: string) {
2727
this.writeJson(message, LogLevels.ERROR);
2828
}
2929

3030
/**
3131
* Write a 'warn' level log.
3232
*/
33-
public warn(message: any) {
33+
public warn(message: string) {
3434
this.writeJson(message, LogLevels.WARN);
3535
}
3636

3737
/**
3838
* Write a 'debug' level log.
3939
*/
40-
public debug(message: any) {
40+
public debug(message: string) {
4141
this.writeJson(message, LogLevels.DEBUG);
4242
}
4343

4444
/**
4545
* Write a 'verbose' level log.
4646
*/
47-
public verbose(message: any) {
47+
public verbose(message: string) {
4848
this.writeJson(message, LogLevels.TRACE);
4949
}
5050

5151
public extraLogs(
52-
message: any,
52+
message: string,
5353
level: number,
5454
extraProps: object = {},
5555
): void {
5656
this.writeJson(message, level, extraProps);
5757
}
5858

5959
protected writeJson(
60-
message: any,
60+
message: string,
6161
level: number,
6262
extraProps: object = {},
6363
): void {

src/services/prerender.service.ts

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
import { JsonLogger, LogLevels} from "./json-logger.service";
1+
import { JsonLogger, LogLevels } from "./json-logger.service";
22
import { config } from "../config";
33
import { Injectable } from "@nestjs/common";
4-
import { chromium, webkit, devices, Browser, Page, ConsoleMessage, Request, BrowserContextOptions } from 'playwright';
5-
import {LeakedRequests} from "../models/LeakedRequests";
4+
import {
5+
// chromium, // Yandex metrics problems
6+
webkit,
7+
devices,
8+
Browser,
9+
Page,
10+
ConsoleMessage,
11+
Request,
12+
BrowserContextOptions,
13+
} from "playwright";
14+
import { LeakedRequests } from "../models/LeakedRequests";
615

716
@Injectable()
817
export class PrerenderService {
918
public constructor(private readonly logger: JsonLogger) {}
1019

1120
public async render(url: string, headers: Headers) {
12-
1321
const browser: Browser = await webkit.launch({
1422
// headless: false, // for debug
1523
// devtools: true,
@@ -21,8 +29,8 @@ export class PrerenderService {
2129

2230
const authHeaders = this.setAuth(url);
2331
const context = await browser.newContext({
24-
...devices['Galaxy S8'],
25-
...authHeaders
32+
...devices["Galaxy S8"],
33+
...authHeaders,
2634
});
2735

2836
let requests: LeakedRequests[] = [];
@@ -35,17 +43,17 @@ export class PrerenderService {
3543
Reflect.set(window, "prerender", data);
3644
},
3745
{
38-
userAgent: headers["user-agent"],
46+
userAgent: headers["user-agent"] as string,
3947
},
4048
);
4149

4250
page.setDefaultNavigationTimeout(config.navTimeout);
4351
page.setDefaultTimeout(config.defaultTimeout);
4452
this.setLogOnConsole(page);
45-
requests = await this.setRequestLeakDetector(page);
53+
requests = this.setRequestLeakDetector(page);
4654

4755
await page.goto(url, {
48-
waitUntil: config.waitUntil as any,
56+
waitUntil: config.waitUntil as "networkidle",
4957
timeout: config.navTimeout,
5058
});
5159
const pageContent = await page.content(); // serialized HTML of page DOM.
@@ -69,7 +77,9 @@ export class PrerenderService {
6977
}
7078
}
7179

72-
private async setAuth(url: string): Promise<Pick<BrowserContextOptions, "httpCredentials">> {
80+
private setAuth(
81+
url: string,
82+
): Pick<BrowserContextOptions, "httpCredentials"> {
7383
if (config.basicAuth) {
7484
// Url, login, password
7585
const basicAuths: [string, string, string][] = config.basicAuth
@@ -86,7 +96,7 @@ export class PrerenderService {
8696
httpCredentials: {
8797
username: auth[1],
8898
password: auth[2],
89-
}
99+
},
90100
};
91101
}
92102
}
@@ -121,7 +131,7 @@ export class PrerenderService {
121131
});
122132
}
123133

124-
private async setRequestLeakDetector(page: Page): Promise<LeakedRequests[]> {
134+
private setRequestLeakDetector(page: Page): LeakedRequests[] {
125135
const requests: LeakedRequests[] = [];
126136

127137
page.on("request", (request: Request) => {
@@ -150,10 +160,7 @@ export class PrerenderService {
150160
requests: LeakedRequests[],
151161
error: unknown,
152162
) {
153-
if (
154-
error instanceof Error &&
155-
error.name.startsWith("TimeoutError")
156-
) {
163+
if (error instanceof Error && error.name.startsWith("TimeoutError")) {
157164
requests.forEach((lreq) => {
158165
lreq.endTime = Date.now();
159166
lreq.time = lreq.endTime - lreq.startTime;
@@ -163,5 +170,4 @@ export class PrerenderService {
163170
});
164171
}
165172
}
166-
167173
}

0 commit comments

Comments
 (0)