Add SUBSCRIBERURL parameter to set the subscriber urls

Author: gfenoy

env_sample

@@ -16,6 +16,8 @@ NEXTAUTH_SECRET=mysecret
 NEXTAUTH_URL=${NUXT_BASE_URL}${NUXT_BASE_URL_PREFIX}
 ZOO_OGCAPI_REQUIRES_BEARER_TOKEN=true
 
+SUBSCRIBERURL=http://zookernel/cgi-bin/publish.py
+
 # NODE_ENV=production
 # Uncomment NODE_ENV for production
 

nuxt.config.ts

@@ -74,7 +74,8 @@ export default defineNuxtConfig({
             NUXT_OIDC_CLIENT_ID: process.env.NUXT_OIDC_CLIENT_ID,
             AUTH_ORIGIN: process.env.AUTH_ORIGIN,
             NEXTAUTH_URL: process.env.NEXTAUTH_URL,
-            ZOO_OGCAPI_REQUIRES_BEARER_TOKEN: process.env.ZOO_OGCAPI_REQUIRES_BEARER_TOKEN
+            ZOO_OGCAPI_REQUIRES_BEARER_TOKEN: process.env.ZOO_OGCAPI_REQUIRES_BEARER_TOKEN,
+            SUBSCRIBERURL: process.env.SUBSCRIBERURL,
         },
     }
 })

pages/processes/[processId].vue

@@ -41,9 +41,9 @@ const helpContent = processIdHelp
 
 
 const subscriberValues = ref({
-  successUri: 'http://zookernel/cgi-bin/publish.py?jobid=JOBSOCKET-' + channelId.value + '&type=success',
-  inProgressUri: 'http://zookernel/cgi-bin/publish.py?jobid=JOBSOCKET-' + channelId.value + '&type=inProgress',
-  failedUri: 'http://zookernel/cgi-bin/publish.py?jobid=JOBSOCKET-' + channelId.value + '&type=failed'
+  successUri: `${config.public.SUBSCRIBERURL}?jobid=JOBSOCKET-${channelId.value}&type=success`,
+  inProgressUri: `${config.public.SUBSCRIBERURL}?jobid=JOBSOCKET-${channelId.value}&type=inProgress`,
+  failedUri: `${config.public.SUBSCRIBERURL}jobid=JOBSOCKET-${channelId.value}&type=failed`
 })
 
 
@@ -443,7 +443,14 @@ const submitProcess = async () => {
           const msgId = msg.id ?? null;
 
           if (msgJobId !== "JOBSOCKET-" + channelId.value && msgId !== jobId.value) {
-            console.log("Ignored WS message, not for this job:", msgJobId, msgId);
+            if(event.data!="1"){
+              progressPercent.value = 100;
+              progressMessage.value = "Completed successfully";
+              response.value = JSON.parse(event.data);
+              loading.value = false;
+              ws?.close();
+            }else
+              console.log("Ignored WS message, not for this job:", msgJobId, msgId);
             return;
           }
 
@@ -470,13 +477,6 @@ const submitProcess = async () => {
           }
         } catch (e) {
           console.error(" Invalid WS message:", event.data, e);
-          if(event.data!="1"){
-            progressPercent.value = 100;
-            progressMessage.value = "Completed successfully";
-            response.value = JSON.parse(event.data);
-            loading.value = false;
-            ws?.close();
-          }
         }
       };