cc4-embedded-system 3.1.3 → 3.1.5

package/dist/gui.js

@@ -64,7 +64,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { runMakeFsData } from './makefsdata.js';
 import { getPackageVersion } from './utils.js';
-import { execSync } from 'node:child_process';
+import { execFile } from 'node:child_process';
 import os from 'node:os';
 // prevent socket errors
 process.on('uncaughtException', (err) => {
@@ -98,6 +98,53 @@ const cancelShutdown = () => {
         // console.log('🛡️ Shutdown cancelled (keep alive)');
     }
 };
+const buildPowerShellArgs = (script) => {
+    const encodedCommand = Buffer.from(script, 'utf16le').toString('base64');
+    return [
+        '-NoProfile',
+        '-STA',
+        '-EncodedCommand',
+        encodedCommand
+    ];
+};
+const runDialogCommand = (command, args) => {
+    return new Promise((resolve, reject) => {
+        execFile(command, args, {
+            windowsHide: false,
+            maxBuffer: 1024 * 1024
+        }, (error, stdout, stderr) => {
+            if (error) {
+                reject(new Error(stderr.trim() || error.message));
+                return;
+            }
+            resolve(stdout.trim());
+        });
+    });
+};
+const buildWindowsDialogScript = (dialogLines) => {
+    return [
+        'Add-Type -AssemblyName System.Windows.Forms',
+        'Add-Type -AssemblyName System.Drawing',
+        '$screen = [System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea',
+        '$owner = New-Object System.Windows.Forms.Form',
+        '$owner.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual',
+        '$owner.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::None',
+        '$owner.ShowInTaskbar = $false',
+        '$owner.TopMost = $true',
+        '$owner.Width = 1',
+        '$owner.Height = 1',
+        '$owner.Left = $screen.Left + [int]($screen.Width / 2)',
+        '$owner.Top = $screen.Top + [int]($screen.Height / 2)',
+        '$owner.Opacity = 0',
+        '$null = $owner.Show()',
+        '$null = $owner.Activate()',
+        '$owner.BringToFront()',
+        '[System.Windows.Forms.Application]::DoEvents()',
+        ...dialogLines,
+        '$owner.Close()',
+        '$owner.Dispose()'
+    ].join('\n');
+};
 app.get('/api/version', (_req, res) => {
     cancelShutdown();
     res.json({ version: getPackageVersion() });
@@ -173,30 +220,46 @@ app.post('/api/change-port', (req, res) => {
         }
     }, 100);
 });
-app.get('/api/browse', (req, res) => {
+app.get('/api/browse', async (req, res) => {
+    cancelShutdown();
     const isDir = req.query.type === 'dir';
     const platform = os.platform();
-    let command = '';
     try {
-        if (platform === 'win32') { // Windows: Powershell + OpenFileDialog
-            if (isDir)
-                command = `powershell -Command "Add-Type -AssemblyName System.Windows.Forms; $f = New-Object System.Windows.Forms.OpenFileDialog; $f.CheckFileExists = $false; $f.CheckPathExists = $true; $f.FileName = 'Select Folder'; $f.ValidateNames = $false; if($f.ShowDialog() -eq 'OK'){ Split-Path $f.FileName }"`;
-            else
-                command = `powershell -Command "Add-Type -AssemblyName System.Windows.Forms; $f = New-Object System.Windows.Forms.OpenFileDialog; $f.Filter = 'C Files (*.c)|*.c|All Files (*.*)|*.*'; if($f.ShowDialog() -eq 'OK'){ $f.FileName }"`;
+        let result = '';
+        if (platform === 'win32') {
+            const script = isDir
+                ? buildWindowsDialogScript([
+                    '$dialog = New-Object System.Windows.Forms.FolderBrowserDialog',
+                    '$dialog.Description = "Select Input Directory"',
+                    'if ($dialog.ShowDialog($owner) -eq [System.Windows.Forms.DialogResult]::OK) {',
+                    '    $dialog.SelectedPath',
+                    '}'
+                ])
+                : buildWindowsDialogScript([
+                    '$dialog = New-Object System.Windows.Forms.SaveFileDialog',
+                    '$dialog.Filter = "C Files (*.c)|*.c|All Files (*.*)|*.*"',
+                    '$dialog.DefaultExt = "c"',
+                    '$dialog.AddExtension = $true',
+                    '$dialog.OverwritePrompt = $true',
+                    'if ($dialog.ShowDialog($owner) -eq [System.Windows.Forms.DialogResult]::OK) {',
+                    '    $dialog.FileName',
+                    '}'
+                ]);
+            result = await runDialogCommand('powershell.exe', buildPowerShellArgs(script));
         }
-        else if (platform === 'darwin') { // macOS: darwin
-            if (isDir)
-                command = `osascript -e 'POSIX path of (choose folder with prompt "Select Input Directory")'`;
-            else
-                command = `osascript -e 'POSIX path of (choose file with prompt "Select Output File")'`;
+        else if (platform === 'darwin') {
+            result = await runDialogCommand('osascript', [
+                '-e',
+                isDir
+                    ? 'POSIX path of (choose folder with prompt "Select Input Directory")'
+                    : 'POSIX path of (choose file name with prompt "Select Output File")'
+            ]);
         }
-        else { // Linux: Zenity
-            if (isDir)
-                command = `zenity --file-selection --directory --title="Select Input Directory"`;
-            else
-                command = `zenity --file-selection --title="Select Output File"`;
+        else {
+            result = await runDialogCommand('zenity', isDir
+                ? ['--file-selection', '--directory', '--title=Select Input Directory']
+                : ['--file-selection', '--save', '--confirm-overwrite', '--title=Select Output File', '--filename=fsdata.c']);
         }
-        const result = execSync(command).toString().trim();
         res.json({ success: true, path: result || null });
     }
     catch (e) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "cc4-embedded-system",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "A modern typescript version of makefsdata based on html-minifier-next and lwIP v1.3.1",
   "bin": {
-    "cc4es": "./dist/gui.js"
+    "cc4es": "dist/gui.js"
   },
   "type": "module",
   "scripts": {