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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.328 by root, Wed Aug 8 06:24:30 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
…		…
1372	# replace G<male\|female> tags	1498	# replace G<male\|female> tags
1373	\|\| s{G<([^>\|])\\|([^>])>}{	1499	\|\| s{G<([^>\|])\\|([^>])>}{
1374	$self->gender ? $2 : $1	1500	$self->gender ? $2 : $1
1375	}ge	1501	}ge
1376	# replace H<hint text>	1502	# replace H<hint text>
1377	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	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;
1378		1510
1379	# create single paragraphs (very hackish)	1511	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1512	s/(?<=\S)\n(?=\w)/ /g;
1381		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
1382	$_	1520	$_
1383	}	1521	}
1384		1522
		1523	sub hintmode {
		1524	$_[0]{hintmode} = $_[1] if @_ > 1;
		1525	$_[0]{hintmode}
		1526	}
		1527
1385	=item $player->ext_reply ($msgid, %msg)	1528	=item $player->ext_reply ($msgid, @msg)
1386		1529
1387	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1388		1531
1389	=cut	1532	=cut
1390		1533
1391	sub ext_reply($$%) {	1534	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1535	my ($self, $id, @msg) = @_;
1393		1536
1394	$msg{msgid} = $id;	1537	if ($self->ns->extcmd == 2) {
1395		1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1396	$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	}
1397	}	1544	}
1398		1545
1399	=item $player->ext_event ($type, %msg)	1546	=item $player->ext_msg ($type, @msg)
1400		1547
1401	Sends an ext event to the client.	1548	Sends an ext event to the client.
1402		1549
1403	=cut	1550	=cut
1404		1551
1405	sub ext_event($$%) {	1552	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1553	my ($self, $type, @msg) = @_;
1407		1554
1408	$self->ns->ext_event ($type, %msg);	1555	$self->ns->ext_msg ($type, @msg);
1409	}	1556	}
1410		1557
1411	=head3 cf::region	1558	=head3 cf::region
1412		1559
1413	=over 4	1560	=over 4
…		…
1426	my ($path) = @_;	1573	my ($path) = @_;
1427		1574
1428	my ($match, $specificity);	1575	my ($match, $specificity);
1429		1576
1430	for my $region (list) {	1577	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1578	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1579	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1580	if $region->specificity > $specificity;
1434	}	1581	}
1435	}	1582	}
1436		1583
…		…
1556	$self->init; # pass $1 etc.	1703	$self->init; # pass $1 etc.
1557	return $self;	1704	return $self;
1558	}	1705	}
1559	}	1706	}
1560		1707
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1708	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1709	()
1563	}	1710	}
1564		1711
1565	sub init {	1712	sub init {
1566	my ($self) = @_;	1713	my ($self) = @_;
…		…
1774	$self->set_darkness_map;	1921	$self->set_darkness_map;
1775	Coro::cede;	1922	Coro::cede;
1776	$self->activate;	1923	$self->activate;
1777	}	1924	}
1778		1925
		1926	$self->{last_save} = $cf::RUNTIME;
		1927	$self->last_access ($cf::RUNTIME);
		1928
1779	$self->in_memory (cf::MAP_IN_MEMORY);	1929	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	1930	}
1781		1931
1782	$self->post_load;	1932	$self->post_load;
1783	}	1933	}
…		…
1844		1994
1845	undef $MAP_PREFETCH{$path};	1995	undef $MAP_PREFETCH{$path};
1846	$MAP_PREFETCHER \|\|= cf::async {	1996	$MAP_PREFETCHER \|\|= cf::async {
1847	while (%MAP_PREFETCH) {	1997	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	1998	for my $path (keys %MAP_PREFETCH) {
1849	my $map = find $path	1999	if (my $map = find $path) {
1850	or next;
1851	$map->load;	2000	$map->load;
		2001	}
1852		2002
1853	delete $MAP_PREFETCH{$path};	2003	delete $MAP_PREFETCH{$path};
1854	}	2004	}
1855	}	2005	}
1856	undef $MAP_PREFETCHER;	2006	undef $MAP_PREFETCHER;
…		…
2083		2233
2084	} else {	2234	} else {
2085	my $pl = $self->contr;	2235	my $pl = $self->contr;
2086		2236
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2237	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2238	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2239	$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		2240
2096	} else {	2241	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2242	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2243	$self->message ($msg, $flags);
2099	}	2244	}
…		…
2193		2338
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2340	$self->enter_map ($map, $x, $y);
2196	}	2341	}
2197		2342
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2343	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2344
2200	Moves the player to the given map-path and coordinates by first freezing	2345	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	2346	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	2347	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2348	the new (success) or old (failed) map position. In either case, $done will
		2349	be called at the end of this process.
