[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.317 by root, Mon Jul 23 23:38:17 2007 UTC

…		…
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
24		24
		25	use JSON::XS 1.4 ();
25	use BDB ();	26	use BDB ();
26	use Data::Dumper;	27	use Data::Dumper;
27	use Digest::MD5;	28	use Digest::MD5;
28	use Fcntl;	29	use Fcntl;
29	use YAML::Syck ();	30	use YAML::Syck ();
30	use IO::AIO 2.32 ();	31	use IO::AIO 2.32 ();
31	use Time::HiRes;	32	use Time::HiRes;
32	use Compress::LZF;	33	use Compress::LZF;
		34	use Digest::MD5 ();
33		35
34	# configure various modules to our taste	36	# configure various modules to our taste
35	#	37	#
36	$Storable::canonical = 1; # reduce rsync transfers	38	$Storable::canonical = 1; # reduce rsync transfers
37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
49	our %COMMAND = ();	51	our %COMMAND = ();
50	our %COMMAND_TIME = ();	52	our %COMMAND_TIME = ();
51		53
52	our @EXTS = (); # list of extension package names	54	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	55	our %EXTCMD = ();
		56	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	57	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	58	our %EXT_MAP = (); # pluggable maps
56		59
57	our $RELOAD; # number of reloads so far	60	our $RELOAD; # number of reloads so far
58	our @EVENT;	61	our @EVENT;
…		…
163	=item cf::wait_for_tick, cf::wait_for_tick_begin	166	=item cf::wait_for_tick, cf::wait_for_tick_begin
164		167
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that call.
168		177
169	=back	178	=back
170		179
171	=cut	180	=cut
172		181
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	246	$d
238	} \|\| "[unable to dump $_[0]: '$@']";	247	} \|\| "[unable to dump $_[0]: '$@']";
239	}	248	}
240		249
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	250	=item $ref = cf::from_json $json
244		251
245	Converts a JSON string into the corresponding perl data structure.	252	Converts a JSON string into the corresponding perl data structure.
246		253
247	=item $json = cf::to_json $ref	254	=item $json = cf::to_json $ref
248		255
249	Converts a perl data structure into its JSON representation.	256	Converts a perl data structure into its JSON representation.
		257
		258	=cut
		259
		260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		261
		262	sub to_json ($) { $json_coder->encode ($_[0]) }
		263	sub from_json ($) { $json_coder->decode ($_[0]) }
