tedserv 0.0.1c → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fd129cd99ea9211fe1c145cee2183c9c049e8be
-  data.tar.gz: f6779b941b922863dd5bb15db696323510e02469
+  metadata.gz: 145ff88a5e9148245a8ea3e21a3e37015184ce65
+  data.tar.gz: d6fdff564bd56a6738c6460c83947642bd012462
 SHA512:
-  metadata.gz: 5e84c333625547bfe5d4de569e90d53835b300c863b08da729f14da383733938a75e7fc91d75c6cb9411362bb6b8cbb1bf9817329c088b55319ed96075735ab3
-  data.tar.gz: 16e83d2fca5ee8efb3ddc3c2224255c9381122af65e56a7825bc84d9817af3b2e20c2fbbbb6c5e6a2f4409fb6e5f0b9967ab5c82f4b4e6084a6aaffefbd8ceff
+  metadata.gz: c242e30020bfd42714aaa07d8c03fc4604151876d3c6f92923bd0c2034a1b782c632d5b9c74e1871151598de6acddbf4b1df7cab7fcadb2bfc4dce3f67d85eb0
+  data.tar.gz: f6bc1f364c239d4df6df23c7d8f0891aa13e45bec22cbefd7ca5464540d4d44dfa788a5c490602db7c8ba6281e531ce10e4c571d85f39d01aba9bd1f8aab1885

data/bin/tedserver

@@ -1,38 +1,59 @@
 #!/usr/bin/env ruby
 
 require "tedserv"
-
-@f = TED::Config.new(".tedconfig.txt")
+require "socket"
 
 def config
+	f = TED::Config.new("config.txt")
 	puts "TED Server config tool"
 	loop{
-		puts "Current: #{@f.getData['port']}"
+		puts "Current: #{f.getIP}:#{f.getPort}"
 		puts "------------"
-		puts "1.  Port"
+		puts "1.  IP"
+		puts "2.  Port"
+		puts "3.  Valid Links"
 		puts "99. Exit"
 		o = STDIN.gets.chomp.to_i
 		if o == 1
+			puts "What's the new IP?"
+			ip = STDIN.gets.chomp
+			f.changeIP(ip)
+		elsif o == 2
 			puts "What's the new port?"
 			p = STDIN.gets.chomp.to_i
-			@f.changePort(p)
+			f.changePort(p)
+		elsif o == 3
+			pust "Links change"
 		else
 			break
 		end
 	}	
+	f.close
 end
 
 def runServer
-	s = TED::Server.new(@f.getData['port'])
+	f = TED::Config.new("config.txt")
+	ip = f.getIP
+	port = f.getPort
+	f.close
+	s = TED::Server.new(ip, port)
 end
 
 def runClient
-	c = TED::Client.new
+	f = TED::Config.new("config.txt")
+	ip = f.getIP
+	port = f.getPort
+	f.close
+	#s = TCPSocket.new(ip, port)
+	#c = TED::Client.new(s)
 end
 
 def runMini
-	@f = TED::Config.new(".config.txt")
-	#s = TED::Serverlet.new(ip, port)
+	f = TED::Config.new("config.txt")
+	ip = f.getIP
+	port = f.getPort
+	f.close
+	s = TED::Serverlet.new(ip, port+1)
 end
 
 

data/lib/config.rb

@@ -1,33 +1,47 @@
-require "yaml"
-
 class TED::Config
 
 	def initialize(path)
-		@path = path
-		exist = File.file?(@path)
+		exist = File.file?(path)
 		if exist
-			file = File.open(@path, "r")
-			@data = YAML.load(file.read)
-			file.close
+			File.open(path,"r").each do |l|
+				p = l.split(",")
+				@ip = p[0]
+				@port = p[1].to_i
+			end
+			@file = File.open(path, "w+")
 		else
-			@data = {"port"=>"9017"}
+			@file = File.open(path, "a+")
+			@ip = "localhost"
+			@port = 3030
 			save
 		end
 	end
-
+	
 	def save
-		file = File.open(@path, "w")
-		file.puts(@data.to_yaml)
-		file.close
+		@file.rewind
+		@file.puts("#{@ip},#{@port}")
 	end
-
-	def changePort(pt="9017")
-		@data["port"]=pt.to_s
-		puts "Chnaged config port to: #{pt}"
+	
+	def changePort(port)
+		@port=port.to_i
 		save
 	end
-
-	def getData
-		return @data
+	
+	def changeIP(ip)
+		@ip=ip
+		save
+	end
+	
+	def getIP
+		return @ip
+	end
+	
+	def getPort
+		return @port.to_i
+	end
+	
+	def close
+		save
+		@file.close
 	end
 end

data/lib/server.rb

@@ -1,34 +1,44 @@
 require "socket"
-require "proto"
+#require "colorize"
 
 class TED::Server
-  def initialize(port=9017)
-    @port = port
-		log("Server ready @ #{port}")
-    run() 
+
+  def initialize(ip, port)
+    @server = TCPServer.open(ip, port)
+    @minSer = TCPServer.open(ip, port + 1)
+    @minis = []
+    @users = []
+    @mute = Mutex.new
+		log("Server ready @ #{ip}:#{port}")
+		log("Listening for serverlets on #{port+1}")
+    begin
+    	run
+    rescue Exception => e
+    	puts "Shutting down!"
+    end    
   end
 
   def run
-  	Socket.udp_server_loop(@port) do |msg, from|
-				proto = TED::Protocol.new
-				proto.read(msg)
-
-        puts proto.cmd
-
-				if proto.kind == TED::Protocol.server
-
-				elsif proto.kind == TED::Protocol.node
-
-        elsif proto.kind == TED::Protocol.player
-
-        else
-          log("Unknow user type from: #{ip}")
-          from.reply("Not too sure what you are?")
-        end
-  	end
+    loop { ## Forever loop
+      Thread.new(@minSer.accept) do | mini |
+      	
+      end
+    }.join
   end
   
   def log(msg)
   	puts "[#{Time.now.strftime('%H:%M:%S')}]: #{msg}"
   end
+  
+  def isNameTaken(name) 
+  	return false if @users.count == 0
+  	@mute.synchonize do
+			@users.each do |conUser|
+				if conUser.name == name
+					return true
+				end
+			end
+			return false
+  	end
+  end
 end

data/lib/tedserv.rb

@@ -3,7 +3,6 @@ class TED
 end
 
 require 'config'
-require 'proto'
-require 'client'
+require 'user'
 require 'server'
 require 'serverlet'

data/lib/user.rb

@@ -0,0 +1,6 @@
+class TED::User
+	def initialize(name, socket)
+		@name = name
+		@socket = socket
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tedserv
 version: !ruby/object:Gem::Version
-  version: 0.0.1c
+  version: 0.0.1
 platform: ruby
 authors:
 - Elliot Lee-Cerrino
@@ -9,21 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-08-24 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.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
+dependencies: []
 description: All in one TED gem
 email: "@h2n0"
 executables:
@@ -32,12 +18,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/tedserver
-- lib/client.rb
 - lib/config.rb
-- lib/proto.rb
 - lib/server.rb
 - lib/serverlet.rb
 - lib/tedserv.rb
+- lib/user.rb
 homepage: 
 licenses:
 - MIT
@@ -53,9 +38,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/client.rb

@@ -1,35 +0,0 @@
-require "socket"
-require "proto"
-
-class TED::Client
-    def initialize
-        @s = UDPSocket.new
-        puts "Welcome to TED Client"
-        mainLobby
-    end
-
-    def mainLobby
-        loop{
-            p = sendAndGet("LIST", TED::Protocol.hubIp, TED::Protocol.hubPort)
-            puts p.cmd
-        }
-    end
-
-    def inGame
-
-    end
-
-    def getMeaning(msg)
-        return TED::Protocol.read(msg)
-    end
-
-    def sendAndGet(msg, ip, port)
-        p = TED::Protocol.new
-        p.kind = TED::Protocol.player
-        p.cmd = msg
-
-        @s.send(p.to_binary_s, 0, ip, port)
-        rep, from = @s.recvfrom(20)
-        return getMeaning(rep)
-    end
-end

data/lib/proto.rb

@@ -1,37 +0,0 @@
-require "bindata"
-class TED::Protocol < BinData::Record
-
-	@@player = 0x00
-	@@node = 0x01
-	@@hub = 0x10
-	@@other = 0x11
-	@@hubIp = "46.101.76.160"
-	@@hubPort = 9017
-
-	stringz :cmd
-	bit2 :kind
-
-	def self.player
-		@@player
-	end
-
-	def self.node
-		@@node
-	end
-
-	def self.hub
-		@@hub
-	end
-
-	def self.other
-		@@other
-	end
-
-	def self.hubIp
-		@@hubIp
-	end
-
-	def self.hubPort
-		@@hubPort
-	end
-end