Release 2.4.17

Author: lfeigen

.gitignore

@@ -84,4 +84,4 @@ wlsrc
 wlsrc/**
 
 translation-work
-translation-work/**
+.metadata

THIRD_PARTY_LICENSES.txt

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.16</version>
+    <version>2.4.17</version>
   </parent>
 
   <packaging>pom</packaging>

assembly/pom.xml

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021, 2024, Oracle and/or its affiliates.
+# Copyright 2021, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 do_docker_pull() {
@@ -170,6 +170,7 @@ then
   export ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=$https_proxy
 fi
 
+npm install --location=global npm || true
 npm install
 
 rm -rf dist

build-electron.sh

@@ -6,13 +6,13 @@
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.4.16</version>
+  <version>2.4.17</version>
   <name>Build Tools</name>
 
   <parent>
       <groupId>com.oracle.weblogic</groupId>
       <artifactId>console-backend</artifactId>
-      <version>2.4.16</version>
+      <version>2.4.17</version>
   </parent>
 
   <properties>

build-tools/pom.xml

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -46,6 +46,7 @@ const AppConfig = (() => {
       if (settings.checkPpidMillis) _config['checkPpidMillis'] = settings.checkPpidMillis;
       if (settings.javaPath) _config['javaPath'] = `${settings.javaPath}`;
       if (settings.executablePath) _config['executableJar'] = `${_appPaths.exe}/${settings.executablePath}`;
+      if (settings['weblogic.remoteconsole.java.startoptions']) _config['weblogic.remoteconsole.java.startoptions'] = `${settings['weblogic.remoteconsole.java.startoptions']}`;
     },
     read: () => {
       if (fs.existsSync(AppConfig.getPath())) {
@@ -60,6 +61,8 @@ const AppConfig = (() => {
         }
         catch(err) {
           log('error', err);
+          const WindowManagement = require('./window-management');
+          WindowManagement.corruptFile(AppConfig.getPath());
         }
       }
     },

electron/app/js/config-json.js

@@ -20,12 +20,12 @@ const LoggingLevels = [
 let _logFilename;
 let _loggingLevel;
 let _isHeadlessMode;
-let _isStdoutErrorEpipe;
+let _isStdoutEnabled;
 
 (function () {
   _loggingLevel = 'info';
   _isHeadlessMode = false;
-  _isStdoutErrorEpipe = false;
+  _isStdoutEnabled = false;
   const _error = console.error;
   const _warning = console.warning;
   const _debug = console.debug;
@@ -53,15 +53,15 @@ let _isStdoutErrorEpipe;
 
   // Handle error on stdout and also prevent a dialog box when using console logging functions...
   process.stdout.on('error', function (error) {
-    if (error.code == 'EPIPE') _isStdoutErrorEpipe = true;
+    if (error.code == 'EPIPE') _isStdoutEnabled = false;
     const caller = _getCaller((new Error('StackLog')));
     const line = `${getLogEntryDateTime()} ${getLogEntryLevel('error')} ${caller} ${error}`;
     fs.appendFileSync(_logFilename, line + os.EOL);
   });
 })();
 
 function _useConsoleLogging() {
-  return (!_isHeadlessMode && !_isStdoutErrorEpipe);
+  return (_isStdoutEnabled && !_isHeadlessMode);
 }
 
 function initializeLog(options) {
@@ -179,6 +179,10 @@ function setOptions(options) {
   }
 }
 
+function setStdoutEnabled() {
+  _isStdoutEnabled = true;
+}
+
 function rotateLog(options) {
   _logFilename = _rotateLogfile(options.appPaths.userData, options.baseFilename);
   if (options.loggingLevel) _loggingLevel = options.loggingLevel;
@@ -226,5 +230,6 @@ module.exports = {
   setLoggingLevel,
   getLoggingLevel,
   setOptions,
+  setStdoutEnabled,
   rotateLog
 };

electron/app/js/console-logger.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -357,7 +357,15 @@ const ProjectManagement = (() => {
       return result;
     },
     readProjects: (userDataPath) => {
-      UserProjects.read(userDataPath);
+      try {
+        UserProjects.read(userDataPath);
+      } catch(err) {
+        log('error', `Cannot read project file: ${err}`);
+        const WindowManagement = require('./window-management');
+        WindowManagement.corruptFile(UserProjects.getPath(userDataPath));
+        // The file is removed by corruptFile()
+        UserProjects.read(userDataPath);
+      }
     }
   };
 

electron/app/js/project-management.js

@@ -101,6 +101,13 @@ const SettingsEditor = (() => {
       else if (key === 'console.disableHostnameVerification') {
         preferences.value('networking.disableHostnameVerification', data[key]);
       }
+      else if (key === 'weblogic.remoteconsole.java.startoptions') {
+        const list = [];
+        for (var entry of data[key].split(';')) {
+          list.push(entry);
+        }
+        preferences.value('java.javaStartOptions', list);
+      }
       else if (key === 'weblogic.remote-console-logging') {
         const list = [];
         for (var rule of data[key].split(';')) {
@@ -165,6 +172,16 @@ const SettingsEditor = (() => {
         data['weblogic.remote-console-logging'] += entry;
       }
     }
+    const javaOptionsList = preferences.preferences?.java?.javaStartOptions;
+    if (javaOptionsList) {
+      for (var entry of javaOptionsList) {
+        if (data['weblogic.remoteconsole.java.startoptions'])
+          data['weblogic.remoteconsole.java.startoptions'] += ';';
+        else
+          data['weblogic.remoteconsole.java.startoptions'] = '';
+        data['weblogic.remoteconsole.java.startoptions'] += entry;
+      }
+    }
     fs.writeFileSync(path, JSON.stringify(data, null, 4));
     decryptData(data);
     if (configSender)
@@ -446,6 +463,30 @@ const SettingsEditor = (() => {
                   }
                 ]
               }
+          },
+          {
+              id: 'java',
+              label: `${I18NUtils.get('wrc-electron.menus.settings.section.java.label')}`,
+              icon: 'preferences',
+              form: {
+                groups: [
+                  {
+                    'fields': [
+                      {
+                        label: `${I18NUtils.get('wrc-electron.menus.settings.java-options.label')}`,
+                        help: `${I18NUtils.get('wrc-electron.menus.settings.java-options.help')}`,
+                        key: 'javaStartOptions',
+                        type: 'list'
+                      },
+                      {
+                        type: 'button',
+                        key: 'save',
+                        buttonLabel: `${I18NUtils.get('wrc-electron.common.save')}`,
+                      }
+                    ]
+                  }
+                ]
+              }
           }]
       };
       preferences = new ElectronPreferences(preferencesTemplate);

electron/app/js/settings-editor.js

@@ -15,6 +15,7 @@ const UserPrefs = require('./user-prefs-json');
 const SettingsEditor = require('./settings-editor');
 var supportsAutoUpgrades = false;
 var findString = '';
+const path = require('path');
 
 /**
  * See {@link https://stackabuse.com/javascripts-immediately-invoked-function-expressions/}
@@ -35,6 +36,7 @@ const WindowManagement = (() => {
   // persisted in the auto-prefs.json file
   const AutoPrefs = require('./auto-prefs-json');
 
+  let corruption = [];
   let _window;
   let _params;
   let newVersion;
@@ -63,6 +65,25 @@ const WindowManagement = (() => {
     });
   }
 
+  function saveCorruption(filename, newfilename) {
+    corruption.push({ 'filename': filename, 'newfilename': newfilename });
+  }
+
+  function processSavedCorruption() {
+    for (var corr of corruption) {
+      showCorruption(corr.filename, corr.newfilename);
+    }
+    corruption = [];
+  }
+
+  function showCorruption(filename, newfilename) {
+    dialog.showMessageBoxSync(_window, {
+      title: `${I18NUtils.get('wrc-electron.corrupt-file-title', path.basename(filename))}`,
+      type: 'error',
+      message: `${I18NUtils.get('wrc-electron.corrupt-file-message', filename, newfilename)}`
+    });
+  }
+
   /**
    *
    * @private
@@ -756,7 +777,14 @@ const WindowManagement = (() => {
         });
       }
 
-      AutoPrefs.read(userDataPath);
+      try {
+        AutoPrefs.read(userDataPath);
+      } catch(err) {
+        log('error', `Cannot read auto preferences file: ${err}`);
+        WindowManagement.corruptFile(AutoPrefs.getPath(userDataPath));
+        // The file is removed by corruptFile()
+        AutoPrefs.read(userDataPath);
+      }
       AutoPrefs.set({
         version: params.version,
         location: (
@@ -785,6 +813,7 @@ const WindowManagement = (() => {
       _window = createBrowserWindow(title, AutoPrefs.get('width'), AutoPrefs.get('height'));
       _window.webContents.session.clearCache();
 
+      processSavedCorruption();
       _window.on('resize', () => {
         AutoPrefs.set({width: _window.getSize()[0], height: _window.getSize()[1]});
         AutoPrefs.write();
@@ -927,6 +956,16 @@ const WindowManagement = (() => {
     hideDockIconMacOS: () => {
       // Ensure the doc icon is hidden for MacOS
       if (OSUtils.isMacOS()) app.dock.hide();
+    },
+    corruptFile: (filename) => {
+      let date = new Date();
+      let newfilename = filename + "-corrupt-" + date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + "-" + Math.floor(Math.random() * 10000);
+      fs.rmSync(newfilename, { force: true } );
+      fs.renameSync(filename, newfilename);
+      if (!_window)
+        saveCorruption(filename, newfilename);
+      else
+        showCorruption(filename, newfilename);
     }
   };