libsl 0.0.2 → 0.0.3

data/HISTORY

@@ -0,0 +1,23 @@
+Release history
+===============
+
+Version 0.0.3
+-------------
+
+* Instant messaging
+* Teleport
+* Directory searching
+* Logging
+
+Version 0.0.2
+-------------
+
+* Fixed Gemspec
+* Fixed Rakefile
+
+Version 0.0.1
+-------------
+
+* Working Login
+* Networking
+* Event system

data/LICENSE

@@ -0,0 +1,281 @@
+.
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+ License is intended to guarantee your freedom to share and change free
+ software--to make sure the software is free for all its users.  This
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it.  (Some other Free Software Foundation software is covered by
+ the GNU Lesser General Public License instead.)  You can apply it to
+ your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+ price.  Our General Public Licenses are designed to make sure that you
+ have the freedom to distribute copies of free software (and charge for
+ this service if you wish), that you receive source code or can get it
+ if you want it, that you can change the software or use pieces of it
+ in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+ anyone to deny you these rights or to ask you to surrender the rights.
+ These restrictions translate to certain responsibilities for you if you
+ distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+ gratis or for a fee, you must give the recipients all the rights that
+ you have.  You must make sure that they, too, receive or can get the
+ source code.  And you must show them these terms so they know their
+ rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+ (2) offer you this license which gives you legal permission to copy,
+ distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+ that everyone understands that there is no warranty for this free
+ software.  If the software is modified by someone else and passed on, we
+ want its recipients to know that what they have is not the original, so
+ that any problems introduced by others will not reflect on the original
+ authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+ patents.  We wish to avoid the danger that redistributors of a free
+ program will individually obtain patent licenses, in effect making the
+ program proprietary.  To prevent this, we have made it clear that any
+ patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+ modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+ a notice placed by the copyright holder saying it may be distributed
+ under the terms of this General Public License.  The "Program", below,
+ refers to any such program or work, and a "work based on the Program"
+ means either the Program or any derivative work under copyright law:
+ that is to say, a work containing the Program or a portion of it,
+ either verbatim or with modifications and/or translated into another
+ language.  (Hereinafter, translation is included without limitation in
+ the term "modification".)  Each licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are not
+ covered by this License; they are outside its scope.  The act of
+ running the Program is not restricted, and the output from the Program
+ is covered only if its contents constitute a work based on the
+ Program (independent of having been made by running the Program).
+ Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+ source code as you receive it, in any medium, provided that you
+ conspicuously and appropriately publish on each copy an appropriate
+ copyright notice and disclaimer of warranty; keep intact all the
+ notices that refer to this License and to the absence of any warranty;
+ and give any other recipients of the Program a copy of this License
+ along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy, and
+ you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+ of it, thus forming a work based on the Program, and copy and
+ distribute such modifications or work under the terms of Section 1
+ above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+ These requirements apply to the modified work as a whole.  If
+ identifiable sections of that work are not derived from the Program,
+ and can be reasonably considered independent and separate works in
+ themselves, then this License, and its terms, do not apply to those
+ sections when you distribute them as separate works.  But when you
+ distribute the same sections as part of a whole which is a work based
+ on the Program, the distribution of the whole must be on the terms of
+ this License, whose permissions for other licensees extend to the
+ entire whole, and thus to each and every part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or contest
+ your rights to work written entirely by you; rather, the intent is to
+ exercise the right to control the distribution of derivative or
+ collective works based on the Program.
+
+ In addition, mere aggregation of another work not based on the Program
+ with the Program (or with a work based on the Program) on a volume of
+ a storage or distribution medium does not bring the other work under
+ the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+ under Section 2) in object code or executable form under the terms of
+ Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work for
+ making modifications to it.  For an executable work, complete source
+ code means all the source code for all modules it contains, plus any
+ associated interface definition files, plus the scripts used to
+ control compilation and installation of the executable.  However, as a
+ special exception, the source code distributed need not include
+ anything that is normally distributed (in either source or binary
+ form) with the major components (compiler, kernel, and so on) of the
+ operating system on which the executable runs, unless that component
+ itself accompanies the executable.
+
+ If distribution of executable or object code is made by offering
+ access to copy from a designated place, then offering equivalent
+ access to copy the source code from the same place counts as
+ distribution of the source code, even though third parties are not
+ compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License.  Any attempt
+ otherwise to copy, modify, sublicense or distribute the Program is
+ void, and will automatically terminate your rights under this License.
+ However, parties who have received copies, or rights, from you under
+ this License will not have their licenses terminated so long as such
+ parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+ signed it.  However, nothing else grants you permission to modify or
+ distribute the Program or its derivative works.  These actions are
+ prohibited by law if you do not accept this License.  Therefore, by
+ modifying or distributing the Program (or any work based on the
+ Program), you indicate your acceptance of this License to do so, and
+ all its terms and conditions for copying, distributing or modifying
+ the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+ Program), the recipient automatically receives a license from the
+ original licensor to copy, distribute or modify the Program subject to
+ these terms and conditions.  You may not impose any further
+ restrictions on the recipients' exercise of the rights granted herein.
+ You are not responsible for enforcing compliance by third parties to
+ this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+ infringement or for any other reason (not limited to patent issues),
+ conditions are imposed on you (whether by court order, agreement or
+ otherwise) that contradict the conditions of this License, they do not
+ excuse you from the conditions of this License.  If you cannot
+ distribute so as to satisfy simultaneously your obligations under this
+ License and any other pertinent obligations, then as a consequence you
+ may not distribute the Program at all.  For example, if a patent
+ license would not permit royalty-free redistribution of the Program by
+ all those who receive copies directly or indirectly through you, then
+ the only way you could satisfy both it and this License would be to
+ refrain entirely from distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable under
+ any particular circumstance, the balance of the section is intended to
+ apply and the section as a whole is intended to apply in other
+ circumstances.
+
+ It is not the purpose of this section to induce you to infringe any
+ patents or other property right claims or to contest validity of any
+ such claims; this section has the sole purpose of protecting the
+ integrity of the free software distribution system, which is
+ implemented by public license practices.  Many people have made
+ generous contributions to the wide range of software distributed
+ through that system in reliance on consistent application of that
+ system; it is up to the author/donor to decide if he or she is willing
+ to distribute software through any other system and a licensee cannot
+ impose that choice.
+
+ This section is intended to make thoroughly clear what is believed to
+ be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces, the
+ original copyright holder who places the Program under this License
+ may add an explicit geographical distribution limitation excluding
+ those countries, so that distribution is permitted only in or among
+ countries not thus excluded.  In such case, this License incorporates
+ the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+ of the General Public License from time to time.  Such new versions will
+ be similar in spirit to the present version, but may differ in detail to
+ address new problems or concerns.
+
+ Each version is given a distinguishing version number.  If the Program
+ specifies a version number of this License which applies to it and "any
+ later version", you have the option of following the terms and conditions
+ either of that version or of any later version published by the Free
+ Software Foundation.  If the Program does not specify a version number of
+ this License, you may choose any version ever published by the Free Software
+ Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+ programs whose distribution conditions are different, write to the author
+ to ask for permission.  For software which is copyrighted by the Free
+ Software Foundation, write to the Free Software Foundation; we sometimes
+ make exceptions for this.  Our decision will be guided by the two goals
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+ REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+

