stun 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bddb10f4448adc3b54028bbe5215b55857250f9e04b13e85e7aa3137cf14b3
-  data.tar.gz: 8025826614dfea4833b943014864831529ffd0e5b9d8cc4eb9d591976e2d2bf4
+  metadata.gz: 0b060d28741f56171298558ebaccca095b5e2022b079ceb0d0debc6da5c64571
+  data.tar.gz: 0315c04d1cbffdbd27dba2753e20c699867db61a48e63f8738edd472c2392cae
 SHA512:
-  metadata.gz: 70bf71bf4075d66014efabdb02f3450ede2498789f5ec271292cbd404c18dfa4b41e72d67ed391deca02bb02bbfbf437e77f1c1ad4c154370e4aac7e62272b05
-  data.tar.gz: 9c1f8ac959e9a3b80b40eb3d41879865f6945a073233202d06aee7643cff35eb28d20b910f7542d998e8035dfd0790c88ef55df8ce2d07832566b132e560ad93
+  metadata.gz: e945bcd363a021cbb41e24db39da772ece139b25bc2fef0168b5056aa80feede3f4d8cbc6d79b6bac8dba8e2958e2dad2d933e92258888eeee7012be4ef2a0fd
+  data.tar.gz: 6f6bd4a87ba23b526c35f2101111c49f596b07461fe3ddb0046d79d4410d21b956b8e706fddccc794609c29608b847d9e9ba69d95cdced6e26815865eed0ff25

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    stun-client (0.1.0)
-      bindata (~> 2.4.6)
+    stun (0.2.1)
+      bindata (~> 2.4.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bindata (2.4.6)
-    diff-lcs (1.3)
-    rake (10.5.0)
+    bindata (2.4.10)
+    diff-lcs (1.5.0)
+    rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.4)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  rake (~> 10.0)
+  bundler (~> 2.2.33)
+  rake (~> 12.3.3)
   rspec (~> 3.9.0)
-  stun-client!
+  stun!
 
 BUNDLED WITH
-   2.1.2
+   2.2.33

data/README.md

@@ -18,13 +18,14 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
 ```ruby
 require 'stun'
 
+socket = UDPSocket.new
 client = Stun::Client.new(host: '108.177.14.127', port: 19302)
-client.query_address
+response = client.query(socket: socket)
+response.ip # external ip
+response.port # external port
 ```
 
 

data/lib/stun/client.rb

@@ -47,8 +47,7 @@ module Stun
 
       uint16 :value_type
       uint16 :value_length
-      # buffer :attribute_value, type: :uint8, length: :value_length
-      choice :attribute_value, selection: lambda { value_type }, choices: {
+      choice :attribute_value, selection: -> { value_type }, choices: {
         0x0001 => :mapped_address,
         0x0002 => :response_address,
       }
@@ -72,32 +71,33 @@ module Stun
 
       uint16 :message_type
       uint16 :message_length, initial_value: 0
-      string :transaction_id, length: 16, initial_value: lambda { SecureRandom.alphanumeric(16) }
-      buffer :attributes, type: :stun_message_attribute, length: lambda { message_length }, onlyif: lambda { message_length > 0 }
+      string :transaction_id, length: 16, initial_value: -> { SecureRandom.alphanumeric(16) }
+      buffer :attributes, type: :stun_message_attribute, length: -> { message_length }, onlyif: -> { message_length > 0 }
 
       def message_type_name
         MESSAGE_TYPES.fetch(message_type)
       end
     end
 
-    def initialize(options = {})
-      @host = options.fetch(:host, '108.177.14.127')
-      @port = options.fetch(:port, 19302)
+    def initialize(host:, port:)
+      @host = host
+      @port = port
     end
 
-    def query_address
+    def query(socket:)
       payload = StunMessage.new(message_type: 0x0001).to_binary_s
-      socket = UDPSocket.new
-      socket.connect(@host, @port)
-      socket.send(payload, 0, @host, @port)
+      socket.send(payload, 0, host, port)
       resp = socket.recv(1024)
 
       msg = StunMessage.read(resp)
       attr = msg[:attributes][:attribute_value]
-      {
-        id: "#{attr[:ip_a]}.#{attr[:ip_b]}.#{attr[:ip_c]}.#{attr[:ip_d]}",
-        port: attr[:port]
-      }
+      QueryResponse.new(ip: attr.ip, port: attr[:port])
     end
+
+    private
+
+    QueryResponse = Struct.new(:ip, :port, keyword_init: true)
+
+    attr_reader :host, :port
   end
 end

data/lib/stun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stun
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

data/stun.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bindata", "~> 2.4.6"
+  spec.add_runtime_dependency "bindata", "~> 2.4.10"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2.33"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.9.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: stun
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mateusz Kluge
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.6
+        version: 2.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.6
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
 description: Stun client
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -89,23 +89,23 @@ homepage: http://github.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Stun client
 test_files: []