2204		2350
2205	=cut	2351	=cut
2206		2352
2207	our $GOTOGEN;	2353	our $GOTOGEN;
2208		2354
2209	sub cf::object::player::goto {	2355	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2356	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2357
2212	# do generation counting so two concurrent goto's will be executed in-order	2358	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2360
2215	$self->enter_link;	2361	$self->enter_link;
…		…
2235		2381
2236	if ($gen == $self->{_goto_generation}) {	2382	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2383	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2384	$self->leave_link ($map, $x, $y);
2239	}	2385	}
		2386
		2387	$done->() if $done;
2240	})->prio (1);	2388	})->prio (1);
2241	}	2389	}
2242		2390
2243	=item $player_object->enter_exit ($exit_object)	2391	=item $player_object->enter_exit ($exit_object)
2244		2392
…		…
2313	my $hp = $exit->stats->hp;	2461	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2462	my $sp = $exit->stats->sp;
2315		2463
2316	$self->enter_link;	2464	$self->enter_link;
2317		2465
		2466	# if exit is damned, update players death & WoR home-position
		2467	$self->contr->savebed ($slaying, $hp, $sp)
		2468	if $exit->flag (FLAG_DAMNED);
		2469
2318	(async {	2470	(async {
2319	$self->deactivate_recursive; # just to be sure	2471	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2472	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2473	$self->goto ($slaying, $hp, $sp);
2322		2474
…		…
2349		2501
2350	utf8::encode $text;	2502	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2503	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2352	}	2504	}
2353		2505
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2506	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2507
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2508	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	2509	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	2510	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2511	the message unless the client supports the msg packet.
2360		2512
2361	=cut	2513	=cut
2362		2514
2363	sub cf::client::send_msg {	2515	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2516	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2517
2366	$msg = $self->pl->expand_cfpod ($msg);	2518	$msg = $self->pl->expand_cfpod ($msg);
2367		2519
		2520	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2521
		2522	if (ref $channel) {
		2523	# send meta info to client, if not yet sent
		2524	unless (exists $self->{channel}{$channel->{id}}) {
		2525	$self->{channel}{$channel->{id}} = $channel;
		2526	$self->ext_msg (channel_info => $channel);
		2527	}
		2528
		2529	$channel = $channel->{id};
		2530	}
		2531
		2532	return unless @extra \|\| length $msg;
		2533
2368	if ($self->can_msg) {	2534	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2535	# default colour, mask it out
		2536	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2537	if $color & cf::NDI_DEF;
		2538
		2539	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2540	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2541	} 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]${2}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2542	if ($color >= 0) {
		2543	# replace some tags by gcfclient-compatible ones
		2544	for ($msg) {
		2545	1 while
		2546	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2547	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2548	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2549	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2550	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2551	}
		2552
		2553	$color &= cf::NDI_COLOR_MASK;
		2554
		2555	utf8::encode $msg;
		2556
2382	if (0 && $msg =~ /\[/) {	2557	if (0 && $msg =~ /\[/) {
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2558	$self->send_packet ("drawextinfo $color 4 0 $msg")
2384	} else {	2559	} else {
2385	s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2560	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2561	$self->send_packet ("drawinfo $color $msg")
2387	}	2562	}
2388	}	2563	}
2389	}	2564	}
2390	}	2565	}
2391		2566
2392	=item $client->ext_event ($type, %msg)	2567	=item $client->ext_msg ($type, @msg)
2393		2568
2394	Sends an exti event to the client.	2569	Sends an ext event to the client.
2395		2570
2396	=cut	2571	=cut
2397		2572
2398	sub cf::client::ext_event($$%) {	2573	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2574	my ($self, $type, @msg) = @_;
2400		2575
		2576	my $extcmd = $self->extcmd;
		2577
		2578	if ($extcmd == 2) {
		2579	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2580	} elsif ($extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2581	push @msg, msgtype => "event_$type";
2402	$self->send_packet ("ext " . cf::to_json \%msg);	2582	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2583	}
2403	}	2584	}
2404		2585
2405	=item $success = $client->query ($flags, "text", \&cb)	2586	=item $success = $client->query ($flags, "text", \&cb)
2406		2587
2407	Queues a query to the client, calling the given callback with	2588	Queues a query to the client, calling the given callback with
2408	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2589	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2590	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410		2591
2411	Queries can fail, so check the return code. Or don't, as queries will become	2592	Queries can fail, so check the return code. Or don't, as queries will
2412	reliable at some point in the future.	2593	become reliable at some point in the future.
2413		2594
2414	=cut	2595	=cut
2415		2596
2416	sub cf::client::query {	2597	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2598	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2606	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2607	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2608
2428	$self->send_packet ($self->{query_queue}[0][0])	2609	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2610	if @{ $self->{query_queue} } == 1;
		2611
		2612	1
2430	}	2613	}
2431		2614
2432	cf::client->attach (	2615	cf::client->attach (
		2616	on_connect => sub {
		2617	my ($ns) = @_;
		2618
		2619	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2620	},
2433	on_reply => sub {	2621	on_reply => sub {
2434	my ($ns, $msg) = @_;	2622	my ($ns, $msg) = @_;
2435		2623
2436	# this weird shuffling is so that direct followup queries	2624	# this weird shuffling is so that direct followup queries
2437	# get handled first	2625	# get handled first
…		…
2449	} else {	2637	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2638	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2639	}
2452	}	2640	}
2453	},	2641	},
		2642	on_exticmd => sub {
		2643	my ($ns, $buf) = @_;
		2644
		2645	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2646
		2647	if (ref $msg) {
		2648	my ($type, $reply, @payload) =
		2649	"ARRAY" eq ref $msg
		2650	? @$msg
		2651	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2652
		2653	if (my $cb = $EXTICMD{$type}) {
		2654	my @reply = $cb->($ns, @payload);
		2655
		2656	$ns->ext_reply ($reply, @reply)
		2657	if $reply;
		2658	}
		2659	} else {
		2660	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2661	}
		2662
		2663	cf::override;
		2664	},