data/Rakefile

@@ -36,6 +36,9 @@ task :inc_version do
 	else
 		version[1] += 1
 	end
+	puts "Increment version to: #{version.join(".")}?"
+	prompt = $stdin.gets.chomp
+	version = prompt.split(".") unless prompt == ""
 	File.open('VERSION', "w") { |f| f.write version.join(".") }
 	system "git add VERSION && git commit -m \"Increment version\""
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/agent.rb

@@ -2,8 +2,8 @@
 
 module LibSL
 	class AgentManager
-		attr_accessor :client
-		attr_reader :position, :look_at, :region_handle, :region_name
+		attr_accessor :client, :position, :look_at
+		attr_reader :region_handle, :region_name
 
 		# New AgentManager
 		# @param [Client] client The client
@@ -11,11 +11,23 @@ module LibSL
 			@client = client
 			@position = LLVector3.new(0, 0, 0)
 			@look_at = LLVector3.new(0, 0, 0)
+			@region_id = LLUUID.new
 			@region_handle = LLU64.new(0)
 			@region_name = ""
 			init_handlers
 		end
 
+		def first_name
+			@client.network_manager.first_name
+		end
+
+		def last_name
+			@client.network_manager.last_name
+		end
+
+		def full_name
+			first_name + " " + last_name
+		end
 
 		# Complete a transfer to a sim (e.g. after login or teleport)
 		# @param [Simulator] sim The sim you have been transfered to
