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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 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
…		…
1244	$self->{deny_save} = 1;	1370	$self->{deny_save} = 1;
1245		1371
1246	$cf::PLAYER{$login} = $self;	1372	$cf::PLAYER{$login} = $self;
1247		1373
1248	$self	1374	$self
		1375	}
		1376
		1377	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1378
		1379	=cut
		1380
		1381	sub send_msg {
		1382	my $ns = shift->ns
		1383	or return;
		1384	$ns->send_msg (@_);
1249	}	1385	}
1250		1386
1251	=item $pl->quit_character	1387	=item $pl->quit_character
1252		1388
1253	Nukes the player without looking back. If logged in, the connection will	1389	Nukes the player without looking back. If logged in, the connection will
…		…
1372	# replace G<male\|female> tags	1508	# replace G<male\|female> tags
1373	\|\| s{G<([^>\|])\\|([^>])>}{	1509	\|\| s{G<([^>\|])\\|([^>])>}{
1374	$self->gender ? $2 : $1	1510	$self->gender ? $2 : $1
1375	}ge	1511	}ge
1376	# replace H<hint text>	1512	# replace H<hint text>
1377	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1513	\|\| s{H<([^\>]*)>}
		1514	{
		1515	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1516	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1517	"")
		1518	[$self->{hintmode}]
		1519	}ge;
1378		1520
1379	# create single paragraphs (very hackish)	1521	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1522	s/(?<=\S)\n(?=\w)/ /g;
1381		1523
		1524	# compress some whitespace
		1525	s/\s+\n/\n/g; # ws line-ends
		1526	s/\n\n+/\n/g; # double lines
		1527	s/^\n+//; # beginning lines
		1528	s/\n+$//; # ending lines
		1529
1382	$_	1530	$_
1383	}	1531	}
1384		1532
		1533	sub hintmode {
		1534	$_[0]{hintmode} = $_[1] if @_ > 1;
		1535	$_[0]{hintmode}
		1536	}
		1537
