Skip to content

Commit

Permalink
refactor: remove get-port to allow reuse of the same port without min…
Browse files Browse the repository at this point in the history
…imal wait time
  • Loading branch information
fwouts committed Jun 27, 2023
1 parent 71d9ed2 commit 7527250
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 17 deletions.
1 change: 0 additions & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"exclusive-promises": "^1.0.3",
"express": "^4.18.2",
"fs-extra": "^11.1.1",
"get-port": "^7.0.0",
"globby": "^13.2.0",
"html-escaper": "^3.0.3",
"http-terminator": "^3.2.0",
Expand Down
22 changes: 22 additions & 0 deletions core/src/get-free-port.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import net from "net";

export async function getFreePort(min: number) {
for (let port = min; ; port++) {
if (await isAvailable(port)) {
return port;
}
}
}

async function isAvailable(port: number) {
return new Promise<boolean>((resolve) => {
const server = net.createServer();
server.unref();
server.on("error", () => resolve(false));
server.listen(port, () => {
server.close(() => {
resolve(true);
});
});
});
}
9 changes: 2 additions & 7 deletions core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { createTypeAnalyzer, UNKNOWN_TYPE } from "@previewjs/type-analyzer";
import type { Reader } from "@previewjs/vfs";
import express from "express";
import fs from "fs-extra";
import getPort, { portNumbers } from "get-port";
import { createRequire } from "module";
import path from "path";
import type { Logger } from "pino";
import { detectComponents } from "./detect-components";
import { getFreePort } from "./get-free-port";
import type { ComponentAnalysis, FrameworkPlugin } from "./plugins/framework";
import type { SetupPreviewEnvironment } from "./preview-env";
import { Previewer } from "./previewer";
Expand Down Expand Up @@ -205,12 +205,7 @@ export async function createWorkspace({
start: async (allocatePort) => {
const port = await previewer.start(async () => {
const port = allocatePort ? await allocatePort() : 0;
return (
port ||
(await getPort({
port: portNumbers(3140, 4000),
}))
);
return port || (await getFreePort(3140));
});
return {
url: () => `http://localhost:${port}`,
Expand Down
36 changes: 27 additions & 9 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7527250

Please sign in to comment.