redmineup 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb516fc8ae25a65558bec625b9603e7aacd7188d473e80b23eb27223050d2ac
-  data.tar.gz: 66e4cecc1aa21ab23211e51774fbd262840f5df3efdbb9bb355d20870d142909
+  metadata.gz: 16f1cce1801a74eabcd8a01b4c1039f3bec3a1e4ced0911a75f1f01b2294a7ec
+  data.tar.gz: 9d8172c485f65ca0c76fa2af110e2b326ed9282b5655d00ed8532cf69e75a0d8
 SHA512:
-  metadata.gz: 43bddd0b96c58e00fc4645476801b1792022bce7c13588dc99f00486f77f47031e0fce58a4b5fe41d11b3dfca899527d003f294e1030957662141042e96e6a71
-  data.tar.gz: 4164a606ad2a264bb4501d3ec773215b5396b7da7dcdbc58bb09adadae630875d14dc9bdf4d669749b391ce19ff620df38c204d6474f2785f465d1e7b461a0b7
+  metadata.gz: 46644a7392b9f57a5343499c03d7bc5a1c87a76793b09c5c6bde68c79f007bd7a65228fa5bf67cc2cf1ddccb9232c83b1dc0038195ee1bc810597dba3b2fb83e
+  data.tar.gz: 49f143063899297dfed5ea555c2fc38d3d22b534ec3ec63013784f802571ccd10c511d0b24790f68a4456ef8fa15b6d174381bea2a33059704f89236caf1c286

data/app/assets/javascripts/consumer_worker.js

@@ -1,5 +1,7 @@
 const connections = new Map();
 const MAX_PENDING_ACK = 3;
+const RETRY_BASE_DELAY = 5000;
+const RETRY_MAX_DELAY = 320000;
 
 self.onconnect = function (event) {
   const clientPort = event.ports[0];
@@ -114,26 +116,41 @@ function sendSubscribe(socket, identifier) {
 }
 
 function initSocketStruct() {
-  return { socket: null, clients: new Map() };
+  return { socket: null, clients: new Map(), retryDelay: RETRY_BASE_DELAY };
 }
 
 function initWebSocket(url) {
   const conn = connections.get(url);
   if (!conn) return;
 
-  conn.socket = new WebSocket(url);
+  if (conn.socket) {
+    try {
+      conn.socket.onopen =
+        conn.socket.onmessage =
+        conn.socket.onclose =
+        conn.socket.onerror =
+          null;
+      conn.socket.close();
+    } catch (e) {}
+  }
+
+  const socket = new WebSocket(url);
+  conn.socket = socket;
 
   conn.socket.onopen = function () {
+    if (conn.socket !== socket) return;
+    conn.retryDelay = RETRY_BASE_DELAY;
     const seen = new Set();
     for (const { channelIdentifier } of conn.clients.values()) {
       if (!seen.has(channelIdentifier)) {
         seen.add(channelIdentifier);
-        sendSubscribe(conn.socket, channelIdentifier);
+        sendSubscribe(socket, channelIdentifier);
       }
     }
   };
 
   conn.socket.onmessage = function (event) {
+    if (conn.socket !== socket) return;
     const messageData = (event.data && JSON.parse(event.data)) || {};
 
     if (messageData.type === "confirm_subscription") {
@@ -154,15 +171,18 @@ function initWebSocket(url) {
     });
   };
 
-  conn.socket.onclose = function () {
+  socket.onclose = function () {
+    if (conn.socket !== socket) return;
     broadcastTo(conn, { type: "disconnected" });
+    const delay = conn.retryDelay;
+    conn.retryDelay = Math.min(conn.retryDelay * 2, RETRY_MAX_DELAY);
     setTimeout(function () {
-      if (connections.has(url)) initWebSocket(url);
-    }, 5000);
+      if (connections.has(url) && conn.socket === socket) initWebSocket(url);
+    }, delay);
   };
 
-  conn.socket.onerror = function (error) {
-    conn.socket.close();
+  socket.onerror = function (error) {
+    socket.close();
   };
 }
 

data/doc/CHANGELOG

@@ -4,6 +4,11 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-07-23 v1.1.12
+
+* Fixed race condition and added exponential backoff to shared worker websocket reconnect logic
+* Added `Redmineup::TestHelper#load_plugin_fixtures` for loading plugin test fixtures
+
 == 2026-06-26 v1.1.11
 
 * Added shared workers for websocket connection

data/lib/redmineup/helpers/test_helper.rb

@@ -0,0 +1,12 @@
+module Redmineup
+  module TestHelper
+    module ClassMethods
+      def load_plugin_fixtures(plugin_name, *names)
+        fixtures_dir = File.join(Redmine::Plugin.find(plugin_name).directory, 'test', 'fixtures')
+        ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, names)
+      end
+    end
+  end
+end
+
+ActiveSupport::TestCase.extend Redmineup::TestHelper::ClassMethods

data/lib/redmineup/version.rb

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

data/lib/redmineup.rb

@@ -45,6 +45,7 @@ require 'redmineup/helpers/external_assets_helper'
 require 'redmineup/helpers/form_tag_helper'
 require 'redmineup/helpers/calendars_helper'
 require 'redmineup/helpers/datetime_helper'
+require 'redmineup/helpers/test_helper'
 require 'redmineup/assets_manager'
 
 require 'redmineup/patches/liquid_patch'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,6 +174,7 @@ files:
 - lib/redmineup/helpers/external_assets_helper.rb
 - lib/redmineup/helpers/form_tag_helper.rb
 - lib/redmineup/helpers/tags_helper.rb
+- lib/redmineup/helpers/test_helper.rb
 - lib/redmineup/helpers/vote_helper.rb
 - lib/redmineup/hooks/views_layouts_hook.rb
 - lib/redmineup/liquid/drops/attachment_drop.rb