1385	=item $player->ext_reply ($msgid, %msg)	1538	=item $player->ext_reply ($msgid, @msg)
1386		1539
1387	Sends an ext reply to the player.	1540	Sends an ext reply to the player.
1388		1541
1389	=cut	1542	=cut
1390		1543
1391	sub ext_reply($$%) {	1544	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1545	my ($self, $id, @msg) = @_;
1393		1546
1394	$msg{msgid} = $id;	1547	if ($self->ns->extcmd == 2) {
1395		1548	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1396	$self->send ("ext " . cf::to_json \%msg);	1549	} elsif ($self->ns->extcmd == 1) {
		1550	#TODO: version 1, remove
		1551	unshift @msg, msgtype => "reply", msgid => $id;
		1552	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
		1553	}
1397	}	1554	}
1398		1555
1399	=item $player->ext_event ($type, %msg)	1556	=item $player->ext_msg ($type, @msg)
1400		1557
1401	Sends an ext event to the client.	1558	Sends an ext event to the client.
1402		1559
1403	=cut	1560	=cut
1404		1561
1405	sub ext_event($$%) {	1562	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1563	my ($self, $type, @msg) = @_;
1407		1564
1408	$self->ns->ext_event ($type, %msg);	1565	$self->ns->ext_msg ($type, @msg);
1409	}	1566	}
1410		1567
1411	=head3 cf::region	1568	=head3 cf::region
1412		1569
1413	=over 4	1570	=over 4
…		…
1426	my ($path) = @_;	1583	my ($path) = @_;
1427		1584
1428	my ($match, $specificity);	1585	my ($match, $specificity);
1429		1586
1430	for my $region (list) {	1587	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1588	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1589	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1590	if $region->specificity > $specificity;
1434	}	1591	}
1435	}	1592	}
1436		1593
…		…
1556	$self->init; # pass $1 etc.	1713	$self->init; # pass $1 etc.
1557	return $self;	1714	return $self;
1558	}	1715	}
1559	}	1716	}
1560		1717
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1718	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1719	()
1563	}	1720	}
1564		1721
1565	sub init {	1722	sub init {
1566	my ($self) = @_;	1723	my ($self) = @_;
…		…
1774	$self->set_darkness_map;	1931	$self->set_darkness_map;
1775	Coro::cede;	1932	Coro::cede;
1776	$self->activate;	1933	$self->activate;
1777	}	1934	}
1778		1935
		1936	$self->{last_save} = $cf::RUNTIME;
		1937	$self->last_access ($cf::RUNTIME);
		1938
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1939	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1940	}
1781		1941
1782	$self->post_load;	1942	$self->post_load;
1783	}	1943	}
…		…
1844		2004
1845	undef $MAP_PREFETCH{$path};	2005	undef $MAP_PREFETCH{$path};
1846	$MAP_PREFETCHER \|\|= cf::async {	2006	$MAP_PREFETCHER \|\|= cf::async {
1847	while (%MAP_PREFETCH) {	2007	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2008	for my $path (keys %MAP_PREFETCH) {
1849	my $map = find $path	2009	if (my $map = find $path) {
1850	or next;
1851	$map->load;	2010	$map->load;
		2011	}
1852		2012
1853	delete $MAP_PREFETCH{$path};	2013	delete $MAP_PREFETCH{$path};
1854	}	2014	}
1855	}	2015	}
1856	undef $MAP_PREFETCHER;	2016	undef $MAP_PREFETCHER;
…		…
2083		2243
2084	} else {	2244	} else {
2085	my $pl = $self->contr;	2245	my $pl = $self->contr;
2086		2246
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2247	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2248	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2249	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2250
2096	} else {	2251	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2252	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2253	$self->message ($msg, $flags);
2099	}	2254	}
2100	}	2255	}
		2256	}
		2257
		2258	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2259
		2260	=cut
		2261
		2262	sub cf::object::send_msg {
		2263	my $pl = shift->contr
		2264	or return;
		2265	$pl->send_msg (@_);
2101	}	2266	}
2102		2267
2103	=item $player_object->may ("access")	2268	=item $player_object->may ("access")
2104		2269
2105	Returns wether the given player is authorized to access resource "access"	2270	Returns wether the given player is authorized to access resource "access"
…		…
2193		2358
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2359	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2360	$self->enter_map ($map, $x, $y);
2196	}	2361	}
2197		2362
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2363	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2364
2200	Moves the player to the given map-path and coordinates by first freezing	2365	Moves the player to the given map-path and coordinates by first freezing
2201	her, loading and preparing them map, calling the provided $check callback	2366	her, loading and preparing them map, calling the provided $check callback
2202	that has to return the map if sucecssful, and then unfreezes the player on	2367	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2368	the new (success) or old (failed) map position. In either case, $done will
		2369	be called at the end of this process.
2204		2370
2205	=cut	2371	=cut
2206		2372
2207	our $GOTOGEN;	2373	our $GOTOGEN;
2208		2374
2209	sub cf::object::player::goto {	2375	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2376	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2377
2212	# do generation counting so two concurrent goto's will be executed in-order	2378	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2379	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2380
2215	$self->enter_link;	2381	$self->enter_link;
…		…
2235		2401
2236	if ($gen == $self->{_goto_generation}) {	2402	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2403	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2404	$self->leave_link ($map, $x, $y);
2239	}	2405	}
		2406
		2407	$done->() if $done;
2240	})->prio (1);	2408	})->prio (1);
2241	}	2409	}
2242		2410
2243	=item $player_object->enter_exit ($exit_object)	2411	=item $player_object->enter_exit ($exit_object)
2244		2412
…		…
2313	my $hp = $exit->stats->hp;	2481	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2482	my $sp = $exit->stats->sp;
2315		2483
2316	$self->enter_link;	2484	$self->enter_link;
2317		2485
		2486	# if exit is damned, update players death & WoR home-position
		2487	$self->contr->savebed ($slaying, $hp, $sp)
		2488	if $exit->flag (FLAG_DAMNED);
		2489
2318	(async {	2490	(async {
2319	$self->deactivate_recursive; # just to be sure	2491	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2492	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2493	$self->goto ($slaying, $hp, $sp);
2322		2494
…		…
2349		2521
2350	utf8::encode $text;	2522	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2523	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2352	}	2524	}
2353		2525
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2526	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2527
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2528	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2529	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2530	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2531	the message unless the client supports the msg packet.
2360		2532
2361	=cut	2533	=cut
2362		2534
2363	sub cf::client::send_msg {	2535	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2536	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2537
2366	$msg = $self->pl->expand_cfpod ($msg);	2538	$msg = $self->pl->expand_cfpod ($msg);
2367		2539
		2540	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2541
		2542	if (ref $channel) {
		2543	# send meta info to client, if not yet sent
		2544	unless (exists $self->{channel}{$channel->{id}}) {
		2545	$self->{channel}{$channel->{id}} = $channel;
		2546	$self->ext_msg (channel_info => $channel);
		2547	}
		2548
		2549	$channel = $channel->{id};
		2550	}
		2551
		2552	return unless @extra \|\| length $msg;
		2553
2368	if ($self->can_msg) {	2554	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2555	# default colour, mask it out
		2556	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2557	if $color & cf::NDI_DEF;
		2558
		2559	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2560	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2561	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2562	if ($color >= 0) {
		2563	# replace some tags by gcfclient-compatible ones
		2564	for ($msg) {
		2565	1 while
		2566	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2567	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2568	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2569	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2570	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2571	}
		2572
		2573	$color &= cf::NDI_COLOR_MASK;
		2574
		2575	utf8::encode $msg;
		2576
2382	if ($msg =~ /\[/) {	2577	if (0 && $msg =~ /\[/) {
		2578	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2579	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2580	} else {
		2581	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2385	$self->send_packet ("drawinfo $color $msg")	2582	$self->send_packet ("drawinfo $color $msg")
2386	}	2583	}
2387	}	2584	}
2388	}	2585	}
2389	}	2586	}
2390		2587
2391	=item $client->ext_event ($type, %msg)	2588	=item $client->ext_msg ($type, @msg)
2392		2589
2393	Sends an exti event to the client.	2590	Sends an ext event to the client.
2394		2591
2395	=cut	2592	=cut
2396		2593
2397	sub cf::client::ext_event($$%) {	2594	sub cf::client::ext_msg($$@) {
2398	my ($self, $type, %msg) = @_;	2595	my ($self, $type, @msg) = @_;
2399		2596
		2597	my $extcmd = $self->extcmd;
		2598
		2599	if ($extcmd == 2) {
		2600	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2601	} elsif ($extcmd == 1) { # TODO: remove
2400	$msg{msgtype} = "event_$type";	2602	push @msg, msgtype => "event_$type";
2401	$self->send_packet ("ext " . cf::to_json \%msg);	2603	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2604	}
2402	}	2605	}
2403		2606
2404	=item $success = $client->query ($flags, "text", \&cb)	2607	=item $success = $client->query ($flags, "text", \&cb)
2405		2608
2406	Queues a query to the client, calling the given callback with	2609	Queues a query to the client, calling the given callback with
2407	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2610	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2611	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409		2612
2410	Queries can fail, so check the return code. Or don't, as queries will become	2613	Queries can fail, so check the return code. Or don't, as queries will
2411	reliable at some point in the future.	2614	become reliable at some point in the future.
2412		2615
2413	=cut	2616	=cut
2414		2617
2415	sub cf::client::query {	2618	sub cf::client::query {
2416	my ($self, $flags, $text, $cb) = @_;	2619	my ($self, $flags, $text, $cb) = @_;
…		…
2424	utf8::encode $text;	2627	utf8::encode $text;
2425	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2628	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426		2629
2427	$self->send_packet ($self->{query_queue}[0][0])	2630	$self->send_packet ($self->{query_queue}[0][0])
2428	if @{ $self->{query_queue} } == 1;	2631	if @{ $self->{query_queue} } == 1;
		2632
		2633	1
2429	}	2634	}
2430		2635
2431	cf::client->attach (	2636	cf::client->attach (
		2637	on_connect => sub {
		2638	my ($ns) = @_;
		2639
		2640	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2641	},
2432	on_reply => sub {	2642	on_reply => sub {
2433	my ($ns, $msg) = @_;	2643	my ($ns, $msg) = @_;
2434		2644
2435	# this weird shuffling is so that direct followup queries	2645	# this weird shuffling is so that direct followup queries
2436	# get handled first	2646	# get handled first
…		…
2448	} else {	2658	} else {
2449	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2659	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450	}	2660	}
2451	}	2661	}
2452	},	2662	},
		2663	on_exticmd => sub {
		2664	my ($ns, $buf) = @_;
		2665
		2666	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2667
		2668	if (ref $msg) {
		2669	my ($type, $reply, @payload) =
		2670	"ARRAY" eq ref $msg
		2671	? @$msg
		2672	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2673
		2674	if (my $cb = $EXTICMD{$type}) {
		2675	my @reply = $cb->($ns, @payload);
		2676
		2677	$ns->ext_reply ($reply, @reply)
		2678	if $reply;
		2679	}
		2680	} else {
		2681	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2682	}
		2683
		2684	cf::override;
		2685	},
2453	);	2686	);
2454		2687
2455	=item $client->async (\&cb)	2688	=item $client->async (\&cb)
2456		2689
2457	Create a new coroutine, running the specified callback. The coroutine will	2690	Create a new coroutine, running the specified callback. The coroutine will
…		…
2498	our $safe = new Safe "safe";	2731	our $safe = new Safe "safe";
2499	our $safe_hole = new Safe::Hole;	2732	our $safe_hole = new Safe::Hole;
2500		2733
2501	$SIG{FPE} = 'IGNORE';	2734	$SIG{FPE} = 'IGNORE';
2502		2735
2503	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2736	$safe->permit_only (Opcode::opset qw(
		2737	:base_core :base_mem :base_orig :base_math
		2738	grepstart grepwhile mapstart mapwhile
		2739	sort time
		2740	));
2504		2741
2505	# here we export the classes and methods available to script code	2742	# here we export the classes and methods available to script code
2506		2743
2507	=pod	2744	=pod
2508		2745
2509	The following functions and methods are available within a safe environment:	2746	The following functions and methods are available within a safe environment:
2510		2747
2511	cf::object contr pay_amount pay_player map	2748	cf::object
		2749	contr pay_amount pay_player map x y force_find force_add
		2750	insert remove name archname title slaying race
		2751
2512	cf::object::player player	2752	cf::object::player
2513	cf::player peaceful	2753	player
2514	cf::map trigger	2754
		2755	cf::player
		2756	peaceful
		2757
		2758	cf::map
		2759	trigger
2515		2760
2516	=cut	2761	=cut
2517		2762
2518	for (	2763	for (
2519	["cf::object" => qw(contr pay_amount pay_player map)],	2764	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2765	insert remove inv name archname title slaying race)],
2520	["cf::object::player" => qw(player)],	2766	["cf::object::player" => qw(player)],
2521	["cf::player" => qw(peaceful)],	2767	["cf::player" => qw(peaceful)],
2522	["cf::map" => qw(trigger)],	2768	["cf::map" => qw(trigger)],
2523	) {	2769	) {
2524	no strict 'refs';	2770	no strict 'refs';
…		…
2616	{	2862	{
2617	my $faces = $facedata->{faceinfo};	2863	my $faces = $facedata->{faceinfo};
2618		2864
2619	while (my ($face, $info) = each %$faces) {	2865	while (my ($face, $info) = each %$faces) {
2620	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2866	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2621	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2867	cf::face::set_visibility $idx, $info->{visibility};
		2868	cf::face::set_magicmap $idx, $info->{magicmap};
2622	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2869	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2623	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2870	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2624	Coro::cede;	2871
		2872	cf::cede_to_tick;
2625	}	2873	}
2626		2874
2627	while (my ($face, $info) = each %$faces) {	2875	while (my ($face, $info) = each %$faces) {
2628	next unless $info->{smooth};	2876	next unless $info->{smooth};
2629	my $idx = cf::face::find $face	2877	my $idx = cf::face::find $face
2630	or next;	2878	or next;
2631	if (my $smooth = cf::face::find $info->{smooth}) {	2879	if (my $smooth = cf::face::find $info->{smooth}) {
		2880	cf::face::set_smooth $idx, $smooth;
2632	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2881	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633	} else {	2882	} else {
2634	warn "smooth face '$info->{smooth}' not found for face '$face'";	2883	warn "smooth face '$info->{smooth}' not found for face '$face'";
2635	}	2884	}
2636	Coro::cede;	2885
		2886	cf::cede_to_tick;
2637	}	2887	}
2638	}	2888	}
2639		2889
2640	{	2890	{
2641	my $anims = $facedata->{animinfo};	2891	my $anims = $facedata->{animinfo};
2642		2892
2643	while (my ($anim, $info) = each %$anims) {	2893	while (my ($anim, $info) = each %$anims) {
2644	cf::anim::set $anim, $info->{frames}, $info->{facings};	2894	cf::anim::set $anim, $info->{frames}, $info->{facings};
2645	Coro::cede;	2895	cf::cede_to_tick;
2646	}	2896	}
2647		2897
2648	cf::anim::invalidate_all; # d'oh	2898	cf::anim::invalidate_all; # d'oh
2649	}	2899	}
2650		2900
		2901	{
		2902	# TODO: for gcfclient pleasure, we should give resources
		2903	# that gcfclient doesn't grok a >10000 face index.
		2904	my $res = $facedata->{resource};
		2905	my $enc = JSON::XS->new->utf8->canonical;
		2906
		2907	my $soundconf = delete $res->{"res/sound.conf"};
		2908
		2909	while (my ($name, $info) = each %$res) {
		2910	my $meta = $enc->encode ({
		2911	name => $name,
		2912	%{ $info->{meta} \|\| {} },
		2913	});
		2914
		2915	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2916
		2917	if ($info->{type} & 1) {
		2918	# prepend meta info
		2919
		2920	my $data = pack "(w/a)", $meta, $info->{data};
		2921	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2922
		2923	cf::face::set_data $idx, 0, $data, $chk;
		2924	} else {
		2925	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
		2926	}
		2927
		2928	cf::face::set_type $idx, $info->{type};
		2929
		2930	cf::cede_to_tick;
		2931	}
		2932
		2933	if ($soundconf) {
		2934	$soundconf = $enc->decode (delete $soundconf->{data});
		2935
		2936	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2937	my $sound = $soundconf->{compat}[$_]
		2938	or next;
		2939
		2940	my $face = cf::face::find "sound/$sound->[1]";
		2941	cf::sound::set $sound->[0] => $face;
		2942	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2943	}
		2944
		2945	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2946	my $face = cf::face::find "sound/$v";
		2947	cf::sound::set $k => $face;
		2948	}
		2949	}
		2950	}
		2951
