Merge pull request #14 from foundersandcoders/workingEXE

Working exe

Author: ShaughnAnderson94

.DS_Store

@@ -1,2 +1,3 @@
 node_modules
-data.xml
+data.xml
+out/

.gitignore

@@ -0,0 +1,44 @@
+const { FusesPlugin } = require('@electron-forge/plugin-fuses');
+const { FuseV1Options, FuseVersion } = require('@electron/fuses');
+
+module.exports = {
+  packagerConfig: {
+    asar: true,
+  },
+  rebuildConfig: {},
+  makers: [
+    {
+      name: '@electron-forge/maker-squirrel',
+      config: {},
+    },
+    {
+      name: '@electron-forge/maker-zip',
+      platforms: ['darwin'],
+    },
+    {
+      name: '@electron-forge/maker-deb',
+      config: {},
+    },
+    {
+      name: '@electron-forge/maker-rpm',
+      config: {},
+    },
+  ],
+  plugins: [
+    {
+      name: '@electron-forge/plugin-auto-unpack-natives',
+      config: {},
+    },
+    // Fuses are used to enable/disable various Electron functionality
+    // at package time, before code signing the application
+    new FusesPlugin({
+      version: FuseVersion.V1,
+      [FuseV1Options.RunAsNode]: false,
+      [FuseV1Options.EnableCookieEncryption]: true,
+      [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
+      [FuseV1Options.EnableNodeCliInspectArguments]: false,
+      [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
+      [FuseV1Options.OnlyLoadAppFromAsar]: true,
+    }),
+  ],
+};

forge.config.js

@@ -1,15 +1,32 @@
 // const {xsd} = require("./schema-for-validate")
 const xmllint = require('xmllint');
-const { app, BrowserWindow, ipcMain, globalShortcut } = require("electron");
+const { app, BrowserWindow, ipcMain, globalShortcut, dialog, shell  } = require("electron");
 const path = require("node:path");
 const fs = require("fs");
 const xmlbuilder = require("xmlbuilder");
 const currentDate = new Date(Date());
 const isoWithoutMsOrZ = currentDate.toISOString().split('.')[0];
 const dateOnlyString = isoWithoutMsOrZ.replace(/T.*/, '');
 const { Worker } = require('worker_threads');
+const os = require('os');
 
+const log = require('electron-log');
+const { error } = require('node:console');
 
+log.info('Application starting...');
+
+process.on('uncaughtException', (error) => {
+    log.error('Uncaught Exception:', error);
+});
+
+const tempDir = path.join(os.tmpdir(), `electron-${app.name}-xmls`);
+let XMLfilePath = ""
+let versionForExport = ""
+const formatDateTime = (date) => {
+  const yyyymmdd = date.toISOString().split('T')[0].replace(/-/g, '');
+  const hhmmss = date.toTimeString().split(' ')[0].replace(/:/g, '');
+  return `${yyyymmdd}-${hhmmss}`;
+};
 let xmlBase = {
 
   Header: {
@@ -72,6 +89,7 @@ app.whenReady().then(() => {
 
 ipcMain.on("upload-csv", (event, dataArray, version) => {
   try {
+    versionForExport = version
     if (dataArray.some((learner, learnerIndex) => 
     learner.some((item, index) => {
       let exceptionIndices = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,193];
@@ -478,68 +496,104 @@ console.log(result); // Outputs: "ab-cd"*/
   .att('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
   .end({ pretty: true });
 
-  const formatDateTime = (date) => {
-    const yyyymmdd = date.toISOString().split('T')[0].replace(/-/g, '');
-    const hhmmss = date.toTimeString().split(' ')[0].replace(/:/g, '');
-    return `${yyyymmdd}-${hhmmss}`;
-  };
+ 
 
 
- 
+  XMLfilePath = path.join(tempDir, `ILR-10085696-${version.split('.')[0]}-${formatDateTime(currentDate)}-01.xml`)
 
-  fs.writeFile(`ILR-10085696-${version.split('.')[0]}-${formatDateTime(currentDate)}-01.xml`, xml, (err) => {
+  fs.writeFile(XMLfilePath, xml, (err) => {
     if (err) {
       console.error(err);
       event.reply('xml-creation-failed', err.message);
     } else {
       console.log("The XML file was saved successfully.");
       event.reply('xml-created', `ILR-10085696-${version.split('.')[0]}-${formatDateTime(currentDate)}-01.xml`);
+      log.info('xml file created'); 
+
     }
 
   });
-  let xsd = fs.readFileSync("ILR-2024-25-schemafile-January.xsd", 'utf-8');
+  let xsd = fs.readFileSync(path.join(__dirname, "ILR-2024-25-schemafile-January.xsd"), 'utf-8');
+  log.info('schema declared'); 
 
 
 
-const worker = new Worker('./xmlValidator.js', {
-  workerData: { xml, xsd }
-});
+    log.info('Attempting to create worker...');
+    // log.info('xml before worker creation ', xml, ' xsd before worker creation ', xsd)
+    const worker = new Worker(path.join(__dirname, 'xmlValidator.js'), {
+      workerData: { xml, xsd }
+    });
+    log.info('Worker created successfully'); 
+
 
+log.info('worker created')
 worker.on('message', (result) => {
+  log.info('information received')
+
   if (result.valid) {
       console.log("The XML is valid!");
+      
       // event.reply('xml-validation-success', result);
   } else {
+    log.info("results being sent ", result)
       event.reply('xml-validation-errors', result);
+
   }
 });
 
 worker.on('error', (error) => {
   console.error("Worker error:", error);
+  log.error('Worker error:', error);
   event.reply('xml-validation-errors', [error.message]);
 });
 
 worker.on('exit', (code) => {
   if (code !== 0) {
       console.error(`Worker stopped with exit code ${code}`);
+      log.error(`Worker stopped with exit code ${code}`)
+
   }
 });
 
-
-
-
-
-
-  xml = null;
-  xsd = null;
 
 
 }
 } catch (error) {
   console.error("An error occurred during XML validation:", error);
 }
+log.info('end of csv upload')
 });
 
+ipcMain.on("openSave",event => {
+async function saveDialouge() {
+  
+ try {
+
+    
+    // Show save dialog
+    const result =  await dialog.showSaveDialog({
+        title: 'Export XML File',
+        defaultPath: path.join(app.getPath('documents'), `ILR-10085696-${versionForExport.split('.')[0]}-${formatDateTime(currentDate)}-01.xml`),
+        filters: [
+            { name: 'XML Files', extensions: ['xml'] }
+        ]
+    });
+console.log('result.cancled', result.canceled, " result filepath " , result.filePath)
+    // If user didn't cancel
+    if (!result.canceled && result.filePath) {
+        // Copy from temp to chosen location
+        console.log('copy file from ',XMLfilePath, ' to ', result.filePath)
+        await fs.promises.copyFile(XMLfilePath, result.filePath);  
+        }
+    else{
+      console.log('result canceled or has no file path')
+    }
+} catch (error) {
+    console.error('Error exporting temporary XML:', error);
+    throw error;
+}}
+saveDialouge();
+});
 
 
 app.on("window-all-closed", () => {