@@ -81,13 +93,73 @@ module LibSL
 		# Send an instant message to another agent
 		# @param [String] message the message to send
 		# @param [LLUUID] to The recepients id
-		def im(message, to)
+		def im(message, to, session=nil)
+			session ||= LLUUID.new
+			packet = ImprovedInstantMessagePacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:MessageBlock => {
+					:FromGroup => LLBool.new(false),
+					:ToAgentID => to,
+					:ParentEstateID => LLU32.new(0),
+					:RegionID => @region_id,
+					:Position => @position,
+					:Offline => LLU8.new(1),
+					:Dialog => LLU8.new(DIALOG[:IM]),
+					:ID => session,
+					:Timestamp => LLU32.new(Time.now.to_i),
+					:FromAgentName => LLVariable1.new(full_name),
+					:Message => LLVariable2.new(message),
+					:BinaryBucket => LLVariable2.new("")
+				}
+			})
+			@client.network_manager.send_packet packet
 		end
 
 		# Send Linden$ to another agent
 		# @param [Integer] amount The amount of L$ to send
 		# @param [LLUUID] to The recepient
-		def send_money(amount, to)
+		def send_money(amount, to, description="")
+			packet = MoneyTransferRequestPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:Money => {
+					:SourceID => @client.network_manager.agent_id,
+					:DestID => to,
+					:Flags => LLU8.new(0),
+					:Amount => LLS32.new(amount),
+					:AggregatePermNextOwner => LLU8.new(0),
+					:AggregatePermInventory => LLU8.new(0),
+					# see http://hg.secondlife.com/viewer-release/src/tip/indra/llinventory/lltransactiontypes.h#cl-77)
+					:TransactionType => LLS32.new(5001), # Gift
+					:Description => LLVariable1.new(description)
+				}
+			})
+		end
+
+		# Teleport somewhere
+		# @param [LLUUID] region_id The ID of the region to teleport to
+		# @param [LLVector3] position (optional) The position to teleport
+		# to in region local coordinates
+		def teleport(region_id, position=nil)
+			raise ArgumentError, "region_id has to be a LLUUID" unless region_id.is_a? LLUUID
+			position = LLVector3.new(128, 128, 0) unless position.is_a? LLVector3
+			packet = TeleportRequestPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:Info => {
+					:RegionID => region_id,
+					:Position => position,
+					:LookAt => LLVector3.new(1, 0, 0)
+				}
+			})
+			@client.network_manager.send_packet packet
 		end
 
 		private
@@ -111,7 +183,8 @@ module LibSL
 			EventManager.register_handler(handler)
 
 			handler = EventHandler.new(Proc.new do |type, packet, sim|
-				@region_name = packet.RegionInfo.SimName.data
+				@region_name = packet.RegionInfo.SimName.data.delete("\0")
+				@region_id = packet.RegionInfo2.RegionID
 			end, :RegionHandshakePacket_Received)
 			EventManager.register_handler(handler)
 		end