2454	);	2665	);
2455		2666
2456	=item $client->async (\&cb)	2667	=item $client->async (\&cb)
2457		2668
2458	Create a new coroutine, running the specified callback. The coroutine will	2669	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2710	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2711	our $safe_hole = new Safe::Hole;
2501		2712
2502	$SIG{FPE} = 'IGNORE';	2713	$SIG{FPE} = 'IGNORE';
2503		2714
2504	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2715	$safe->permit_only (Opcode::opset qw(
		2716	:base_core :base_mem :base_orig :base_math
		2717	grepstart grepwhile mapstart mapwhile
		2718	sort time
		2719	));
2505		2720
2506	# here we export the classes and methods available to script code	2721	# here we export the classes and methods available to script code
2507		2722
2508	=pod	2723	=pod
2509		2724
2510	The following functions and methods are available within a safe environment:	2725	The following functions and methods are available within a safe environment:
2511		2726
2512	cf::object contr pay_amount pay_player map	2727	cf::object
		2728	contr pay_amount pay_player map x y force_find force_add
		2729	insert remove
		2730
2513	cf::object::player player	2731	cf::object::player
2514	cf::player peaceful	2732	player
2515	cf::map trigger	2733
		2734	cf::player
		2735	peaceful
		2736
		2737	cf::map
		2738	trigger
