1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
//! Subscription management
use clasp_core::{address::Pattern, SignalType, SubscribeOptions};
use dashmap::DashMap;
use std::collections::HashSet;
use crate::SessionId;
/// A subscription entry
#[derive(Debug, Clone)]
pub struct Subscription {
/// Subscription ID (unique per session)
pub id: u32,
/// Session that owns this subscription
pub session_id: SessionId,
/// Pattern to match
pub pattern: Pattern,
/// Signal types to filter (empty = all)
pub types: HashSet<SignalType>,
/// Subscription options
pub options: SubscribeOptions,
}
impl Subscription {
pub fn new(
id: u32,
session_id: SessionId,
pattern: &str,
types: Vec<SignalType>,
options: SubscribeOptions,
) -> Result<Self, clasp_core::Error> {
let pattern = Pattern::compile(pattern)?;
Ok(Self {
id,
session_id,
pattern,
types: types.into_iter().collect(),
options,
})
}
/// Check if this subscription matches an address
pub fn matches(&self, address: &str, signal_type: Option<SignalType>) -> bool {
// Check address pattern
if !self.pattern.matches(address) {
return false;
}
// Check signal type filter
if !self.types.is_empty() {
if let Some(st) = signal_type {
if !self.types.contains(&st) {
return false;
}
}
}
true
}
}
/// Manages all subscriptions
pub struct SubscriptionManager {
/// All subscriptions by (session_id, subscription_id)
subscriptions: DashMap<(SessionId, u32), Subscription>,
/// Index by address prefix for faster lookup
by_prefix: DashMap<String, Vec<(SessionId, u32)>>,
}
impl SubscriptionManager {
pub fn new() -> Self {
Self {
subscriptions: DashMap::new(),
by_prefix: DashMap::new(),
}
}
/// Add a subscription
pub fn add(&self, sub: Subscription) {
let key = (sub.session_id.clone(), sub.id);
// Add to prefix index (use first segment as prefix)
let prefix = sub
.pattern
.address()
.segments()
.first()
.map(|s| format!("/{}", s))
.unwrap_or_else(|| "/".to_string());
self.by_prefix
.entry(prefix)
.or_insert_with(Vec::new)
.push(key.clone());
self.subscriptions.insert(key, sub);
}
/// Remove a subscription
pub fn remove(&self, session_id: &SessionId, id: u32) -> Option<Subscription> {
let key = (session_id.clone(), id);
if let Some((_, sub)) = self.subscriptions.remove(&key) {
// Clean up the by_prefix index
let prefix = sub
.pattern
.address()
.segments()
.first()
.map(|s| format!("/{}", s))
.unwrap_or_else(|| "/".to_string());
// Remove from prefix index and clean up empty entries
self.by_prefix.alter(&prefix, |_, mut vec| {
vec.retain(|k| k != &key);
vec
});
// Remove empty prefix entries to prevent memory accumulation
self.by_prefix.retain(|_, v| !v.is_empty());
Some(sub)
} else {
None
}
}
/// Remove all subscriptions for a session
pub fn remove_session(&self, session_id: &SessionId) {
let keys: Vec<_> = self
.subscriptions
.iter()
.filter(|entry| entry.key().0 == *session_id)
.map(|entry| entry.key().clone())
.collect();
for key in &keys {
self.subscriptions.remove(key);
}
// Clean up by_prefix index - remove entries referencing this session
for mut entry in self.by_prefix.iter_mut() {
entry.value_mut().retain(|k| k.0 != *session_id);
}
// Remove empty prefix entries
self.by_prefix.retain(|_, v| !v.is_empty());
}
/// Find all sessions subscribed to an address
pub fn find_subscribers(
&self,
address: &str,
signal_type: Option<SignalType>,
) -> Vec<SessionId> {
let mut subscribers = HashSet::new();
// Extract prefix from address (first segment)
let address_prefix = address
.split('/')
.nth(1)
.map(|s| format!("/{}", s))
.unwrap_or_else(|| "/".to_string());
// Collect candidate subscription keys from prefix index
let mut candidate_keys: Vec<(SessionId, u32)> = Vec::new();
// Check subscriptions indexed under the address's prefix
if let Some(keys) = self.by_prefix.get(&address_prefix) {
candidate_keys.extend(keys.iter().cloned());
}
// Also check subscriptions indexed under "/" (wildcard patterns like "/**")
if address_prefix != "/" {
if let Some(keys) = self.by_prefix.get("/") {
candidate_keys.extend(keys.iter().cloned());
}
}
// CRITICAL: Always check "/**" key - globstar patterns that start with /**
// get indexed under "/**" but match everything. Without this check,
// subscriptions to "/**" would never match any addresses.
if let Some(keys) = self.by_prefix.get("/**") {
candidate_keys.extend(keys.iter().cloned());
}
// Also check "/*" key for single-level wildcard patterns at root
if let Some(keys) = self.by_prefix.get("/*") {
candidate_keys.extend(keys.iter().cloned());
}
// Check only the candidate subscriptions
for key in candidate_keys {
if let Some(entry) = self.subscriptions.get(&key) {
let sub = entry.value();
if sub.matches(address, signal_type) {
subscribers.insert(sub.session_id.clone());
}
}
}
subscribers.into_iter().collect()
}
/// Get subscription count
pub fn len(&self) -> usize {
self.subscriptions.len()
}
/// Check if empty
pub fn is_empty(&self) -> bool {
self.subscriptions.is_empty()
}
}
impl Default for SubscriptionManager {
fn default() -> Self {
Self::new()
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_subscription_matching() {
let sub = Subscription::new(
1,
"session1".to_string(),
"/lumen/scene/*/layer/*/opacity",
vec![],
SubscribeOptions::default(),
)
.unwrap();
assert!(sub.matches("/lumen/scene/0/layer/3/opacity", None));
assert!(!sub.matches("/lumen/scene/0/opacity", None));
}
#[test]
fn test_manager() {
let manager = SubscriptionManager::new();
let sub = Subscription::new(
1,
"session1".to_string(),
"/test/**",
vec![],
SubscribeOptions::default(),
)
.unwrap();
manager.add(sub);
let subscribers = manager.find_subscribers("/test/foo/bar", None);
assert!(subscribers.contains(&"session1".to_string()));
}
#[test]
fn test_root_globstar_subscription() {
// Test that "/**" subscriptions match all addresses
let manager = SubscriptionManager::new();
let sub = Subscription::new(
1,
"session1".to_string(),
"/**",
vec![],
SubscribeOptions::default(),
)
.unwrap();
manager.add(sub);
// Should match any address
let subscribers = manager.find_subscribers("/a/b/c", None);
assert!(
subscribers.contains(&"session1".to_string()),
"/** should match /a/b/c"
);
let subscribers = manager.find_subscribers("/foo", None);
assert!(
subscribers.contains(&"session1".to_string()),
"/** should match /foo"
);
let subscribers = manager.find_subscribers("/deeply/nested/path/here", None);
assert!(
subscribers.contains(&"session1".to_string()),
"/** should match deeply nested paths"
);
}
#[test]
fn test_multiple_globstar_patterns() {
// Test multiple globstar patterns coexisting
let manager = SubscriptionManager::new();
// Root globstar
manager.add(
Subscription::new(
1,
"global".to_string(),
"/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
// Specific prefix globstar
manager.add(
Subscription::new(
2,
"lumen".to_string(),
"/lumen/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
// Non-matching prefix globstar
manager.add(
Subscription::new(
3,
"other".to_string(),
"/other/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
// /lumen/scene/0 should match both "global" (/**) and "lumen" (/lumen/**)
let subscribers = manager.find_subscribers("/lumen/scene/0", None);
assert!(subscribers.contains(&"global".to_string()));
assert!(subscribers.contains(&"lumen".to_string()));
assert!(!subscribers.contains(&"other".to_string()));
// /other/data should match "global" and "other"
let subscribers = manager.find_subscribers("/other/data", None);
assert!(subscribers.contains(&"global".to_string()));
assert!(subscribers.contains(&"other".to_string()));
assert!(!subscribers.contains(&"lumen".to_string()));
}
#[test]
fn test_remove_cleans_up_by_prefix() {
let manager = SubscriptionManager::new();
// Add a subscription
let sub = Subscription::new(
1,
"session1".to_string(),
"/test/**",
vec![],
SubscribeOptions::default(),
)
.unwrap();
manager.add(sub);
assert_eq!(manager.len(), 1);
// Remove the subscription
let removed = manager.remove(&"session1".to_string(), 1);
assert!(removed.is_some());
assert_eq!(manager.len(), 0);
// by_prefix should be cleaned up (empty entries removed)
// We can verify this indirectly by checking that a new subscription
// to the same prefix works correctly
let sub2 = Subscription::new(
2,
"session2".to_string(),
"/test/**",
vec![],
SubscribeOptions::default(),
)
.unwrap();
manager.add(sub2);
let subscribers = manager.find_subscribers("/test/foo", None);
assert_eq!(subscribers.len(), 1);
assert!(subscribers.contains(&"session2".to_string()));
}
#[test]
fn test_remove_session_cleans_up_by_prefix() {
let manager = SubscriptionManager::new();
// Add multiple subscriptions for one session
manager.add(
Subscription::new(
1,
"session1".to_string(),
"/test/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
manager.add(
Subscription::new(
2,
"session1".to_string(),
"/other/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
// Add subscription for different session
manager.add(
Subscription::new(
1,
"session2".to_string(),
"/test/**",
vec![],
SubscribeOptions::default(),
)
.unwrap(),
);
assert_eq!(manager.len(), 3);
// Remove all subscriptions for session1
manager.remove_session(&"session1".to_string());
assert_eq!(manager.len(), 1);
// Session2 should still get messages
let subscribers = manager.find_subscribers("/test/foo", None);
assert_eq!(subscribers.len(), 1);
assert!(subscribers.contains(&"session2".to_string()));
// /other/** should have no subscribers
let subscribers = manager.find_subscribers("/other/foo", None);
assert_eq!(subscribers.len(), 0);
}
}