data/lib/client.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 
-%w{ types packet events agent network dsl }.each { |file|
+%w{ logging types packet events search agent network dsl }.each { |file|
 	require File.expand_path File.join(File.dirname(__FILE__), file)
 }
 
@@ -11,13 +11,20 @@ require 'eventmachine'
 
 module LibSL
 	class Client
-		attr_accessor :event_manager, :network_manager, :agent_manager
+		attr_accessor :event_manager, :network_manager, :agent_manager, :search_manager, :logger
 
 		def initialize()
 			@is_setup = false
 			#@event_manager = EventManager.new self
 			@network_manager = NetworkManager.new self
 			@agent_manager = AgentManager.new self
+			@search_manager = SearchManager.new self
+			@logger = Logger.new
+		end
+
+		def logger=(logger)
+			raise ArgumentError, "Argument has to be a Logger" unless logger.is_a? Logger
+			@logger = logger
 		end
 
 		def login()

data/lib/dsl.rb

@@ -7,6 +7,19 @@ module LibSL
 		end
 		module_function :client
 
+		def logger
+			client.logger
+		end
+
+		# Configure logging
+		# @param [String] output Path to a logfile
+		# @param [IOS] output An output stream ($stdout, $stderr, etc..)
+		# @param [Bool] debug (optional) Enable debug messages
+		# @param [Bool] colors (optional) Enable ANSI coloring for terminal emulators
+		def set_logging(output, debug=false, colors=true)
+			client.logger = Logger.new(output, debug, colors)
+		end
+
 		# Setup the client
 		# @param [String] firstname Avatar firstname or account username
 		# @param [String] lastname (optional) Account lastname. Or 'Resident' if a username

data/lib/libsl.rb

@@ -1,5 +1,46 @@
 require File.join File.dirname(__FILE__), "client"
 
+module LibSL
+	# IM Dialog types (see http://wiki.secondlife.com/wiki/ImprovedInstantMessage)
+	DIALOG = {
+		:IM => 0,
+		:Notification => 1,
+		:GroupInvitation => 3,
+		:InventoryOffer => 4,
+		:AcceptInventoryOffer => 5,
+		:DeclineInventoryOffer => 6,
+		:GroupVote => 7,
+		:ObjectInventoryOffer => 9,
+		:AcceptObjectInventoryOffer => 10,
+		:DeclineObjectInventoryOffer => 11,
+		:StartSession => 13,
+		:StartSessionOnline => 14, # Start a session but don't prune offline users
+		:StartGroupSession => 15,
+		:MessageToSession => 17,
+		:LeaveSession => 18,
+		:IMFromObject => 19,
+		:AutoResponse => 20,
+		:ChatHistory => 21, # Shows the message in the console and chat history
+		:SendTeleportLure => 22,
+		:AcceptTeleportLure => 23,
+		:DeclineTeleportLure => 24,
+		:GodlikeRequestTeleport => 25, # Only with god powers
+		:GotoURL => 28,
+		:RequestHelp => 29, # IM for help
+		:HelpRequested => 30, # IM sent automatically on call for help
+		:IMNoEmail => 31, # IM won't go to email
+		:IMToGroup => 32, # IM from Group Officer to all group members
+		:GroupNoticeRequested => 33,
+		:AcceptGroupInvitation => 35,
+		:DeclineGroupInvitation => 36,
+		:FriendshipOffer => 38,
+		:AcceptFriendshipOffer => 39,
+		:DeclineFriendshipOffer => 40,
+		:StartTyping => 41,
+		:StopTyping => 42
+	}
+end
+
 include LibSL
 include LibSL::DSL
 

data/lib/logging.rb

@@ -0,0 +1,61 @@
+
+module LibSL
+	class LogFile
+		def initialize(dest=nil)
+			@dest = dest
+		end
+		
+		def << (val)
+			case @dest
+			when nil then return
+			when String then
+				File.new(@dest) {|f| f << val}
+			when IO then @dest << val
+			end
+			self
+		end
+	end
+
+	class Logger
+		# Colors
+		RESET_COLOR = "\e[0m"			# Reset
+		ERROR_COLOR = "\e[1m\e[31m"		# Red
+		DEBUG_COLOR = "\e[1m\e[37m"		# Grey
+		INFO_COLOR	= "\e[1m\e[33m"		# Yellow
+		UNDERLINE	= "\e[4m"			# Underline
+
+		def initialize(output=nil, debug=false, colors=true)
+			@output = output.is_a?(LogFile) ? output : LogFile.new(output)
+			@debug = debug
+			@colors = colors
+		end
+
+		def log(level, message, *args)
+			color = self.class.const_get("#{level.to_s.upcase}_COLOR".to_sym)
+			@output << "[" << apply_color(color + UNDERLINE, level.to_s.upcase + " " + Time.now.strftime("%F %T")) << "] " \
+					<< sprintf(apply_color(color, message), *args) << "\n"
+		end
+
+		def debug(message, *args)
+			return unless @debug
+			log(:debug, message, *args)
+		end
+
+		def info(message, *args)
+			log(:info, message, *args)
+		end
+
+		def error(message, *args)
+			log(:error, message, *args)
+		end
+
+		private
+		def apply_color(color, to)
+			if @colors && color
+				return sprintf("%s%s%s", color, to, RESET_COLOR)
+			else
+				return to
+			end
+		end
+	end
+end

data/lib/network.rb

@@ -26,7 +26,7 @@ module LibSL
 
 	class Simulator
 		attr_accessor :client, :packets_sent_reliably, :packets_received_reliably, :connected
-		attr_reader :connect_packet_ack_handler
+		attr_reader :connect_packet_ack_handler, :sim_ip, :sim_port
 
 		# Manages the connection to a Simulator 
 		# @param [Client] client The client
@@ -63,6 +63,15 @@ module LibSL
 			end
 		end
 
+		def ==(other)
+			return false unless other.is_a? Simulator
+			other.sim_ip == sim_ip and other.sim_port == sim_port
+		end
+
+		def eql?(other)
+			self == other
+		end
+
 		# Open the connection to the simulator
 		def connect(move_to=true)
 
@@ -107,7 +116,7 @@ module LibSL
 		# Disconnect from the sim
 		def disconnect
 			send_acks
-			#send_packet CloseCircuitPacket.new
+			send_packet CloseCircuitPacket.new
 			self.connected = false
 			@connection.close_connection_after_writing
 		end
@@ -131,6 +140,7 @@ module LibSL
 			@packets_sent_reliably[packet.sequence_number] = packet if packet.reliable_flag
 			
 			append_acks packet
+			EventManager::fire_event(:sending_packet, packet, self)
 			data = packet.encode()
 			@connection.send_datagram data, @sim_ip, @sim_port
 		end
@@ -273,24 +283,43 @@ module LibSL
 				EventManager::remove_handler(sim.client.network_manager.ready_handler)
 				EventManager::fire_event(:ready, sim.client)
 			end, :movement_complete))
