Improve organization with Claude

Author: garrettmflynn

packages/cli/index.ts

@@ -14,7 +14,10 @@ import {
   resolveHooks,
   resolveAppToLaunch,
   UserConfig,
-  valid
+  valid,
+
+  // Errors
+  CommonersError,
 } from '@commoners/solidarity'
 
 import pkg from './package.json' assert { type: 'json' }
@@ -143,14 +146,15 @@ cli
   .option('--public', 'Launch your service as public (services only)')
 
   .action(async (root, options) => {
-    const { config: configPath, service, public: isPublic, port, stdin, ...overrides } = options
-    const isOnlyServices = !overrides.target && service // Services take priority if specified
+    try {
+      const { config: configPath, service, public: isPublic, port, stdin, ...overrides } = options
+      const isOnlyServices = !overrides.target && service // Services take priority if specified
 
-    preprocessTarget(overrides.target, cliHooks)
-    const config = await getConfig({ root, config: configPath, stdin })
-    if (!config) return failed('Configuration not found')
-    const reconciledConfig = reconcile(config, overrides) as UserConfig
-    const hooks = await resolveHooks(reconciledConfig.hooks, cliHooks) // Default hooks
+      preprocessTarget(overrides.target, cliHooks)
+      const config = await getConfig({ root, config: configPath, stdin })
+      if (!config) return failed('Configuration not found')
+      const reconciledConfig = reconcile(config, overrides) as UserConfig
+      const hooks = await resolveHooks(reconciledConfig.hooks, cliHooks) // Default hooks
 
     let launchSpinner
     const start = message => {
@@ -207,11 +211,18 @@ cli
       }
     }
 
-    // Ensure services are not specified with a target
-    else if (service) return failed(`Cannot specify both services and a launch target`, `Specify either a target or services to launch`)
+      // Ensure services are not specified with a target
+      else if (service) return failed(`Cannot specify both services and a launch target`, `Specify either a target or services to launch`)
 
-    // Enhanced launch feedback
-    await launch({ ...reconciledConfig, hooks })
+      // Enhanced launch feedback
+      await launch({ ...reconciledConfig, hooks })
+    } catch (error) {
+      if (error instanceof CommonersError) {
+        ui.error(error.message, error.details)
+        process.exit(1)
+      }
+      throw error // Re-throw unexpected errors
+    }
   })
 
 // Build the application using the specified settings

packages/core/assets/electron/main.ts

@@ -146,7 +146,10 @@ runVerification().then(async isValid => {
     try {
       if (this.isDestroyed()) return // Do not send messages to destroyed windows
       return this.webContents.send(channel, ...args)
-    } catch (e) {} // Catch in case messages are registered as sendable for a window that has been closed
+    } catch (e) {
+      // Window may have been closed - this is expected and safe to ignore
+      console.debug(`Failed to send message to channel ${channel}:`, e instanceof Error ? e.message : e)
+    }
   }
 
   type ReadyFunction = (win: BrowserWindow) => any
