redmineup 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6feb6d737db874723584bcc0b14626ed2934aa1ef1b225825358193ec456ee3
-  data.tar.gz: b6e44ef698a044cb4329219754a55fca5daaf977daf9e6ca8b1a4381a990e913
+  metadata.gz: ecb516fc8ae25a65558bec625b9603e7aacd7188d473e80b23eb27223050d2ac
+  data.tar.gz: 66e4cecc1aa21ab23211e51774fbd262840f5df3efdbb9bb355d20870d142909
 SHA512:
-  metadata.gz: 8ebf0a0812b6ec826c78da2f98f28b6b5f2b919fcfa892b998714ed7ae03ed15d4198e37d2798349a7932895ca54ad19148a76f8e2a9b009cea50b7a6c31bab2
-  data.tar.gz: bb3ad12a661044ef9d84f805541ebeacaf88c7fcee27b434748532b0848f04d311f89ab3ab0a5516f9a401d413868025c6fc543c541051e1c7ec9894fdb21dea
+  metadata.gz: 43bddd0b96c58e00fc4645476801b1792022bce7c13588dc99f00486f77f47031e0fce58a4b5fe41d11b3dfca899527d003f294e1030957662141042e96e6a71
+  data.tar.gz: 4164a606ad2a264bb4501d3ec773215b5396b7da7dcdbc58bb09adadae630875d14dc9bdf4d669749b391ce19ff620df38c204d6474f2785f465d1e7b461a0b7

data/app/assets/javascripts/consumer.js