2516		2739
2517	=cut	2740	=cut
2518		2741
2519	for (	2742	for (
2520	["cf::object" => qw(contr pay_amount pay_player map)],	2743	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2744	insert remove inv)],
2521	["cf::object::player" => qw(player)],	2745	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2746	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2747	["cf::map" => qw(trigger)],
2524	) {	2748	) {
2525	no strict 'refs';	2749	no strict 'refs';
…		…
2617	{	2841	{
2618	my $faces = $facedata->{faceinfo};	2842	my $faces = $facedata->{faceinfo};
2619		2843
2620	while (my ($face, $info) = each %$faces) {	2844	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2845	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2846	cf::face::set_visibility $idx, $info->{visibility};
		2847	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2848	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2849	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2625	Coro::cede;	2850
		2851	cf::cede_to_tick;
2626	}	2852	}
2627		2853
2628	while (my ($face, $info) = each %$faces) {	2854	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	2855	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	2856	my $idx = cf::face::find $face
2631	or next;	2857	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	2858	if (my $smooth = cf::face::find $info->{smooth}) {
		2859	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	2860	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	2861	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	2862	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	2863	}
2637	Coro::cede;	2864
		2865	cf::cede_to_tick;
2638	}	2866	}
2639	}	2867	}
2640		2868
2641	{	2869	{
2642	my $anims = $facedata->{animinfo};	2870	my $anims = $facedata->{animinfo};
2643		2871
2644	while (my ($anim, $info) = each %$anims) {	2872	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	2873	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	2874	cf::cede_to_tick;
2647	}	2875	}
2648		2876
2649	cf::anim::invalidate_all; # d'oh	2877	cf::anim::invalidate_all; # d'oh
2650	}	2878	}
2651		2879
		2880	{
		2881	# TODO: for gcfclient pleasure, we should give resources
		2882	# that gcfclient doesn't grok a >10000 face index.
		2883	my $res = $facedata->{resource};
		2884	my $enc = JSON::XS->new->utf8->canonical;
		2885
		2886	my $soundconf = delete $res->{"res/sound.conf"};
		2887
		2888	while (my ($name, $info) = each %$res) {
		2889	my $meta = $enc->encode ({
		2890	name => $name,
		2891	%{ $info->{meta} \|\| {} },
		2892	});
		2893
		2894	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		2895
		2896	if ($info->{type} & 1) {
		2897	# prepend meta info
		2898
		2899	my $data = pack "(w/a)", $meta, $info->{data};
		2900	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2901
		2902	cf::face::set_data $idx, 0, $data, $chk;
		2903	} else {
		2904	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
		2905	}
		2906
		2907	cf::face::set_type $idx, $info->{type};
		2908
		2909	cf::cede_to_tick;
		2910	}
		2911
		2912	if ($soundconf) {
		2913	$soundconf = $enc->decode (delete $soundconf->{data});
		2914
		2915	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2916	my $sound = $soundconf->{compat}[$_]
		2917	or next;
		2918
		2919	my $face = cf::face::find "sound/$sound->[1]";
		2920	cf::sound::set $sound->[0] => $face;
		2921	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2922	}
		2923
		2924	while (my ($k, $v) = each %{$soundconf->{event}}) {
		2925	my $face = cf::face::find "sound/$v";
		2926	cf::sound::set $k => $face;
		2927	}
		2928	}
		2929	}
		2930
2652	1	2931	1
2653	}	2932	}
		2933
		2934	register_exticmd fx_want => sub {
		2935	my ($ns, $want) = @_;
		2936
		2937	while (my ($k, $v) = each %$want) {
		2938	$ns->fx_want ($k, $v);
		2939	}
		2940	};
2654		2941
2655	sub reload_regions {	2942	sub reload_regions {
2656	load_resource_file "$MAPDIR/regions"	2943	load_resource_file "$MAPDIR/regions"
2657	or die "unable to load regions file\n";	2944	or die "unable to load regions file\n";
		2945
		2946	for (cf::region::list) {
		2947	$_->{match} = qr/$_->{match}/
		2948	if exists $_->{match};
		2949	}
2658	}	2950	}
2659		2951
2660	sub reload_facedata {	2952	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	2953	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	2954	or die "unable to load facedata\n";
2663	}	2955	}
2664		2956
2665	sub reload_archetypes {	2957	sub reload_archetypes {
		2958	load_resource_file "$DATADIR/archetypes"
		2959	or die "unable to load archetypes\n";
		2960	#d# NEED to laod twice to resolve forward references
		2961	# this really needs to be done in an extra post-pass
		2962	# (which needs to be synchronous, so solve it differently)
2666	load_resource_file "$DATADIR/archetypes"	2963	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	2964	or die "unable to load archetypes\n";
2668	}	2965	}
2669		2966
2670	sub reload_treasures {	2967	sub reload_treasures {
…		…
2864	%EXT_CORO = ();	3161	%EXT_CORO = ();
2865		3162
2866	warn "removing commands";	3163	warn "removing commands";
2867	%COMMAND = ();	3164	%COMMAND = ();
2868		3165
2869	warn "removing ext commands";	3166	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3167	%EXTCMD = ();
		3168	%EXTICMD = ();
2871		3169
2872	warn "unloading/nuking all extensions";	3170	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3171	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3172	warn "... unloading $pkg";
2875		3173

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC vs. Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC