mirror of
https://github.com/bitsocialnet/5chan.git
synced 2026-08-03 07:41:04 +02:00
Merge branch 'codex/fix/portless-auto-open-url'
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import { existsSync } from 'node:fs';
|
import { existsSync } from 'node:fs';
|
||||||
import { join } from 'node:path';
|
import { join } from 'node:path';
|
||||||
import { spawn, spawnSync } from 'node:child_process';
|
import { spawn, spawnSync } from 'node:child_process';
|
||||||
|
import { get } from 'node:http';
|
||||||
import { resolvePort } from './dev-server-utils.mjs';
|
import { resolvePort } from './dev-server-utils.mjs';
|
||||||
|
|
||||||
const isWindows = process.platform === 'win32';
|
const isWindows = process.platform === 'win32';
|
||||||
@@ -125,6 +126,17 @@ const child = spawn(command, args, {
|
|||||||
env: process.env,
|
env: process.env,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (publicUrl && process.env.BROWSER !== 'none') {
|
||||||
|
waitForHttpReady(publicUrl, 30_000)
|
||||||
|
.then(() => {
|
||||||
|
console.log(`Opening ${publicUrl} in browser...`);
|
||||||
|
openInBrowser(publicUrl);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.warn(`Could not auto-open ${publicUrl}: ${error.message}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
child.on('exit', (code, signal) => {
|
child.on('exit', (code, signal) => {
|
||||||
if (signal) {
|
if (signal) {
|
||||||
process.kill(process.pid, signal);
|
process.kill(process.pid, signal);
|
||||||
@@ -133,3 +145,40 @@ child.on('exit', (code, signal) => {
|
|||||||
|
|
||||||
process.exit(code ?? 0);
|
process.exit(code ?? 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
async function waitForHttpReady(url, timeoutMs) {
|
||||||
|
const startedAt = Date.now();
|
||||||
|
|
||||||
|
while (Date.now() - startedAt < timeoutMs) {
|
||||||
|
const ready = await new Promise((resolve) => {
|
||||||
|
const request = get(url, (response) => {
|
||||||
|
response.resume();
|
||||||
|
const statusCode = response.statusCode ?? 500;
|
||||||
|
resolve(statusCode >= 200 && statusCode < 400);
|
||||||
|
});
|
||||||
|
|
||||||
|
request.on('error', () => resolve(false));
|
||||||
|
request.setTimeout(2_000, () => {
|
||||||
|
request.destroy();
|
||||||
|
resolve(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (ready) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 200));
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Timed out waiting for ${url}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function openInBrowser(url) {
|
||||||
|
const opener =
|
||||||
|
process.platform === 'darwin' ? { cmd: 'open', args: [url] }
|
||||||
|
: process.platform === 'win32' ? { cmd: 'cmd', args: ['/c', 'start', '""', url] }
|
||||||
|
: { cmd: 'xdg-open', args: [url] };
|
||||||
|
|
||||||
|
spawn(opener.cmd, opener.args, { stdio: 'ignore', detached: true }).unref();
|
||||||
|
}
|
||||||
|
|||||||
+1
-1
@@ -206,7 +206,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
port: 3000,
|
port: 3000,
|
||||||
open: process.env.PORT ? 'http://5chan.localhost:1355/' : true,
|
open: process.env.PORTLESS_URL ? false : true,
|
||||||
watch: {
|
watch: {
|
||||||
usePolling: true,
|
usePolling: true,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user