syncorejs 0.2.4 → 0.2.5

package/dist/_vendor/core/cli.mjs

@@ -1522,8 +1522,11 @@ async function startDevHub(options) {
 	await runDevProjectBootstrap(options.cwd, options.template);
 	await setupDevProjectWatch(options.cwd, options.template);
 	if (await isLocalPortInUse(devtoolsPort)) {
+		const activeSessionState = await readDevtoolsSessionState(options.cwd) ?? sessionState;
 		console.log(`Syncore devtools hub already running at ws://localhost:${devtoolsPort}. Reusing existing hub/dashboard.`);
-		return await readDevtoolsSessionState(options.cwd) ?? sessionState;
+		console.log(`Devtools dashboard token: ${activeSessionState.token}`);
+		console.log(`Dashboard shell: ${activeSessionState.authenticatedDashboardUrl}`);
+		return activeSessionState;
 	}
 	await writeDevtoolsSessionState(options.cwd, sessionState);
 	const httpServer = createServer((request, response) => {
@@ -1978,19 +1981,18 @@ async function startDevHub(options) {
 	console.log(`Electron/Node runtimes: set devtoolsUrl to ws://localhost:${devtoolsPort}.`);
 	console.log(`Web/Next apps: connect the dashboard or worker bridge to ws://localhost:${devtoolsPort}.`);
 	console.log("Expo apps: use the same hub URL through LAN or adb reverse while developing.");
-	const dashboardRoot = path.resolve(CORE_PACKAGE_ROOT, "..", "..", "apps", "dashboard");
-	if (await fileExists(path.join(dashboardRoot, "vite.config.ts"))) try {
-		await (await (await import("vite")).createServer({
-			configFile: path.join(dashboardRoot, "vite.config.ts"),
-			root: dashboardRoot,
-			server: { port: dashboardPort }
-		})).listen();
+	let dashboardStaticServer;
+	const dashboardStaticRoot = await resolvePackagedDashboardRoot();
+	if (!dashboardStaticRoot) throw new Error("Syncore Dashboard build is missing. Expected the packaged dashboard at syncorejs/dist/_dashboard/index.html. Rebuild syncorejs before running `syncorejs dev`.");
+	try {
+		dashboardStaticServer = await startPackagedDashboardServer(dashboardStaticRoot, dashboardPort);
 		console.log(`Dashboard shell: ${sessionState.authenticatedDashboardUrl}`);
 	} catch (error) {
-		console.log(`Dashboard source not started automatically: ${formatError(error)}`);
+		throw new Error(`Syncore Dashboard shell could not start: ${formatError(error)}`, { cause: error });
 	}
 	const close = () => {
 		projectTargetBackend?.dispose();
+		dashboardStaticServer?.close();
 		websocketServer.close();
 		httpServer.close();
 		process.exit(0);
@@ -1999,6 +2001,81 @@ async function startDevHub(options) {
 	process.on("SIGTERM", close);
 	return sessionState;
 }
+async function resolvePackagedDashboardRoot() {
+	const candidates = [
+		path.resolve(CORE_PACKAGE_ROOT, "..", "_dashboard"),
+		path.resolve(CORE_PACKAGE_ROOT, "_dashboard"),
+		path.resolve(CORE_PACKAGE_ROOT, "..", "syncore", "dist", "_dashboard")
+	];
+	for (const candidate of candidates) if (await fileExists(path.join(candidate, "index.html"))) return candidate;
+	return null;
+}
+async function startPackagedDashboardServer(root, port) {
+	const server = createServer((request, response) => {
+		serveDashboardAsset(root, request, response).catch((error) => {
+			if (!response.headersSent) writeTextResponse(response, 500, formatError(error));
+			else response.destroy(error instanceof Error ? error : void 0);
+		});
+	});
+	await new Promise((resolve, reject) => {
+		server.once("error", reject);
+		server.listen(port, "127.0.0.1", () => {
+			server.off("error", reject);
+			resolve();
+		});
+	});
+	return server;
+}
+async function serveDashboardAsset(root, request, response) {
+	if (request.method !== "GET" && request.method !== "HEAD") {
+		writeTextResponse(response, 405, "Method not allowed.");
+		return;
+	}
+	const requestUrl = new URL(request.url ?? "/", "http://127.0.0.1");
+	const requestedPath = decodeURIComponent(requestUrl.pathname);
+	const relativePath = requestedPath === "/" ? "index.html" : requestedPath.slice(1);
+	let assetPath = path.resolve(root, relativePath);
+	if (!isPathInside(root, assetPath)) {
+		writeTextResponse(response, 403, "Forbidden.");
+		return;
+	}
+	try {
+		if ((await stat(assetPath)).isDirectory()) assetPath = path.join(assetPath, "index.html");
+	} catch {
+		assetPath = path.join(root, "index.html");
+	}
+	if (!isPathInside(root, assetPath)) {
+		writeTextResponse(response, 403, "Forbidden.");
+		return;
+	}
+	const body = await readFile(assetPath);
+	response.writeHead(200, {
+		"Content-Type": getDashboardAssetContentType(assetPath),
+		"Content-Length": body.byteLength
+	});
+	if (request.method === "HEAD") {
+		response.end();
+		return;
+	}
+	response.end(body);
+}
+function isPathInside(root, candidate) {
+	const relative = path.relative(root, candidate);
+	return relative === "" || !relative.startsWith("..") && !path.isAbsolute(relative);
+}
+function getDashboardAssetContentType(filePath) {
+	switch (path.extname(filePath)) {
+		case ".html": return "text/html; charset=utf-8";
+		case ".js": return "text/javascript; charset=utf-8";
+		case ".css": return "text/css; charset=utf-8";
+		case ".json": return "application/json; charset=utf-8";
+		case ".svg": return "image/svg+xml";
+		case ".png": return "image/png";
+		case ".ico": return "image/x-icon";
+		case ".woff2": return "font/woff2";
+		default: return "application/octet-stream";
+	}
+}
 function setStorageCorsHeaders(response) {
 	response.setHeader("Access-Control-Allow-Origin", "*");
 	response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS");