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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC

… …
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use 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
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @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
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These 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 169returns 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. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that 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
241use 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
245Converts a JSON string into the corresponding perl data structure. 252Converts 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
249Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
250 264
251=item cf::lock_wait $string 265=item cf::lock_wait $string
252 266
253Wait until the given lock is available. See cf::lock_acquire. 267Wait 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
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $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
371sub 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
315Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
404 474
405=cut 475=cut
406 476
477sub _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
407sub fork_call(&@) { 486sub 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
844our $override; 932our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 934
847sub override { 935sub override {
848 $override = 1; 936 $override = 1;
849 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
850} 938}
851 939
852sub do_invoke { 940sub 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
879Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
880 968
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This 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 970removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 971results (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
981sub _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
892sub reattach { 991sub 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
1034Register a callback fro execution when the client sends an extcmd packet. 1133Register a callback for execution when the client sends an (synchronous)
1134extcmd packet. Ext commands will be processed in the order they are
1135received by the server, like other user commands. The first argument is
1136the logged-in player. Ext commands can only be processed after a player
1137has logged in successfully.
1035 1138
1036If the callback returns something, it is sent back as if reply was being 1139If the callback returns something, it is sent back as if reply was being
1037called. 1140called.
1038 1141
1142=item cf::register_exticmd $name => \&callback($ns,$packet);
1143
1144Register a callback for execution when the client sends an (asynchronous)
1145exticmd packet. Exti commands are processed by the server as soon as they
1146are received, i.e. out of order w.r.t. other commands. The first argument
1147is a client socket. Exti commands can be received anytime, even before
1148log-in.
1149
1150If the callback returns something, it is sent back as if reply was being
1151called.
1152
1039=cut 1153=cut
1040 1154
1041sub register_extcmd { 1155sub register_extcmd {
1042 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
1043 1157
1044 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
1045} 1165}
1046 1166
1047cf::player->attach ( 1167cf::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) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1187 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1188 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1492 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1493 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1494 $self->gender ? $2 : $1
1375 }ge 1495 }ge
1376 # replace H<hint text> 1496 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1378 1504
1379 # create single paragraphs (very hackish) 1505 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1506 s/(?<=\S)\n(?=\w)/ /g;
1381 1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1382 $_ 1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1383} 1520}
1384 1521
1385=item $player->ext_reply ($msgid, %msg) 1522=item $player->ext_reply ($msgid, %msg)
1386 1523
1387Sends an ext reply to the player. 1524Sends an ext reply to the player.
… …
1390 1527
1391sub ext_reply($$%) { 1528sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1529 my ($self, $id, %msg) = @_;
1393 1530
1394 $msg{msgid} = $id; 1531 $msg{msgid} = $id;
1395 1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1533}
1398 1534
1399=item $player->ext_event ($type, %msg) 1535=item $player->ext_event ($type, %msg)
1400 1536
1401Sends an ext event to the client. 1537Sends an ext event to the client.
… …
1426 my ($path) = @_; 1562 my ($path) = @_;
1427 1563
1428 my ($match, $specificity); 1564 my ($match, $specificity);
1429 1565
1430 for my $region (list) { 1566 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1434 } 1570 }
1435 } 1571 }
1436 1572
… …
1556 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1557 return $self; 1693 return $self;
1558 } 1694 }
1559 } 1695 }
1560 1696
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1698 ()
1563} 1699}
1564 1700
1565sub init { 1701sub init {
1566 my ($self) = @_; 1702 my ($self) = @_;
… …
1844 1980
1845 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1846 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1849 my $map = find $path 1985 if (my $map = find $path) {
1850 or next;
1851 $map->load; 1986 $map->load;
1987 }
1852 1988
1853 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1854 } 1990 }
1855 } 1991 }
1856 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2193 2329
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2196} 2332}
2197 2333
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2335
2200Moves the player to the given map-path and coordinates by first freezing 2336Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2338that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2339the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process.
2204 2341
2205=cut 2342=cut
2206 2343
2207our $GOTOGEN; 2344our $GOTOGEN;
2208 2345
2209sub cf::object::player::goto { 2346sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2348
2212 # do generation counting so two concurrent goto's will be executed in-order 2349 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2351
2215 $self->enter_link; 2352 $self->enter_link;
… …
2235 2372
2236 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2239 } 2376 }
2377
2378 $done->() if $done;
2240 })->prio (1); 2379 })->prio (1);
2241} 2380}
2242 2381
2243=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2244 2383
… …
2313 my $hp = $exit->stats->hp; 2452 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2453 my $sp = $exit->stats->sp;
2315 2454
2316 $self->enter_link; 2455 $self->enter_link;
2317 2456
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2318 (async { 2461 (async {
2319 $self->deactivate_recursive; # just to be sure 2462 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2463 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2464 $self->goto ($slaying, $hp, $sp);
2322 2465
… …
2349 2492
2350 utf8::encode $text; 2493 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2495}
2353 2496
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2498
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2499Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2500client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2501the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2360 2503
2361=cut 2504=cut
2362 2505
2363sub cf::client::send_msg { 2506sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2508
2366 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2367 2510
2511 $color &= ~cf::NDI_UNIQUE; # just in case...
2512
2513 if (ref $channel) {
2514 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel);
2518 }
2519
2520 $channel = $channel->{id};
2521 }
2522
2523 return unless @extra || length $msg;
2524
2368 if ($self->can_msg) { 2525 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2370 } else { 2527 } else {
2371 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2529 for ($msg) {
2373 1 while 2530 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2536 }
2380 2537
2381 if ($color >= 0) { 2538 if ($color >= 0) {
2382 if ($msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2540 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2541 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2543 $self->send_packet ("drawinfo $color $msg")
2386 } 2544 }
2387 } 2545 }
2388 } 2546 }
2389} 2547}
2390 2548
2391=item $client->ext_event ($type, %msg) 2549=item $client->ext_event ($type, %msg)
2392 2550
2393Sends an exti event to the client. 2551Sends an ext event to the client.
2394 2552
2395=cut 2553=cut
2396 2554
2397sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2398 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2399 2557
2558 return unless $self->extcmd;
2559
2400 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2402} 2562}
2403 2563
2404=item $success = $client->query ($flags, "text", \&cb) 2564=item $success = $client->query ($flags, "text", \&cb)
2405 2565
2406Queues a query to the client, calling the given callback with 2566Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2567the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2568C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2569
2410Queries can fail, so check the return code. Or don't, as queries will become 2570Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2571become reliable at some point in the future.
2412 2572
2413=cut 2573=cut
2414 2574
2415sub cf::client::query { 2575sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2576 my ($self, $flags, $text, $cb) = @_;
… …
2424 utf8::encode $text; 2584 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2585 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2586
2427 $self->send_packet ($self->{query_queue}[0][0]) 2587 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2588 if @{ $self->{query_queue} } == 1;
2589
2590 1
2429} 2591}
2430 2592
2431cf::client->attach ( 2593cf::client->attach (
2594 on_connect => sub {
2595 my ($ns) = @_;
2596
2597 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2598 },
2432 on_reply => sub { 2599 on_reply => sub {
2433 my ($ns, $msg) = @_; 2600 my ($ns, $msg) = @_;
2434 2601
2435 # this weird shuffling is so that direct followup queries 2602 # this weird shuffling is so that direct followup queries
2436 # get handled first 2603 # get handled first
… …
2448 } else { 2615 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2616 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2617 }
2451 } 2618 }
2452 }, 2619 },
2620 on_exticmd => sub {
2621 my ($ns, $buf) = @_;
2622
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624
2625 if (ref $msg) {
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2627 if (my %reply = $cb->($ns, $msg)) {
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 }
2632 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 }
2635
2636 cf::override;
2637 },
2453); 2638);
2454 2639
2455=item $client->async (\&cb) 2640=item $client->async (\&cb)
2456 2641
2457Create a new coroutine, running the specified callback. The coroutine will 2642Create a new coroutine, running the specified callback. The coroutine will
… …
2506 2691
2507=pod 2692=pod
2508 2693
2509The following functions and methods are available within a safe environment: 2694The following functions and methods are available within a safe environment:
2510 2695
2511 cf::object contr pay_amount pay_player map 2696 cf::object
2697 contr pay_amount pay_player map x y force_find force_add
2698 insert remove
2699
2512 cf::object::player player 2700 cf::object::player
2513 cf::player peaceful 2701 player
2514 cf::map trigger 2702
2703 cf::player
2704 peaceful
2705
2706 cf::map
2707 trigger
2515 2708
2516=cut 2709=cut
2517 2710
2518for ( 2711for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)],
2520 ["cf::object::player" => qw(player)], 2714 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 2715 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 2716 ["cf::map" => qw(trigger)],
2523) { 2717) {
2524 no strict 'refs'; 2718 no strict 'refs';
… …
2616 { 2810 {
2617 my $faces = $facedata->{faceinfo}; 2811 my $faces = $facedata->{faceinfo};
2618 2812
2619 while (my ($face, $info) = each %$faces) { 2813 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2814 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2815 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2624 Coro::cede; 2819
2820 cf::cede_to_tick;
2625 } 2821 }
2626 2822
2627 while (my ($face, $info) = each %$faces) { 2823 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 2824 next unless $info->{smooth};
2629 my $idx = cf::face::find $face 2825 my $idx = cf::face::find $face
2630 or next; 2826 or next;
2631 if (my $smooth = cf::face::find $info->{smooth}) { 2827 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 2830 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2831 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 2832 }
2636 Coro::cede; 2833
2834 cf::cede_to_tick;
2637 } 2835 }
2638 } 2836 }
2639 2837
2640 { 2838 {
2641 my $anims = $facedata->{animinfo}; 2839 my $anims = $facedata->{animinfo};
2642 2840
2643 while (my ($anim, $info) = each %$anims) { 2841 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2842 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 2843 cf::cede_to_tick;
2646 } 2844 }
2647 2845
2648 cf::anim::invalidate_all; # d'oh 2846 cf::anim::invalidate_all; # d'oh
2847 }
2848
2849 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854
2855 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2867 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 }
2874
2875 cf::cede_to_tick;
2876 }
2649 } 2877 }
2650 2878
2651 1 2879 1
2652} 2880}
2653 2881
2654sub reload_regions { 2882sub reload_regions {
2655 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 2884 or die "unable to load regions file\n";
2885
2886 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/
2888 if exists $_->{match};
2889 }
2657} 2890}
2658 2891
2659sub reload_facedata { 2892sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 2894 or die "unable to load facedata\n";
2662} 2895}
2663 2896
2664sub reload_archetypes { 2897sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 2903 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 2904 or die "unable to load archetypes\n";
2667} 2905}
2668 2906
2669sub reload_treasures { 2907sub reload_treasures {
… …
2863 %EXT_CORO = (); 3101 %EXT_CORO = ();
2864 3102
2865 warn "removing commands"; 3103 warn "removing commands";
2866 %COMMAND = (); 3104 %COMMAND = ();
2867 3105
2868 warn "removing ext commands"; 3106 warn "removing ext/exti commands";
2869 %EXTCMD = (); 3107 %EXTCMD = ();
3108 %EXTICMD = ();
2870 3109
2871 warn "unloading/nuking all extensions"; 3110 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 3111 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 3112 warn "... unloading $pkg";
2874 3113

Diff Legend

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