diff --git a/dist/main/file_handlers.js b/dist/main/file_handlers.js index cbf016a..85177cc 100644 --- a/dist/main/file_handlers.js +++ b/dist/main/file_handlers.js @@ -44,21 +44,27 @@ const axios_1 = __importDefault(require("axios")); const file_utils_1 = require("./file_utils"); let endpoints_in_progress = []; function registerFileHandlers() { - function get_legacy_hashed_path(root, hash) { - return path.join((0, file_utils_1.expandPath)(root), `${hash}.file`); + // Flexible organization: [root]/[prefix_len-char-prefix]/[hash].file + function get_organized_hashed_path(root, hash, prefix_len = 2) { + const expanded_root = (0, file_utils_1.expandPath)(root); + const prefix = hash.substring(0, Math.max(1, Math.min(prefix_len, 8))); + const dir = path.join(expanded_root, prefix); + if (!fs.existsSync(dir)) + fs.mkdirSync(dir, { recursive: true }); + return path.join(dir, `${hash}.file`); } - electron_1.ipcMain.handle('native:check-cache', async (event, { cache_root, hash }) => { - const full_path = get_legacy_hashed_path(cache_root, hash); + electron_1.ipcMain.handle('native:check-cache', async (event, { cache_root, hash, hash_prefix_length = 2 }) => { + const full_path = get_organized_hashed_path(cache_root, hash, hash_prefix_length); return fs.existsSync(full_path); }); - electron_1.ipcMain.handle('native:download-to-cache', async (event, { url, cache_root, hash, api_key, account_id }) => { - const full_path = get_legacy_hashed_path(cache_root, hash); + electron_1.ipcMain.handle('native:download-to-cache', async (event, { url, cache_root, hash, api_key, account_id, hash_prefix_length = 2 }) => { + const full_path = get_organized_hashed_path(cache_root, hash, hash_prefix_length); const tmp_path = `${full_path}.tmp`; if (endpoints_in_progress.includes(url)) return { success: true, status: 'in_progress' }; if (fs.existsSync(full_path)) return { success: true, path: full_path, status: 'exists' }; - console.log(`Native: Downloading ${hash} -> ${full_path}`); + console.log(`Native: Organized Download (${hash_prefix_length} chars) -> ${full_path}`); try { endpoints_in_progress.push(url); const response = await (0, axios_1.default)({ @@ -87,9 +93,9 @@ function registerFileHandlers() { endpoints_in_progress = endpoints_in_progress.filter(e => e !== url); } }); - electron_1.ipcMain.handle('native:launch-from-cache', async (event, { cache_root, hash, temp_root, filename }) => { + electron_1.ipcMain.handle('native:launch-from-cache', async (event, { cache_root, hash, temp_root, filename, hash_prefix_length = 2 }) => { try { - const source = get_legacy_hashed_path(cache_root, hash); + const source = get_organized_hashed_path(cache_root, hash, hash_prefix_length); const expanded_temp = (0, file_utils_1.expandPath)(temp_root); const target = path.join(expanded_temp, filename); if (!fs.existsSync(expanded_temp)) diff --git a/dist/main/file_handlers.js.map b/dist/main/file_handlers.js.map index e05f54d..f43173a 100644 --- a/dist/main/file_handlers.js.map +++ b/dist/main/file_handlers.js.map @@ -1 +1 @@ -{"version":3,"file":"file_handlers.js","sourceRoot":"","sources":["../../src/main/file_handlers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"file_handlers.js","sourceRoot":"","sources":["../../src/main/file_handlers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,oDAkEC;AA1ED,uCAA0C;AAC1C,uCAAyB;AACzB,2CAA6B;AAC7B,kDAA0B;AAC1B,6CAA0C;AAE1C,IAAI,qBAAqB,GAAa,EAAE,CAAC;AAEzC,SAAgB,oBAAoB;IAClC,qEAAqE;IACrE,SAAS,yBAAyB,CAAC,IAAY,EAAE,IAAY,EAAE,aAAqB,CAAC;QACnF,MAAM,aAAa,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,kBAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE;QACjG,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAClF,OAAO,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,kBAAO,CAAC,MAAM,CAAC,0BAA0B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE;QACjI,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,GAAG,SAAS,MAAM,CAAC;QAEpC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;QACzF,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAE1F,OAAO,CAAC,GAAG,CAAC,+BAA+B,kBAAkB,cAAc,SAAS,EAAE,CAAC,CAAC;QAExF,IAAI,CAAC;YACH,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAK,EAAC;gBAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,QAAQ;gBAC1C,OAAO,EAAE;oBACP,kBAAkB,EAAE,OAAO;oBAC3B,cAAc,EAAE,UAAU,IAAI,EAAE;oBAChC,iBAAiB,EAAE,qBAAqB;iBACzC;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC9C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE3B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACrD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;gBAAS,CAAC;YACT,qBAAqB,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACvE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,kBAAO,CAAC,MAAM,CAAC,0BAA0B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE;QAC5H,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAC/E,MAAM,aAAa,GAAG,IAAA,uBAAU,EAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;gBAAE,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpF,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAChC,MAAM,gBAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file diff --git a/dist/main/index.js b/dist/main/index.js index 3eefc35..c4dbe61 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () { Object.defineProperty(exports, "__esModule", { value: true }); const electron_1 = require("electron"); const path = __importStar(require("path")); +const os = __importStar(require("os")); const config_loader_1 = require("./config_loader"); const api_client_1 = require("./api_client"); const shell_handlers_1 = require("./shell_handlers"); @@ -43,7 +44,6 @@ let mainWindow = null; let cachedSeed = null; let cachedFullConfig = null; async function createWindow() { - // 1. Initial Load of Configs cachedSeed = await (0, config_loader_1.loadSeedConfig)(); if (cachedSeed) { cachedFullConfig = await (0, api_client_1.fetchFullConfig)(cachedSeed); @@ -58,7 +58,6 @@ async function createWindow() { nodeIntegration: false, }, }); - // Determine target URL based on hydrated config let targetUrl = 'http://demo.localhost:5173'; if (cachedFullConfig && cachedFullConfig.native_device) { const device = cachedFullConfig.native_device; @@ -68,37 +67,44 @@ async function createWindow() { const useHost = (host.includes('localhost')) ? host : 'demo.localhost:5173'; targetUrl = `http://${useHost}/events/${eventId}/launcher/${locationId}`; } - console.log(`Launcher: Navigating to ${targetUrl}`); mainWindow.loadURL(targetUrl).catch(() => { - console.warn(`Failed to load ${targetUrl}. Falling back to dev-demo...`); mainWindow?.loadURL('https://dev-demo.oneskyit.com/'); }); - mainWindow.on('closed', () => { - mainWindow = null; - }); + mainWindow.on('closed', () => { mainWindow = null; }); } -// Register OS-level handlers (0, shell_handlers_1.registerShellHandlers)(); (0, file_handlers_1.registerFileHandlers)(); electron_1.app.on('ready', createWindow); electron_1.app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { + if (process.platform !== 'darwin') electron_1.app.quit(); - } }); electron_1.app.on('activate', () => { - if (mainWindow === null) { + if (mainWindow === null) createWindow(); +}); +electron_1.ipcMain.handle('get-seed-config', async () => cachedSeed || await (0, config_loader_1.loadSeedConfig)()); +electron_1.ipcMain.handle('get-device-config', async () => cachedFullConfig); +electron_1.ipcMain.handle('get-jwt', async () => null); +electron_1.ipcMain.handle('get-device-info', async () => { + const interfaces = os.networkInterfaces(); + const addresses = []; + for (const name of Object.keys(interfaces)) { + for (const net of interfaces[name]) { + if (net.family === 'IPv4' && !net.internal) { + addresses.push(net.address); + } + } } -}); -// IPC Handlers -electron_1.ipcMain.handle('get-seed-config', async () => { - return cachedSeed || await (0, config_loader_1.loadSeedConfig)(); -}); -electron_1.ipcMain.handle('get-device-config', async () => { - return cachedFullConfig; -}); -electron_1.ipcMain.handle('get-jwt', async () => { - return null; + return { + platform: os.platform(), + release: os.release(), + arch: os.arch(), + hostname: os.hostname(), + cpus: os.cpus().length, + total_mem: os.totalmem(), + free_mem: os.freemem(), + ip_addresses: addresses + }; }); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/main/index.js.map b/dist/main/index.js.map index 74a3ada..764ca92 100644 --- a/dist/main/index.js.map +++ b/dist/main/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/main/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAuD;AACvD,2CAA6B;AAC7B,mDAAiD;AACjD,6CAA+C;AAC/C,qDAAyD;AACzD,mDAAuD;AAGvD,IAAI,UAAU,GAAyB,IAAI,CAAC;AAC5C,IAAI,UAAU,GAAsB,IAAI,CAAC;AACzC,IAAI,gBAAgB,GAAQ,IAAI,CAAC;AAEjC,KAAK,UAAU,YAAY;IACzB,6BAA6B;IAC7B,UAAU,GAAG,MAAM,IAAA,8BAAc,GAAE,CAAC;IACpC,IAAI,UAAU,EAAE,CAAC;QACf,gBAAgB,GAAG,MAAM,IAAA,4BAAe,EAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,UAAU,GAAG,IAAI,wBAAa,CAAC;QAC7B,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,+BAA+B;QACtC,cAAc,EAAE;YACd,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC;YACpD,gBAAgB,EAAE,IAAI;YACtB,eAAe,EAAE,KAAK;SACvB;KACF,CAAC,CAAC;IAEH,gDAAgD;IAChD,IAAI,SAAS,GAAG,4BAA4B,CAAC;IAE7C,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,aAAa,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,gBAAgB,CAAC,aAAa,CAAC;QAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,QAAQ,CAAC;QAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACrF,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,IAAI,qBAAqB,CAAC;QAE1D,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;QAE5E,SAAS,GAAG,UAAU,OAAO,WAAW,OAAO,aAAa,UAAU,EAAE,CAAC;IAC3E,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;IAEpD,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,kBAAkB,SAAS,+BAA+B,CAAC,CAAC;QACzE,UAAU,EAAE,OAAO,CAAC,gCAAgC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAC3B,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,6BAA6B;AAC7B,IAAA,sCAAqB,GAAE,CAAC;AACxB,IAAA,oCAAoB,GAAE,CAAC;AAEvB,cAAG,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AAE9B,cAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,cAAG,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,cAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,YAAY,EAAE,CAAC;IACjB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,eAAe;AACf,kBAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IAC3C,OAAO,UAAU,IAAI,MAAM,IAAA,8BAAc,GAAE,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,kBAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;IAC7C,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,kBAAO,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;IACnC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/main/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/main/shell_handlers.js b/dist/main/shell_handlers.js index 5452e40..32b5d2f 100644 --- a/dist/main/shell_handlers.js +++ b/dist/main/shell_handlers.js @@ -36,34 +36,57 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.registerShellHandlers = registerShellHandlers; const electron_1 = require("electron"); const child_process_1 = require("child_process"); -const fs = __importStar(require("fs")); +const os = __importStar(require("os")); function registerShellHandlers() { - // Open a local directory in the OS File Manager electron_1.ipcMain.handle('native:open-folder', async (event, folderPath) => { - console.log(`Native: Opening folder ${folderPath}`); const error = await electron_1.shell.openPath(folderPath); return { success: !error, error }; }); - // Run a generic shell command (Whitelisted logic can be added here) - electron_1.ipcMain.handle('native:run-cmd', async (event, command) => { - console.log(`Native: Running command: ${command}`); + electron_1.ipcMain.handle('native:run-cmd', async (event, { cmd, timeout = 30000 }) => { return new Promise((resolve) => { - (0, child_process_1.exec)(command, (error, stdout, stderr) => { - resolve({ - success: !error, - stdout, - stderr, - error: error ? error.message : null - }); + (0, child_process_1.exec)(cmd, { timeout }, (error, stdout, stderr) => { + resolve({ success: !error, stdout: stdout.trim(), stderr: stderr.trim(), error: error ? error.message : null }); }); }); }); - // Specific handler for launching a presentation file - electron_1.ipcMain.handle('native:launch-file', async (event, filePath) => { - console.log(`Native: Launching file: ${filePath}`); - if (!fs.existsSync(filePath)) { - return { success: false, error: 'File not found' }; + electron_1.ipcMain.handle('native:run-cmd-sync', async (event, { cmd }) => { + try { + const stdout = (0, child_process_1.execSync)(cmd).toString(); + return { success: true, stdout: stdout.trim() }; } + catch (error) { + return { success: false, error: error.message, stderr: error.stderr?.toString() }; + } + }); + electron_1.ipcMain.handle('native:run-osascript', async (event, script) => { + if (os.platform() !== 'darwin') + return { success: false, error: 'AppleScript is only available on macOS' }; + const escapedScript = script.replace(/"/g, '\"'); + const cmd = `osascript -e "${escapedScript}"`; + return new Promise((resolve) => { + (0, child_process_1.exec)(cmd, (error, stdout, stderr) => { + resolve({ success: !error, stdout: stdout.trim(), stderr: stderr.trim(), error: error ? error.message : null }); + }); + }); + }); + electron_1.ipcMain.handle('native:kill-processes', async (event, { process_name_li = [] }) => { + console.log(`Native: Killing processes -> `, process_name_li); + const results = []; + for (const name of process_name_li) { + const cmd = os.platform() === 'win32' + ? `taskkill /F /IM ${name} /T` + : `pkill -f ${name}`; + try { + (0, child_process_1.execSync)(cmd); + results.push({ name, success: true }); + } + catch (e) { + results.push({ name, success: false, error: e.message }); + } + } + return { success: true, results }; + }); + electron_1.ipcMain.handle('native:open-local-file-v2', async (event, filePath) => { const error = await electron_1.shell.openPath(filePath); return { success: !error, error }; }); diff --git a/dist/main/shell_handlers.js.map b/dist/main/shell_handlers.js.map index b84cd04..e9cb239 100644 --- a/dist/main/shell_handlers.js.map +++ b/dist/main/shell_handlers.js.map @@ -1 +1 @@ -{"version":3,"file":"shell_handlers.js","sourceRoot":"","sources":["../../src/main/shell_handlers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,sDAgCC;AArCD,uCAA0C;AAC1C,iDAAqC;AAErC,uCAAyB;AAEzB,SAAgB,qBAAqB;IACnC,gDAAgD;IAChD,kBAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,UAAkB,EAAE,EAAE;QACvE,OAAO,CAAC,GAAG,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,gBAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/C,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,kBAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;QAChE,OAAO,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAA,oBAAI,EAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACtC,OAAO,CAAC;oBACN,OAAO,EAAE,CAAC,KAAK;oBACf,MAAM;oBACN,MAAM;oBACN,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;iBACpC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,qDAAqD;IACrD,kBAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;QACrE,OAAO,CAAC,GAAG,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QACrD,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,gBAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file +{"version":3,"file":"shell_handlers.js","sourceRoot":"","sources":["../../src/main/shell_handlers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/preload/index.js b/dist/preload/index.js index a25974c..8cb7e61 100644 --- a/dist/preload/index.js +++ b/dist/preload/index.js @@ -5,12 +5,13 @@ electron_1.contextBridge.exposeInMainWorld('aetherNative', { get_seed_config: () => electron_1.ipcRenderer.invoke('get-seed-config'), get_device_config: () => electron_1.ipcRenderer.invoke('get-device-config'), get_jwt: () => electron_1.ipcRenderer.invoke('get-jwt'), - log: (message) => console.log('[Native Log]', message), - // Shell Handlers + get_device_info: () => electron_1.ipcRenderer.invoke('get-device-info'), open_folder: (path) => electron_1.ipcRenderer.invoke('native:open-folder', path), - run_command: (args) => electron_1.ipcRenderer.invoke('native:run-cmd', args), - launch_file: (path) => electron_1.ipcRenderer.invoke('native:launch-file', path), - // File/Cache Handlers + run_cmd: (args) => electron_1.ipcRenderer.invoke('native:run-cmd', args), + run_cmd_sync: (args) => electron_1.ipcRenderer.invoke('native:run-cmd-sync', args), + run_osascript: (script) => electron_1.ipcRenderer.invoke('native:run-osascript', script), + kill_processes: (args) => electron_1.ipcRenderer.invoke('native:kill-processes', args), + open_local_file_v2: (path) => electron_1.ipcRenderer.invoke('native:open-local-file-v2', path), check_cache: (args) => electron_1.ipcRenderer.invoke('native:check-cache', args), download_to_cache: (args) => electron_1.ipcRenderer.invoke('native:download-to-cache', args), launch_from_cache: (args) => electron_1.ipcRenderer.invoke('native:launch-from-cache', args), diff --git a/dist/preload/index.js.map b/dist/preload/index.js.map index 391f03a..77d6953 100644 --- a/dist/preload/index.js.map +++ b/dist/preload/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/preload/index.ts"],"names":[],"mappings":";;AAAA,uCAAsD;AAEtD,wBAAa,CAAC,iBAAiB,CAAC,cAAc,EAAE;IAC9C,eAAe,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC;IAC5D,iBAAiB,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAChE,OAAO,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5C,GAAG,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC;IAE9D,iBAAiB;IACjB,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAC7E,WAAW,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC;IACtE,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAE7E,sBAAsB;IACtB,WAAW,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAC1E,iBAAiB,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC;IACtF,iBAAiB,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC;CACvF,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/preload/index.ts"],"names":[],"mappings":";;AAAA,uCAAsD;AAEtD,wBAAa,CAAC,iBAAiB,CAAC,cAAc,EAAE;IAC9C,eAAe,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC;IAC5D,iBAAiB,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAChE,OAAO,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5C,eAAe,EAAE,GAAG,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC;IAE5D,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAC7E,OAAO,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC;IAClE,YAAY,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC;IAC5E,aAAa,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACrF,cAAc,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,uBAAuB,EAAE,IAAI,CAAC;IAChF,kBAAkB,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,2BAA2B,EAAE,IAAI,CAAC;IAE3F,WAAW,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC;IAC1E,iBAAiB,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC;IACtF,iBAAiB,EAAE,CAAC,IAAS,EAAE,EAAE,CAAC,sBAAW,CAAC,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC;CACvF,CAAC,CAAC"} \ No newline at end of file diff --git a/src/main/index.ts b/src/main/index.ts index 9ac5040..258a7b3 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -1,5 +1,6 @@ import { app, BrowserWindow, ipcMain } from 'electron'; import * as path from 'path'; +import * as os from 'os'; import { loadSeedConfig } from './config_loader'; import { fetchFullConfig } from './api_client'; import { registerShellHandlers } from './shell_handlers'; @@ -11,7 +12,6 @@ let cachedSeed: SeedConfig | null = null; let cachedFullConfig: any = null; async function createWindow() { - // 1. Initial Load of Configs cachedSeed = await loadSeedConfig(); if (cachedSeed) { cachedFullConfig = await fetchFullConfig(cachedSeed); @@ -28,59 +28,57 @@ async function createWindow() { }, }); - // Determine target URL based on hydrated config let targetUrl = 'http://demo.localhost:5173'; - if (cachedFullConfig && cachedFullConfig.native_device) { const device = cachedFullConfig.native_device; const eventId = device.event_id_random || device.event_id; const locationId = device.event_location_id_random || device.event_location_id || ''; const host = device.app_base_url || 'demo.localhost:5173'; - const useHost = (host.includes('localhost')) ? host : 'demo.localhost:5173'; - targetUrl = `http://${useHost}/events/${eventId}/launcher/${locationId}`; } - console.log(`Launcher: Navigating to ${targetUrl}`); - mainWindow.loadURL(targetUrl).catch(() => { - console.warn(`Failed to load ${targetUrl}. Falling back to dev-demo...`); mainWindow?.loadURL('https://dev-demo.oneskyit.com/'); }); - mainWindow.on('closed', () => { - mainWindow = null; - }); + mainWindow.on('closed', () => { mainWindow = null; }); } -// Register OS-level handlers registerShellHandlers(); registerFileHandlers(); - app.on('ready', createWindow); app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit(); - } + if (process.platform !== 'darwin') app.quit(); }); app.on('activate', () => { - if (mainWindow === null) { - createWindow(); + if (mainWindow === null) createWindow(); +}); + +ipcMain.handle('get-seed-config', async () => cachedSeed || await loadSeedConfig()); +ipcMain.handle('get-device-config', async () => cachedFullConfig); +ipcMain.handle('get-jwt', async () => null); + +ipcMain.handle('get-device-info', async () => { + const interfaces = os.networkInterfaces(); + const addresses: string[] = []; + for (const name of Object.keys(interfaces)) { + for (const net of interfaces[name]!) { + if (net.family === 'IPv4' && !net.internal) { + addresses.push(net.address); + } + } } -}); - -// IPC Handlers -ipcMain.handle('get-seed-config', async () => { - return cachedSeed || await loadSeedConfig(); -}); - -ipcMain.handle('get-device-config', async () => { - return cachedFullConfig; -}); - -ipcMain.handle('get-jwt', async () => { - return null; + return { + platform: os.platform(), + release: os.release(), + arch: os.arch(), + hostname: os.hostname(), + cpus: os.cpus().length, + total_mem: os.totalmem(), + free_mem: os.freemem(), + ip_addresses: addresses + }; }); diff --git a/src/main/shell_handlers.ts b/src/main/shell_handlers.ts index 51a22e0..ef77639 100644 --- a/src/main/shell_handlers.ts +++ b/src/main/shell_handlers.ts @@ -1,37 +1,60 @@ import { ipcMain, shell } from 'electron'; -import { exec } from 'child_process'; -import * as path from 'path'; +import { exec, execSync } from 'child_process'; import * as fs from 'fs'; +import * as os from 'os'; export function registerShellHandlers() { - // Open a local directory in the OS File Manager ipcMain.handle('native:open-folder', async (event, folderPath: string) => { - console.log(`Native: Opening folder ${folderPath}`); const error = await shell.openPath(folderPath); return { success: !error, error }; }); - // Run a generic shell command (Whitelisted logic can be added here) - ipcMain.handle('native:run-cmd', async (event, command: string) => { - console.log(`Native: Running command: ${command}`); + ipcMain.handle('native:run-cmd', async (event, { cmd, timeout = 30000 }) => { return new Promise((resolve) => { - exec(command, (error, stdout, stderr) => { - resolve({ - success: !error, - stdout, - stderr, - error: error ? error.message : null - }); + exec(cmd, { timeout }, (error, stdout, stderr) => { + resolve({ success: !error, stdout: stdout.trim(), stderr: stderr.trim(), error: error ? error.message : null }); }); }); }); - // Specific handler for launching a presentation file - ipcMain.handle('native:launch-file', async (event, filePath: string) => { - console.log(`Native: Launching file: ${filePath}`); - if (!fs.existsSync(filePath)) { - return { success: false, error: 'File not found' }; + ipcMain.handle('native:run-cmd-sync', async (event, { cmd }) => { + try { + const stdout = execSync(cmd).toString(); + return { success: true, stdout: stdout.trim() }; + } catch (error: any) { + return { success: false, error: error.message, stderr: error.stderr?.toString() }; } + }); + + ipcMain.handle('native:run-osascript', async (event, script: string) => { + if (os.platform() !== 'darwin') return { success: false, error: 'AppleScript is only available on macOS' }; + const escapedScript = script.replace(/"/g, '\"'); + const cmd = `osascript -e "${escapedScript}"`; + return new Promise((resolve) => { + exec(cmd, (error, stdout, stderr) => { + resolve({ success: !error, stdout: stdout.trim(), stderr: stderr.trim(), error: error ? error.message : null }); + }); + }); + }); + + ipcMain.handle('native:kill-processes', async (event, { process_name_li = [] }) => { + console.log(`Native: Killing processes -> `, process_name_li); + const results = []; + for (const name of process_name_li) { + const cmd = os.platform() === 'win32' + ? `taskkill /F /IM ${name} /T` + : `pkill -f ${name}`; + try { + execSync(cmd); + results.push({ name, success: true }); + } catch (e: any) { + results.push({ name, success: false, error: e.message }); + } + } + return { success: true, results }; + }); + + ipcMain.handle('native:open-local-file-v2', async (event, filePath: string) => { const error = await shell.openPath(filePath); return { success: !error, error }; }); diff --git a/src/preload/index.ts b/src/preload/index.ts index 76d4c4f..d7a4aee 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -4,14 +4,15 @@ contextBridge.exposeInMainWorld('aetherNative', { get_seed_config: () => ipcRenderer.invoke('get-seed-config'), get_device_config: () => ipcRenderer.invoke('get-device-config'), get_jwt: () => ipcRenderer.invoke('get-jwt'), - log: (message: string) => console.log('[Native Log]', message), + get_device_info: () => ipcRenderer.invoke('get-device-info'), - // Shell Handlers open_folder: (path: string) => ipcRenderer.invoke('native:open-folder', path), - run_command: (args: any) => ipcRenderer.invoke('native:run-cmd', args), - launch_file: (path: string) => ipcRenderer.invoke('native:launch-file', path), + run_cmd: (args: any) => ipcRenderer.invoke('native:run-cmd', args), + run_cmd_sync: (args: any) => ipcRenderer.invoke('native:run-cmd-sync', args), + run_osascript: (script: string) => ipcRenderer.invoke('native:run-osascript', script), + kill_processes: (args: any) => ipcRenderer.invoke('native:kill-processes', args), + open_local_file_v2: (path: string) => ipcRenderer.invoke('native:open-local-file-v2', path), - // File/Cache Handlers check_cache: (args: any) => ipcRenderer.invoke('native:check-cache', args), download_to_cache: (args: any) => ipcRenderer.invoke('native:download-to-cache', args), launch_from_cache: (args: any) => ipcRenderer.invoke('native:launch-from-cache', args),