ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS 1.4 ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
… …
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 247 $d
238 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
239} 249}
240 250
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
250 265
251=item cf::lock_wait $string 266=item cf::lock_wait $string
252 267
253Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
254 269
… …
306 my $guard = Coro::guard { 321 my $guard = Coro::guard {
307 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
308 }; 323 };
309 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
310 $guard 325 $guard
326}
327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
311} 382}
312 383
313=item cf::async { BLOCK } 384=item cf::async { BLOCK }
314 385
315Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
… …
405=cut 476=cut
406 477
407sub fork_call(&@) { 478sub fork_call(&@) {
408 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
409 480
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
413 or die "pipe: $!";
414 484
415 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 486 reset_signals;
428 local $SIG{__WARN__}; 487 &$cb
429 local $SIG{__DIE__}; 488 }, @args;
430 eval {
431 close $fh1;
432 489
433 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 491}
441 492
442=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
443 494
444Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
840 "; 891 ";
841 die if $@; 892 die if $@;
842} 893}
843 894
844our $override; 895our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 897
847sub override { 898sub override {
848 $override = 1; 899 $override = 1;
849 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
850} 901}
851 902
852sub do_invoke { 903sub do_invoke {
853 my $event = shift; 904 my $event = shift;
854 my $callbacks = shift; 905 my $callbacks = shift;
855 906
856 @invoke_results = (); 907 @INVOKE_RESULTS = ();
857 908
858 local $override; 909 local $override;
859 910
860 for (@$callbacks) { 911 for (@$callbacks) {
861 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
878 929
879Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
880 931
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 935
885=back 936=back
886 937
887=cut 938=cut
888 939
889############################################################################# 940#############################################################################
890# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
891 953
892sub reattach { 954sub reattach {
893 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 956 my ($obj) = @_;
895 957
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1092}
1031 1093
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1095
1034Register a callback fro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
1035 1101
1036If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
1037called. 1103called.
1038 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
1039=cut 1116=cut
1040 1117
1041sub register_extcmd { 1118sub register_extcmd {
1042 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
1043 1120
1044 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
1045} 1128}
1046 1129
1047cf::player->attach ( 1130cf::player->attach (
1048 on_command => sub { 1131 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1141 cf::override;
1059 }, 1142 },
1060 on_extcmd => sub { 1143 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1062 1145
1063 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1147
1065 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1069 } 1158 if $reply;
1070 } 1159 }
1071 } else { 1160 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1162 }
1074 1163
… …
1246 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1247 1336
1248 $self 1337 $self
1249} 1338}
1250 1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1348}
1349
1251=item $pl->quit_character 1350=item $pl->quit_character
1252 1351
1253Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1255 1354
… …
1347 } 1446 }
1348 1447
1349 \@paths 1448 \@paths
1350} 1449}
1351 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1352=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1353 1502
1354Sends an ext reply to the player. 1503Sends an ext reply to the player.
1355 1504
1356=cut 1505=cut
1357 1506
1358sub ext_reply($$%) { 1507sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1360 1509
1361 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1362 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1363 $self->send ("ext " . cf::to_json \%msg); 1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1364} 1517}
1365 1518
1366=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1367 1520
1368Sends an ext event to the client. 1521Sends an ext event to the client.
1369 1522
1370=cut 1523=cut
1371 1524
1372sub ext_event($$%) { 1525sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1374 1527
1375 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1376} 1529}
1377 1530
1378=head3 cf::region 1531=head3 cf::region
1379 1532
1380=over 4 1533=over 4
… …
1393 my ($path) = @_; 1546 my ($path) = @_;
1394 1547
1395 my ($match, $specificity); 1548 my ($match, $specificity);
1396 1549
1397 for my $region (list) { 1550 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1401 } 1554 }
1402 } 1555 }
1403 1556
… …
1523 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1524 return $self; 1677 return $self;
1525 } 1678 }
1526 } 1679 }
1527 1680
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1682 ()
1530} 1683}
1531 1684
1532sub init { 1685sub init {
1533 my ($self) = @_; 1686 my ($self) = @_;
… …
1741 $self->set_darkness_map; 1894 $self->set_darkness_map;
1742 Coro::cede; 1895 Coro::cede;
1743 $self->activate; 1896 $self->activate;
1744 } 1897 }
1745 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1903 }
1748 1904
1749 $self->post_load; 1905 $self->post_load;
1750} 1906}
… …
1811 1967
1812 undef $MAP_PREFETCH{$path}; 1968 undef $MAP_PREFETCH{$path};
1813 $MAP_PREFETCHER ||= cf::async { 1969 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1970 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1971 for my $path (keys %MAP_PREFETCH) {
1816 my $map = find $path 1972 if (my $map = find $path) {
1817 or next;
1818 $map->load; 1973 $map->load;
1974 }
1819 1975
1820 delete $MAP_PREFETCH{$path}; 1976 delete $MAP_PREFETCH{$path};
1821 } 1977 }
1822 } 1978 }
1823 undef $MAP_PREFETCHER; 1979 undef $MAP_PREFETCHER;
… …
2045 2201
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2202 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2203
2048 if ($self->{record_replies}) { 2204 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2205 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2206
2050 } else { 2207 } else {
2208 my $pl = $self->contr;
2209
2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2211 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213
2214 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2217 }
2053 } 2218 }
2219}
2220
2221=item $object->send_msg ($channel, $msg, $color, [extra...])
2222
2223=cut
2224
2225sub cf::object::send_msg {
2226 my $pl = shift->contr
2227 or return;
2228 $pl->send_msg (@_);
2054} 2229}
2055 2230
2056=item $player_object->may ("access") 2231=item $player_object->may ("access")
2057 2232
2058Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
… …
2146 2321
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2323 $self->enter_map ($map, $x, $y);
2149} 2324}
2150 2325
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2327
2153Moves the player to the given map-path and coordinates by first freezing 2328Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2329her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2330that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2331the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process.
2157 2333
2158=cut 2334=cut
2159 2335
2160our $GOTOGEN; 2336our $GOTOGEN;
2161 2337
2162sub cf::object::player::goto { 2338sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2339 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2340
2165 # do generation counting so two concurrent goto's will be executed in-order 2341 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2343
2168 $self->enter_link; 2344 $self->enter_link;
… …
2188 2364
2189 if ($gen == $self->{_goto_generation}) { 2365 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2366 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2367 $self->leave_link ($map, $x, $y);
2192 } 2368 }
2369
2370 $done->() if $done;
2193 })->prio (1); 2371 })->prio (1);
2194} 2372}
2195 2373
2196=item $player_object->enter_exit ($exit_object) 2374=item $player_object->enter_exit ($exit_object)
2197 2375
… …
2266 my $hp = $exit->stats->hp; 2444 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2445 my $sp = $exit->stats->sp;
2268 2446
2269 $self->enter_link; 2447 $self->enter_link;
2270 2448
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2271 (async { 2453 (async {
2272 $self->deactivate_recursive; # just to be sure 2454 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2455 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2456 $self->goto ($slaying, $hp, $sp);
2275 2457
… …
2302 2484
2303 utf8::encode $text; 2485 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2487}
2306 2488
2489=item $client->send_msg ($channel, $msg, $color, [extra...])
2490
2491Send a drawinfo or msg packet to the client, formatting the msg for the
2492client if neccessary. C<$type> should be a string identifying the type of
2493the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet.
2495
2496=cut
2497
2498sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_;
2500
2501 $msg = $self->pl->expand_cfpod ($msg);
2502
2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504
2505 if (ref $channel) {
2506 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel);
2510 }
2511
2512 $channel = $channel->{id};
2513 }
2514
2515 return unless @extra || length $msg;
2516
2517 if ($self->can_msg) {
2518 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF;
2521
2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2524 } else {
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535
2536 $color &= cf::NDI_COLOR_MASK;
2537
2538 utf8::encode $msg;
2539
2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 }
2549}
2550
2307=item $client->ext_event ($type, %msg) 2551=item $client->ext_msg ($type, @msg)
2308 2552
2309Sends an exti event to the client. 2553Sends an ext event to the client.
2310 2554
2311=cut 2555=cut
2312 2556
2313sub cf::client::ext_event($$%) { 2557sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2558 my ($self, $type, @msg) = @_;
2315 2559
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2565 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2318} 2568}
2319 2569
2320=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
2321 2571
2322Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2573the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2574C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2575
2326Queries can fail, so check the return code. Or don't, as queries will become 2576Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2577become reliable at some point in the future.
2328 2578
2329=cut 2579=cut
2330 2580
2331sub cf::client::query { 2581sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2582 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2590 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2591 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2592
2343 $self->send_packet ($self->{query_queue}[0][0]) 2593 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2594 if @{ $self->{query_queue} } == 1;
2595
2596 1
2345} 2597}
2346 2598
2347cf::client->attach ( 2599cf::client->attach (
2600 on_connect => sub {
2601 my ($ns) = @_;
2602
2603 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2604 },
2348 on_reply => sub { 2605 on_reply => sub {
2349 my ($ns, $msg) = @_; 2606 my ($ns, $msg) = @_;
2350 2607
2351 # this weird shuffling is so that direct followup queries 2608 # this weird shuffling is so that direct followup queries
2352 # get handled first 2609 # get handled first
… …
2364 } else { 2621 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2622 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2623 }
2367 } 2624 }
2368 }, 2625 },
2626 on_exticmd => sub {
2627 my ($ns, $buf) = @_;
2628
2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2630
2631 if (ref $msg) {
2632 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg
2634 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636
2637 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 }
2643 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 }
2646
2647 cf::override;
2648 },
2369); 2649);
2370 2650
2371=item $client->async (\&cb) 2651=item $client->async (\&cb)
2372 2652
2373Create a new coroutine, running the specified callback. The coroutine will 2653Create a new coroutine, running the specified callback. The coroutine will
… …
2414our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2416 2696
2417$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2418 2698
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2699$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math
2701 grepstart grepwhile mapstart mapwhile
2702 sort time
2703));
2420 2704
2421# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2422 2706
2423=pod 2707=pod
2424 2708
2425The following functions and methods are available within a safe environment: 2709The 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 name archname title slaying race
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
2434for ( 2726for (
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 inv name archname title slaying race)],
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
2565 } 2862 }
2566 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 my $soundconf = delete $res->{"res/sound.conf"};
2871
2872 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
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_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2889 }
2890
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 }
2914
2567 1 2915 1
2568} 2916}
2917
2918register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_;
2920
2921 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v);
2923 }
2924};
2569 2925
2570sub reload_regions { 2926sub reload_regions {
2571 load_resource_file "$MAPDIR/regions" 2927 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 2928 or die "unable to load regions file\n";
2929
2930 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/
2932 if exists $_->{match};
2933 }
2573} 2934}
2574 2935
2575sub reload_facedata { 2936sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 2937 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2938 or die "unable to load facedata\n";
2578} 2939}
2579 2940
2580sub reload_archetypes { 2941sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2947 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2948 or die "unable to load archetypes\n";
2583} 2949}
2584 2950
2585sub reload_treasures { 2951sub reload_treasures {
… …
2779 %EXT_CORO = (); 3145 %EXT_CORO = ();
2780 3146
2781 warn "removing commands"; 3147 warn "removing commands";
2782 %COMMAND = (); 3148 %COMMAND = ();
2783 3149
2784 warn "removing ext commands"; 3150 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3151 %EXTCMD = ();
3152 %EXTICMD = ();
2786 3153
2787 warn "unloading/nuking all extensions"; 3154 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3155 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3156 warn "... unloading $pkg";
2790 3157

Diff Legend

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