Skip to content

Commit

Permalink
Merge branch 'release/4.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@francois-normandin
francois-normandin committed Aug 15, 2022
2 parents 782e723 + 1888120 commit 4506194
Show file tree
Hide file tree
Showing 12 changed files with 405 additions and 385 deletions.
30 changes: 21 additions & 9 deletions MQTT Broker.vipb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2022-05-08 11:25:52" Creator="normandinf" Comments="" ID="ffe0f0e96ba5b804395e97c6f71acf4e">
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2022-08-14 20:32:40" Creator="normandinf" Comments="" ID="492bc1b9aecde1206db0fe8e117bd175">
<Library_General_Settings>
<Package_File_Name>LabVIEW_Open_Source_Project_lib_MQTT_Broker</Package_File_Name>
<Library_Version>4.0.0.16</Library_Version>
<Library_Version>4.0.1.17</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>source</Library_Source_Folder>
<Library_Output_Folder>.</Library_Output_Folder>
Expand Down Expand Up @@ -93,11 +93,9 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Packager/>
<URL/>
<Release_Notes>[Feature: 173] Addition of Get NbConnections accessor method
[Fix: 176] unsubscribe from topic when session has more than one topic now searches and removes correctly the sessions in any order called.

-Updated the code base to common Connection base class
-Constructor exposes option to support session storage (defaults to True)
-Exposed protected methods for inspection of Subscriptions, Sessions and ClientIDs
</Release_Notes>
Optimized how sessions are discarded in the wake of a Disconnect packet.</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -556,7 +554,21 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Path>&lt;vi.lib&gt;\LabVIEW Open Source Project\MQTT Connection\MQTT_Base\Base Class\Stop.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>142321E26F61E06BBBE08F906EEBC0A5</GUID>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Get NbConnections.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>4</Column>
</Position>
<Icon>00000000</Icon>
<Path>source\Server class\Get NbConnections.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>D909C652DBF386ACFB27D2A859059F97</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -787,7 +799,7 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Path>source\Subscription\Write Topic Filter.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>AC44B0A7A976231D83751119E1FB2635</GUID>
<GUID>C148CAD5B0CB7568891D9A2C5261210C</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -920,7 +932,7 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Path>source\TopicFilter\Write Topic Filter.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>C5CFBE0B3FA1B82D0045509D8ABD6CFD</GUID>
<GUID>F045A82D844B612B0E4BA7D4FDA99E56</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
9 changes: 6 additions & 3 deletions MQTT-Broker.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,9 @@
<Item Name="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="Compare Two Paths.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Compare Two Paths.vi"/>
<Item Name="Configure Websockets Connection.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Websockets Connection/MQTT_Websockets/Connection/Configure Websockets Connection.vi"/>
<Item Name="Connection.TCP_GOSPL.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Connection/Connection.TCP/Connection.TCP_GOSPL.lvlib"/>
<Item Name="Connection.WS_GOSPL.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Connection/Connection.Websockets/Connection.WS_GOSPL.lvlib"/>
<Item Name="Connection_GOSPL.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Connection/Connection/Connection_GOSPL.lvlib"/>
<Item Name="Convert property node font to graphics font.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Convert property node font to graphics font.vi"/>
<Item Name="Default MQTT Packet (Empty).vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/ControlPacket/Default MQTT Packet (Empty).vi"/>
Expand Down Expand Up @@ -457,7 +459,6 @@
<Item Name="GetRTHostConnectedProp.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/GetRTHostConnectedProp.vi"/>
<Item Name="Has LLB Extension.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Has LLB Extension.vi"/>
<Item Name="imagedata.ctl" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/imagedata.ctl"/>
<Item Name="Join Strings.vi" Type="VI" URL="/&lt;vilib&gt;/AdvancedString/Join Strings.vi"/>
<Item Name="KVP Parser.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/KVP Parser.vi"/>
<Item Name="Librarian File Info In.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Librarian File Info In.ctl"/>
<Item Name="Librarian File Info Out.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Librarian File Info Out.ctl"/>
Expand Down Expand Up @@ -496,19 +497,21 @@
<Item Name="Parse State Queue__jki_lib_state_machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Parse State Queue__jki_lib_state_machine.vi"/>
<Item Name="Path to URL.vi" Type="VI" URL="/&lt;vilib&gt;/printing/PathToURL.llb/Path to URL.vi"/>
<Item Name="RandomStringGenerator.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Unicity/RandomStringGenerator/RandomStringGenerator.lvclass"/>
<Item Name="Read Headers.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Websockets Connection/MQTT_Websockets/Connection/Read Headers.vi"/>
<Item Name="Recursive File List.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Recursive File List.vi"/>
<Item Name="Release Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Release Semaphore.vi"/>
<Item Name="RemoveNamedSemaphorePrefix.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/RemoveNamedSemaphorePrefix.vi"/>
<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
<Item Name="Semaphore RefNum" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Semaphore RefNum"/>
<Item Name="Semaphore Refnum Core.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Semaphore Refnum Core.ctl"/>
<Item Name="Serializer.Base64.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/OpenSerializer.Base64/Serializer.Base64.lvclass"/>
<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
<Item Name="Set Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Busy.vi"/>
<Item Name="Set Cursor (Cursor ID).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Cursor ID).vi"/>
<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
<Item Name="Set Cursor.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor.vi"/>
<Item Name="Set String Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set String Value.vi"/>
<Item Name="Sockets.lvlib" Type="Library" URL="/&lt;vilib&gt;/MediaMongrels Ltd/WebSockets/Sockets/Sockets.lvlib"/>
<Item Name="SHA-1.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Cryptographic Functions/SHA-1/SHA-1.lvlib"/>
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
<Item Name="subFile Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/express/express input/FileDialogBlock.llb/subFile Dialog.vi"/>
<Item Name="System Directory Type.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/sysdir.llb/System Directory Type.ctl"/>
Expand All @@ -535,8 +538,8 @@
<Item Name="Validate Semaphore Size.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Validate Semaphore Size.vi"/>
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
<Item Name="VI Scripting - Traverse.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/traverseref.llb/VI Scripting - Traverse.lvlib"/>
<Item Name="WebSockets.lvlib" Type="Library" URL="/&lt;vilib&gt;/MediaMongrels Ltd/WebSockets/WebSockets/WebSockets.lvlib"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
<Item Name="Write Text Frame.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Websockets Connection/MQTT_Websockets/Connection/Write Text Frame.vi"/>
</Item>
<Item Name="TRef FinderCallback.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef FinderCallback.vi"/>
</Item>
Expand Down
Binary file modified Unit Tests/Manual Dev Tests/Test HighFrequency Client Connection.vi
View file
Binary file not shown.
Binary file modified source/Server class/Get NbConnections.vi
View file
Binary file not shown.
Binary file modified source/Server class/Remove Session (byClientID).vi
View file
Binary file not shown.
Binary file modified source/Server class/Remove Session (byMailbox).vi
View file
Binary file not shown.
Binary file modified source/Server class/Remove Subscription.vi
View file
Binary file not shown.
751 changes: 378 additions & 373 deletions source/Server class/Server.lvclass
View file

Large diffs are not rendered by default.

Binary file added source/Server class/Statistics -- cluster.ctl
View file
Binary file not shown.
Binary file modified source/Server class/onCreate.vi
View file
Binary file not shown.
Binary file modified source/Server class/onDestroy.vi
View file
Binary file not shown.
Binary file modified source/Server class/process.vi
View file
Binary file not shown.

0 comments on commit 4506194

Please sign in to comment.