@tramvai/module-server 2.152.3 → 2.153.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/modules/browserTiming.browser.js +45 -13
  2. package/package.json +15 -14
package/lib/modules/browserTiming.browser.js CHANGED
@@ -1,32 +1,64 @@
1
- import { declareModule, provide } from '@tramvai/core';
1
+ import { declareModule, provide, commandLineListTokens } from '@tramvai/core';
2
2
  import { COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
3
+ import { ROUTER_TOKEN } from '@tramvai/tokens-router';
4
+ import isNil from '@tinkoff/utils/is/nil';
3
5
 
4
6
  const BrowserTimingModule = declareModule({
5
7
  name: 'BrowserTiming',
6
8
  providers: [
9
+ provide({
10
+ provide: commandLineListTokens.customerStart,
11
+ multi: true,
12
+ useFactory: ({ router }) => {
13
+ return () => {
14
+ router.registerHook('beforeResolve', async ({ key }) => {
15
+ const startKey = `router:before-resolve:start:${key}`;
16
+ performance.mark(startKey);
17
+ });
18
+ router.registerHook('beforeNavigate', async ({ key }) => {
19
+ const startKey = `router:before-resolve:start:${key}`;
20
+ const endKey = `router:before-resolve:end:${key}`;
21
+ const measureKey = `router:before-resolve:${key}`;
22
+ performance.mark(endKey);
23
+ performance.measure(measureKey, startKey, endKey);
24
+ performance.clearMeasures(measureKey);
25
+ [startKey, endKey].forEach((name) => performance.clearMarks(name));
26
+ });
27
+ };
28
+ },
29
+ deps: {
30
+ router: ROUTER_TOKEN,
31
+ },
32
+ }),
7
33
  provide({
8
34
  provide: COMMAND_LINE_EXECUTION_END_TOKEN,
9
35
  multi: true,
10
- useValue: (di, type, status, timingInfo) => {
36
+ useValue: (di, type, status, timingInfo, key) => {
11
37
  Object.keys(timingInfo).forEach((line) => {
12
38
  const { start, end } = timingInfo[line];
13
- const name = `command-line:${line}`;
39
+ const keyPostfix = isNil(key) ? '' : `:${key}`;
40
+ const name = `command-line:${line}${keyPostfix}`;
14
41
  const startName = `${name}:start`;
15
42
  const endName = `${name}:end`;
16
43
  performance.mark(startName, { startTime: start });
17
44
  performance.mark(endName, { startTime: end });
18
45
  performance.measure(name, startName, endName);
19
- performance.clearMarks(startName);
20
- performance.clearMarks(endName);
46
+ [startName, endName].forEach((name) => performance.clearMarks(name));
47
+ performance.clearMeasures(name);
21
48
  // special wark between `spa_transition` end and `after_spa_transition` start - in most ways it will be React rerender time
22
- if (line === 'spa_transition') {
23
- performance.mark('spa-render-start', { startTime: end });
24
- }
25
- else if (line === 'after_spa_transition') {
26
- performance.mark('spa-render-end', { startTime: start });
27
- performance.measure('tramvai:spa-render', 'spa-render-start', 'spa-render-end');
28
- performance.clearMarks('spa-render-start');
29
- performance.clearMarks('spa-render-end');
49
+ if (line === 'spa_transition' || line === 'after_spa_transition') {
50
+ const spaRenderStartMark = `spa-render-start:${keyPostfix}`;
51
+ const spaRenderEndMark = `spa-render-end:${keyPostfix}`;
52
+ if (line === 'spa_transition') {
53
+ performance.mark(spaRenderStartMark, { startTime: end });
54
+ }
55
+ else if (line === 'after_spa_transition') {
56
+ performance.mark(spaRenderEndMark, { startTime: start });
57
+ const spaRenderMeasureName = `tramvai:spa-render:${keyPostfix}`;
58
+ performance.measure(spaRenderMeasureName, spaRenderStartMark, spaRenderEndMark);
59
+ [spaRenderStartMark, spaRenderEndMark].forEach((name) => performance.clearMarks(name));
60
+ performance.clearMeasures(spaRenderMeasureName);
61
+ }
30
62
  }
31
63
  });
32
64
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-server",
3
- "version": "2.152.3",
3
+ "version": "2.153.1",
4
4
  "description": "",
5
5
  "browser": "lib/browser.js",
6
6
  "main": "lib/server.js",
@@ -25,11 +25,12 @@
25
25
  "@tinkoff/monkeypatch": "2.0.5",
26
26
  "@tinkoff/terminus": "0.1.9",
27
27
  "@tinkoff/url": "0.8.6",
28
- "@tramvai/module-cache-warmup": "2.152.3",
29
- "@tramvai/module-metrics": "2.152.3",
30
- "@tramvai/papi": "2.152.3",
31
- "@tramvai/tokens-server": "2.152.3",
32
- "@tramvai/tokens-server-private": "2.152.3",
28
+ "@tramvai/module-cache-warmup": "2.153.1",
29
+ "@tramvai/module-metrics": "2.153.1",
30
+ "@tramvai/papi": "2.153.1",
31
+ "@tramvai/tokens-server": "2.153.1",
32
+ "@tramvai/tokens-router": "2.153.1",
33
+ "@tramvai/tokens-server-private": "2.153.1",
33
34
  "@tramvai/safe-strings": "0.5.12",
34
35
  "fastify": "^4.14.1",
35
36
  "@fastify/cookie": "^8.3.0",
@@ -42,14 +43,14 @@
42
43
  "peerDependencies": {
43
44
  "@tinkoff/dippy": "0.8.16",
44
45
  "@tinkoff/utils": "^2.1.2",
45
- "@tramvai/cli": "2.152.3",
46
- "@tramvai/core": "2.152.3",
47
- "@tramvai/react": "2.152.3",
48
- "@tramvai/module-common": "2.152.3",
49
- "@tramvai/module-environment": "2.152.3",
50
- "@tramvai/tokens-common": "2.152.3",
51
- "@tramvai/tokens-core-private": "2.152.3",
52
- "@tramvai/tokens-render": "2.152.3",
46
+ "@tramvai/cli": "2.153.1",
47
+ "@tramvai/core": "2.153.1",
48
+ "@tramvai/react": "2.153.1",
49
+ "@tramvai/module-common": "2.153.1",
50
+ "@tramvai/module-environment": "2.153.1",
51
+ "@tramvai/tokens-common": "2.153.1",
52
+ "@tramvai/tokens-core-private": "2.153.1",
53
+ "@tramvai/tokens-render": "2.153.1",
53
54
  "react": ">=16.14.0",
54
55
  "react-dom": ">=16.14.0",
55
56
  "tslib": "^2.4.0"