- | ${isBuiltIn ? '' : ``} |
+ |
${escapeHtml(hostname)}
- ${isBuiltIn ? 'built-in' : ''}
|
- ${isBuiltIn ? '—' : `
${truncate(hsUrl, 28)}
- `}
+
|
${escapeHtml(backend)} |
@@ -83,14 +80,14 @@ function updateConnectionsTable(state) {
Open
- ${!isBuiltIn && needsReconnect ? ` |
`;
diff --git a/native-host/dashboard-server.js b/native-host/dashboard-server.js
deleted file mode 100644
index 566607a..0000000
--- a/native-host/dashboard-server.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
- * Local HTTP server that serves the Holesail dashboard as a static site.
- *
- * In distribution mode (running as a standalone Bare binary), dashboard files
- * are read from the bare-bundle assets embedded at build time via `require.bundle()`.
- *
- * In development mode (`bare index.mjs`), `require.bundle()` is not available,
- * so files are read from disk relative to the source directory.
- *
- * The server is registered as the backend for the `my.dash.board` virtual host
- * so the HTTPS proxy can serve the dashboard over a trusted HTTPS origin,
- * satisfying Chrome's PWA installability requirement.
- */
-
-const http1 = require('bare-http1');
-const tcp = require('bare-tcp');
-const path = require('bare-path');
-const EventEmitter = require('bare-events');
-
-const { allocateTunnelPort, releaseTunnelPort } = require('./holesail-manager/port-allocator.js');
-
-// Resolve the extension/dashboard directory for dev-mode file serving.
-// Uses the same logic as host/paths.js: in dev mode __dirname is the real
-// native-host/ directory; in distribution mode the bundle read takes priority
-// and this path is only used as a last-resort fallback.
-function _resolveDevDashboardDir() {
- // In dev mode __dirname is the real native-host/ path
- if (process.stderr) process.stderr.write('[dashboard-server] __dirname=' + __dirname + '\n');
- if (__dirname && !__dirname.startsWith('bare:')) {
- const d = path.join(__dirname, '..', 'extension', 'dashboard');
- if (process.stderr) process.stderr.write('[dashboard-server] DEV_DASHBOARD_DIR (from __dirname)=' + d + '\n');
- return d;
- }
- // Distribution mode: try executable directory as fallback
- try {
- const os = require('bare-os');
- const execPath = os.execPath();
- if (process.stderr) process.stderr.write('[dashboard-server] execPath=' + execPath + '\n');
- if (execPath && !execPath.startsWith('bare:')) {
- const d = path.join(path.dirname(execPath), 'extension', 'dashboard');
- if (process.stderr) process.stderr.write('[dashboard-server] DEV_DASHBOARD_DIR (from execPath)=' + d + '\n');
- return d;
- }
- } catch (e) {
- if (process.stderr) process.stderr.write('[dashboard-server] execPath error: ' + e.message + '\n');
- }
- if (process.stderr) process.stderr.write('[dashboard-server] DEV_DASHBOARD_DIR=null\n');
- return null;
-}
-const DEV_DASHBOARD_DIR = _resolveDevDashboardDir();
-
-const DASHBOARD_HOSTNAME = 'my.dash.board';
-
-const MIME_TYPES = {
- '.html': 'text/html; charset=utf-8',
- '.css': 'text/css; charset=utf-8',
- '.js': 'application/javascript; charset=utf-8',
- '.json': 'application/json; charset=utf-8',
- '.webmanifest': 'application/manifest+json; charset=utf-8',
- '.png': 'image/png',
- '.ico': 'image/x-icon',
- '.svg': 'image/svg+xml; charset=utf-8',
- '.woff': 'font/woff',
- '.woff2': 'font/woff2'
-};
-
-let _server = null;
-let _port = null;
-
-function _getMimeType(filePath) {
- const ext = path.extname(filePath).toLowerCase();
- return MIME_TYPES[ext] || 'application/octet-stream';
-}
-
-/**
- * Read a file by its bundle key and disk-relative path.
- * In distribution mode, reads from the bare-bundle asset embedded at build time.
- * In development mode, reads from disk relative to DEV_DASHBOARD_DIR.
- * @param {string} bundleKey - Key in the bare-bundle (e.g. '/dashboard/dashboard.html').
- * @param {string} diskRelPath - Path relative to DEV_DASHBOARD_DIR (e.g. 'dashboard.html' or '../icons/48.png').
- * @returns {Buffer|null} File contents or null if not found.
- */
-function _readFileByKey(bundleKey, diskRelPath) {
- // Distribution mode: read from bare-bundle assets
- try {
- if (typeof require.bundle === 'function') {
- const b = require.bundle();
- if (process.stderr) process.stderr.write('[dashboard-server] bundle=' + (b ? 'object' : 'null') + ' key=' + bundleKey + '\n');
- if (b) {
- const buf = b.read(bundleKey);
- if (process.stderr) process.stderr.write('[dashboard-server] bundle.read=' + (buf ? buf.length + ' bytes' : 'null') + '\n');
- if (buf !== null) return buf;
- }
- } else {
- if (process.stderr) process.stderr.write('[dashboard-server] require.bundle not a function (type=' + typeof require.bundle + ')\n');
- }
- } catch (e) {
- if (process.stderr) process.stderr.write('[dashboard-server] bundle error: ' + e.message + '\n');
- }
-
- // Disk fallback (dev mode, or distribution mode without bundle assets)
- if (DEV_DASHBOARD_DIR) {
- try {
- const fs = require('bare-fs');
- const fullPath = path.join(DEV_DASHBOARD_DIR, diskRelPath);
- if (process.stderr) process.stderr.write('[dashboard-server] disk read: ' + fullPath + '\n');
- const buf = fs.readFileSync(fullPath);
- if (process.stderr) process.stderr.write('[dashboard-server] disk read OK: ' + buf.length + ' bytes\n');
- return buf;
- } catch (e) {
- if (process.stderr) process.stderr.write('[dashboard-server] disk read error: ' + e.message + '\n');
- }
- } else {
- if (process.stderr) process.stderr.write('[dashboard-server] DEV_DASHBOARD_DIR is null, skipping disk read\n');
- }
-
- return null;
-}
-
-/**
- * Start the dashboard HTTP server.
- * @returns {Promise<{port: number}>}
- */
-function start() {
- return new Promise((resolve, reject) => {
- if (_server) {
- resolve({ port: _port });
- return;
- }
-
- _port = allocateTunnelPort();
-
- const tcpServer = tcp.createServer();
-
- // Minimal server object required by bare-http1 ServerConnection.
- // ServerConnection emits 'request' on this object, not on itself.
- const httpServer = new EventEmitter();
- httpServer.timeout = 0;
- httpServer.closing = false;
- httpServer.on('request', (req, res) => {
- let urlPath = (req.url || '/').split('?')[0];
- if (urlPath === '/') urlPath = '/dashboard.html';
-
- // Serve a dynamically generated manifest with absolute https://my.dash.board/ URLs
- // so Chrome accepts start_url, id, scope, and protocol_handlers (same-origin requirement).
- if (urlPath === '/manifest.webmanifest') {
- const manifest = {
- id: 'https://' + DASHBOARD_HOSTNAME + '/',
- name: 'Holesail Browser',
- short_name: 'Holesail',
- description: 'P2P Holesail tunnels in the browser',
- start_url: 'https://' + DASHBOARD_HOSTNAME + '/',
- scope: 'https://' + DASHBOARD_HOSTNAME + '/',
- display: 'standalone',
- display_override: ['window-controls-overlay', 'standalone'],
- background_color: '#0f1117',
- theme_color: '#0f1117',
- protocol_handlers: [
- { protocol: 'web+holesail', url: 'https://' + DASHBOARD_HOSTNAME + '/?lookup=%s' }
- ],
- screenshots: [
- { src: 'https://' + DASHBOARD_HOSTNAME + '/screenshots/wide.png', sizes: '1024x515', type: 'image/png', form_factor: 'wide', label: 'Holesail Browser Dashboard' },
- { src: 'https://' + DASHBOARD_HOSTNAME + '/screenshots/narrow.png', sizes: '390x844', type: 'image/png', form_factor: 'narrow', label: 'Holesail Browser Dashboard' }
- ],
- icons: [
- { src: 'https://' + DASHBOARD_HOSTNAME + '/icons/48.png', sizes: '48x48', type: 'image/png', purpose: 'any' },
- { src: 'https://' + DASHBOARD_HOSTNAME + '/icons/128.png', sizes: '128x128', type: 'image/png', purpose: 'any' },
- { src: 'https://' + DASHBOARD_HOSTNAME + '/icons/192.png', sizes: '192x192', type: 'image/png', purpose: 'any' },
- { src: 'https://' + DASHBOARD_HOSTNAME + '/icons/512.png', sizes: '512x512', type: 'image/png', purpose: 'any' }
- ]
- };
- const body = Buffer.from(JSON.stringify(manifest, null, 2));
- res.statusCode = 200;
- res.setHeader('Content-Type', 'application/manifest+json; charset=utf-8');
- res.setHeader('Content-Length', body.length);
- res.end(body);
- return;
- }
-
- // Strip leading slash for file lookup
- let relPath = urlPath.replace(/^\/+/, '');
-
- // Icons are stored in extension/icons/ (one level up from dashboard/).
- // Remap /icons/