250		264
251	=item cf::lock_wait $string	265	=item cf::lock_wait $string
252		266
253	Wait until the given lock is available. See cf::lock_acquire.	267	Wait until the given lock is available. See cf::lock_acquire.
254		268
…		…
306	my $guard = Coro::guard {	320	my $guard = Coro::guard {
307	$TICK_WATCHER->start;	321	$TICK_WATCHER->start;
308	};	322	};
309	$TICK_WATCHER->stop;	323	$TICK_WATCHER->stop;
310	$guard	324	$guard
		325	}
		326
		327	=item cf::get_slot $time[, $priority[, $name]]
		328
		329	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		330	This call blocks and returns only when you have at least C<$time> seconds
		331	of cpu time till the next tick. The slot is only valid till the next cede.
		332
		333	The optional C<$name> can be used to identify the job to run. It might be
		334	used for statistical purposes and should identify the same time-class.
		335
		336	Useful for short background jobs.
		337
		338	=cut
		339
		340	our @SLOT_QUEUE;
		341	our $SLOT_QUEUE;
		342
		343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		344	$SLOT_QUEUE = Coro::async {
		345	my $signal = new Coro::Signal;
		346
		347	while () {
		348	next_job:
		349	my $avail = cf::till_tick;
		350	if ($avail > 0.01) {
		351	for (0 .. $#SLOT_QUEUE) {
		352	if ($SLOT_QUEUE[$_][0] < $avail) {
		353	my $job = splice @SLOT_QUEUE, $_, 1, ();
		354	$job->[2]->send;
		355	Coro::cede;
		356	goto next_job;
		357	}
		358	}
		359	}
		360
		361	if (@SLOT_QUEUE) {
		362	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		363	push @cf::WAIT_FOR_TICK, $signal;
		364	$signal->wait;
		365	} else {
		366	Coro::schedule;
		367	}
		368	}
		369	};
		370
		371	sub get_slot($;$$) {
		372	my ($time, $pri, $name) = @_;
		373
		374	$time = $TICK * .6 if $time > $TICK * .6;
		375	my $sig = new Coro::Signal;
		376
		377	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		378	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		379	$SLOT_QUEUE->ready;
		380	$sig->wait;
311	}	381	}
312		382
313	=item cf::async { BLOCK }	383	=item cf::async { BLOCK }
314		384
315	Currently the same as Coro::async_pool, meaning you cannot use	385	Currently the same as Coro::async_pool, meaning you cannot use
…		…
402	Coro::Storable. May, of course, block. Note that the executed sub may	472	Coro::Storable. May, of course, block. Note that the executed sub may
403	never block itself or use any form of Event handling.	473	never block itself or use any form of Event handling.
404		474
405	=cut	475	=cut
406		476
		477	sub _store_scalar {
		478	open my $fh, ">", \my $buf
		479	or die "fork_call: cannot open fh-to-buf in child : $!";
		480	Storable::store_fd $_[0], $fh;
		481	close $fh;
		482
		483	$buf
		484	}
		485
407	sub fork_call(&@) {	486	sub fork_call(&@) {
408	my ($cb, @args) = @_;	487	my ($cb, @args) = @_;
409		488
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411	# or die "socketpair: $!";	490	# or die "socketpair: $!";
…		…
414		493
415	if (my $pid = fork) {	494	if (my $pid = fork) {
416	close $fh2;	495	close $fh2;
417		496
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);	497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		498	warn "pst<$res>" unless $res =~ /^pst/;
419	$res = Coro::Storable::thaw $res;	499	$res = Coro::Storable::thaw $res;
420		500
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave	501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422		502
423	die $$res unless "ARRAY" eq ref $res;	503	Carp::confess $$res unless "ARRAY" eq ref $res;
424		504
425	return wantarray ? @$res : $res->[-1];	505	return wantarray ? @$res : $res->[-1];
426	} else {	506	} else {
427	reset_signals;	507	reset_signals;
428	local $SIG{__WARN__};	508	local $SIG{__WARN__};
429	local $SIG{__DIE__};	509	local $SIG{__DIE__};
		510	# just in case, this hack effectively disables event
		511	# in the child. cleaner and slower would be canceling all watchers,
		512	# but this works for the time being.
		513	local $Coro::idle;
		514	$Coro::current->prio (Coro::PRIO_MAX);
		515
430	eval {	516	eval {
431	close $fh1;	517	close $fh1;
432		518
433	my @res = eval { $cb->(@args) };	519	my @res = eval { $cb->(@args) };
		520
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
		522	close $fh2;
435	};	523	};
436		524
437	warn $@ if $@;	525	warn $@ if $@;
438	_exit 0;	526	_exit 0;
439	}	527	}
…		…
840	";	928	";
841	die if $@;	929	die if $@;
842	}	930	}
843		931
844	our $override;	932	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	933	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		934
847	sub override {	935	sub override {
848	$override = 1;	936	$override = 1;
849	@invoke_results = ();	937	@INVOKE_RESULTS = (@_);
850	}	938	}
851		939
852	sub do_invoke {	940	sub do_invoke {
853	my $event = shift;	941	my $event = shift;
854	my $callbacks = shift;	942	my $callbacks = shift;
855		943
856	@invoke_results = ();	944	@INVOKE_RESULTS = ();
857		945
858	local $override;	946	local $override;
859		947
860	for (@$callbacks) {	948	for (@$callbacks) {
861	eval { &{$_->[1]} };	949	eval { &{$_->[1]} };
…		…
878		966
879	Generate an object-specific event with the given arguments.	967	Generate an object-specific event with the given arguments.
880		968
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	969	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	970	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	971	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		972
885	=back	973	=back
886		974
887	=cut	975	=cut
888		976
889	#############################################################################	977	#############################################################################
890	# object support	978	# object support
		979	#
		980
		981	sub _can_merge {
		982	my ($ob1, $ob2) = @_;
		983
		984	local $Storable::canonical = 1;
		985	my $fob1 = Storable::freeze $ob1;
		986	my $fob2 = Storable::freeze $ob2;
		987
		988	$fob1 eq $fob2
		989	}
891		990
892	sub reattach {	991	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	992	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	993	my ($obj) = @_;
895		994
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1128	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1129	}
1031		1130
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1131	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1132
1034	Register a callback fro execution when the client sends an extcmd packet.	1133	Register a callback for execution when the client sends an (synchronous)
		1134	extcmd packet. Ext commands will be processed in the order they are
		1135	received by the server, like other user commands. The first argument is
		1136	the logged-in player. Ext commands can only be processed after a player
		1137	has logged in successfully.
1035		1138
1036	If the callback returns something, it is sent back as if reply was being	1139	If the callback returns something, it is sent back as if reply was being
1037	called.	1140	called.
1038		1141
		1142	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1143
		1144	Register a callback for execution when the client sends an (asynchronous)
		1145	exticmd packet. Exti commands are processed by the server as soon as they
		1146	are received, i.e. out of order w.r.t. other commands. The first argument
		1147	is a client socket. Exti commands can be received anytime, even before
		1148	log-in.
		1149
		1150	If the callback returns something, it is sent back as if reply was being
		1151	called.
		1152
1039	=cut	1153	=cut
1040		1154
1041	sub register_extcmd {	1155	sub register_extcmd {
1042	my ($name, $cb) = @_;	1156	my ($name, $cb) = @_;
1043		1157
1044	$EXTCMD{$name} = $cb;	1158	$EXTCMD{$name} = $cb;
		1159	}
		1160
		1161	sub register_exticmd {
		1162	my ($name, $cb) = @_;
		1163
		1164	$EXTICMD{$name} = $cb;
1045	}	1165	}
1046		1166
1047	cf::player->attach (	1167	cf::player->attach (
1048	on_command => sub {	1168	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1169	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1178	cf::override;
1059	},	1179	},
1060	on_extcmd => sub {	1180	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1181	my ($pl, $buf) = @_;
1062		1182
1063	my $msg = eval { from_json $buf };	1183	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1184
1065	if (ref $msg) {	1185	if (ref $msg) {
		1186	my ($type, $reply, @payload) =
		1187	"ARRAY" eq ref $msg
		1188	? @$msg
		1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1190
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1192	my @reply = $cb->($pl, @payload);
		1193
1068	$pl->ext_reply ($msg->{msgid}, %reply);	1194	$pl->ext_reply ($reply, @reply)
1069	}	1195	if $reply;
1070	}	1196	}
1071	} else {	1197	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1199	}
1074		1200
…		…
1347	}	1473	}
1348		1474
1349	\@paths	1475	\@paths
1350	}	1476	}
1351		1477
		1478	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1479
		1480	Expand crossfire pod fragments into protocol xml.
		1481
		1482	=cut
		1483
		1484	sub expand_cfpod {
		1485	((my $self), (local $_)) = @_;
		1486
		1487	# escape & and <
		1488	s/&/&/g;
		1489	s/(?<![BIUGH])</</g;
		1490
		1491	# this is buggy, it needs to properly take care of nested <'s
		1492
		1493	1 while
		1494	# replace B<>, I<>, U<> etc.
		1495	s/B<([^\>]*)>/<b>$1<\/b>/
		1496	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1497	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1498	# replace G<male\|female> tags
		1499	\|\| s{G<([^>\|])\\|([^>])>}{
		1500	$self->gender ? $2 : $1
		1501	}ge
		1502	# replace H<hint text>
		1503	\|\| s{H<([^\>]*)>}
		1504	{
		1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1507	"")
		1508	[$self->{hintmode}]
		1509	}ge;
		1510
		1511	# create single paragraphs (very hackish)
		1512	s/(?<=\S)\n(?=\w)/ /g;
		1513
		1514	# compress some whitespace
		1515	s/\s+\n/\n/g; # ws line-ends
		1516	s/\n\n+/\n/g; # double lines
		1517	s/^\n+//; # beginning lines
		1518	s/\n+$//; # ending lines
		1519
		1520	$_
		1521	}
		1522
		1523	sub hintmode {
		1524	$_[0]{hintmode} = $_[1] if @_ > 1;
		1525	$_[0]{hintmode}
		1526	}
		1527
1352	=item $player->ext_reply ($msgid, %msg)	1528	=item $player->ext_reply ($msgid, @msg)
1353		1529
1354	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1355		1531
1356	=cut	1532	=cut
1357		1533
1358	sub ext_reply($$%) {	1534	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1535	my ($self, $id, @msg) = @_;
1360		1536
1361	$msg{msgid} = $id;	1537	if ($self->ns->extcmd == 2) {
1362		1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1363	$self->send ("ext " . cf::to_json \%msg);	1539	} elsif ($self->ns->extcmd == 1) {
		1540	#TODO: version 1, remove
		1541	unshift @msg, msgtype => "reply", msgid => $id;
		1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
		1543	}
1364	}	1544	}
1365		1545
1366	=item $player->ext_event ($type, %msg)	1546	=item $player->ext_msg ($type, @msg)
1367		1547
1368	Sends an ext event to the client.	1548	Sends an ext event to the client.
1369		1549
1370	=cut	1550	=cut
1371		1551
1372	sub ext_event($$%) {	1552	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1553	my ($self, $type, @msg) = @_;
1374		1554
1375	$self->ns->ext_event ($type, %msg);	1555	$self->ns->ext_msg ($type, @msg);
1376	}	1556	}
1377		1557
1378	=head3 cf::region	1558	=head3 cf::region
1379		1559
1380	=over 4	1560	=over 4
…		…
1393	my ($path) = @_;	1573	my ($path) = @_;
1394		1574
1395	my ($match, $specificity);	1575	my ($match, $specificity);
1396		1576
1397	for my $region (list) {	1577	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1578	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1579	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1580	if $region->specificity > $specificity;
1401	}	1581	}
1402	}	1582	}
1403		1583
…		…
1523	$self->init; # pass $1 etc.	1703	$self->init; # pass $1 etc.
1524	return $self;	1704	return $self;
1525	}	1705	}
1526	}	1706	}
1527		1707
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1708	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1709	()
1530	}	1710	}
1531		1711
1532	sub init {	1712	sub init {
1533	my ($self) = @_;	1713	my ($self) = @_;
…		…
1811		1991
1812	undef $MAP_PREFETCH{$path};	1992	undef $MAP_PREFETCH{$path};
1813	$MAP_PREFETCHER \|\|= cf::async {	1993	$MAP_PREFETCHER \|\|= cf::async {
1814	while (%MAP_PREFETCH) {	1994	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	1995	for my $path (keys %MAP_PREFETCH) {
1816	my $map = find $path	1996	if (my $map = find $path) {
1817	or next;
1818	$map->load;	1997	$map->load;
		1998	}
1819		1999
1820	delete $MAP_PREFETCH{$path};	2000	delete $MAP_PREFETCH{$path};
1821	}	2001	}
1822	}	2002	}
1823	undef $MAP_PREFETCHER;	2003	undef $MAP_PREFETCHER;
…		…
2045		2225
2046	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;	2226	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;
2047		2227
2048	if ($self->{record_replies}) {	2228	if ($self->{record_replies}) {
2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2229	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2230
2050	} else {	2231	} else {
		2232	my $pl = $self->contr;
		2233
		2234	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2235	my $dialog = $pl->{npc_dialog};
		2236	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2237
		2238	} else {
2051	$msg = $npc->name . " says: $msg" if $npc;	2239	$msg = $npc->name . " says: $msg" if $npc;
2052	$self->message ($msg, $flags);	2240	$self->message ($msg, $flags);
		2241	}
2053	}	2242	}
2054	}	2243	}
2055		2244
2056	=item $player_object->may ("access")	2245	=item $player_object->may ("access")
2057		2246
…		…
2146		2335
2147	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2336	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148	$self->enter_map ($map, $x, $y);	2337	$self->enter_map ($map, $x, $y);
2149	}	2338	}
2150		2339
2151	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2340	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152		2341
2153	Moves the player to the given map-path and coordinates by first freezing	2342	Moves the player to the given map-path and coordinates by first freezing
2154	her, loading and preparing them map, calling the provided $check callback	2343	her, loading and preparing them map, calling the provided $check callback
2155	that has to return the map if sucecssful, and then unfreezes the player on	2344	that has to return the map if sucecssful, and then unfreezes the player on
2156	the new (success) or old (failed) map position.	2345	the new (success) or old (failed) map position. In either case, $done will
		2346	be called at the end of this process.
2157		2347
2158	=cut	2348	=cut
2159		2349
2160	our $GOTOGEN;	2350	our $GOTOGEN;
2161		2351
2162	sub cf::object::player::goto {	2352	sub cf::object::player::goto {
2163	my ($self, $path, $x, $y, $check) = @_;	2353	my ($self, $path, $x, $y, $check, $done) = @_;
2164		2354
2165	# do generation counting so two concurrent goto's will be executed in-order	2355	# do generation counting so two concurrent goto's will be executed in-order
2166	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2356	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167		2357
2168	$self->enter_link;	2358	$self->enter_link;
…		…
2188		2378
2189	if ($gen == $self->{_goto_generation}) {	2379	if ($gen == $self->{_goto_generation}) {
2190	delete $self->{_goto_generation};	2380	delete $self->{_goto_generation};
2191	$self->leave_link ($map, $x, $y);	2381	$self->leave_link ($map, $x, $y);
2192	}	2382	}
		2383
		2384	$done->() if $done;
2193	})->prio (1);	2385	})->prio (1);
2194	}	2386	}
2195		2387
2196	=item $player_object->enter_exit ($exit_object)	2388	=item $player_object->enter_exit ($exit_object)
2197		2389
…		…
2266	my $hp = $exit->stats->hp;	2458	my $hp = $exit->stats->hp;
2267	my $sp = $exit->stats->sp;	2459	my $sp = $exit->stats->sp;
2268		2460
2269	$self->enter_link;	2461	$self->enter_link;
2270		2462
		2463	# if exit is damned, update players death & WoR home-position
		2464	$self->contr->savebed ($slaying, $hp, $sp)
		2465	if $exit->flag (FLAG_DAMNED);
		2466
2271	(async {	2467	(async {
2272	$self->deactivate_recursive; # just to be sure	2468	$self->deactivate_recursive; # just to be sure
2273	unless (eval {	2469	unless (eval {
2274	$self->goto ($slaying, $hp, $sp);	2470	$self->goto ($slaying, $hp, $sp);
2275		2471
…		…
2302		2498
2303	utf8::encode $text;	2499	utf8::encode $text;
2304	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2500	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2305	}	2501	}
2306		2502
		2503	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2504
		2505	Send a drawinfo or msg packet to the client, formatting the msg for the
		2506	client if neccessary. C<$type> should be a string identifying the type of
		2507	the message, with C<log> being the default. If C<$color> is negative, suppress
		2508	the message unless the client supports the msg packet.
		2509
		2510	=cut
		2511
		2512	sub cf::client::send_msg {
		2513	my ($self, $channel, $msg, $color, @extra) = @_;
		2514
		2515	$msg = $self->pl->expand_cfpod ($msg);
		2516
		2517	$color &= ~cf::NDI_UNIQUE; # just in case...
		2518
		2519	if (ref $channel) {
		2520	# send meta info to client, if not yet sent
		2521	unless (exists $self->{channel}{$channel->{id}}) {
		2522	$self->{channel}{$channel->{id}} = $channel;
		2523	$self->ext_msg (channel_info => %$channel);
		2524	}
		2525
		2526	$channel = $channel->{id};
		2527	}
		2528
		2529	return unless @extra \|\| length $msg;
		2530
		2531	if ($self->can_msg) {
		2532	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
		2533	} else {
		2534	# replace some tags by gcfclient-compatible ones
		2535	for ($msg) {
		2536	1 while
		2537	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2538	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2539	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2540	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2541	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2542	}
		2543
		2544	if ($color >= 0) {
		2545	if (0 && $msg =~ /\[/) {
		2546	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2547	} else {
		2548	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2549	$self->send_packet ("drawinfo $color $msg")
		2550	}
		2551	}
		2552	}
		2553	}
		2554
2307	=item $client->ext_event ($type, %msg)	2555	=item $client->ext_msg ($type, @msg)
2308		2556
2309	Sends an exti event to the client.	2557	Sends an ext event to the client.
2310		2558
2311	=cut	2559	=cut
2312		2560
2313	sub cf::client::ext_event($$%) {	2561	sub cf::client::ext_msg($$@) {
2314	my ($self, $type, %msg) = @_;	2562	my ($self, $type, @msg) = @_;
2315		2563
		2564	my $extcmd = $self->extcmd;
		2565
		2566	if ($extcmd == 2) {
		2567	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2568	} elsif ($extcmd == 1) { # TODO: remove
2316	$msg{msgtype} = "event_$type";	2569	push @msg, msgtype => "event_$type";
2317	$self->send_packet ("ext " . cf::to_json \%msg);	2570	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2571	}
2318	}	2572	}
2319		2573
2320	=item $success = $client->query ($flags, "text", \&cb)	2574	=item $success = $client->query ($flags, "text", \&cb)
2321		2575
2322	Queues a query to the client, calling the given callback with	2576	Queues a query to the client, calling the given callback with
2323	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2577	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2578	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325		2579
2326	Queries can fail, so check the return code. Or don't, as queries will become	2580	Queries can fail, so check the return code. Or don't, as queries will
2327	reliable at some point in the future.	2581	become reliable at some point in the future.
2328		2582
2329	=cut	2583	=cut
2330		2584
2331	sub cf::client::query {	2585	sub cf::client::query {
2332	my ($self, $flags, $text, $cb) = @_;	2586	my ($self, $flags, $text, $cb) = @_;
…		…
2340	utf8::encode $text;	2594	utf8::encode $text;
2341	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2595	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342		2596
2343	$self->send_packet ($self->{query_queue}[0][0])	2597	$self->send_packet ($self->{query_queue}[0][0])
2344	if @{ $self->{query_queue} } == 1;	2598	if @{ $self->{query_queue} } == 1;
		2599
		2600	1
2345	}	2601	}
2346		2602
2347	cf::client->attach (	2603	cf::client->attach (
		2604	on_connect => sub {
		2605	my ($ns) = @_;
		2606
		2607	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2608	},
2348	on_reply => sub {	2609	on_reply => sub {
2349	my ($ns, $msg) = @_;	2610	my ($ns, $msg) = @_;
2350		2611
2351	# this weird shuffling is so that direct followup queries	2612	# this weird shuffling is so that direct followup queries
2352	# get handled first	2613	# get handled first
…		…
2364	} else {	2625	} else {
2365	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2626	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366	}	2627	}
2367	}	2628	}
2368	},	2629	},
		2630	on_exticmd => sub {
		2631	my ($ns, $buf) = @_;
		2632
		2633	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2634
		2635	if (ref $msg) {
		2636	my ($type, $reply, @payload) =
		2637	"ARRAY" eq ref $msg
		2638	? @$msg
		2639	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2640
		2641	if (my $cb = $EXTICMD{$type}) {
		2642	my @reply = $cb->($ns, @payload);
		2643
		2644	$ns->ext_reply ($reply, @reply)
		2645	if $reply;
		2646	}
		2647	} else {
		2648	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2649	}
		2650
		2651	cf::override;
		2652	},
2369	);	2653	);
2370		2654
2371	=item $client->async (\&cb)	2655	=item $client->async (\&cb)
2372		2656
2373	Create a new coroutine, running the specified callback. The coroutine will	2657	Create a new coroutine, running the specified callback. The coroutine will
…		…
2422		2706
2423	=pod	2707	=pod
2424		2708
2425	The following functions and methods are available within a safe environment:	2709	The following functions and methods are available within a safe environment:
2426		2710
2427	cf::object contr pay_amount pay_player map	2711	cf::object
		2712	contr pay_amount pay_player map x y force_find force_add
		2713	insert remove
		2714
2428	cf::object::player player	2715	cf::object::player
2429	cf::player peaceful	2716	player
2430	cf::map trigger	2717
		2718	cf::player
		2719	peaceful
		2720
		2721	cf::map
		2722	trigger
2431		2723
2432	=cut	2724	=cut
2433		2725
2434	for (	2726	for (
2435	["cf::object" => qw(contr pay_amount pay_player map)],	2727	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2728	insert remove)],
2436	["cf::object::player" => qw(player)],	2729	["cf::object::player" => qw(player)],
2437	["cf::player" => qw(peaceful)],	2730	["cf::player" => qw(peaceful)],
2438	["cf::map" => qw(trigger)],	2731	["cf::map" => qw(trigger)],
2439	) {	2732	) {
2440	no strict 'refs';	2733	no strict 'refs';
…		…
2532	{	2825	{
2533	my $faces = $facedata->{faceinfo};	2826	my $faces = $facedata->{faceinfo};
2534		2827
2535	while (my ($face, $info) = each %$faces) {	2828	while (my ($face, $info) = each %$faces) {
2536	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2829	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2537	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2830	cf::face::set_visibility $idx, $info->{visibility};
		2831	cf::face::set_magicmap $idx, $info->{magicmap};
2538	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2832	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2539	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2833	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2540	Coro::cede;	2834
		2835	cf::cede_to_tick;
2541	}	2836	}
2542		2837
2543	while (my ($face, $info) = each %$faces) {	2838	while (my ($face, $info) = each %$faces) {
2544	next unless $info->{smooth};	2839	next unless $info->{smooth};
2545	my $idx = cf::face::find $face	2840	my $idx = cf::face::find $face
2546	or next;	2841	or next;
2547	if (my $smooth = cf::face::find $info->{smooth}) {	2842	if (my $smooth = cf::face::find $info->{smooth}) {
		2843	cf::face::set_smooth $idx, $smooth;
2548	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2844	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549	} else {	2845	} else {
2550	warn "smooth face '$info->{smooth}' not found for face '$face'";	2846	warn "smooth face '$info->{smooth}' not found for face '$face'";
2551	}	2847	}
2552	Coro::cede;	2848
		2849	cf::cede_to_tick;
2553	}	2850	}
2554	}	2851	}
2555		2852
2556	{	2853	{
2557	my $anims = $facedata->{animinfo};	2854	my $anims = $facedata->{animinfo};
2558		2855
2559	while (my ($anim, $info) = each %$anims) {	2856	while (my ($anim, $info) = each %$anims) {
2560	cf::anim::set $anim, $info->{frames}, $info->{facings};	2857	cf::anim::set $anim, $info->{frames}, $info->{facings};
2561	Coro::cede;	2858	cf::cede_to_tick;
2562	}	2859	}
2563		2860
2564	cf::anim::invalidate_all; # d'oh	2861	cf::anim::invalidate_all; # d'oh
		2862	}
		2863
		2864	{
		2865	# TODO: for gcfclient pleasure, we should give resources
		2866	# that gcfclient doesn't grok a >10000 face index.
		2867	my $res = $facedata->{resource};
		2868	my $enc = JSON::XS->new->utf8->canonical;
		2869
		2870	while (my ($name, $info) = each %$res) {
		2871	my $meta = $enc->encode ({
		2872	name => $name,
		2873	type => $info->{type},
		2874	copyright => $info->{copyright}, #TODO#
		2875	});
		2876
		2877	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2878
		2879	if ($name =~ /\.(?:jpg\|png)$/) {
		2880	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
		2881	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
		2882	} else {
		2883	my $data = pack "(w/a)", $meta, $info->{data};
		2884	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2885
		2886	cf::face::set_type $idx, 1;
		2887	cf::face::set_data $idx, 0, $data, $chk;
		2888	}
		2889
		2890	cf::cede_to_tick;
		2891	}
2565	}	2892	}
2566		2893
2567	1	2894	1
2568	}	2895	}
2569		2896
2570	sub reload_regions {	2897	sub reload_regions {
2571	load_resource_file "$MAPDIR/regions"	2898	load_resource_file "$MAPDIR/regions"
2572	or die "unable to load regions file\n";	2899	or die "unable to load regions file\n";
		2900
		2901	for (cf::region::list) {
		2902	$_->{match} = qr/$_->{match}/
		2903	if exists $_->{match};
		2904	}
2573	}	2905	}
2574		2906
2575	sub reload_facedata {	2907	sub reload_facedata {
2576	load_facedata "$DATADIR/facedata"	2908	load_facedata "$DATADIR/facedata"
2577	or die "unable to load facedata\n";	2909	or die "unable to load facedata\n";
2578	}	2910	}
2579		2911
2580	sub reload_archetypes {	2912	sub reload_archetypes {
		2913	load_resource_file "$DATADIR/archetypes"
		2914	or die "unable to load archetypes\n";
		2915	#d# NEED to laod twice to resolve forward references
		2916	# this really needs to be done in an extra post-pass
		2917	# (which needs to be synchronous, so solve it differently)
2581	load_resource_file "$DATADIR/archetypes"	2918	load_resource_file "$DATADIR/archetypes"
2582	or die "unable to load archetypes\n";	2919	or die "unable to load archetypes\n";
2583	}	2920	}
2584		2921
2585	sub reload_treasures {	2922	sub reload_treasures {
…		…
2779	%EXT_CORO = ();	3116	%EXT_CORO = ();
2780		3117
2781	warn "removing commands";	3118	warn "removing commands";
2782	%COMMAND = ();	3119	%COMMAND = ();
2783		3120
2784	warn "removing ext commands";	3121	warn "removing ext/exti commands";
2785	%EXTCMD = ();	3122	%EXTCMD = ();
		3123	%EXTICMD = ();
2786		3124
2787	warn "unloading/nuking all extensions";	3125	warn "unloading/nuking all extensions";
2788	for my $pkg (@EXTS) {	3126	for my $pkg (@EXTS) {
2789	warn "... unloading $pkg";	3127	warn "... unloading $pkg";
2790		3128

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs. Revision 1.317 by root, Mon Jul 23 23:38:17 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.317 by root, Mon Jul 23 23:38:17 2007 UTC