Merge branch 'next' into feature/FOUR-9709

ProcessMaker · Oct 13, 2023 · d46b3e9 · d46b3e9
2 parents d73585c + 484260b
commit d46b3e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.39.14",
+  "version": "1.39.15",
   "scripts": {
     "serve": "vue-cli-service serve --mode development",
     "test:unit": "vue-cli-service test:unit",

diff --git a/src/multiplayer/multiplayer.js b/src/multiplayer/multiplayer.js
@@ -48,7 +48,7 @@ export default class Multiplayer {
     this.room = new Room(`room-${window.ProcessMaker.modeler.process.id}`);
 
     // Connect to websocket server
-    this.clientIO = io(process.env.VUE_APP_WEBSOCKET_PROVIDER, { transports: ['websocket', 'polling']});
+    this.clientIO = io(window.ProcessMaker.multiplayer.host, { transports: ['websocket', 'polling']});
 
     this.clientIO.on('connect', () => {
       // Join the room

diff --git a/src/setup/globals.js b/src/setup/globals.js
@@ -33,6 +33,9 @@ window.ProcessMaker = {
   navbar: {
     alerts: [],
   },
+  multiplayer:{
+    host: process.env.VUE_APP_WEBSOCKET_PROVIDER,
+  },
   EventBus: new Vue(),
   apiClient: axios,
   alert(msg, variant, showValue = 60, stayNextScreen = false) {
@@ -54,4 +57,5 @@ window.ProcessMaker = {
       id: 1,
     },
   },
+
 };