fix issues with package paths in macos

routes/routes-api.js

@@ -70,7 +70,7 @@ router.post('/readExcelData', async (req, res) => {
   // this just dumps data out as-is.
 
   // var excelFile = path.join(__dirname, '..', 'ASSETS', req.body.filename); // fails when packaged
-  var excelFile = path.join(process.cwd(), 'ASSETS', req.body.filename);
+  var excelFile = path.join(config.startUpPath, 'ASSETS', req.body.filename);
   var workSheetsData;
   try {
 
@@ -216,7 +216,8 @@ router.post('/exportCSVfile', async (req, res) => {
   try {
     let timestamp  = spx.prettifyDate(new Date(), 'YYYY-MM-DD-HHMMSS');
     let filenameref = item_relpath.split('.')[0].replace('\\', '/').split('/').slice(-1)[0];
-    let CSVfileRef = path.join(process.cwd(), 'ASSETS', 'csv', filenameref + '_' + timestamp + '.csv');
+    // let CSVfileRef = path.join(process.cwd(), 'ASSETS', 'csv', filenameref + '_' + timestamp + '.csv'); // failed in (at least, macos) PKG version
+    let CSVfileRef = path.join(config.startUpPath, 'ASSETS', 'csv', filenameref + '_' + timestamp + '.csv');
     console.log('Writing file ' + CSVfileRef);
     await spx.writeTextFile(CSVfileRef,CSVdata);
     res.status(200).send('Yea man');

server.js

@@ -559,7 +559,8 @@ app.engine('handlebars', exphbs({
     DropdownOptionsLANG() {
       let html = '';
       let sel = '';
-      let fileListData = spx.getJSONFileList('./locales/');
+      // let fileListData = spx.getJSONFileList('./locales/'); // failed in (at least, macos) PKG version
+      let fileListData = spx.getJSONFileList(path.resolve(spx.getStartUpFolder(), './locales/'));
       fileListData.files.forEach((element,i) => {
         sel = '';
         if (element.name == config.general.langfile)

utils/logger.js

@@ -17,7 +17,8 @@ const myFormat = printf(({ level, message, label, timestamp }) => {
 
 let LOGLEVEL = config.general.loglevel || 'debug';
 let LOGFOLDER = config.general.logfolder || 'LOG';
-var logFile = path.resolve(process.cwd(),LOGFOLDER, 'access.log');
+// var logFile = path.resolve(process.cwd(),LOGFOLDER, 'access.log'); // failed in (at least, macos) PKG version
+var logFile = path.resolve(config.startUpPath, LOGFOLDER, 'access.log');
 
 const logger = createLogger({
   format: combine(

utils/spx_getconf.js

@@ -25,7 +25,7 @@ module.exports = {
             }
       },
 
-
+      
     readConfig: function () {
         // read config.json. Usage: "cfg.readConfig()"
         return new Promise(resolve => {
@@ -36,7 +36,7 @@ module.exports = {
                 // var startUpPath = path.resolve(process.execPath + '/..');  // This works while in pkg, but not in Node, so here we go:
 
                 let startUpPath, runtime
-                if ( process.pkg ) {
+                if ( typeof process.pkg !== 'undefined' && process.pkg  ) {
                     runtime = 'pkg'
                     startUpPath = path.resolve(process.execPath + '/..');
                 } else {
@@ -141,6 +141,9 @@ module.exports = {
                     global.config = JSON.parse(configFileStr);
                 }
 
+                // added to avoid circular dependency in spx_server_functions when used spx.startUpPath()
+                global.config.startUpPath = startUpPath;
+
                 // folderchecks
                 this.makeFolderIfNotExist(global.config.general.logfolder);
                 this.makeFolderIfNotExist(global.config.general.dataroot);

utils/spx_server_functions.js

@@ -362,11 +362,7 @@ module.exports = {
 getStartUpFolder: function () {
   // a workaround to resolve the path to the current startup folder
   // on this runtime session (node vs binary pkg)
-  if ( process.pkg ) {
-      return path.resolve(process.execPath + '/..');
-  } else {
-      return process.cwd();
-  }
+  return config.startUpPath;
 },