@@ -1,76 +1,53 @@
 class activeCableConsumer {
-  OPEN = 1;
-
   constructor(consumer) {
     this.consumer = consumer;
-    this._isConnecting = true;
-
-    this.connect();
-  }
-
-  connect() {
-    this.socket = this.intializeSocket(this, this.consumer);
-    this._isConnecting = false;
-  }
+    this.uuid = crypto.randomUUID();
+    this._connected = false;
+
+    const worker = new SharedWorker(
+      consumer.workerUrl || window.redmineupWorkerUrl,
+    );
+    this._port = worker.port;
+
+    this._port.onmessage = (e) => {
+      const { type, data } = e.data;
+      if (type === "connected") {
+        this._connected = true;
+      } else if (type === "disconnected") {
+        this._connected = false;
+      } else if (type === "message") {
+        this.processMessage(data);
+      }
+      this._port.postMessage({ type: "ack" });
+    };
 
-  reconnect() {
-    if (!this._isConnecting) {
-      setTimeout(this.connect.bind(this), 3000);
-      this._isConnecting = true;
-    }
+    this._port.start();
+
+    this._port.postMessage({
+      type: "connect",
+      uuid: this.uuid,
+      data: {
+        url: consumer.url,
+        channel: consumer.channel,
+        chatId: consumer.chatId,
+      },
+    });
   }
 
   processMessage(message) {
     this.consumer.process(message);
   }
 
-  send(data) {
-    if (this.isOpen()) {
-      this.socket.send(JSON.stringify(data));
-      return true;
-    } else {
-      console.warn("WebSocket is not open");
-      return false;
-    }
-  }
-
   isOpen() {
-    return this.socket.readyState === this.OPEN;
+    return this._connected;
   }
 
-  intializeSocket(self, consumer) {
-    const socket = new WebSocket(consumer.url);
-
-    socket.onopen = function () {
-      const message = {
-        command: "subscribe",
-        identifier: JSON.stringify({
-          channel: consumer.channel,
-          chat_id: consumer.chatId,
-        }),
-      };
-      socket.send(JSON.stringify(message));
-    };
-
-    socket.onclose = function () {
-      self.reconnect();
-    };
-
-    socket.onmessage = function (event) {
-      const messageData = (event.data && JSON.parse(event.data)) || {};
-      if (messageData.type === "ping" || !messageData.message) {
-        return;
-      }
-      const message = messageData.message;
-
-      self.processMessage(message);
-    };
-
-    socket.onerror = function (error) {
-      console.log(error);
-      self.reconnect();
-    };
+  send(data) {
+    this._port.postMessage({ type: "send", data });
+    return true;
+  }
 
-    return socket;
+  disconnect() {
+    this._port.postMessage({ type: "disconnect" });
   }
 }

data/app/assets/javascripts/consumer_worker.js

@@ -0,0 +1,199 @@
+const connections = new Map();
+const MAX_PENDING_ACK = 3;
+
+self.onconnect = function (event) {
+  const clientPort = event.ports[0];
+  let clientUrl = null;
+  let clientUuid = null;
+  let channelIdentifier = null;
+
+  clientPort.onmessage = function (e) {
+    const { type, uuid, data } = e.data;
+
+    switch (type) {
+      case "connect": {
+        clientUuid = uuid;
+        clientUrl = data.url;
+        channelIdentifier = JSON.stringify({
+          channel: data.channel,
+          ...(data.chatId !== undefined && { chat_id: data.chatId }),
+        });
+
+        if (!connections.has(clientUrl)) {
+          connections.set(clientUrl, initSocketStruct());
+        }
+
+        const conn = connections.get(clientUrl);
+        const alreadySubscribed = hasChannelSubscribers(
+          conn,
+          channelIdentifier,
+        );
+
+        conn.clients.set(clientUuid, {
+          port: clientPort,
+          channelIdentifier,
+          pendingAck: 0,
+        });
+
+        if (!conn.socket || conn.socket.readyState > WebSocket.OPEN) {
+          initWebSocket(clientUrl);
+        } else if (
+          conn.socket.readyState === WebSocket.OPEN &&
+          !alreadySubscribed
+        ) {
+          sendSubscribe(conn.socket, channelIdentifier);
+        }
+        break;
+      }
+
+      case "send": {
+        if (clientUrl) {
+          const conn = connections.get(clientUrl);
+          if (
+            conn &&
+            conn.socket &&
+            conn.socket.readyState === WebSocket.OPEN
+          ) {
+            conn.socket.send(JSON.stringify(data));
+          }
+        }
+        break;
+      }
+
+      case "ack": {
+        if (clientUuid && clientUrl) {
+          const conn = connections.get(clientUrl);
+          if (conn) {
+            const client = conn.clients.get(clientUuid);
+            if (client) client.pendingAck = 0;
+          }
+        }
+        break;
+      }
+
+      case "disconnect": {
+        if (clientUuid && clientUrl) {
+          const conn = connections.get(clientUrl);
+          if (conn) {
+            conn.clients.delete(clientUuid);
+            const stillSubscribed = hasChannelSubscribers(
+              conn,
+              channelIdentifier,
+            );
+            if (
+              !stillSubscribed &&
+              conn.socket &&
+              conn.socket.readyState === WebSocket.OPEN
+            ) {
+              conn.socket.send(
+                JSON.stringify({
+                  command: "unsubscribe",
+                  identifier: channelIdentifier,
+                }),
+              );
+            }
+            if (conn.clients.size === 0) {
+              if (conn.socket) conn.socket.close();
+              connections.delete(clientUrl);
+            }
+          }
+          clientUuid = null;
+          clientUrl = null;
+          channelIdentifier = null;
+        }
+        break;
+      }
+    }
+  };
+
+  clientPort.start();
+};
+
+function sendSubscribe(socket, identifier) {
+  socket.send(JSON.stringify({ command: "subscribe", identifier }));
+}
+
+function initSocketStruct() {
+  return { socket: null, clients: new Map() };
+}
+
+function initWebSocket(url) {
+  const conn = connections.get(url);
+  if (!conn) return;
+
+  conn.socket = new WebSocket(url);
+
+  conn.socket.onopen = function () {
+    const seen = new Set();
+    for (const { channelIdentifier } of conn.clients.values()) {
+      if (!seen.has(channelIdentifier)) {
+        seen.add(channelIdentifier);
+        sendSubscribe(conn.socket, channelIdentifier);
+      }
+    }
+  };
+
+  conn.socket.onmessage = function (event) {
+    const messageData = (event.data && JSON.parse(event.data)) || {};
+
+    if (messageData.type === "confirm_subscription") {
+      routeToIdentifier(conn, messageData.identifier, { type: "connected" });
+      return;
+    }
+
+    if (messageData.type === "reject_subscription") {
+      routeToIdentifier(conn, messageData.identifier, { type: "rejected" });
+      return;
+    }
+
+    if (messageData.type === "ping" || !messageData.message) return;
+
+    routeToIdentifier(conn, messageData.identifier, {
+      type: "message",
+      data: messageData.message,
+    });
+  };
+
+  conn.socket.onclose = function () {
+    broadcastTo(conn, { type: "disconnected" });
+    setTimeout(function () {
+      if (connections.has(url)) initWebSocket(url);
+    }, 5000);
+  };
+
+  conn.socket.onerror = function (error) {
+    conn.socket.close();
+  };
+}
+
+function hasChannelSubscribers(conn, channelIdentifier) {
+  for (const client of conn.clients.values()) {
+    if (client.channelIdentifier === channelIdentifier) return true;
+  }
+  return false;
+}
+
+function routeToIdentifier(conn, identifier, message) {
+  console.log("routeToIdentifier:", identifier, message);
+  for (const [key, client] of conn.clients) {
+    if (client.channelIdentifier === identifier) {
+      if (client.pendingAck >= MAX_PENDING_ACK) {
+        conn.clients.delete(key);
+        continue;
+      }
+      client.pendingAck++;
+      client.port.postMessage(message);
+    }
+  }
+}
+
+function broadcastTo(conn, message) {
+  for (const [key, client] of conn.clients) {
+    if (client.pendingAck >= MAX_PENDING_ACK) {
+      conn.clients.delete(key);
+      continue;
+    }
+    client.pendingAck++;
+    client.port.postMessage(message);
+  }
+}

data/config/routes.rb

@@ -4,4 +4,6 @@ Rails.application.routes.draw do
   match 'redmineup/settings/:id', to: 'redmineup#settings', as: 'redmineup_settings', via: [:get, :post]
   match 'auto_completes/taggable_tags' => 'auto_completes#taggable_tags',
         via: :get, as: 'auto_complete_taggable_tags'
+
+  mount ActionCable.rup_server => '/rup_cable', as: 'rup_cable' if Redmineup.cable_available?
 end

data/doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-06-26 v1.1.11
+
+* Added shared workers for websocket connection
+
 == 2026-06-04 v1.1.10
 
 * Added colorpicker JS component to shared gem assets, loaded globally via `redmineup_assets`

data/lib/action_cable/connection/rup_connection.rb

@@ -0,0 +1,17 @@
+module ActionCable
+  module Connection
+    class RupConnection < ActionCable::Connection::Base
+      identified_by :current_user
+
+      def connect
+        self.current_user = find_verified_user
+      end
+
+      private
+
+      def find_verified_user
+        User.find_by(id: @request.session[:user_id]) || User.anonymous
+      end
+    end
+  end
+end

data/lib/action_cable/server/rup_server.rb

@@ -8,6 +8,10 @@ module ActionCable
         @mutex = Monitor.new
         @remote_connections = @event_loop = @worker_pool = @pubsub = nil
       end
+
+      def setup_heartbeat_timer
+        Rails.logger.info('Heartbeat timer disabled for RupServer')
+      end
     end
   end
 end

data/lib/redmineup/helpers/external_assets_helper.rb

@@ -4,13 +4,14 @@ module Redmineup
 
     def redmineup_assets
       return if @redmineup_assets_included
-      
+
       @redmineup_assets_included = true
       javascript_include_tag('consumer', plugin: GEM_NAME) +
         javascript_include_tag('select2', plugin: GEM_NAME) +
         javascript_include_tag('select2_helpers', plugin: GEM_NAME) +
         javascript_include_tag('jquery.colorPicker.min', plugin: GEM_NAME) +
-        stylesheet_link_tag('redmineup', plugin: GEM_NAME)
+        stylesheet_link_tag('redmineup', plugin: GEM_NAME) +
+        javascript_tag("window.redmineupWorkerUrl = #{asset_path('consumer_worker.js', plugin: GEM_NAME).to_json};")
     end
 
     def select2_assets
@@ -19,9 +20,9 @@ module Redmineup
 
     def chartjs_assets
       return if @chartjs_tag_included
+
       @chartjs_tag_included = true
       javascript_include_tag('chart.min', plugin: GEM_NAME)
     end
-
   end
 end

data/lib/redmineup/patches/action_cable_base_patch.rb

@@ -7,8 +7,15 @@ module Redmineup
       end
 
       module ClassMethods
-        def rup_broadcast_to(klass, model, message)
-          ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+        def rup_broadcast_to(*args)
+          # TODO: Remove to 2 args after plugins update
+          if args.length == 3
+            klass, model, message = args
+            ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+          else
+            model, message = args
+            ActionCable.rup_server.broadcast(broadcasting_for(model), message)
+          end
         end
       end
     end

data/lib/redmineup/patches/action_cable_patch.rb

@@ -1,10 +1,9 @@
 module Redmineup
   module Patches
     module ActionCablePatch
-
       def self.included(base)
         base.class_eval do
-          module_function def rup_server(klass = nil)
+          module_function def rup_server(klass = 'ActionCable::Connection::RupConnection')
             @rup_servers ||= {}
             return @rup_servers[klass] if @rup_servers[klass]
 
@@ -14,10 +13,9 @@ module Redmineup
         end
       end
     end
-
   end
 end
 
 unless ActionCable.included_modules.include?(Redmineup::Patches::ActionCablePatch)
-  ActionCable.send(:include, Redmineup::Patches::ActionCablePatch)
+  ActionCable.include Redmineup::Patches::ActionCablePatch
 end

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.10'
+  VERSION = '1.1.11'
 end

data/lib/redmineup.rb

@@ -66,6 +66,7 @@ require 'application_record' if !defined?(ApplicationRecord) && Rails.version <
 if Redmineup.cable_available?
   require 'action_cable/server/rup_configuration'
   require 'action_cable/server/rup_server'
+  require 'action_cable/connection/rup_connection'
   require 'redmineup/patches/action_cable_base_patch'
   require 'redmineup/patches/action_cable_patch'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-04 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ files:
 - app/assets/javascripts/Chart.bundle.min.js.bak
 - app/assets/javascripts/chart.min.js
 - app/assets/javascripts/consumer.js
+- app/assets/javascripts/consumer_worker.js
 - app/assets/javascripts/jquery.colorPicker.min.js
 - app/assets/javascripts/select2.js
 - app/assets/javascripts/select2_helpers.js
@@ -142,6 +143,7 @@ files:
 - doc/active-record-mixins.md
 - doc/assets-money-and-utilities.md
 - doc/tagging-and-select2.md
+- lib/action_cable/connection/rup_connection.rb
 - lib/action_cable/server/rup_configuration.rb
 - lib/action_cable/server/rup_server.rb
 - lib/application_record.rb