+			# Teleport Finish handler
+			EventManager::register_handler(EventHandler.new(Proc.new do |type, packet, sim|
+				@active_sim.disconnect
+				sim = connect_to_simulator(packet.Info.SimIP.ip, packet.Info.SimPort.port)
+				activate_simulator(sim)
+			end, :TeleportFinishPacket_Received))
+			# Teleport Local handler
+			EventManager::register_handler(EventHandler.new(Proc.new do |type, packet, sim|
+				@client.agent_manager.position = packet.Info.Position
+				@client.agent_manager.look_at = packet.Info.LookAt
+			end, :TeleportLocalPacket_Received))
 		end
 
 		# Connects to a simulator
 		# @param [String] ip The simulator ip
 		# @param [Integer] port The simulator port
 		def connect_to_simulator(ip, port)
-			@sims << Simulator.new(@client, ip, port, @circuit_code, @session_id, @agent_id)
-			@sims.last.connect
-			@active_sim = @sims.last
+			sim = Simulator.new(@client, ip, port, @circuit_code, @session_id, @agent_id)
+			unless @sims.include? sim
+				@sims << sim 
+				@sims.last.connect
+				@active_sim = @sims.last
+			end
+			sim
 		end
 
 		# Activates a simulator as the main simulator
 		# @param [Simulator] sim The simulator to activate
 		def activate_simulator(sim)
