Feat for media server #165
Conversation
…xt-hop which include it-self
WalkthroughWalkthroughThe recent modifications across multiple files introduce significant changes to type parameters, pattern matching, and data structures. These include updates to the Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
clippy found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #165 +/- ##
==========================================
- Coverage 83.62% 83.59% -0.04%
==========================================
Files 68 68
Lines 8972 9019 +47
==========================================
+ Hits 7503 7539 +36
- Misses 1469 1480 +11 ☔ View full report in Codecov by Sentry. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 49
Out of diff range and nitpick comments (4)
packages/network/src/data_plane/connection.rs (1)
Line range hint
29-37: Avoid magic numbers in buffer size calculations.- buf.ensure_back(12 + 16); //TODO remove magic numbers + const HEADER_SIZE: usize = 12; + const ENCRYPTION_OVERHEAD: usize = 16; + buf.ensure_back(HEADER_SIZE + ENCRYPTION_OVERHEAD);Using named constants instead of magic numbers improves code readability and maintainability.
packages/network/src/services/visualization.rs (1)
Line range hint
74-85: Consider adding a comment to explain the purpose of theVisualizationServiceimplementation block.+ // Implementation block for VisualizationService impl<UserData: Copy, SC, SE, TC, TW> VisualizationService<UserData, SC, SE, TC, TW> where SC: From<Control> + TryInto<Control>, SE: From<Event> + TryInto<Event>, { pub fn new() -> Self { Self { broadcast_seq: 0, last_ping: 0, conns: BTreeMap::new(), network_nodes: BTreeMap::new(), queue: VecDeque::from([ServiceOutput::FeatureControl(FeaturesControl::Data(data::Control::DataListen(DATA_PORT)))]), subscribers: Vec::new(), _tmp: std::marker::PhantomData, } } fn fire_event(&mut self, event: Event) { for sub in self.subscribers.iter() { self.queue.push_back(ServiceOutput::Event(*sub, event.clone().into())); } } }packages/network/src/data_plane.rs (1)
Line range hint
129-149: Theon_inputmethod doesn't need a mutable reference forself.switcher.- self.features.input(&mut self.switcher).on_input(&mut self.feature_ctx, feature, now_ms, FeatureWorkerInput::Control(actor, control)); + self.features.input(&self.switcher).on_input(&mut self.feature_ctx, feature, now_ms, FeatureWorkerInput::Control(actor, control));packages/network/src/features/pubsub/controller/source_hint.rs (1)
28-28: Consider adding a brief comment explaining the purpose of thederivativecrate for better code readability.use derivative::Derivative; // Used for deriving default implementations with custom bounds
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files ignored due to path filters (4)
Cargo.tomlis excluded by!**/*.tomlexamples/whip-whep/Cargo.tomlis excluded by!**/*.tomlpackages/network/Cargo.tomlis excluded by!**/*.tomlpackages/runner/Cargo.tomlis excluded by!**/*.toml
Files selected for processing (57)
- bin/src/main.rs (4 hunks)
- examples/quic-tunnel/src/sdn.rs (4 hunks)
- examples/quic-tunnel/src/vnet/mod.rs (2 hunks)
- examples/quic-tunnel/src/vnet/socket.rs (1 hunks)
- examples/whip-whep/src/main.rs (4 hunks)
- examples/whip-whep/src/sfu/cluster.rs (2 hunks)
- examples/whip-whep/src/sfu/mod.rs (6 hunks)
- examples/whip-whep/src/sfu/whep.rs (9 hunks)
- examples/whip-whep/src/sfu/whip.rs (8 hunks)
- examples/whip-whep/src/worker.rs (9 hunks)
- packages/network/src/base/feature.rs (4 hunks)
- packages/network/src/base/mod.rs (1 hunks)
- packages/network/src/base/msg.rs (9 hunks)
- packages/network/src/base/secure.rs (3 hunks)
- packages/network/src/base/service.rs (4 hunks)
- packages/network/src/controller_plane.rs (3 hunks)
- packages/network/src/controller_plane/features.rs (1 hunks)
- packages/network/src/controller_plane/neighbours.rs (3 hunks)
- packages/network/src/controller_plane/neighbours/connection.rs (14 hunks)
- packages/network/src/controller_plane/services.rs (1 hunks)
- packages/network/src/data_plane.rs (5 hunks)
- packages/network/src/data_plane/connection.rs (3 hunks)
- packages/network/src/data_plane/features.rs (1 hunks)
- packages/network/src/data_plane/services.rs (2 hunks)
- packages/network/src/features/alias.rs (17 hunks)
- packages/network/src/features/data.rs (4 hunks)
- packages/network/src/features/dht_kv/client.rs (4 hunks)
- packages/network/src/features/dht_kv/client/map.rs (15 hunks)
- packages/network/src/features/dht_kv/internal.rs (4 hunks)
- packages/network/src/features/dht_kv/mod.rs (4 hunks)
- packages/network/src/features/mod.rs (3 hunks)
- packages/network/src/features/neighbours.rs (4 hunks)
- packages/network/src/features/pubsub/controller.rs (9 hunks)
- packages/network/src/features/pubsub/controller/consumers.rs (12 hunks)
- packages/network/src/features/pubsub/controller/feedbacks.rs (8 hunks)
- packages/network/src/features/pubsub/controller/local_relay.rs (3 hunks)
- packages/network/src/features/pubsub/controller/remote_relay.rs (18 hunks)
- packages/network/src/features/pubsub/controller/source_hint.rs (25 hunks)
- packages/network/src/features/pubsub/mod.rs (5 hunks)
- packages/network/src/features/pubsub/msg.rs (3 hunks)
- packages/network/src/features/pubsub/worker.rs (9 hunks)
- packages/network/src/features/router_sync.rs (7 hunks)
- packages/network/src/features/socket.rs (4 hunks)
- packages/network/src/features/vpn.rs (2 hunks)
- packages/network/src/lib.rs (4 hunks)
- packages/network/src/secure/encryption/x25519_dalek_aes.rs (6 hunks)
- packages/network/src/services/manual_discovery.rs (11 hunks)
- packages/network/src/services/visualization.rs (14 hunks)
- packages/network/src/worker.rs (5 hunks)
- packages/network/tests/feature_alias.rs (9 hunks)
- packages/network/tests/feature_dht_kv.rs (1 hunks)
- packages/network/tests/feature_neighbours.rs (2 hunks)
- packages/network/tests/feature_pubsub.rs (1 hunks)
- packages/network/tests/feature_router_sync.rs (7 hunks)
- packages/network/tests/feature_socket.rs (3 hunks)
- packages/network/tests/service_manual_discovery.rs (2 hunks)
- packages/network/tests/service_visualization.rs (4 hunks)
Files not processed due to max files limit (7)
- packages/network/tests/simulator.rs
- packages/runner/examples/simple_kv.rs
- packages/runner/examples/simple_node.rs
- packages/runner/src/builder.rs
- packages/runner/src/lib.rs
- packages/runner/src/worker_inner.rs
- packages/runner/tests/feature_dht_kv.rs
Files not reviewed due to errors (5)
- examples/quic-tunnel/src/vnet/mod.rs (no review received)
- examples/quic-tunnel/src/sdn.rs (no review received)
- packages/network/src/lib.rs (no review received)
- packages/network/src/controller_plane/services.rs (no review received)
- packages/network/src/data_plane/services.rs (no review received)
Files skipped from review due to trivial changes (1)
- packages/network/src/base/mod.rs
Additional Context Used
GitHub Check Runs (2)
codecov/patch failure (30)
bin/src/main.rs: [warning] 238-238: bin/src/main.rs#L238
Added line #L238 was not covered by tests
bin/src/main.rs: [warning] 261-261: bin/src/main.rs#L261
Added line #L261 was not covered by tests
bin/src/main.rs: [warning] 289-289: bin/src/main.rs#L289
Added line #L289 was not covered by tests
bin/src/main.rs: [warning] 303-303: bin/src/main.rs#L303
Added line #L303 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 113-113: packages/network/src/controller_plane.rs#L113
Added line #L113 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 137-137: packages/network/src/controller_plane.rs#L137
Added line #L137 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 148-148: packages/network/src/controller_plane.rs#L148
Added line #L148 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 151-153: packages/network/src/controller_plane.rs#L151-L153
Added lines #L151 - L153 were not covered by tests
packages/network/src/controller_plane.rs: [warning] 163-164: packages/network/src/controller_plane.rs#L163-L164
Added lines #L163 - L164 were not covered by tests
packages/network/src/controller_plane.rs: [warning] 167-167: packages/network/src/controller_plane.rs#L167
Added line #L167 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 186-186: packages/network/src/controller_plane.rs#L186
Added line #L186 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 189-189: packages/network/src/controller_plane.rs#L189
Added line #L189 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 220-220: packages/network/src/controller_plane.rs#L220
Added line #L220 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 235-235: packages/network/src/controller_plane.rs#L235
Added line #L235 was not covered by tests
packages/network/src/controller_plane.rs: [warning] 237-237: packages/network/src/controller_plane.rs#L237
Added line #L237 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 62-66: packages/network/src/controller_plane/features.rs#L62-L66
Added lines #L62 - L66 were not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 68-69: packages/network/src/controller_plane/features.rs#L68-L69
Added lines #L68 - L69 were not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 74-75: packages/network/src/controller_plane/features.rs#L74-L75
Added lines #L74 - L75 were not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 83-83: packages/network/src/controller_plane/features.rs#L83
Added line #L83 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 85-85: packages/network/src/controller_plane/features.rs#L85
Added line #L85 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 87-87: packages/network/src/controller_plane/features.rs#L87
Added line #L87 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 89-89: packages/network/src/controller_plane/features.rs#L89
Added line #L89 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 93-95: packages/network/src/controller_plane/features.rs#L93-L95
Added lines #L93 - L95 were not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 97-97: packages/network/src/controller_plane/features.rs#L97
Added line #L97 was not covered by tests
packages/network/src/controller_plane/features.rs: [warning] 99-99: packages/network/src/controller_plane/features.rs#L99
Added line #L99 was not covered by tests
packages/network/src/controller_plane/neighbours/connection.rs: [warning] 129-135: packages/network/src/controller_plane/neighbours/connection.rs#L129-L135
Added lines #L129 - L135 were not covered by tests
packages/network/src/controller_plane/neighbours/connection.rs: [warning] 153-160: packages/network/src/controller_plane/neighbours/connection.rs#L153-L160
Added lines #L153 - L160 were not covered by tests
packages/network/src/controller_plane/neighbours/connection.rs: [warning] 194-200: packages/network/src/controller_plane/neighbours/connection.rs#L194-L200
Added lines #L194 - L200 were not covered by tests
packages/network/src/controller_plane/neighbours/connection.rs: [warning] 353-353: packages/network/src/controller_plane/neighbours/connection.rs#L353
Added line #L353 was not covered by tests
packages/network/src/controller_plane/services.rs: [warning] 61-61: packages/network/src/controller_plane/services.rs#L61
Added line #L61 was not covered by testsclippy success (30)
packages/network/src/base/feature.rs: [warning] 129-129:
this lifetime isn't used in the impl
packages/network/src/base/feature.rs: [warning] 154-154:
the following explicit lifetimes could be elided: 'a
packages/network/src/base/feature.rs: [warning] 154-154:
the following explicit lifetimes could be elided: 'a
packages/network/src/base/feature.rs: [warning] 187-187:
this lifetime isn't used in the impl
packages/network/src/base/secure.rs: [warning] 49-49:
this lifetime isn't used in the function definition
packages/network/src/base/secure.rs: [warning] 68-68:
this lifetime isn't used in the function definition
packages/network/src/controller_plane.rs: [warning] 48-48:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/controller_plane.rs: [warning] 60-60:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/controller_plane/features.rs: [warning] 59-59:
the following explicit lifetimes could be elided: 'a
packages/network/src/controller_plane/features.rs: [warning] 59-59:
the following explicit lifetimes could be elided: 'a
packages/network/src/controller_plane/neighbours.rs: [warning] 126-126:
unused variable:now
packages/network/src/controller_plane/services.rs: [warning] 13-18:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/controller_plane/services.rs: [warning] 23-23:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/data_plane.rs: [warning] 77-77:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/data_plane.rs: [warning] 87-87:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/data_plane.rs: [warning] 125-125:
the methodon_tickdoesn't need a mutable reference
packages/network/src/data_plane.rs: [warning] 149-149:
the methodon_inputdoesn't need a mutable reference
packages/network/src/data_plane.rs: [warning] 179-179:
the methodon_inputdoesn't need a mutable reference
packages/network/src/data_plane.rs: [warning] 199-199:
useless conversion to the same type:sans_io_runtime::Buffer
packages/network/src/data_plane.rs: [warning] 276-276:
useless conversion to the same type:sans_io_runtime::Buffer
packages/network/src/data_plane.rs: [warning] 325-325:
the methodon_inputdoesn't need a mutable reference
packages/network/src/data_plane.rs: [warning] 334-334:
useless conversion to the same type:sans_io_runtime::Buffer
packages/network/src/data_plane/features.rs: [warning] 59-59:
this function has too many arguments (8/7)
packages/network/src/data_plane/services.rs: [warning] 13-18:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/data_plane/services.rs: [warning] 24-24:
very complex type used. Consider factoring parts intotypedefinitions
packages/network/src/features/alias.rs: [warning] 259-259:
the following explicit lifetimes could be elided: 'a
packages/network/src/features/alias.rs: [warning] 259-259:
the following explicit lifetimes could be elided: 'a
packages/network/src/features/data.rs: [warning] 88-88:
the following explicit lifetimes could be elided: 'a
packages/network/src/features/data.rs: [warning] 88-88:
the following explicit lifetimes could be elided: 'a
packages/network/src/features/dht_kv/mod.rs: [warning] 106-106:
the following explicit lifetimes could be elided: 'a
Additional comments not posted (236)
packages/network/tests/feature_neighbours.rs (2)
20-21: Ensure type parameters are correctly used inExtIn::FeaturesControl.The addition of type parameters to
ExtIn::FeaturesControlaligns with the updated type requirements.
40-47: Ensure type parameters are correctly used inExtOut::FeaturesEvent.The addition of type parameters to
ExtOut::FeaturesEventaligns with the updated type requirements.packages/network/src/data_plane/connection.rs (2)
5-5: Ensure theBuffertype is correctly imported and used.The import and usage of
Bufferin the struct definition are correct.
Line range hint
44-52: Ensure consistency in encryption and decryption logic.The decryption logic is consistent with the encryption logic and correctly uses the
Buffertype.packages/network/tests/service_manual_discovery.rs (3)
33-33: Ensure type parameters are correctly used inExtIn::FeaturesControl.The addition of type parameters to
ExtIn::FeaturesControlaligns with the updated type requirements.
45-48: Ensure type parameters are correctly used inExtOut::FeaturesEvent.The addition of type parameters to
ExtOut::FeaturesEventaligns with the updated type requirements.
52-55: Ensure type parameters are correctly used inExtOut::FeaturesEvent.The addition of type parameters to
ExtOut::FeaturesEventaligns with the updated type requirements.packages/network/src/features/dht_kv/internal.rs (6)
14-15: Ensure theUserDatatype parameter is correctly used inInternalOutput.The addition of the
UserDatatype parameter inInternalOutputis correct and aligns with the updated type requirements.
19-21: Ensure theUserDatatype parameter is correctly used inDhtKvInternal.The addition of the
UserDatatype parameter inDhtKvInternalis correct and aligns with the updated type requirements.
Line range hint
35-37: Ensure theon_tickmethod correctly updates local and remote storage.The
on_tickmethod correctly updates the local and remote storage.
39-41: Ensure theon_localmethod correctly handles local commands withUserData.The
on_localmethod correctly handles local commands with theUserDatatype parameter.
Line range hint
43-51: Ensure theon_remotemethod correctly handles remote commands.The
on_remotemethod correctly handles remote commands and logs the actions.
Line range hint
53-61: Ensure thepop_actionmethod correctly pops actions from local and remote storage.The
pop_actionmethod correctly pops actions from local and remote storage and logs the actions.packages/network/src/features/pubsub/mod.rs (3)
Line range hint
46-56: Ensure theUserDatatype parameter is correctly used inRelayWorkerControl.The addition of the
UserDatatype parameter inRelayWorkerControlis correct and aligns with the updated type requirements.
75-76: Ensure theUserDatatype parameter is correctly used inToWorker.The addition of the
UserDatatype parameter inToWorkeris correct and aligns with the updated type requirements.
87-88: Ensure theUserDatatype parameter is correctly used inOutputandWorkerOutput.The addition of the
UserDatatype parameter inOutputandWorkerOutputis correct and aligns with the updated type requirements.packages/network/src/features/pubsub/controller/local_relay.rs (2)
14-17: TheLocalRelaystruct definition looks good with the newUserDatatype parameter.
Line range hint
20-72: TheGenericRelaytrait implementation forLocalRelayhas been correctly updated to handle theUserDatatype parameter. The logic within each method is consistent with their intended functionality.packages/network/tests/feature_socket.rs (3)
22-23: Changes are consistent with the new type parameter requirements.Also applies to: 26-26, 31-34
54-55: Changes are consistent with the new type parameter requirements.Also applies to: 59-59, 64-67
91-92: Changes are consistent with the new type parameter requirements.Also applies to: 96-96, 101-104
packages/network/src/features/mod.rs (2)
95-103: Changes are consistent with the new type parameter requirements.
106-106: Changes are consistent with the new type parameter requirements.packages/network/src/features/pubsub/msg.rs (1)
129-136: TheInto<Buffer>implementation is consistent with the new type parameter requirements and correctly convertsPubsubMessageintoBuffer.examples/quic-tunnel/src/vnet/socket.rs (1)
56-56: The conversion oftransmit.contentstoBufferis consistent with the new type parameter requirements.packages/network/src/features/vpn.rs (6)
32-36: Changes are consistent with the new type parameter requirements.
51-55: Changes are consistent with the new type parameter requirements.
38-42: Changes are consistent with the new type parameter requirements.
44-46: Changes are consistent with the new type parameter requirements.
87-94: Changes are consistent with the new type parameter requirements.
98-103: Changes are consistent with the new type parameter requirements.packages/network/src/base/service.rs (8)
12-14: Changes are consistent with the new type parameter requirements.
24-25: Changes are consistent with the new type parameter requirements.
31-32: Changes are consistent with the new type parameter requirements.
62-63: Changes are consistent with the new type parameter requirements.
68-73: Changes are consistent with the new type parameter requirements.
42-49: Changes are consistent with the new type parameter requirements.
80-86: Changes are consistent with the new type parameter requirements.
98-105: Changes are consistent with the new type parameter requirements.examples/whip-whep/src/main.rs (5)
11-17: Update import paths to reflect module changes.
70-70: Service initialization updated to include an additional type parameter().
73-73: IP address updated inaddr_builder.add_protocol.
81-81:sfuaddress updated inICfg.Also applies to: 104-104
124-125: Consider re-enabling signal handling for graceful shutdown.Is there a specific reason for commenting out the signal handling code? Re-enabling it can ensure graceful shutdown on receiving SIGINT.
Also applies to: 131-133
packages/network/src/features/dht_kv/client.rs (3)
24-25: AddedUserDatatype parameter toLocalStorageOutputenum.
29-33: UpdatedLocalStoragestruct to includeUserDatatype parameter.
Line range hint
37-127: UpdatedLocalStorageimplementation to handleUserDatatype parameter.packages/network/tests/feature_router_sync.rs (5)
Line range hint
19-32: UpdatedMockServiceimplementation to includeUserDatatype parameter.
39-54: UpdatedMockServiceWorkerimplementation to handleUserDatatype parameter.
Line range hint
59-72: UpdatedMockServiceBuilderimplementation to handleUserDatatype parameter.
89-107: Updatedfeature_router_sync_single_nodetest case to handleUserDatatype parameter.
116-128: Updatedfeature_router_sync_two_nodesandfeature_router_sync_three_nodestest cases to handleUserDatatype parameter.Also applies to: 151-153
examples/whip-whep/src/sfu/cluster.rs (2)
Line range hint
37-37: AddedDefaultderive toClusterLogicstruct.
Line range hint
41-41: UpdatedClusterLogic::on_inputmethod to handle new input and output types.packages/network/src/features/neighbours.rs (5)
32-39: UpdatedNeighboursFeaturestruct to includeUserDatatype parameter.
Line range hint
42-86: UpdatedNeighboursFeatureimplementation to handleUserDatatype parameter.
95-99: UpdatedNeighboursFeatureWorkerstruct to includeUserDatatype parameter.
101-114: UpdatedNeighboursFeatureWorkerimplementation to handleUserDatatype parameter.
88-121: UpdatedTaskSwitcherChildimplementation forNeighboursFeatureandNeighboursFeatureWorkerto handleUserDatatype parameter.packages/network/tests/service_visualization.rs (8)
13-16: The addition of the type parameter()in thenode_changedfunction is consistent with the new type parameter requirements. The function logic remains unchanged and correct.
41-41: The inclusion of the type parameter()in theExtIn::ServicesControlvariant is consistent with the new type parameter requirements. The test logic remains unchanged and correct.
48-52: The inclusion of the type parameter()in theExtOut::ServicesEventvariant is consistent with the new type parameter requirements. The test logic remains unchanged and correct.
81-82: The inclusion of the type parameter()in theExtIn::ServicesControlvariant is consistent with the new type parameter requirements. The test logic remains unchanged and correct.
89-98: The inclusion of the type parameter()in theExtOut::ServicesEventvariant is consistent with the new type parameter requirements. The test logic remains unchanged and correct.
121-123: The inclusion of the type parameter()in theExtOut::ServicesEventvariant within theget_keylambda function is consistent with the new type parameter requirements. The function logic remains unchanged and correct.
121-123: The sorting ofnode1_eventsandnode2_eventsusing the updatedget_keylambda function is consistent with the new type parameter requirements. The sorting logic remains unchanged and correct.
121-123: The inclusion of the type parameter()in thenode_changedfunction calls within theassert_eq!statements is consistent with the new type parameter requirements. The assertions remain unchanged and correct.examples/whip-whep/src/sfu/whip.rs (6)
3-3: The import ofBufferfromatm0s_sdn::sans_io_runtimeis appropriate and aligns with the changes in the rest of the codebase whereBufferis used instead ofVec<u8>. This change improves type safety and consistency.
20-21: TheWhipInputenum now usesBufferinstead ofVec<u8>for theUdpPacketvariant. This change is consistent with the overall shift to usingBufferfor data handling, enhancing type safety and performance.
26-26: TheWhipOutputenum now usesBufferinstead ofVec<u8>for theUdpPacketvariant. This change is consistent with the overall shift to usingBufferfor data handling, enhancing type safety and performance.
39-39: The addition of thequeuefield to theWhipTaskstruct is a good design choice. It allows for better management of output events, improving the modularity and maintainability of the code.
81-81: The conversion ofsend.contentstoBufferusing.to_vec().into()is correct and aligns with the new data handling approach. This ensures that the data is properly encapsulated in theBuffertype.
117-117: TheTasktrait implementation forWhipTaskhas been updated to use theBuffertype. This change is consistent with the overall shift to usingBufferfor data handling, enhancing type safety and performance.packages/network/tests/feature_dht_kv.rs (4)
13-14: Thecontrolfunction now returnsExtIn<(), ()>, reflecting the addition of type parameters to theExtInenum. This change is consistent with the updated type handling in the codebase.
17-18: Theeventfunction now returnsExtOut<(), ()>, reflecting the addition of type parameters to theExtOutenum. This change is consistent with the updated type handling in the codebase.
Line range hint
93-94: Thefeature_dht_kv_single_nodetest now usesExtIn::FeaturesControl((), FeaturesControl::DhtKv(control))andExtIn::FeaturesControl((), FeaturesControl::DhtKv(control)), reflecting the addition of type parameters to theExtInenum. This change is consistent with the updated type handling in the codebase.
Line range hint
115-115: Thefeature_alias_timeouttest now usesExtIn::FeaturesControl((), FeaturesControl::Alias(alias::Control::Query { alias: alias_v, service, level })), reflecting the addition of type parameters to theExtInenum. This change is consistent with the updated type handling in the codebase.packages/network/src/features/dht_kv/mod.rs (6)
9-10: The addition ofDebugto the imports is appropriate, given that theUserDatatype parameter now requires theDebugtrait. This change ensures that the code can properly handle and logUserDatainstances.
81-83: TheOutputandWorkerOutputtype aliases now include theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly propagated through the system.
84-85: TheDhtKvFeaturestruct now includes theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly encapsulated within the feature.
88-88: TheDhtKvFeatureimplementation now includes theUserDatatype parameter and requiresUserDatato implementEq,Copy, andDebug. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the feature.
146-150: TheDhtKvFeatureWorkerstruct now includes theUserDatatype parameter and usesDynamicDequefor thequeuefield. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the worker.
152-163: TheFeatureWorkertrait implementation forDhtKvFeatureWorkernow includes theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the worker.packages/network/tests/feature_alias.rs (4)
19-19: TheMockServiceimplementation now includes theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the service.
39-39: TheMockServiceWorkerimplementation now includes theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the service worker.
59-59: TheMockServiceBuilderimplementation now includes theUserDatatype parameter. This change is consistent with the updated type handling in the codebase and ensures thatUserDatais properly managed within the service builder.
93-94: Thefeature_alias_single_nodetest now usesExtIn::FeaturesControl((), FeaturesControl::Alias(alias::Control::Register { alias, service, level }))andExtIn::FeaturesControl((), FeaturesControl::Alias(alias::Control::Query { alias, service, level })), reflecting the addition of type parameters to theExtInenum. This change is consistent with the updated type handling in the codebase.examples/whip-whep/src/sfu/whep.rs (6)
3-5: Imports updated to includeBufferandDynamicDeque.
24-24:WhepInputenum updated to useBufferfor theUdpPacketvariant.
29-29:WhepOutputenum updated to useBufferfor theUdpPacketvariant.
42-42:WhepTaskstruct updated to include aqueuefield.
Line range hint
75-85:pop_event_innermethod updated to useBufferinstead ofVec<u8>for thedatafield in theUdpPacketvariant.
Line range hint
121-185: Methodson_tick,on_event,pop_output, andon_shutdownupdated to use thequeuefield andBuffertype.packages/network/src/features/pubsub/controller/feedbacks.rs (6)
1-2: No significant changes to imports.
8-9:FeedbackSourceenum updated to include aUserDatatype parameter.
14-16:SingleFeedbackKindstruct updated to include aUserDatatype parameter.
70-73:FeedbacksAggeratorstruct updated to include aUserDatatype parameter.
Line range hint
77-114: Methods inFeedbacksAggeratorupdated to use theUserDatatype parameter.
Line range hint
140-207: Tests updated to use theUserDatatype parameter.packages/network/src/features/data.rs (6)
1-4: Imports look good and appropriate for the changes.Also applies to: 8-9, 12-14
22-24: The new variants inControlandEventenums are correctly added and follow the existing pattern.Also applies to: 30-30
43-43: The updates to theDataMsgenum and the new type aliases are appropriate and consistent.Also applies to: 46-47
49-54: The updates to theDataFeaturestruct and its implementation are correctly implemented and follow the existing pattern.Also applies to: 56-64, 67-137, 145-145
154-172: The updates to theDataFeatureWorkerstruct and its implementation are correctly implemented and follow the existing pattern.
147-149: The updates to theTaskSwitcherChildimplementations are correctly implemented and follow the existing pattern.Also applies to: 175-179
packages/network/src/controller_plane/neighbours.rs (3)
8-8: The import ofTaskSwitcherChildis appropriate and consistent with the rest of the code.
122-122: The updates to theNeighboursManagerstruct and its methods are correctly implemented and follow the existing pattern.
124-126: The updates to theTaskSwitcherChildimplementation are correctly implemented and follow the existing pattern.packages/network/src/worker.rs (5)
1-1: The updates to the imports and enum definitions are appropriate and consistent with the rest of the code.Also applies to: 4-4, 13-16, 19-23, 28-32, 37-42
44-48: The updates to theSdnWorkerCfgstruct are appropriate and consistent with the rest of the code.
51-70: The updates to theSdnWorkerstruct and its implementation are correctly implemented and follow the existing pattern.Also applies to: 88-130
Line range hint
157-186: The updates to theprocess_controller_outandprocess_data_outmethods are correctly implemented and follow the existing pattern.
201-209: The updates to theTaskSwitcherChildimplementation are correctly implemented and follow the existing pattern.packages/network/src/base/feature.rs (6)
85-87: The addition of theUserDatatype parameter to theFeatureControlActorenum looks good and aligns with the overall update to include additional type parameters.
91-102: Theinto2method for converting between differentUserDatatypes in theFeatureControlActorimpl block looks good and aligns with the overall update to include additional type parameters.
111-115: The addition of theUserDatatype parameter to theFeatureInputenum looks good and aligns with the overall update to include additional type parameters.
119-138: The addition of theUserDatatype parameter to theFeatureOutputenum looks good and aligns with the overall update to include additional type parameters.
160-167: The addition of theUserDatatype parameter to theFeatureWorkerInputenum looks good and aligns with the overall update to include additional type parameters.
171-184: The addition of theUserDatatype parameter to theFeatureWorkerOutputenum looks good and aligns with the overall update to include additional type parameters.packages/network/src/secure/encryption/x25519_dalek_aes.rs (3)
96-96: The update to useBufferMutfor encryption in theEncryptorXDAimplementation looks good and aligns with the overall update to useBufferMutfor data handling.
134-134: The update to useBufferMutfor decryption in theDecryptorXDAimplementation looks good and aligns with the overall update to useBufferMutfor data handling.
Line range hint
157-184: The addition of theBufferMut2implementation to adaptBufferMutfor use with the AES-GCM library looks good and is necessary for integratingBufferMutwith the AES-GCM library.bin/src/main.rs (4)
238-238: The update to useSdnBuilder::<(), SC, SE, TC, TW>::new(...)for initialization looks good and aligns with the overall update to include additional type parameters.
261-261: The update to usecontroller.send_to(0, SdnExtIn::ServicesControl(...))looks good and aligns with the overall update to use additional parameters.
289-289: The update to the pattern matching forSdnExtOut::ServicesEventto include additional parameters looks good and aligns with the overall update to include additional parameters.
303-303: The update to the pattern matching forSdnExtOut::FeaturesEventto include additional parameters looks good and aligns with the overall update to include additional parameters.packages/network/src/features/router_sync.rs (7)
30-36: Ensure consistent usage of the newUserDatatype parameter.Verify that the
UserDatatype parameter is used consistently across the entire codebase, especially in theFeatureOutputandFeatureWorkerOutputtypes.
Line range hint
40-50: LGTM! Thenewmethod correctly initializes theRouterSyncFeaturestruct.
Line range hint
52-58: LGTM! Thesend_sync_tomethod correctly serializes the sync message and pushes it to the queue.
Line range hint
62-123: LGTM! Theon_shared_inputandon_inputmethods correctly handle their respective inputs and update the router state.
160-164: Ensure consistent usage of the newUserDatatype parameter.Verify that the
UserDatatype parameter is used consistently across the entire codebase, especially in theFeatureWorkerOutputtype.
166-183: LGTM! Theon_inputmethod correctly handles its inputs and updates the router state.
186-191: LGTM! Thepop_outputmethod correctly returns the next output from the queue.packages/network/tests/feature_pubsub.rs (7)
13-18: LGTM! Thefeature_pubsub_manual_single_nodetest function correctly simulates the scenario and verifies the expected outcomes.
20-20: LGTM! Thefeature_pubsub_auto_single_nodetest function correctly simulates the scenario and verifies the expected outcomes.
Line range hint
22-22: LGTM! Thefeature_pubsub_auto_single_node_workertest function correctly simulates the scenario and verifies the expected outcomes.
Line range hint
24-24: LGTM! Thefeature_pubsub_manual_two_nodestest function correctly simulates the scenario and verifies the expected outcomes.
Line range hint
26-26: LGTM! Thefeature_pubsub_auto_two_nodestest function correctly simulates the scenario and verifies the expected outcomes.
Line range hint
28-28: LGTM! Thefeature_pubsub_manual_three_nodestest function correctly simulates the scenario and verifies the expected outcomes.
Line range hint
30-30: LGTM! Thefeature_pubsub_auto_three_nodestest function correctly simulates the scenario and verifies the expected outcomes.examples/whip-whep/src/sfu/mod.rs (8)
7-7: Import statement forBufferlooks good.
38-42: Changes to theInputenum to useBufferinstead ofVec<u8>are appropriate.
49-49: Changes to theOutputenum to useBufferinstead ofVec<u8>are appropriate.
63-63: Updates to theSfuWorkerstruct to useTaskGroupandWhepTaskGroupare appropriate.
170-183: Theprocess_cluster_outputmethod is well-implemented and handles various cluster outputs appropriately.
189-208: Theprocess_whip_outmethod is well-implemented and integrates WHIP task outputs with the cluster logic effectively.
214-235: Theprocess_whep_outmethod is well-implemented and integrates WHEP task outputs with the cluster logic effectively.
261-328: Updates to theon_tick,on_event,pop_output, andon_shutdownmethods are consistent with the new task management approach and are correctly implemented.packages/network/src/features/pubsub/controller/consumers.rs (6)
7-8: Import statement forFeatureControlActorwith a type parameter looks good.
21-26: Changes to theRelayConsumersstruct to include a type parameter forUserDataare appropriate.
Line range hint
29-113: Updates to theRelayConsumersimplementation to use the new type parameter are consistent and correctly implemented.
132-142: Updates to therelay_local_should_work_single_subtest to use the new type parameter are appropriate.
152-167: Updates to therelay_local_should_work_multi_substest to use the new type parameter are appropriate.
Line range hint
184-209: Updates to therelay_remote_should_work_single_subandrelay_remote_should_work_multi_substests to use the new type parameter are appropriate.examples/whip-whep/src/worker.rs (8)
3-6: Update import statements to reflect changes in module paths and type names.Also applies to: 14-14
40-40: TheExtInenum now includesSdn(SdnExtIn<(), SC>).
46-46: TheExtOutenum now includesSdn(SdnExtOut<(), SE>).
58-58: TheEventenum now includesSdn(SdnEvent<(), SC, SE, TC, TW>).
73-73: TheSdnInnerCfgstruct now includes a new type parameter()forServiceBuilder.
101-107: TheRunnerWorkerstruct now includes aqueuefield of typeVecDeque<WorkerInnerOutput<RunnerOwner, ExtOut, ChannelId, Event, SCfg>>.
138-138: TheRunnerWorkerimplementation includes changes to thebuild,on_tick,on_event,pop_output, andon_shutdownmethods.Also applies to: 163-163, 167-171, 174-224, 230-243, 252-256
Line range hint
261-303: Theprocess_sdnandprocess_sfumethods now include new type parameters and modified event handling logic.Also applies to: 307-315
packages/network/src/features/pubsub/worker.rs (7)
1-5: Update import statements to reflect changes in module paths and type names.
14-20: TheWorkerRelaystruct now includes a new type parameterUserData.
27-29: ThePubSubFeatureWorkerstruct now includes a new type parameterUserData.
32-36: TheDefaultimplementation forPubSubFeatureWorkernow includes a new type parameterUserData.
Line range hint
41-227: TheFeatureWorkerimplementation forPubSubFeatureWorkernow includes a new type parameterUserDataand modifies the event handling logic.
237-239: TheTaskSwitcherChildimplementation forPubSubFeatureWorkernow includes a new type parameterUserDataand modifies the task processing logic.
239-239: Thepop_outputmethod now includes a new type parameterUserDataand modifies the output processing logic.packages/network/src/controller_plane.rs (5)
79-92: The initialization ofControllerPlanelooks good.
95-105: The implementation ofon_ticklooks good.
172-189: The implementation ofpop_neighbourslooks good.
193-223: The implementation ofpop_featureslooks good.
242-262: The implementation ofTaskSwitcherChildforControllerPlanelooks good.packages/network/src/features/socket.rs (7)
57-60: The implementation ofsend_tolooks good.
Line range hint
73-183: The implementation ofon_inputlooks good.
186-191: The implementation ofpop_outputlooks good.
199-213: The implementation ofprocess_incominglooks good.
227-283: The implementation ofon_inputlooks good.
288-291: The implementation ofTaskSwitcherChildforSocketFeatureWorkerlooks good.
295-310: The implementation ofembed_metaandextract_metalooks good.packages/network/src/features/pubsub/controller.rs (8)
28-28: Ensure theTaskSwitcherChildimport is necessary.The
TaskSwitcherChildtrait is imported but not used until the end of the file. Ensure that this import is necessary and correctly used in the implementation.
31-34: Review theGenericRelayOutputenum for correctness.The
GenericRelayOutputenum is well-defined with appropriate variants forToWorker,RouteChanged, andFeedback. Ensure that these variants are correctly used in the file.
37-48: Review theGenericRelaytrait for correctness.The
GenericRelaytrait is well-defined with appropriate methods for handling relay operations. Ensure that these methods are correctly implemented in the file.
51-54: Review thePubSubFeaturestruct for correctness.The
PubSubFeaturestruct is well-defined with appropriate fields for relays, source hints, and a queue. Ensure that these fields are correctly used in the file.
Line range hint
57-88: Review thePubSubFeatureimplementation for correctness.The
PubSubFeatureimplementation is well-defined with appropriate methods for handling relay and source hint operations. Ensure that these methods are correctly implemented and tested in the file.
Line range hint
216-233: Review thepop_single_relaymethod for correctness.The
pop_single_relaymethod is well-defined with appropriate logic for handling relay outputs. Ensure that this method is correctly used in the file.
Line range hint
235-256: Review thepop_single_source_hintmethod for correctness.The
pop_single_source_hintmethod is well-defined with appropriate logic for handling source hint outputs. Ensure that this method is correctly used in the file.
Line range hint
258-322: Review theFeatureandTaskSwitcherChildtrait implementations for correctness.The
FeatureandTaskSwitcherChildtrait implementations forPubSubFeatureare well-defined with appropriate methods for handling feature inputs and task switching. Ensure that these methods are correctly implemented and tested in the file.packages/network/src/base/msg.rs (6)
286-286: ReplacingVec<u8>withBufferin theTransportMsgstruct improves type safety and performance. Good change!
309-314: The use ofBufferin thebuild_rawmethod aligns with the updatedTransportMsgstruct and ensures consistent use ofBuffer. Looks good!
335-338: Updating thebuildmethod to useBufferinstead ofVec<u8>is consistent with the previous changes and improves type safety. Good job!
392-398: The change to useBufferin thefrom_payload_bincodemethod ensures consistency with the updatedTransportMsgstruct. Looks good!
412-412: ConvertingVec<u8>toBufferin theTryFrom<Vec<u8>>implementation maintains consistency with the updatedTransportMsgstruct. Good change!
424-424: Converting&[u8]toBufferin theTryFrom<&[u8]>implementation ensures consistency with the updatedTransportMsgstruct. Looks good!packages/network/src/data_plane.rs (7)
1-15: Imports and initial declarations look good and are consistent with the overall updates in the codebase.
26-35: The updates to theNetInputandCrossWorkerenums are consistent with the overall changes in the codebase.
39-52: The updates to theInputandNetOutputenums are consistent with the overall changes in the codebase.
56-67: The updates to theOutputenum are consistent with the overall changes in the codebase.
68-77: The updates to theTaskTypeenum andDataPlaneCfgstruct are consistent with the overall changes in the codebase.
81-90: The updates to theDataPlanestruct are consistent with the overall changes in the codebase.
Line range hint
94-113: The updates to theDataPlaneimplementation are consistent with the overall changes in the codebase.packages/network/src/features/alias.rs (12)
1-4: Imports look good and necessary for the new functionality.
8-12: The new imports and type definitions are appropriate and align with the changes in the code.
61-62: The addition of theUserDatatype parameter toQuerySlotis correctly integrated and enhances the flexibility of the struct.
74-75: The updates toOutputandWorkerOutputtype definitions to include theUserDatatype parameter are correctly integrated.
77-83: The addition of theUserDatatype parameter toAliasFeatureis correctly integrated and enhances the flexibility of the struct.
Line range hint
87-210: The new logic for handling various control and remote messages inAliasFeatureis well-implemented and efficient. The use of theUserDatatype parameter is correctly integrated.
210-212: Thesend_tomethod is correctly implemented and efficiently handles message serialization and queueing.
Line range hint
222-275: TheFeaturetrait implementation forAliasFeatureis correctly updated to include theUserDatatype parameter and handle various inputs efficiently.
277-288: The addition of theUserDatatype parameter toAliasFeatureWorkeris correctly integrated and enhances the flexibility of the struct.
290-302: The new logic for handling various inputs inAliasFeatureWorkeris well-implemented and efficient. The use of theUserDatatype parameter is correctly integrated.
305-310: TheTaskSwitcherChildtrait implementation forAliasFeatureWorkeris correctly updated to include theUserDatatype parameter and handle output efficiently.
Line range hint
315-574: The tests are correctly updated to include theUserDatatype parameter and cover the new logic comprehensively.packages/network/src/features/pubsub/controller/remote_relay.rs (10)
18-22: IntroduceUserDatatype parameter toRelayStateenum.The addition of the
UserDatatype parameter to theRelayStateenum is correctly implemented and enhances the flexibility of the state management.
37-40: IntroduceUserDatatype parameter toRemoteRelaystruct.The addition of the
UserDatatype parameter to theRemoteRelaystruct is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
43-58: IntroduceUserDatatype parameter toRemoteRelayimplementation.The addition of the
UserDatatype parameter to theRemoteRelayimplementation is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
65-141: IntroduceUserDatatype parameter toGenericRelaytrait implementation forRemoteRelay.The addition of the
UserDatatype parameter to theGenericRelaytrait implementation forRemoteRelayis correctly implemented and enhances the flexibility of the relay logic.
141-145: IntroduceUserDatatype parameter toon_pub_startandon_pub_stopmethods.The addition of the
UserDatatype parameter to theon_pub_startandon_pub_stopmethods is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
151-180: IntroduceUserDatatype parameter toon_local_submethod.The addition of the
UserDatatype parameter to theon_local_submethod is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
180-195: IntroduceUserDatatype parameter toon_local_feedbackmethod.The addition of the
UserDatatype parameter to theon_local_feedbackmethod is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
195-343: IntroduceUserDatatype parameter toon_local_unsubmethod.The addition of the
UserDatatype parameter to theon_local_unsubmethod is correctly implemented and enhances the flexibility of the relay logic.
343-347: IntroduceUserDatatype parameter topop_outputandrelay_destsmethods.The addition of the
UserDatatype parameter to thepop_outputandrelay_destsmethods is correctly implemented and enhances the flexibility of the relay logic.
Line range hint
374-599: IntroduceUserDatatype parameter to test functions.The addition of the
UserDatatype parameter to the test functions is correctly implemented and ensures that the tests cover the new functionality.packages/network/src/features/dht_kv/client/map.rs (5)
1-4: The addition ofDebugto theusestatements is appropriate and necessary for theLocalMapimplementation.
209-211: The addition of theUserDatatype parameter to theLocalMapOutputenum enhances flexibility and type safety.
223-228: The addition of theUserDatatype parameter to theLocalMapstruct improves flexibility and type safety.
Line range hint
231-509: The changes to theLocalMapimplementation are consistent with the addition of theUserDatatype parameter and enhance the overall functionality.
Line range hint
684-904: The updates to the test cases ensure that the new functionality is properly tested.packages/network/src/features/pubsub/controller/source_hint.rs (7)
43-46: TheOutputenum now includes aUserDatatype parameter. Ensure that all usages of this enum are updated accordingly throughout the codebase.Verification successful
All usages of the
Outputenum have been updated with the newUserDatatype parameter throughout the codebase.
- Verified instances in multiple files such as
worker.rs,controller_plane.rs,vpn.rs,features.rs,socket.rs,router_sync.rs,neighbours.rs,data.rs,alias.rs,pubsub.rs,dht_kv.rs,services.rs,data_plane.rs, andvisualization.rs.Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify all usages of the `Output` enum are updated with the new `UserData` type parameter. # Test: Search for the `Output` enum usage. Expect: Only occurrences with the new type parameter. rg --type rust $'Output<'Length of output: 24289
49-59: TheSourceHintLogicstruct now includeslocal_sourcesandlocal_subscribersfields with theUserDatatype parameter. Ensure that these fields are correctly initialized and used throughout the code.Verification successful
The
local_sourcesandlocal_subscribersfields in theSourceHintLogicstruct are correctly initialized and used throughout the code.
- The
SourceHintLogicstruct is used with theUserDatatype parameter in multiple places.- The
local_sourcesandlocal_subscribersfields are actively managed and manipulated in various methods within theSourceHintLogicimplementation.Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify all usages of the `SourceHintLogic` struct are updated with the new `UserData` type parameter. # Test: Search for the `SourceHintLogic` struct usage. Expect: Only occurrences with the new type parameter. rg --type rust $'SourceHintLogic<'Length of output: 577
Script:
#!/bin/bash # Description: Verify initialization and usage of `local_sources` and `local_subscribers` fields in `SourceHintLogic`. # Search for the initialization of `SourceHintLogic`. rg --type rust 'SourceHintLogic<' --context 10 # Search for methods that interact with `local_sources` and `local_subscribers`. rg --type rust 'local_sources' rg --type rust 'local_subscribers'Length of output: 13929
62-62: TheSourceHintLogicimplementation block now requiresUserDatato implementEq,Copy, andDebug. Ensure that allUserDatatypes used in this context satisfy these trait bounds.Verification successful
All instances of
UserDataused in the context ofSourceHintLogicand related structures consistently implement the required traitsEq,Copy, andDebug.
UserDatais used in various contexts across multiple files, and in all instances, it implements the necessary traits.Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify all `UserData` types used in `SourceHintLogic` satisfy the required trait bounds. # Test: Search for the `SourceHintLogic` struct instantiation. Expect: Only occurrences with `UserData` types implementing `Eq`, `Copy`, and `Debug`. rg --type rust $'SourceHintLogic<'Length of output: 577
Script:
#!/bin/bash # Description: Verify the definition of `UserData` in the relevant files to ensure it implements `Eq`, `Copy`, and `Debug`. # Test: Search for the definition or type alias of `UserData` in `controller.rs` and `source_hint.rs`. rg --type rust 'type UserData' packages/network/src/features/pubsub/controller.rs packages/network/src/features/pubsub/controller/source_hint.rs rg --type rust 'struct UserData' packages/network/src/features/pubsub/controller.rs packages/network/src/features/pubsub/controller/source_hint.rs rg --type rust 'enum UserData' packages/network/src/features/pubsub/controller.rs packages/network/src/features/pubsub/controller/source_hint.rsLength of output: 442
Script:
#!/bin/bash # Description: Verify the definition of `UserData` in the entire repository to ensure it implements `Eq`, `Copy`, and `Debug`. # Test: Search for the definition or type alias of `UserData` across the entire repository. rg --type rust 'type UserData' rg --type rust 'struct UserData' rg --type rust 'enum UserData'Length of output: 100
Script:
#!/bin/bash # Description: Trace the origin of `UserData` by searching for its usage and imports in the relevant files. # Test: Search for `UserData` usage and imports in `controller.rs` and `source_hint.rs`. rg --type rust 'UserData' packages/network/src/features/pubsub/controller.rs packages/network/src/features/pubsub/controller/source_hint.rsLength of output: 5105
Script:
#!/bin/bash # Description: Trace the origin of `UserData` by searching for import statements in the relevant files. # Test: Search for import statements in `controller.rs` and `source_hint.rs`. rg --type rust 'use ' packages/network/src/features/pubsub/controller.rs packages/network/src/features/pubsub/controller/source_hint.rsLength of output: 2851
Script:
#!/bin/bash # Description: Trace the origin and context of `UserData` by searching for its usage in the entire repository. # Test: Search for `UserData` usage in the entire repository. rg --type rust 'UserData'Length of output: 65866
351-351: Thepop_outputmethod now returnsOutput<UserData>. Ensure that all usages of this method handle theUserDatatype correctly.
375-375: The test caselocal_subscribe_should_send_eventnow usesFeatureControlActor<UserData>. Ensure that all test cases are updated to handle theUserDatatype correctly.
450-450: The test caseremote_subscribe_should_send_eventnow usesFeatureControlActor<UserData>. Ensure that all test cases are updated to handle theUserDatatype correctly.#!/bin/bash # Description: Verify all test cases are updated to handle the `UserData` type correctly. # Test: Search for the `FeatureControlActor` usage in test cases. Expect: Only occurrences with the correct `UserData` type. rg --type rust --test $'FeatureControlActor<'
822-838: The test casereject_loop_registernow usesFeatureControlActor<UserData>. Ensure that all test cases are updated to handle theUserDatatype correctly.#!/bin/bash # Description: Verify all test cases are updated to handle the `UserData` type correctly. # Test: Search for the `FeatureControlActor` usage in test cases. Expect: Only occurrences with the correct `UserData` type. rg --type rust --test $'FeatureControlActor<'
| @@ -64,7 +64,7 @@ | |||
| #[derive(Debug, PartialEq)] | |||
| pub enum Output { | |||
| Event(ConnectionEvent), | |||
| Net(SocketAddr, NeighboursControlCmds), | |||
| Net(u64, SocketAddr, NeighboursControlCmds), | |||
There was a problem hiding this comment.
Add test coverage for the new Output::Net variant.
The new Output::Net variant should be covered by tests to ensure it works as expected. Would you like assistance in writing these tests?
| @@ -91,7 +91,7 @@ | |||
| node, | |||
| remote, | |||
| state, | |||
| output: VecDeque::from([Output::Net(remote, NeighboursControlCmds::ConnectRequest { to: node, session, handshake })]), | |||
| output: VecDeque::from([Output::Net(now_ms, remote, NeighboursControlCmds::ConnectRequest { to: node, session, handshake })]), | |||
There was a problem hiding this comment.
Add test coverage for the new_outgoing method's initialization logic.
The new_outgoing method's initialization logic should be covered by tests to ensure it correctly initializes the output field with a ConnectRequest command. Would you like assistance in writing these tests?
| self.output.push_back(self.generate_control( | ||
| now_ms, | ||
| NeighboursControlCmds::DisconnectRequest { | ||
| session: self.conn.session(), | ||
| reason: NeighboursDisconnectReason::Other, | ||
| }, | ||
| )); |
There was a problem hiding this comment.
Add test coverage for the disconnect method.
The disconnect method should be covered by tests to ensure it correctly pushes a DisconnectRequest command to the output queue. Would you like assistance in writing these tests?
| self.output.push_back(self.generate_control( | ||
| now_ms, | ||
| NeighboursControlCmds::ConnectRequest { | ||
| to: self.node, | ||
| session: self.conn.session(), | ||
| handshake: request_buf, | ||
| }, | ||
| )); |
There was a problem hiding this comment.
Add test coverage for the on_tick method's ConnectRequest resending logic.
The on_tick method's logic for resending ConnectRequest commands should be covered by tests to ensure it works as expected. Would you like assistance in writing these tests?
| self.output.push_back(self.generate_control( | ||
| now_ms, | ||
| NeighboursControlCmds::DisconnectRequest { | ||
| session: self.conn.session(), | ||
| reason: NeighboursDisconnectReason::Other, | ||
| }, | ||
| )); |
There was a problem hiding this comment.
Add test coverage for the on_tick method's DisconnectRequest resending logic.
The on_tick method's logic for resending DisconnectRequest commands should be covered by tests to ensure it works as expected. Would you like assistance in writing these tests?
| @@ -20,10 +20,12 @@ | |||
|
|
|||
| use std::{ | |||
| collections::{BTreeMap, VecDeque}, | |||
| fmt::Debug, | |||
There was a problem hiding this comment.
Consider removing the redundant import of fmt::Debug since it is already included in the impl block.
- fmt::Debug,Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| fmt::Debug, |
| @@ -119,7 +122,7 @@ | |||
| } | |||
| } | |||
|
|
|||
| pub fn on_local(&mut self, _now_ms: u64, actor: FeatureControlActor, cmd: LocalCmd) { | |||
| pub fn on_local(&mut self, _now_ms: u64, actor: FeatureControlActor<UserData>, cmd: LocalCmd) { | |||
There was a problem hiding this comment.
Tip
Codebase Verification
Several files in the codebase still use the old function signature.
The on_local method calls in various files, such as source_hint.rs, controller.rs, and others, use FeatureControlActor::Controller(()) and FeatureControlActor::Worker(1, ()). These instances need to be reviewed to ensure they pass the correct UserData type.
packages/network/src/features/pubsub/controller/source_hint.rspackages/network/src/features/pubsub/controller.rspackages/network/src/features/dht_kv/mod.rspackages/network/src/features/dht_kv/internal.rspackages/network/src/features/alias.rspackages/network/src/features/pubsub/controller/remote_relay.rspackages/network/src/features/pubsub/controller/feedbacks.rspackages/network/src/features/pubsub/controller/consumers.rspackages/network/src/features/dht_kv/client/map.rs
Please review these instances to ensure they are updated to use the correct UserData type.
Analysis chain
The on_local method now handles FeatureControlActor<UserData> correctly. Ensure that all calls to this method pass the correct UserData type.
Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify all calls to the `on_local` method pass the correct `UserData` type.
# Test: Search for the `on_local` method calls. Expect: Only occurrences with the correct `UserData` type.
rg --type rust $'.on_local('
Length of output: 100
Script:
#!/bin/bash
# Description: Verify all calls to the `on_local` method pass the correct `UserData` type.
# Test: Search for the `on_local` method calls. Expect: Only occurrences with the correct `UserData` type.
rg --type rust '\.on_local\('
Length of output: 3635
Script:
#!/bin/bash
# Description: Verify the `FeatureControlActor` type definitions to ensure they align with the expected `UserData` type.
# Test: Search for the `FeatureControlActor` type definition.
rg --type rust 'enum FeatureControlActor'
Length of output: 121
Script:
#!/bin/bash
# Description: Verify the `UserData` type used in `FeatureControlActor` instances.
# Test: Search for the `UserData` type definition.
rg --type rust 'type UserData'
Length of output: 32
Script:
#!/bin/bash
# Description: Verify the `FeatureControlActor` enum definition to understand the usage of `UserData`.
# Test: Search for the `FeatureControlActor` enum definition.
rg --type rust 'pub enum FeatureControlActor'
Length of output: 125
Script:
#!/bin/bash
# Description: Verify the instantiations of `FeatureControlActor` to check the `UserData` types.
# Test: Search for instantiations of `FeatureControlActor`.
rg --type rust 'FeatureControlActor::'
Length of output: 17335
| // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self | ||
| if source == self.node_id { | ||
| return; | ||
| } | ||
|
|
There was a problem hiding this comment.
Typographical error: "ocurs" should be "occurs".
- // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self
+ // We don't accept register from local source, this occurs when subscribe and next-hop reply with all sources include itselfCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self | |
| if source == self.node_id { | |
| return; | |
| } | |
| // We don't accept register from local source, this occurs when subscribe and next-hop reply with all sources include itself | |
| if source == self.node_id { | |
| return; | |
| } | |
| // We dont accept unregister from local source, this ocurs when subscribe and next-hop reply with all sources include it self | ||
| if source == self.node_id { | ||
| return; | ||
| } | ||
|
|
There was a problem hiding this comment.
Typographical error: "ocurs" should be "occurs".
- // We dont accept unregister from local source, this ocurs when subscribe and next-hop reply with all sources include it self
+ // We don't accept unregister from local source, this occurs when subscribe and next-hop reply with all sources include itselfCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| // We dont accept unregister from local source, this ocurs when subscribe and next-hop reply with all sources include it self | |
| if source == self.node_id { | |
| return; | |
| } | |
| // We don't accept unregister from local source, this occurs when subscribe and next-hop reply with all sources include itself | |
| if source == self.node_id { | |
| return; | |
| } | |
| // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self | ||
| if source != self.node_id && self.remote_sources.insert(source, now_ms).is_none() { |
There was a problem hiding this comment.
Typographical error: "ocurs" should be "occurs".
- // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self
+ // We don't accept register from local source, this occurs when subscribe and next-hop reply with all sources include itselfCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| // We dont accept register from local source, this ocurs when subscribe and next-hop reply with all sources include it self | |
| if source != self.node_id && self.remote_sources.insert(source, now_ms).is_none() { | |
| // We don't accept register from local source, this occurs when subscribe and next-hop reply with all sources include itself | |
| if source != self.node_id && self.remote_sources.insert(source, now_ms).is_none() { |
…ntralized-sdn into feat-for-media-server
This PR updates and implement more features for working with media-server