2651	1	2952	1
2652	}	2953	}
		2954
		2955	register_exticmd fx_want => sub {
		2956	my ($ns, $want) = @_;
		2957
		2958	while (my ($k, $v) = each %$want) {
		2959	$ns->fx_want ($k, $v);
		2960	}
		2961	};
2653		2962
2654	sub reload_regions {	2963	sub reload_regions {
2655	load_resource_file "$MAPDIR/regions"	2964	load_resource_file "$MAPDIR/regions"
2656	or die "unable to load regions file\n";	2965	or die "unable to load regions file\n";
		2966
		2967	for (cf::region::list) {
		2968	$_->{match} = qr/$_->{match}/
		2969	if exists $_->{match};
		2970	}
2657	}	2971	}
2658		2972
2659	sub reload_facedata {	2973	sub reload_facedata {
2660	load_facedata "$DATADIR/facedata"	2974	load_facedata "$DATADIR/facedata"
2661	or die "unable to load facedata\n";	2975	or die "unable to load facedata\n";
2662	}	2976	}
2663		2977
2664	sub reload_archetypes {	2978	sub reload_archetypes {
		2979	load_resource_file "$DATADIR/archetypes"
		2980	or die "unable to load archetypes\n";
		2981	#d# NEED to laod twice to resolve forward references
		2982	# this really needs to be done in an extra post-pass
		2983	# (which needs to be synchronous, so solve it differently)
2665	load_resource_file "$DATADIR/archetypes"	2984	load_resource_file "$DATADIR/archetypes"
2666	or die "unable to load archetypes\n";	2985	or die "unable to load archetypes\n";
2667	}	2986	}
2668		2987
2669	sub reload_treasures {	2988	sub reload_treasures {
…		…
2863	%EXT_CORO = ();	3182	%EXT_CORO = ();
2864		3183
2865	warn "removing commands";	3184	warn "removing commands";
2866	%COMMAND = ();	3185	%COMMAND = ();
2867		3186
2868	warn "removing ext commands";	3187	warn "removing ext/exti commands";
2869	%EXTCMD = ();	3188	%EXTCMD = ();
		3189	%EXTICMD = ();
2870		3190
2871	warn "unloading/nuking all extensions";	3191	warn "unloading/nuking all extensions";
2872	for my $pkg (@EXTS) {	3192	for my $pkg (@EXTS) {
2873	warn "... unloading $pkg";	3193	warn "... unloading $pkg";
2874		3194

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs. Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC