tiq 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d6c9646c99ec4a20f1836345ae4d40d2cd2c2e4b13b357f354d41e2a1549d0
-  data.tar.gz: 7e9957b6a21ec8aec869b885b14e84b519a2276e070c2406b190f37338b2d287
+  metadata.gz: cbc51f573dbb6b1f9ebb839e651af7939309a34e9b7d7aebbb1aa1bba4821096
+  data.tar.gz: 1f46fdb48cb1700f9e4325d42b7fce28ddbeeb95144bd02765fee4ba39bda5d0
 SHA512:
-  metadata.gz: 762d1f49e97bd77ffe029b6f7ebd2c5974b62a75462b2412f2cc930e08c83c58ad9284c774779f31635eeafc2f026de6a4facfb9dc0d6f89e5676f53b8a740c0
-  data.tar.gz: e8b7897d8a18d9d932986edc09ac160d744247e31672a3ffc879f2c742528473ca4e554675369bba3fbc0e5f75bda135ee531c34d66fe0b433fd5c3efd1cb874
+  metadata.gz: 47f4390cb60bb482a7325a1cc6c24a52c5e70f1b70e38d9d799cfeedf4bdbc98867dba50a4537251cb27036bb4c390c8b0e16b0067c7b148e66b515e0ebf6c3f
+  data.tar.gz: 986a52a560c6ad59557409fafe80d053320c94449d477bf4c848e8f8120eaa4c20d666e2c12b139f22e4f58e953fe2c2f5af1a4efdf70367e326b18e7c508d05

data/LICENSE.md

@@ -1,29 +1,375 @@
-# License
-
-    Copyright (C) 2022, Ecsypno <https://ecsypno.com/>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above copyright notice,
-          this list of conditions and the following disclaimer in the documentation
-          and/or other materials provided with the distribution.
-
-        * Neither the name of the copyright holder nor the names of its contributors
-          may be used to endorse or promote products derived from this software
-          without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+means each individual or legal entity that creates, contributes to
+the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+means the combination of the Contributions of others (if any) used
+by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+means Source Code Form to which the initial Contributor has attached
+the notice in Exhibit A, the Executable Form of such Source Code
+Form, and Modifications of such Source Code Form, in each case
+including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+means a work that combines Covered Software with other material, in
+a separate file or files, that is not Covered Software.
+
+1.8. "License"
+means this document.
+
+1.9. "Licensable"
+means having the right to grant, to the maximum extent possible,
+whether at the time of the initial grant or subsequently, any and
+all of the rights conveyed by this License.
+
+1.10. "Modifications"
+means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+means any patent claim(s), including without limitation, method,
+process, and apparatus claims, in any patent Licensable by such
+Contributor that would be infringed, but for the grant of the
+License, by the making, using, selling, offering for sale, having
+made, import, or transfer of either its Contributions or its
+Contributor Version.
+
+1.12. "Secondary License"
+means either the GNU General Public License, Version 2.0, the GNU
+Lesser General Public License, Version 2.1, the GNU Affero General
+Public License, Version 3.0, or any later versions of those
+licenses.
+
+1.13. "Source Code Form"
+means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+means an individual or a legal entity exercising rights under this
+License. For legal entities, "You" includes any entity that
+controls, is controlled by, or is under common control with You. For
+purposes of this definition, "control" means (a) the power, direct
+or indirect, to cause the direction or management of such entity,
+whether by contract or otherwise, or (b) ownership of more than
+fifty percent (50%) of the outstanding shares or beneficial
+ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+Licensable by such Contributor to use, reproduce, make available,
+modify, display, perform, distribute, and otherwise exploit its
+Contributions, either on an unmodified basis, with Modifications, or
+as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+for sale, have made, import, and otherwise transfer either its
+Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+or
+
+(b) for infringements caused by: (i) Your and any other third party's
+modifications of Covered Software, or (ii) the combination of its
+Contributions with other software (except as part of its Contributor
+Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+Form, as described in Section 3.1, and You must inform recipients of
+the Executable Form how they can obtain a copy of such Source Code
+Form by reasonable means in a timely manner, at a charge no more
+than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+License, or sublicense it under different terms, provided that the
+license for the Executable Form does not attempt to limit or alter
+the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+This Source Code Form is "Incompatible With Secondary Licenses", as
+defined by the Mozilla Public License, v. 2.0.
+```

data/README.md

@@ -19,19 +19,10 @@
     </tr>
     <tr>
         <th>License</th>
-        <td><a href="file.LICENSE.html">3-clause BSD</a></td>
+        <td><a href="file.LICENSE.html">MPL v2</a></td>
     </tr>
 </table>
 
-## Quadron Overall
-
-* [Cuboid](https://github.com/qadron/cuboid) -- Cluster partitioning.
-* -> **[Tiq](https://github.com/qadron/tiq)** -- Clustering solution.
-* [Toq](https://github.com/qadron/toq) -- RPC handling.
-* [Ratkr](https://github.com/qadron/raktr) -- Network connection handling.
-
-Also be sure to check-out [dSel](https://github.com/qadron/dsel) for spiffy DSL generation.
-
 ## Synopsis
 
 Tiq is a simple and lightweight clustering solution.
@@ -53,7 +44,7 @@ and instantiate it with a URL to bind to.
 cass MyNode < Tiq::Node
 end
 
-node = MyNode.new( url: "localhost:9999" )
+node = MyNode.new( url: "localhost:9999" ).start
 ```
 
 ### Cluster
@@ -67,7 +58,7 @@ Any existing _Node_ would do.
 class MySecondNode < Tiq::Node
 end
 
-node_2 = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' )
+node_2 = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' ).start
 ```
 
 ### Client
@@ -75,7 +66,7 @@ node_2 = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' )
 `Tiq::Client` offers a _Client_ to enable _Node_/User communications.
 
 ```ruby
-client = MyClient.new( "localhost:9999" )
+client = MyClient.new( "localhost:9999" ).start
 
 # Issue calls on the server side and get us the responses.
 # Client will return `true`.
@@ -104,18 +95,17 @@ class MyChannelNode < Tiq::Node
 end
 
 # Set up initial Node, the start of the cluster.
-node_1  = MyNode.new( url: "localhost:9999" )
-node_2  = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' )
-channel = MyChannelNode.new( url: "localhost:9997", peer: 'localhost:9999' ).data
+node_1  = MyNode.new( url: "localhost:9999" ).start
+node_2  = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' ).start
+channel = MyChannelNode.new( url: "localhost:9997", peer: 'localhost:9999' ).start.channel
 sleep 1
 
 channel.on_set :my_signal do |value|
     p "#{:on_set} - #{value}"
 end
 
-node_1.data.set :my_signal, 'tada!'
+node_1.channel.set :my_signal, 'tada!'
 sleep 1
-
 ```
 
 ### Add-ons
@@ -129,7 +119,7 @@ class MyNode < Tiq::Node
 end
 
 # Set up initial Node.
-node_1 = MyNode.new( url: "localhost:9999" )
+node_1 = MyNode.new( url: "localhost:9999" ).start
 
 # Add a service to the node, called :poll.
 Tiq::Addon::Attach node_1, :poll do |arguments = nil|
@@ -137,12 +127,14 @@ Tiq::Addon::Attach node_1, :poll do |arguments = nil|
 end
 
 # Interact with the service via a Client.
-Tiq::Addon "localhost:9999", :poll, 'ping' do
+Tiq::Addon "localhost:9999", :poll, 'ping' do |r|
     puts "CLIENT: #{r}"
 end
+
+sleep 1
 ```
 
-### Data
+### Channel Shared Data
 
 Data can be shared across _Nodes_ by means of broadcasting upon
 change - optional.
@@ -155,18 +147,34 @@ class MySecondNode < Tiq::Node
 end
 
 # Set up initial Node, the start of the cluster.
-node_1 = MyNode.new( url: "localhost:9999" )
-node_2 = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' )
+node_1 = MyNode.new( url: "localhost:9999" ).start
+node_2 = MySecondNode.new( url: "localhost:9998", peer: 'localhost:9999' ).start
 
 sleep 1
 
-node_2.data.on_set :my_signal do |value|
+node_2.channel.on_set :my_signal do |value|
     p "#{:on_set} - #{value}"
 end
 
-node_1.data.set :my_signal, 'tada!'
+node_1.channel.set :my_signal, 'tada!'
+sleep 1
+```
+
+#### Custom groups
+
+```ruby
+require 'tiq'
+
+n1 = Tiq::Node.new( url: "localhost:9999" ).start
+n2 = Tiq::Node.new( url: "localhost:9998", peer: 'localhost:9999' ).start
+
+# Add as many groups/channels/shared-data structures as you want.
+n1.create_channel 'agents'
+
+n1.agents.set :a1, 99
 sleep 1
 
+p n2.agents.get :a1
 ```
 
 ## Installation

data/lib/tiq/client.rb

@@ -5,12 +5,14 @@ module Tiq
 class Client < Toq::Client
 
     def initialize( url, options = {} )
+        @handler = (options[:handler] || 'node').to_s
+
         host, port = url.split( ':' )
         super( options.merge( host: host, port: port.to_i ) )
     end
 
     def method_missing( method, *args, &block )
-        call( "node.#{method}", *args, &block )
+        call( "#{@handler}.#{method}", *args, &block )
     end
 
 end

data/lib/tiq/node/addon.rb

@@ -23,13 +23,13 @@ class Node
     class Addon
 
         attr_reader :node
-        attr_reader :data
+        attr_reader :channel
         attr_reader :options
 
         def initialize( node, payload, options = {} )
             @node    = node
             @options = options
-            @data    = @node.data
+            @channel = @node.channel
             @payload = payload
         end
 

data/lib/tiq/node/{data.rb → channel.rb}

@@ -1,16 +1,17 @@
 module Tiq
 class Node
-class Data
+class Channel
 
     CONCURRENCY = 20
 
-    def initialize( node )
+    def initialize( node, options = {} )
         @hash = {}
 
         @on_set_cb    = {}
         @on_delete_cb = {}
 
-        @node = node
+        @handler = (options[:handler] || 'channel').to_s
+        @node    = node
     end
 
     def update( data )
@@ -66,7 +67,7 @@ class Data
         nil
     end
 
-    def on_set( k, &block )
+    def on_set( k = nil, &block )
         # p "#{@node} on_set #{k} 0 #{block}"
         (@on_set_cb[sanitize_key( k )] ||= []) << block
         nil
@@ -86,9 +87,14 @@ class Data
     def call_on_set( k, v )
         k = sanitize_key( k )
 
-        # p "#{@node} call_on_set #{k} 2"
-        # p @on_set_cb
-        # p "--- PEERS #{@node.peers}"
+        # Catch-all!
+        if @on_set_cb['']
+            @on_set_cb.each do |_, cbs|
+                cbs.each do |cb|
+                    cb.call k, v
+                end
+            end
+        end
 
         if @on_set_cb[k]
             @on_set_cb[k].each do |cb|
@@ -103,6 +109,15 @@ class Data
         k = sanitize_key( k )
         return if !@on_delete_cb[k]
 
+        # Catch-all!
+        if @on_delete_cb['']
+            @on_delete_cb.each do |k, cbs|
+                cbs.each do |cb|
+                    cb.call k, v
+                end
+            end
+        end
+
         @on_delete_cb[k].each do |cb|
             cb.call k
         end
@@ -119,7 +134,7 @@ class Data
 
     def connect_to_peer( url, options = {} )
         @rpc_clients      ||= {}
-        @rpc_clients[url] ||= Tiq::Channel.new( url, options )
+        @rpc_clients[url] ||= Tiq::Client.new( url, options.merge( handler: @handler ) )
     end
 
     def sanitize_key( k )

data/lib/tiq/node.rb

@@ -1,18 +1,41 @@
 require 'set'
-require_relative 'node/data'
+require 'yaml'
+require_relative 'node/channel'
 require_relative 'node/addon'
-require_relative 'channel'
 require_relative 'client'
 
 module Tiq
 
 class Node
 
+    class <<self
+
+        def when_ready( url, &block )
+            client = Client.new( url, client_max_retries: 0, connection_pool_size: 1 )
+            r = Raktr.new
+            r.run_in_thread
+            r.delay( 0.1 ) do |task|
+                client.alive? do |r|
+                    if r.rpc_exception?
+                        r.delay( 0.1, &task )
+                        next
+                    end
+
+                    client.close
+
+                    block.call
+                end
+            end
+        end
+
+    end
+
     INTERVAL_PING = 5
 
-    attr_reader :data
-    attr_reader :services
+    attr_reader :url
+    attr_reader :channel
     attr_reader :reactor
+    attr_reader :server
 
     # Initializes the node by:
     #
@@ -33,7 +56,11 @@ class Node
         @addons   = {}
         @nodes_info_cache = []
 
-        host, port = @url.split( ':' )
+        host = port = nil
+        if @url
+            host, port = @url.split( ':' )
+        end
+
         options[:host] ||= host || 'localhost'
         options[:port] ||= port || 9999
 
@@ -47,8 +74,10 @@ class Node
 
         @reactor.run_in_thread if !@reactor.running?
 
-        @data = Data.new( self )
-        @server.add_handler( 'data', @data )
+        @channel = Tiq::Node::Channel.new( self, handler: 'channel' )
+        @server.add_handler( 'channel', @channel )
+
+        @channels = {}
 
         @reactor.on_error do |_, e|
             $stderr.puts "Reactor: #{e}"
@@ -86,7 +115,11 @@ class Node
 
                     announce @url
                 rescue => e
+                    p grid_peers
                     p e
+                    e.backtrace.each do |l|
+                        p l
+                    end
                 end
             end
         end
@@ -94,20 +127,20 @@ class Node
         $stdout.puts 'Node ready.'
 
         log_updated_peers
-
-        run
     end
 
     def attach_addon( name, service, options = {} )
-        if @addons[name.to_s]
+        name = name.to_s
+        if @addons[name]
             fail "Add-on already registered with name: #{name}"
         end
-        @addons[name.to_s] = Node::Addon.new( self, service, options )
+        @addons[name] = Node::Addon.new( self, service, options )
         nil
     end
 
     def call_addon( name, *arguments )
-        if !@addons[name.to_s]
+        name = name.to_s
+        if !@addons[name]
             fail "Add-on not attached with name: #{name}"
         end
 
@@ -119,13 +152,52 @@ class Node
     end
 
     def dettach_addon( name )
-        if !@addons[name.to_s]
+        name = name.to_s
+        if !@addons[name]
             fail "Add-on not attached with name: #{name}"
         end
 
         @addons.delete name
     end
 
+    def create_channel( name, broadcast = true, &block )
+        name = name.to_s
+        @channels[name] = Tiq::Node::Data.new( self, handler: name )
+        @server.add_handler( name, @channels[name] )
+
+        self.class.define_method name do
+            @channels[name]
+        end
+
+        if !broadcast
+            block.call
+            return
+        end
+
+        each = proc { |peer, iterator|
+            begin
+                connect_to_peer( peer ).create_channel( name, false ) { |_, i2| iterator.next; i2.next }
+            rescue => e
+                p e
+            end
+        }
+        @reactor.create_iterator( @peers, 20 ).each( each )
+        nil
+    rescue => e
+    p e
+    e.backtrace.each do |l|
+      p l
+    end
+    end
+
+    def remove_channel( name )
+        @channels.delete name.to_s
+    end
+
+    def channels
+        @channels.keys
+    end
+
     # @return   [Boolean]
     #   `true` if grid member, `false` otherwise.
     def grid_member?
@@ -133,7 +205,7 @@ class Node
     end
 
     def unplug
-        @server.create_iterator( @peers, 20 ).each do |peer, iterator|
+        @reactor.create_iterator( @peers, 20 ).each do |peer, iterator|
             connect_to_peer( peer ).remove_peer( @url ) { iterator.next }
         end
 
@@ -151,14 +223,14 @@ class Node
         $stdout.puts "Adding peer: #{node_url}"
         @peers << node_url
 
-        connect_to_peer( node_url ){ update_data( @data.to_h ) }
+        connect_to_peer( node_url ){ update_channel( @channel.to_h ) }
 
         log_updated_peers
         true
     end
 
-    def update_data( data )
-        @data.update( data )
+    def update_channel( channel )
+        @channel.update( channel )
         nil
     end
 
@@ -225,9 +297,16 @@ class Node
         true
     end
 
-    def run
+    def start
+        # @server.reactor.ensure_reactor_running
         $stdout.puts 'Running'
         @server.start
+
+        q = Queue.new
+        self.class.when_ready( @url) { q << Client.new( @url ) }
+        q.pop
+
+        self
     rescue => e
         $stderr.puts e
         $stderr.puts "Could not start server"

data/lib/tiq/version.rb

@@ -0,0 +1,3 @@
+module Tiq
+    VERSION = '0.2.1'
+end

data/lib/tiq.rb

@@ -1,8 +1,7 @@
 require 'msgpack'
 require_relative 'tiq/node'
 require_relative 'tiq/client'
-require_relative 'tiq/channel'
+require_relative 'tiq/node/channel'
 
 module Tiq
-    VERSION = '0.2'
 end

data/spec/tiq/node/addon_spec.rb

@@ -5,8 +5,9 @@ describe 'Tiq::Node::Addon' do
     let( :peer ) { @peer ||= Tiq::Node.new( url: 'localhost:9998', peer: 'localhost:9999' ) }
 
     before( :each ) do
-        node
-        peer
+        node.start
+        sleep 1
+        peer.start
         sleep 0.1
     end
 
@@ -15,7 +16,7 @@ describe 'Tiq::Node::Addon' do
         @peer = nil
         @node.shutdown
         @node = nil
-        sleep 1
+        sleep 2
     end
 
     it 'attaches and calls an addon' do

data/spec/tiq/node/{data_spec.rb → channel_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Tiq::Node::Data do
+describe Tiq::Node::Channel do
     let( :node ) { @node ||= Tiq::Node.new( url: 'localhost:9999' ) }
     let( :peer ) { @peer ||= Tiq::Node.new( url: 'localhost:9998', peer: 'localhost:9999' ) }
 
@@ -19,44 +19,44 @@ describe Tiq::Node::Data do
     end
 
     it 'sets and gets data locally' do
-        node.data.set( 'key1', 'value1' )
-        expect( node.data.get( 'key1' ) ).to eq 'value1'
+        node.channel.set( 'key1', 'value1' )
+        expect( node.channel.get( 'key1' ) ).to eq 'value1'
     end
 
     it 'propagates data to peers' do
-        node.data.set( 'key2', 'value2' )
+        node.channel.set( 'key2', 'value2' )
         sleep 1
-        expect( peer.data.get( 'key2' ) ).to eq 'value2'
+        expect( peer.channel.get( 'key2' ) ).to eq 'value2'
     end
 
     it 'does not propagate data when broadcast is false' do
-        node.data.set( 'key3', 'value3', false )
+        node.channel.set( 'key3', 'value3', false )
         sleep 0.1
-        expect( peer.data.get( 'key3' ) ).to be_nil
+        expect( peer.channel.get( 'key3' ) ).to be_nil
     end
 
     it 'calls on_set callbacks' do
         called = false
-        peer.data.on_set( 'key4' ) { |k, v| called = (k == 'key4' && v == 'value4') }
-        node.data.set( 'key4', 'value4' )
+        peer.channel.on_set( 'key4' ) { |k, v| called = (k == 'key4' && v == 'value4') }
+        node.channel.set( 'key4', 'value4' )
         sleep 1
         expect( called ).to be true
     end
 
     it 'calls on_delete callbacks' do
         called = false
-        peer.data.set( 'key5', 'value5' )
+        peer.channel.set( 'key5', 'value5' )
         sleep 1
-        peer.data.on_delete( 'key5' ) { |k| called = (k == 'key5') }
-        node.data.delete( 'key5' )
+        peer.channel.on_delete( 'key5' ) { |k| called = (k == 'key5') }
+        node.channel.delete( 'key5' )
         sleep 1
         expect( called ).to be true
     end
 
     it 'does not call on_set callback when value is unchanged' do
         count = 0
-        peer.data.on_set( 'key6' ) { count += 1 }
-        node.data.set( 'key6', 'value6' )
-        node.data
+        peer.channel.on_set( 'key6' ) { count += 1 }
+        node.channel.set( 'key6', 'value6' )
+        node.channel
     end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tiq
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Tasos Laskos
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-11 00:00:00.000000000 Z
+date: 2025-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -43,30 +42,28 @@ email: tasos.laskos@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
-- LICENSE.md
 - CHANGELOG.md
+- LICENSE.md
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE.md
 - README.md
 - lib/tiq.rb
-- lib/tiq/channel.rb
 - lib/tiq/client.rb
 - lib/tiq/node.rb
 - lib/tiq/node/addon.rb
-- lib/tiq/node/data.rb
+- lib/tiq/node/channel.rb
+- lib/tiq/version.rb
 - spec/spec_helper.rb
-- spec/tiq/channel_spec.rb
 - spec/tiq/client_spec.rb
 - spec/tiq/node/addon_spec.rb
-- spec/tiq/node/data_spec.rb
+- spec/tiq/node/channel_spec.rb
 - spec/tiq/node_spec.rb
 homepage: https://github.com/qadron/tiq
 licenses:
-- BSD 3-Clause
+- MPL v2
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -82,14 +79,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple RPC protocol.
 test_files:
+- spec/spec_helper.rb
 - spec/tiq/client_spec.rb
-- spec/tiq/node_spec.rb
-- spec/tiq/channel_spec.rb
-- spec/tiq/node/data_spec.rb
 - spec/tiq/node/addon_spec.rb
-- spec/spec_helper.rb
+- spec/tiq/node/channel_spec.rb
+- spec/tiq/node_spec.rb

data/lib/tiq/channel.rb

@@ -1,17 +0,0 @@
-require 'msgpack'
-require 'toq'
-
-module Tiq
-class Channel < Toq::Client
-
-    def initialize( url, options = {} )
-        host, port = url.split( ':' )
-        super( options.merge( host: host, port: port.to_i ) )
-    end
-
-    def method_missing( method, *args, &block )
-        call( "data.#{method}", *args, &block )
-    end
-
-end
-end

data/spec/tiq/channel_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Tiq::Channel do
-
-end