positron.js 1.0.6 → 1.1.0

package/packager.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { execSync, execFileSync } = require("child_process");
+const { execSync, execFileSync, spawnSync } = require("child_process");
 const { info, error, success } = require("./logs");
 const https = require("https");
 const esbuild = require("esbuild");
@@ -8,7 +8,8 @@ const findPackageJson = require("./findpackage");
 
 const MAJOR_NODE_V = 24;
 
-const ob = process.argv.includes("--obfuscate");
+const min = process.argv.includes("--minify") || process.argv.includes("--min");
+const ob = process.argv.includes("--obfuscate") || process.argv.includes("--ob");
 
 const arch = process.argv.includes("--x64") ? "x64" : process.argv.includes("--arm64") ? "arm64" : process.arch;
 
@@ -22,13 +23,25 @@ function performPackager() {
   if (fs.existsSync(distDir)) fs.rmSync(distDir, { recursive: true, force: true });
   fs.mkdirSync(distDir, { recursive: true });
 
+  let selectedPlatform = false;
+
   if (process.argv.includes("--mac") || process.argv.includes("--m")) {
     packageMacOS(appRoot, distDir, appName);
-  } else if (process.argv.includes("--windows") || process.argv.includes("--w")) {
+    selectedPlatform = true;
+  } 
+   if (process.argv.includes("--windows") || process.argv.includes("--w")) {
     packageWindows(appRoot, distDir, appName);
-  } else {
-    process.platform === "win32" ? packageWindows(appRoot, distDir, appName) : packageMacOS(appRoot, distDir, appName);
-  }
+      selectedPlatform = true;
+  } 
+   if (process.argv.includes("--linux") || process.argv.includes("--l")) {
+    packageLinux(appRoot, distDir, appName);
+      selectedPlatform = true;
+  } 
+
+    if (selectedPlatform) return;
+    if (process.platform === "win32") packageWindows(appRoot, distDir, appName);
+    else if (process.platform === "linux") packageLinux(appRoot, distDir, appName);
+    else packageMacOS(appRoot, distDir, appName);
 }
 
 function handleJavaScriptPipeline(appRoot, resourcesPath) {
@@ -89,7 +102,7 @@ async function packageMacOS(appRoot, distDir, appName) {
     <key>CFBundleExecutable</key>
     <string>${appName}</string>
     <key>CFBundleIdentifier</key>
-    <string>com.${package.author || "positron"}.${appName.toLowerCase()}</string>
+    <string>${package.bundleIdentifier || `com.${package.author || "positron"}.${appName.toLowerCase()}`}</string>
     <key>CFBundleName</key>
     <string>${appName}</string>
     <key>CFBundlePackageType</key>
@@ -215,6 +228,57 @@ async function packageWindows(appRoot, distDir, appName) {
   success(`Successfully packaged Windows app directory at: ${outputFolder}`);
 }
 
+async function packageLinux(appRoot, distDir, appName) {
+  const outputFolder = path.join(distDir, `${appName}-linux`);
+  fs.mkdirSync(outputFolder, { recursive: true });
+
+  info(`[Packager] Creating Linux App structure...`);
+
+  const binFolder = path.join(appRoot, "bin");
+  const compiledBinary = path.join(binFolder, "positron-runtime");
+  
+  if (!fs.existsSync(compiledBinary)) {
+    error("Fatal: Native compiled binary missing from bin/. Run build first.");
+    process.exit(1);
+  }
+
+  const binaryPath = path.join(outputFolder, appName);
+  fs.copyFileSync(compiledBinary, binaryPath);
+  fs.chmodSync(binaryPath, "755");
+
+  const resourcesPath = path.join(outputFolder, "resources");
+  fs.mkdirSync(resourcesPath, { recursive: true });
+
+  handleJavaScriptPipeline(appRoot, resourcesPath);
+
+  const bundledJs = path.join(resourcesPath, "index.js");
+  const backendName = appName.replace(/([a-z0-9])([A-Z])/g, '$1-$2').replace(/[\s_]+/g, '-').toLowerCase() + '-backend';
+  
+  if (fs.existsSync(bundledJs)) {
+    await compileWithPkg(bundledJs, "linux", resourcesPath, backendName);
+  } else {
+    error(`[Packager] Fatal: Bundled JavaScript entry point missing at ${bundledJs}`);
+    process.exit(1);
+  }
+
+  const desktopContent = `[Desktop Entry]
+Name=${appName}
+Exec=./${appName}
+Icon=utilities-terminal
+Type=Application
+Categories=Utility;`;
+  fs.writeFileSync(path.join(outputFolder, `${appName}.desktop`), desktopContent);
+
+  if(!process.argv.includes('--keep-package-json') || !process.argv.includes('--kpj')) {
+    fs.rmSync(path.join(resourcesPath, "package.json"), { force: true });
+  }
+
+  fs.rmSync(path.join(resourcesPath, "icon.icns"), { force: true });
+  fs.rmSync(path.join(resourcesPath, "icon.ico"), { force: true });
+
+  success(`Successfully packaged Linux app directory at: ${outputFolder}`);
+}
+
 function copyAppAssets(src, dest, ignoredFiles = []) {
   const ignoreList = ["node_modules", "dist", "bin", ".git"];
   
@@ -238,6 +302,34 @@ function copyAppAssets(src, dest, ignoredFiles = []) {
         copyRecursive(srcPath, destPath);
       } else {
         fs.copyFileSync(srcPath, destPath);
+
+        if(min && item.endsWith(".js")) {
+          info(`Minifying JavaScript file: ${destPath}`);
+          try {
+            esbuild.buildSync({
+              "bundle": false,
+              "minify": true,
+              "sourcemap": false,
+              "target": `node${MAJOR_NODE_V}`,
+              "entryPoints": [srcPath],
+              "outfile": destPath,
+            })
+          } catch (err) {
+            error(`JavaScript minification failed for ${destPath}:`, err);
+          }
+        }
+
+        if(ob && item.endsWith(".js")) {
+          info(`Obfuscating JavaScript file: ${destPath}`);
+          try {
+            const obResult = spawnSync("npx", ["javascript-obfuscator", destPath, "--compact", "true", "--self-defending", "true", "--string-array", "true", "--string-array-encoding", "base64", "--string-array-threshold", "1", "--output", destPath], { stdio:"inherit" });
+            if (obResult.error) throw obResult.error;
+            if (obResult.status !== 0) throw new Error("javascript-obfuscator failed");
+          } catch (err) {
+            error(`JavaScript obfuscation failed for ${destPath}:`, err);
+          }
+        }
+
       }
     }
   }
@@ -268,6 +360,8 @@ async function compileWithPkg(bundledJsPath, targetPlatform, outputFolder, appNa
     finalBinaryName = `${appName}.exe`;
   } else if (targetPlatform === "darwin") {
     pkgTarget = `node${MAJOR_NODE_V}-macos-${arch}`;
+  } else if (targetPlatform === "linux") {
+    pkgTarget = `node${MAJOR_NODE_V}-linux-${arch}`;
   }
 
   const outputPath = path.join(outputFolder, finalBinaryName);

package/screen.js

@@ -1,4 +1,4 @@
-const { execSync } = require('child_process');
+const { spawnSync } = require('child_process');
 
 /**
  * Gets the screen size of the primary display. The implementation varies based on the operating system:
@@ -11,16 +11,18 @@ function getScreenSize() {
 
   try {
     if (platform === 'win32') {
-      const cmd = "powershell -command \"Get-CimInstance Win32_VideoController | Select-Object CurrentHorizontalResolution, CurrentVerticalResolution | Format-List\"";
-      const output = execSync(cmd).toString();
+      const result = spawnSync("powershell", ["-command", "Get-CimInstance Win32_VideoController | Select-Object CurrentHorizontalResolution, CurrentVerticalResolution | Format-List"]);
+      if (result.error || result.status !== 0) throw new Error("Failed to execute powershell");
+      const output = result.stdout.toString();
       const width = output.match(/CurrentHorizontalResolution\s*:\s*(\d+)/)?.[1];
       const height = output.match(/CurrentVerticalResolution\s*:\s*(\d+)/)?.[1];
       return { width: parseInt(width), height: parseInt(height) };
     } 
     
     if (platform === 'darwin') {
-      const cmd = "system_profiler SPDisplaysDataType | grep Resolution";
-      const output = execSync(cmd).toString();
+      const result = spawnSync("system_profiler", ["SPDisplaysDataType"]);
+      if (result.error || result.status !== 0) throw new Error("Failed to execute system_profiler");
+      const output = result.stdout.toString().split('\\n').filter(line => line.includes('Resolution')).join('\\n');
       const match = output.match(/(\d+) x (\d+)/);
       return { width: parseInt(match[1]), height: parseInt(match[2]) };
     } 

package/tray.js

@@ -1,5 +1,6 @@
 const { app } = require("./index");
 const { Menu } = require("./menu");
+const { warn } = require("./logs");
 
 let createdTray = false;
  
@@ -7,8 +8,10 @@ module.exports = {
 
 create(menu, title = "", icon = "") {
 
+  if(process.platform == "linux") return warn("Tray is not supported on Linux at this time.");
+
     if(createdTray) {
-        console.warn("Tray already created. Use setMenu, setTitle, or setIcon to update the existing tray.");
+        warn("Tray already created. Use setMenu, setTitle, or setIcon to update the existing tray.");
         return;
     }
     
@@ -34,6 +37,9 @@ create(menu, title = "", icon = "") {
   },
 
   setMenu(menu) {
+
+      if(process.platform == "linux") return warn("Tray is not supported on Linux at this time.");
+
     if(menu instanceof Menu) {
         menu = menu.template
     }
@@ -54,10 +60,12 @@ create(menu, title = "", icon = "") {
   },
 
   setTitle(title) {
+      if(process.platform == "linux") return warn("Tray is not supported on Linux at this time.");
     app.sendToNative("createTray", [title, "setTitle"]);
   },
 
   setIcon(iconPath) {
+      if(process.platform == "linux") return warn("Tray is not supported on Linux at this time.");
     app.sendToNative("createTray", [iconPath, "setIcon"]);
   }