+			return if @active_sim == sim
 			@sims << sim unless @sims.include? sim
-			sim.connect unless sim.connected?
+			if sim.connected?
+				AgentManager.move_to_sim sim
+			else
+				sim.connect
+			end
 			@active_sim = sim
-			AgentManager.move_to_sim sim
 		end
 
 		# Send a packet to a specific simulator

data/lib/search.rb

@@ -0,0 +1,248 @@
+
+
+module LibSL
+	class SearchResult
+		attr_reader :type, :query_id, :data
+
+		def initialize(type, query_id, data)
+			@type = type
+			@query_id = query_id
+			@data = data
+		end
+	end
+
+	class SearchManager
+
+		PARCEL_CATEGORIES = {
+			:none => 0,
+			:linden => 1,
+			:adult => 2,
+			:arts => 3,
+			:business => 4,
+			:educational => 5,
+			:gaming => 6,
+			:hangout => 7,
+			:newcomer => 8,
+			:park => 9,
+			:residential => 10,
+			:shopping => 11,
+			:stage => 12,
+			:other => 13,
+			:any => -1
+		}
+
+		attr_accessor :client
+		attr_reader :results
+		
+		def initialize(client)
+			@client = client
+			@results = []
+			register_handlers
+		end
+
+		# Pick a list of avatars by name
+		# @param [String] name The name to search for
+		# @yield [SearchResult]
+		def pick_avatar(name, &block)
+			query_id = LLUUID.new
+			register_callback(query_id, block)
+			packet = AvatarPickerRequestPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id,
+					:QueryID => query_id
+				},
+				:Data => { :Name => LLVariable1.new(name) }
+			})
+			@client.network_manager.send_packet packet
+		end
+
+		# Start a person search query
+		# @param [String] query The query string to search for
+		# @param [Bool] online (optional) List only online people if true
+		# @param [Integer] start (optional) Pagination support
+		# @yield [SearchResult]
+		def person(query, online=false, start=0, &block)
+			query_id = LLUUID.new
+			register_callback(query_id, block)
+			flags = 0x01
+			flags |= 0x02 if online
+			packet = DirFindQueryPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:QueryData => {
+					:QueryID => query_id,
+					:QueryText => LLVariable1.new(query),
+					:QueryFlags => LLU32.new(flags),
+					:QueryStart => LLS32.new(start)
+				}
+			})
+			@client.network_manager.send_packet packet
+		end
+
+		# Start a group search query
+		# @param [String] query The query string to search for
+		# @param [Integer] start (optional) Pagination support
+		# @yield [SearchResult]
+		def group(query, start=0, &block)
+			query_id = LLUUID.new
+			register_callback(query_id, block)
+			flags = 0x10
+			packet = DirFindQueryPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:QueryData => {
+					:QueryID => query_id,
+					:QueryText => LLVariable1.new(query),
+					:QueryFlags => LLU32.new(flags),
+					:QueryStart => LLS32.new(start)
+				}
+			})
+			@client.network_manager.send_packet packet
+		end
+
+		# Start an event search query. Searches for all upcoming events.
+		# @param [String] query The query string to search for
+		# @param [Bool] mature (optional) Whether to include mature events
+		# @param [Integer] start (optional) Pagination support
+		# @yield [SearchResult]
+		def event(query, mature=false, start=0, &block)
+			query_id = LLUUID.new
+			register_callback(query_id, block)
+			flags = 0x20
+			flags |= 0x2000 unless mature
+			packet = DirFindQueryPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:QueryData => {
+					:QueryID => query_id,
+					:QueryText => LLVariable1.new("u|0|"+query),
+					:QueryFlags => LLU32.new(flags),
+					:QueryStart => LLS32.new(start)
+				}
+			})
+			@client.network_manager.send_packet packet
+		end
+
+		# Start a places search query
+		# @param [String] query (optional) Query string. Empty string => Agent owned
+		# @param [String] sim_name (optional) Restrict search to this region
+		# @param [Symbol] parcel_category (optional) See PARCEL_CATEGORIES
+		# @param [Integer] start (optional) Pagination support
+		# @yield [SearchResult]
+		def place(query="", sim_name="", parcel_category=:any, start=0, &block)
+			query_id = LLUUID.new
+			register_callback(query_id, block)
+			flags = 0
+			flags |= 0x40 if query == "" # Agent owned
+			category = PARCEL_CATEGORIES[parcel_category] or -1
+			packet = DirPlacesQueryPacket.new({
+				:AgentData => {
+					:AgentID => @client.network_manager.agent_id,
+					:SessionID => @client.network_manager.session_id
+				},
+				:QueryData => {
+					:QueryID => query_id,
+					:QueryText => LLVariable1.new(query),
+					:QueryFlags => LLU32.new(flags),
+					:Category => LLS8.new(category),
+					:SimName => LLVariable1.new(sim_name),
+					:QueryStart => LLS32.new(start)
+				}
+			})
+			@client.network_manager.send_packet packet
+		end
+
+		private 
+		
+		def register_handlers()
+			EventManager::register_handler(EventHandler.new(Proc.new do |type, packet, sim|
+				result_type = case type
+							  when :AvatarPickerReplyPacket_Received then :Avatars
+							  when :DirPeopleReplyPacket_Received then :People
+							  when :DirEventsReplyPacket_Received then :Events
+							  when :DirGroupsReplyPacket_Received then :Groups
+							  when :DirPlacesReplyPacket_Received then :Places
+							  end
+				results = case type
+						  when :AvatarPickerReplyPacket_Received then
+							  packet.Data.blocks.map do |block|
+								  {
+									  :FirstName => block.FirstName.data.delete("\0"),
+									  :LastName => block.LastName.data.delete("\0"),
+									  :ID => block.AvatarID
+								  }
+							  end
+						  when :DirPeopleReplyPacket_Received then
+							  packet.QueryReplies.blocks.map do |block|
+								  {
+									  :FirstName => block.FirstName.data.delete("\0"),
+									  :LastName => block.LastName.data.delete("\0"),
+									  :ID => block.AgentID,
+									  :Group => block.Group.data.delete("\0"),
+									  :Reputation => block.Reputation.value
+								  }
+							  end
+						  when :DirEventsReplyPacket_Received then
+							  packet.QueryReplies.blocks.map do |block|
+								  {
+									  :OwnerID => block.OwnerID,
+									  :Name => block.Name.data.delete("\0"),
+									  :EventID => block.EventID.value,
+									  :Date => block.Date.data.delete("\0"),
+									  :UnixTime => block.UnixTime.value,
+									  :Mature => (block.EventFlags.value & 0x02 > 0)
+								  }
+							  end
+						  when :DirGroupsReplyPacket_Received then
+							  packet.QueryReplies.blocks.map do |block|
+								  {
+									  :ID => block.GroupID,
+									  :Name => block.GroupName.data.delete("\0"),
+									  :Members => block.Members.value
+								  }
+							  end
+						  when :DirPlacesReplyPacket_Received then
+							  packet.QueryReplies.block.map do |block|
+								  {
+									  :ID => block.ParcelID,
+									  :Name => block.Name.data.delete("\0"),
+									  :ForSale => block.ForSale.value,
+									  :Auction => block.Auction.value
+								  }
+							  end
+						  end
+				query_id = case type
+						   when :AvatarPickerReplyPacket_Received then
+							   packet.AgentData.QueryID
+						   else
+							   packet.QueryData.QueryID
+						   end
+				results = SearchResult.new(result_type, query_id, results)
+				@results << results
+				EventManager::fire_event(:search_results, results)
+				EventManager::fire_event("search_results_#{query_id.to_s}".to_sym, results)
+			end, [
+				:AvatarPickerReplyPacket_Received,
+				:DirPeopleReplyPacket_Received,
+				:DirEventsReplyPacket_Received,
+				:DirGroupsReplyPacket_Received,
+				:DirPlacesReplyPacket_Received
+			]))
+		end
+
+		def register_callback(query_id, cb)
+			if cb
+				EventManager::register_handler(EventHandler.new(Proc.new do |type, results|
+					cb.call(results)
+				end, "search_results_#{query_id.to_s}".to_sym))
+			end
+		end
+	end
+end