@@ -593,10 +596,6 @@ runVerification().then(async isValid => {
       __location.hash = urlObj.hash
 
       await loadPage(win, urlObj.pathname) // Required for successful navigation relative to the root (e.g. "../..")
-
-      // // NOTE: This does not work when using loadFile
-      // const pageIdentifier = urlObj.pathname + urlObj.search + urlObj.hash
-      // loadPage(win, pageIdentifier) // Required for successful navigation relative to the root (e.g. "../..")
     })
 
     Object.defineProperty(win, '__show', {
@@ -731,15 +730,6 @@ runVerification().then(async isValid => {
     await boundRunAppPlugins([resolvedServices]) // Run plugins on start with resolved services
 
     app.whenReady().then(async () => {
-      // session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
-      //   console.log(`[CSP] Headers received for ${details.url}`)
-      //   callback({
-      //     responseHeaders: {
-      //       ...details.responseHeaders
-      //     }
-      //   })
-      // })
-
       // ------------------------ STDIN Commands ------------------------
 
       const rl = createInterface({
@@ -792,8 +782,6 @@ runVerification().then(async isValid => {
         const { protocol, net } = electron
         app.setAppUserModelId(`com.${scheme}`)
 
-        // console.log("Registered protocol", protocolOptions)
-
         protocol.handle(scheme, req => {
           const loadedURL = new URL(req.url)
           const { host, pathname, search, hash } = loadedURL

packages/core/assets/services/env/utils.ts

@@ -11,7 +11,8 @@ export function tryStatSync(file: string): Stats | undefined {
     // The "throwIfNoEntry" is a performance optimization for cases where the file does not exist
     return statSync(file, { throwIfNoEntry: false })
   } catch {
-    // Ignore errors
+    // File doesn't exist or cannot be accessed
+    return undefined
   }
 }
 

packages/core/assets/services/index.ts

@@ -339,7 +339,6 @@ export async function start(
 
     const resolvedURL = new URL(config.url)
 
-    // const host = getLocalIP() // Constrain to local IP address if not public
     resolvedURL.hostname = config.public ? '0.0.0.0' : resolvedURL.hostname
 
     hooks.emit({ type: 'service:launch:start',  service: label, filepath })
@@ -413,7 +412,6 @@ export async function start(
         hooks.emit({ type: 'service:exit', service: label, code  })
       })
 
-      // process.on('close', (code) => code === null ? console.log(chalk.gray(`Restarting ${label}...`)) : console.error(chalk.red(`[${label}] exited with code ${code}`)));
 
       hooks.emit({ type: 'service:launch:complete',  service: label, url: resolvedURL.href, filepath })
       processes[id] = childProcess
@@ -429,7 +427,7 @@ const killProcess = p => {
   try {
     return p.kill()
   } catch (e) {
-    console.error(e)
+    console.error(`Failed to kill process ${p.pid}:`, e instanceof Error ? e.message : e)
   }
 }
 

packages/core/assets/utils/icons.ts

@@ -1,13 +1,14 @@
 import { safePath } from './paths.js'
 
 // Copied types
+import type { IconType as ImportedIconType } from '../../types.js'
 type BaseIconType = string | string[]
 function tuple<T extends string[]>(...o: T) {
   return o
 }
 
 const valid = tuple('light', 'dark')
-type IconType = BaseIconType | Record<(typeof valid)[number], BaseIconType>
+type IconType = ImportedIconType
 
 const isIconValue = o => typeof o === 'string' || Array.isArray(o)
 
@@ -34,7 +35,7 @@ const getPreferredIcon = (
 
 // Get icon safely
 type IconOptions = {
-  type?: (typeof valid.icon)[number]
+  type?: (typeof valid)[number]
   preferredFormats?: string[]
 }
 
@@ -57,7 +58,7 @@ export const getIcon = (icon: IconType, options: IconOptions = {}) => {
   }
 
   // Get first valid icon
-  const found = valid.icon.find(str => isIconValue(icon[str]))
+  const found = valid.find(str => isIconValue(icon[str]))
   const resolved = found ? icon[found] : Object.values(icon).find(isIconValue)
   return resolved ? getPreferredIcon(resolved, preferredFormats) : resolved
 }

packages/core/assets/utils/index.ts

@@ -36,24 +36,6 @@ export function isPluginLoadable(plugin) {
   return isPluginFeatureSupported.call(this, plugin, 'load')
 }
 
-// const commonPluginFeatures = [ 'load', 'start', 'ready', 'quit' ]
-
-// export async function isPluginSupported (plugin, target) {
-
-//     const isDesktopBuild = target === 'desktop'
-
-//     let { desktop } = plugin
-//     if (desktop && isDesktopBuild) return true // Desktop plugins are always supported in desktop builds
-
-//     const supported = []
-//     for (const feature of commonPluginFeatures) {
-//         const supported = await isPluginFeatureSupported.call(this, plugin, feature)
-//         supported.push(supported)
-//     }
-
-//     return supported.some(supported => supported) // Support if any feature is supported
-// }
-
 export const sanitizePluginProperties = (plugin, target) => {
   const copy = { ...plugin }
 

packages/core/build.ts

@@ -14,6 +14,7 @@ import {
   vite,
   electronVersion,
 } from './globals.js'
+import { TARGET_ELECTRON, DIR_ELECTRON, DIR_MOBILE } from './constants.js'
 import {
   BuildHooks,
   ServiceBuildOptions,
@@ -35,11 +36,8 @@ import merge from './utils/merge.js'
 //     chainArtifactBuildCompleted,
 //     debugAfterPack,
 //     makeAfterPackEmbedAsarIntegrity,
-//     readIntegrityResource,
-//     afterPackFlipFuses
-// } from "./utils/asar/security.js";
-
-// import { logAsarState } from "./utils/asar/debug.js";
+// ASAR security features - commented out pending future implementation
+// See: https://github.com/commoners/commoners/issues/XXX
 
 // Core Internal Imports
 import { configureForDesktop, resolveConfig, resolveHooks } from './index.js'
@@ -61,8 +59,6 @@ export const buildServices = async (config: UserConfig = {}, options: ServiceBui
 
   const { outDir } = options
 
-  // if (!dev) await printHeader(`${name} – ${buildOnlyServices ? 'Building Selected Services' : `${getTargetDisplayName(target)} Build`}`)
-
   const resolvedConfig = await resolveConfig(config, { services, build: true })
   const { hooks } = resolvedConfig
 
@@ -117,7 +113,7 @@ export async function buildApp(
 
     const { publish, sign } = build
 
-    const isElectronBuild = target === 'electron'
+    const isElectronBuild = target === TARGET_ELECTRON
     const isDesktopBuild = isDesktop(target)
     const isMobileBuild = isMobile(target)
 
@@ -131,7 +127,7 @@ export async function buildApp(
 
     let wasOverwritten = false
     if (customTempDir) {
-      outDir = join(root, globalTempDir, isElectronBuild ? 'electron' : 'mobile')
+      outDir = join(root, globalTempDir, isElectronBuild ? DIR_ELECTRON : DIR_MOBILE)
       const { overwrite: __wasOverwritten } = await handleTemporaryDirectories(
         dirname(outDir),
         overwrite
@@ -178,7 +174,7 @@ export async function buildApp(
 
     if (onBuildAssets) {
       const result = onBuildAssets(outDir)
-      if (result === null) return // Skip packaging if requested
+      if (result === null) return undefined // Skip packaging if requested
     }
 
     // ------------------------- Target-Specific Build Steps -------------------------
@@ -272,7 +268,7 @@ export async function buildApp(
       if (preferredWinIcon) buildConfig.win.icon = resolveIconPath(preferredWinIcon)
 
       // Ensure proper absolute paths are provided for Electron build
-      const electronTemplateDir = path.join(templateDir, 'electron')
+      const electronTemplateDir = path.join(templateDir, DIR_ELECTRON)
 
       buildConfig.directories.buildResources = path.join(
         electronTemplateDir,
@@ -297,103 +293,8 @@ export async function buildApp(
           buildConfig[key] = path.join(root, buildConfig[key]) // Resolve paths relative to the root
       }
 
-      // // Ensure electron-builder runs our integrity injector first, then flips fuses
-      // if (buildConfig.asar && security.integrity) {
-
-      //     // Create debugged hook functions
-      //     const debuggedAfterPackFlipFuses = async (context: any) => {
-      //         const asarPath = join(context.appOutDir, 'resources', 'app.asar');
-      //         logAsarState('BEFORE_FUSE_FLIP', asarPath, { hook: 'afterPackFlipFuses' });
-
-      //         await afterPackFlipFuses(context);
-
-      //         logAsarState('AFTER_FUSE_FLIP', asarPath, { hook: 'afterPackFlipFuses' });
-      //     };
-
-      //     // Add this after your signing step
-      //     const verifyIntegrityAfterSigning = async (config: any, fail = true) => {
-      //         const exePath = path.resolve(config.file);
-
-      //         // Log ASAR state during artifact build completion
-      //         const artifactDir = path.dirname(exePath);
-      //         const possibleAsarPaths = [
-      //             path.join(artifactDir, 'win-unpacked', 'resources', 'app.asar'),
-      //             path.join(path.dirname(artifactDir), 'win-unpacked', 'resources', 'app.asar'),
-      //         ];
-
-      //         for (const asarPath of possibleAsarPaths) {
-      //             if (existsSync(asarPath)) {
-      //                 logAsarState('ARTIFACT_BUILD_COMPLETED_VERIFICATION', asarPath, {
-      //                     artifact: path.basename(exePath),
-      //                     hook: 'verifyIntegrityAfterSigning'
-      //                 });
-      //                 break;
-      //             }
-      //         }
-
-      //         const embedded = readIntegrityResource(exePath);
-      //         if (!embedded.length) {
-      //             const message = `⚠️\tNo integrity resource found in ${exePath}. This may indicate a problem with the signing process.`;
-      //             if (fail)  throw new Error(message);
-      //             console.warn(message);
-      //             return;
-      //         }
-      //     };
-
-      //     // OPTIONAL: if you still patch app.asar (e.g., your test blocker), do it here.
-      //     // Ensure it modifies the ASAR at `${appOutDir}/resources/app.asar` (Win/Linux) or
-      //     // `${appOutDir}/${product}.app/Contents/Resources/app.asar` (macOS).
-      //     const mutateAsar = async ({ appOutDir, productName }) => {
-      //         // Track ASAR state before mutation
-      //         const asarPath = join(appOutDir, 'resources', 'app.asar');
-      //         logAsarState('MUTATE_ASAR_START', asarPath, { hook: 'mutateAsar' });
-
-      //         // Example: run your patcher here so the final hash matches what ships.
-      //         // await cp.execFile('node', ['utilities/patch-electron-asar.js', '--app', appOutDir]);
-      //         console.log('🔧 ASAR mutation step (currently no-op)');
-
-      //         logAsarState('MUTATE_ASAR_END', asarPath, { hook: 'mutateAsar' });
-      //     };
-
-      //     // Hook setup with comprehensive debugging
-      //     buildConfig.afterPack = chainAfterPack(
-      //         buildConfig.afterPack,
-      //         debugAfterPack,
-      //         debuggedAfterPackFlipFuses,                            // flip fuses first
-      //         makeAfterPackEmbedAsarIntegrity(mutateAsar)           // then embed integrity LAST
-      //     );
-
-      //     buildConfig.artifactBuildCompleted = chainArtifactBuildCompleted(
-      //         buildConfig.artifactBuildCompleted,
-      //         (config) => {
-      //             // Add comprehensive logging for artifact build completion
-      //             const exePath = path.resolve(config.file);
-      //             console.log(`\n🔍 Artifact Build Completed: ${path.basename(exePath)}`);
-
-      //             // Find and log the associated unpacked directory
-      //             const artifactDir = path.dirname(exePath);
-      //             const possibleUnpackedDirs = [
-      //                 path.join(artifactDir, 'win-unpacked'),
-      //                 path.join(path.dirname(artifactDir), 'win-unpacked'),
-      //             ];
-
-      //             for (const unpackedDir of possibleUnpackedDirs) {
-      //                 if (existsSync(unpackedDir)) {
-      //                     const asarPath = path.join(unpackedDir, 'resources', 'app.asar');
-      //                     if (existsSync(asarPath)) {
-      //                         logAsarState('ARTIFACT_BUILD_COMPLETED', asarPath, {
-      //                             artifact: path.basename(exePath),
-      //                             unpackedDir,
-      //                             hook: 'artifactBuildCompleted'
-      //                         });
-      //                     }
-      //                 }
-      //             }
-
-      //             return verifyIntegrityAfterSigning(config, false);
-      //         }
-      //     );
-      // }
+      // TODO: Implement ASAR integrity checking
+      // See: https://github.com/commoners/commoners/issues/XXX
 
       buildConfig.mac.entitlementsInherit = path.join(
         electronTemplateDir,