Web app: similar support to the URI scheme should work no matter where the Web app is deployed.

Author: agarny

package.json

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "2025.03.17",
+  "version": "2025.03.18",
   "pnpm": {
     "onlyBuiltDependencies": [
       "electron",

src/constants.ts

@@ -0,0 +1,7 @@
+export const URI_SCHEME = 'opencor'
+export const FULL_URI_SCHEME = `${URI_SCHEME}://`
+
+export const SHORT_DELAY = 69
+export const LONG_DELAY = 369
+
+export const TOAST_LIFE = 3000

src/main/MainWindow.ts

@@ -2,10 +2,10 @@ import electron from 'electron'
 import * as electronSettings from 'electron-settings'
 import path from 'path'
 
+import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY } from '../constants'
 import { isDevMode, isMacOs } from '../electron'
 
 import icon from './assets/icon.png?asset'
-import { URI_SCHEME } from './index'
 import { ApplicationWindow } from './ApplicationWindow'
 import { disableMainMenu, enableMainMenu } from './MainMenu'
 import type { SplashScreenWindow } from './SplashScreenWindow'
@@ -85,18 +85,16 @@ export class MainWindow extends ApplicationWindow {
     // (also with a short delay if needed).
 
     this.once('show', () => {
-      let handleCommandLineDelay = 0
+      let handleCommandLineDelay = SHORT_DELAY
 
       if (!this._splashScreenWindowClosed && !!splashScreenWindow) {
-        const SHORT_DELAY = 369
-
         this._splashScreenWindowClosed = true
 
-        handleCommandLineDelay = SHORT_DELAY
+        handleCommandLineDelay = LONG_DELAY
 
         setTimeout(() => {
           splashScreenWindow.close()
-        }, SHORT_DELAY)
+        }, LONG_DELAY)
       }
 
       setTimeout(() => {
@@ -168,10 +166,8 @@ export class MainWindow extends ApplicationWindow {
 
   // Handle our command line arguments.
 
-  private _FULL_URI_SCHEME = `${URI_SCHEME}://`
-
   isAction(argument: string): boolean {
-    return argument.startsWith(this._FULL_URI_SCHEME)
+    return argument.startsWith(FULL_URI_SCHEME)
   }
 
   handleArguments(commandLine: string[]): void {
@@ -181,7 +177,7 @@ export class MainWindow extends ApplicationWindow {
 
     commandLine.forEach((argument) => {
       if (this.isAction(argument)) {
-        this.webContents.send('action', argument.slice(this._FULL_URI_SCHEME.length))
+        this.webContents.send('action', argument.slice(FULL_URI_SCHEME.length))
       } else if (argument !== '--allow-file-access-from-files' && argument !== '--enable-avfoundation') {
         // The argument is not an action (and not --allow-file-access-from-files or --enable-avfoundation either), so it
         // must be a file to open. But, first, check whether the argument is a relative path and, if so, convert it to

src/main/index.ts

@@ -6,6 +6,7 @@ import fs from 'fs'
 import * as nodeChildProcess from 'node:child_process'
 import path from 'path'
 
+import { URI_SCHEME } from '../constants'
 import { isDevMode, isWindows, isLinux } from '../electron'
 
 import { disableMainMenu, enableMainMenu } from './MainMenu'
@@ -27,8 +28,6 @@ if (electronSettings.getSync('resetAll')) {
 
 // Register our URI scheme.
 
-export const URI_SCHEME = 'opencor'
-
 electron.app.setAsDefaultProtocolClient(URI_SCHEME, isWindows() ? process.execPath : undefined)
 
 if (isLinux()) {

src/renderer/package.json

@@ -16,7 +16,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "2025.03.17",
+  "version": "2025.03.18",
   "devDependencies": {
     "@primeuix/themes": "^1.0.0",
     "@primevue/auto-import-resolver": "^4.3.2",

src/renderer/src/App.vue

@@ -27,6 +27,7 @@ import { useToast } from 'primevue/usetoast'
 import * as vue from 'vue'
 import * as vueusecore from '@vueuse/core'
 
+import { SHORT_DELAY, TOAST_LIFE } from '../../constants'
 import { electronAPI } from '../../electronAPI'
 import * as locAPI from '../../libopencor/locAPI'
 
@@ -51,9 +52,6 @@ function handleAction(action: string): void {
   const actionName = index !== -1 ? action.substring(0, index) : action
   const actionArguments = index !== -1 ? action.substring(index + 1) : ''
 
-  console.log(`actionName: >${actionName}<`)
-  console.log(`actionArguments: >${actionArguments}<`)
-
   if (isAction(actionName, 'openAboutDialog')) {
     onAbout()
   } else if (isAction(actionName, 'openSettingsDialog')) {
@@ -68,6 +66,13 @@ function handleAction(action: string): void {
       for (const filePath of filePaths) {
         openFile(filePath)
       }
+    } else {
+      toast.add({
+        severity: 'error',
+        summary: 'Handling an action',
+        detail: action + '\n\nThe action could not be handled.',
+        life: TOAST_LIFE
+      })
     }
   }
 }
@@ -115,7 +120,7 @@ electronAPI?.onCheckForUpdates(() => {
     severity: 'info',
     summary: 'Check for updates',
     detail: 'The Check for updates dialog has yet to be implemented.',
-    life: common.toastLife
+    life: TOAST_LIFE
   })
 })
 
@@ -142,7 +147,7 @@ function onSettings(): void {
     severity: 'info',
     summary: 'Settings',
     detail: 'The Settings dialog has yet to be implemented.',
-    life: common.toastLife
+    life: TOAST_LIFE
   })
 }
 
@@ -180,7 +185,7 @@ function openFile(fileOrFilePath: string | File): void {
             (fileType === locAPI.FileType.UnknownFile
               ? 'Only CellML files, SED-ML files, and COMBINE archives are supported.'
               : 'The file could not be retrieved.'),
-          life: common.toastLife
+          life: TOAST_LIFE
         })
       } else {
         contentsRef.value?.addFile(file)
@@ -199,7 +204,7 @@ function openFile(fileOrFilePath: string | File): void {
         severity: 'error',
         summary: 'Opening a file',
         detail: filePath + '\n\n' + (error instanceof Error ? error.message : String(error)),
-        life: common.toastLife
+        life: TOAST_LIFE
       })
     })
 }
@@ -277,37 +282,28 @@ function onResetAll(): void {
 
 // Things that need to be done when the component is mounted.
 
-const url = vueusecore.useStorage('url', '')
+const action = vueusecore.useStorage('action', '')
 
 vue.onMounted(() => {
-  // Check whether the URL contains an OpenCOR action, but with a bit of a delay to ensure that our background (with the
-  // OpenCOR logo) is properly rendered.
+  // Handle the action, if any. We handle the action with a bit of a delay to give our background (with the OpenCOR
+  // logo) time to be renderered.
   // Note: to use vue.nextTick() doesn't do the trick, so we have no choice but to use setTimeout().
 
   setTimeout(() => {
-    console.log(`window.location.pathname: >${window.location.pathname}<`)
-
     if (electronAPI === undefined) {
-      console.log(`window.location.pathname: >${window.location.pathname}<`)
-
-      console.log('window.location.pathname starts with https://')
-      if (window.location.pathname !== '/') {
-        console.log(`window.location.pathname: >${window.location.pathname}<`)
-        console.log('OLD url:', url.value)
-        url.value = window.location.pathname
-        console.log('NEW url:', url.value)
-
-        window.location.pathname = '/'
-      } else {
-        console.log(`window.location.pathname: >${window.location.pathname}<`)
-        console.log('CRT url:', url.value.substring(1))
+      if (window.location.search !== '') {
+        action.value = window.location.search.substring(1)
 
-        handleAction(url.value.substring(1))
+        window.location.search = ''
+      } else if (action.value !== '') {
+        setTimeout(() => {
+          handleAction(action.value)
 
-        url.value = ''
+          action.value = ''
+        }, SHORT_DELAY)
       }
     }
-  }, 0)
+  }, SHORT_DELAY)
 })
 </script>
 

src/renderer/src/common.ts

@@ -3,8 +3,6 @@ import { UAParser } from 'ua-parser-js'
 import { electronAPI } from '../../electronAPI'
 import * as locAPI from '../../libopencor/locAPI'
 
-export const toastLife = 3000
-
 const uaParser = new UAParser()
 
 export function isWindows(): boolean {