Skip to content

Commit 4a77268

Browse files
committed
bug: fix blocking perf bug
1 parent aa922f6 commit 4a77268

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@elderjs/elderjs",
3-
"version": "1.6.11",
3+
"version": "1.6.12",
44
"main": "./build/index.js",
55
"types": "./build/index.d.ts",
66
"engineStrict": true,

src/Elder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,6 @@ class Elder {
349349
this.router = prepareRouter(this);
350350
this.perf.end(`startup.prepareRouter`);
351351

352-
this.markBootstrapComplete(this);
353-
354352
this.perf.end('startup');
355353
this.perf.stop();
356354

@@ -363,6 +361,8 @@ class Elder {
363361
displayPerfTimings([...this.perf.timings]);
364362
}
365363
}
364+
365+
this.markBootstrapComplete(this);
366366
});
367367
});
368368
}

src/utils/prepareServer.ts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
function prepareServer({ bootstrapComplete }) {
22
// eslint-disable-next-line consistent-return
33
return async function prepServer(req, res, next) {
4-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
5-
const { runHook, perf, ...bootstrap } = await bootstrapComplete;
6-
7-
await runHook('middleware', {
8-
...bootstrap,
9-
runHook,
10-
req,
11-
next,
12-
res,
13-
request: { type: 'server' },
14-
});
4+
try {
5+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6+
const { runHook, ...bootstrap } = await bootstrapComplete;
7+
await runHook('middleware', {
8+
...bootstrap,
9+
runHook,
10+
req,
11+
next,
12+
res,
13+
request: { type: 'server' },
14+
});
15+
} catch (e) {
16+
console.error(e);
17+
}
1518
};
1619
}
1720

0 commit comments

Comments
 (0)