data/test/tc_logging.rb

@@ -0,0 +1,56 @@
+require "test/unit"
+require File.expand_path File.join(File.dirname(__FILE__), "..", "lib", "logging")
+
+class Time
+	def strftime(format)
+		"TIME"
+	end
+end
+
+module LibSL
+	class LogFile
+		def initialize(out)
+			@data = ""
+		end
+
+		def << (val)
+			@data += val.to_s
+			self
+		end
+
+		def print()
+			$stdout << @data
+		end
+
+		def to_s
+			@data
+		end
+	end
+
+	class TestLogger < Test::Unit::TestCase
+		def test_logging()
+			stream = LogFile.new
+			logger = Logger.new(stream, false, false)
+			logger.debug("DEBUG MESSAGE")
+			logger.info("INFO MESSAGE")
+			logger.error("ERROR MESSAGE")
+			output = "[INFO TIME] INFO MESSAGE\n[ERROR TIME] ERROR MESSAGE\n"
+			assert_equal(output, stream.to_s)
+		end
+
+		def test_colors()
+			stream = LogFile.new
+			logger = Logger.new(stream, true, true)
+			logger.debug("DEBUG MESSAGE")
+			logger.info("INFO MESSAGE")
+			logger.error("ERROR MESSAGE")
+			output = "[#{Logger::DEBUG_COLOR}#{Logger::UNDERLINE}DEBUG TIME#{Logger::RESET_COLOR}] " +
+					 "#{Logger::DEBUG_COLOR}DEBUG MESSAGE#{Logger::RESET_COLOR}\n" +
+					 "[#{Logger::INFO_COLOR}#{Logger::UNDERLINE}INFO TIME#{Logger::RESET_COLOR}] " +
+					 "#{Logger::INFO_COLOR}INFO MESSAGE#{Logger::RESET_COLOR}\n" +
+					 "[#{Logger::ERROR_COLOR}#{Logger::UNDERLINE}ERROR TIME#{Logger::RESET_COLOR}] " +
+					 "#{Logger::ERROR_COLOR}ERROR MESSAGE#{Logger::RESET_COLOR}\n"
+			assert_equal(output, stream.to_s)
+		end
+	end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libsl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lukas Botsch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +02:00
+date: 2011-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- HISTORY
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -54,10 +56,13 @@ files:
 - lib/dsl.rb
 - lib/events.rb
 - lib/libsl.rb
+- lib/logging.rb
 - lib/network.rb
 - lib/packet.rb
+- lib/search.rb
 - lib/types.rb
 - libsl.gemspec
+- test/tc_logging.rb
 - test/tc_packet.rb
 - test/tc_types.rb
 - test/ts_all.rb