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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 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
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
165 167
166These 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
167returns 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
168per 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.
169 177
170=back 178=back
171 179
172=cut 180=cut
173 181
… …
237 $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;
238 $d 246 $d
239 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
240} 248}
241 249
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
245 251
246Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
247 253
248=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
249 255
250Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
251 257
252=cut 258=cut
253 259
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 261
256sub to_json ($) { $json_coder->encode ($_[0]) } 262sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 263sub from_json ($) { $json_coder->decode ($_[0]) }
258 264
259=item cf::lock_wait $string 265=item cf::lock_wait $string
… …
314 my $guard = Coro::guard { 320 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 321 $TICK_WATCHER->start;
316 }; 322 };
317 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
318 $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;
319} 381}
320 382
321=item cf::async { BLOCK } 383=item cf::async { BLOCK }
322 384
323Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
412 474
413=cut 475=cut
414 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
415sub fork_call(&@) { 486sub fork_call(&@) {
416 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
417 488
418# 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
419# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
422 493
423 if (my $pid = fork) { 494 if (my $pid = fork) {
424 close $fh2; 495 close $fh2;
425 496
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
428 500
429 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
430 502
431 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
432 504
433 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
434 } else { 506 } else {
435 reset_signals; 507 reset_signals;
436 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
437 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
438 eval { 516 eval {
439 close $fh1; 517 close $fh1;
440 518
441 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
443 }; 523 };
444 524
445 warn $@ if $@; 525 warn $@ if $@;
446 _exit 0; 526 _exit 0;
447 } 527 }
… …
848 "; 928 ";
849 die if $@; 929 die if $@;
850} 930}
851 931
852our $override; 932our $override;
853our @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?
854 934
855sub override { 935sub override {
856 $override = 1; 936 $override = 1;
857 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
858} 938}
859 939
860sub do_invoke { 940sub do_invoke {
861 my $event = shift; 941 my $event = shift;
862 my $callbacks = shift; 942 my $callbacks = shift;
863 943
864 @invoke_results = (); 944 @INVOKE_RESULTS = ();
865 945
866 local $override; 946 local $override;
867 947
868 for (@$callbacks) { 948 for (@$callbacks) {
869 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
886 966
887Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
888 968
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 972
893=back 973=back
894 974
895=cut 975=cut
896 976
897############################################################################# 977#############################################################################
898# 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}
899 990
900sub reattach { 991sub reattach {
901 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 993 my ($obj) = @_;
903 994
… …
1087 cf::override; 1178 cf::override;
1088 }, 1179 },
1089 on_extcmd => sub { 1180 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1091 1182
1092 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1184
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1098 } 1195 if $reply;
1099 } 1196 }
1100 } else { 1197 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1199 }
1103 1200
… …
1273 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1274 1371
1275 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1276 1373
1277 $self 1374 $self
1375}
1376
1377=item $player->send_msg ($channel, $msg, $color, [extra...])
1378
1379=cut
1380
1381sub send_msg {
1382 my $ns = shift->ns
1383 or return;
1384 $ns->send_msg (@_);
1278} 1385}
1279 1386
1280=item $pl->quit_character 1387=item $pl->quit_character
1281 1388
1282Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1401 # replace G<male|female> tags 1508 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1509 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1510 $self->gender ? $2 : $1
1404 }ge 1511 }ge
1405 # replace H<hint text> 1512 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1513 || s{H<([^\>]*)>}
1514 {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "")
1518 [$self->{hintmode}]
1519 }ge;
1407 1520
1408 # create single paragraphs (very hackish) 1521 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1522 s/(?<=\S)\n(?=\w)/ /g;
1410 1523
1524 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1529
1411 $_ 1530 $_
1412} 1531}
1413 1532
1533sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode}
1536}
1537
1414=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1415 1539
1416Sends an ext reply to the player. 1540Sends an ext reply to the player.
1417 1541
1418=cut 1542=cut
1419 1543
1420sub ext_reply($$%) { 1544sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1422 1546
1423 $msg{msgid} = $id; 1547 if ($self->ns->extcmd == 2) {
1424 $self->send ("ext " . cf::to_json \%msg); 1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1425} 1554}
1426 1555
1427=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1428 1557
1429Sends an ext event to the client. 1558Sends an ext event to the client.
1430 1559
1431=cut 1560=cut
1432 1561
1433sub ext_event($$%) { 1562sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1435 1564
1436 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1437} 1566}
1438 1567
1439=head3 cf::region 1568=head3 cf::region
1440 1569
1441=over 4 1570=over 4
… …
1454 my ($path) = @_; 1583 my ($path) = @_;
1455 1584
1456 my ($match, $specificity); 1585 my ($match, $specificity);
1457 1586
1458 for my $region (list) { 1587 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1462 } 1591 }
1463 } 1592 }
1464 1593
… …
1584 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1585 return $self; 1714 return $self;
1586 } 1715 }
1587 } 1716 }
1588 1717
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1719 ()
1591} 1720}
1592 1721
1593sub init { 1722sub init {
1594 my ($self) = @_; 1723 my ($self) = @_;
… …
1802 $self->set_darkness_map; 1931 $self->set_darkness_map;
1803 Coro::cede; 1932 Coro::cede;
1804 $self->activate; 1933 $self->activate;
1805 } 1934 }
1806 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1940 }
1809 1941
1810 $self->post_load; 1942 $self->post_load;
1811} 1943}
… …
1872 2004
1873 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 2009 if (my $map = find $path) {
1878 or next;
1879 $map->load; 2010 $map->load;
2011 }
1880 2012
1881 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1882 } 2014 }
1883 } 2015 }
1884 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2111 2243
2112 } else { 2244 } else {
2113 my $pl = $self->contr; 2245 my $pl = $self->contr;
2114 2246
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2250
2124 } else { 2251 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2127 } 2254 }
2128 } 2255 }
2256}
2257
2258=item $object->send_msg ($channel, $msg, $color, [extra...])
2259
2260=cut
2261
2262sub cf::object::send_msg {
2263 my $pl = shift->contr
2264 or return;
2265 $pl->send_msg (@_);
2129} 2266}
2130 2267
2131=item $player_object->may ("access") 2268=item $player_object->may ("access")
2132 2269
2133Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2221 2358
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2224} 2361}
2225 2362
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2364
2228Moves the player to the given map-path and coordinates by first freezing 2365Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2367that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2368the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process.
2232 2370
2233=cut 2371=cut
2234 2372
2235our $GOTOGEN; 2373our $GOTOGEN;
2236 2374
2237sub cf::object::player::goto { 2375sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2377
2240 # do generation counting so two concurrent goto's will be executed in-order 2378 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2380
2243 $self->enter_link; 2381 $self->enter_link;
… …
2263 2401
2264 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2267 } 2405 }
2406
2407 $done->() if $done;
2268 })->prio (1); 2408 })->prio (1);
2269} 2409}
2270 2410
2271=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2272 2412
… …
2341 my $hp = $exit->stats->hp; 2481 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2482 my $sp = $exit->stats->sp;
2343 2483
2344 $self->enter_link; 2484 $self->enter_link;
2345 2485
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2346 (async { 2490 (async {
2347 $self->deactivate_recursive; # just to be sure 2491 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2492 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2493 $self->goto ($slaying, $hp, $sp);
2350 2494
… …
2377 2521
2378 utf8::encode $text; 2522 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2523 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2524}
2381 2525
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2527
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2528Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2529client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2530the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2388 2532
2389=cut 2533=cut
2390 2534
2391sub cf::client::send_msg { 2535sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2537
2394 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2395 2539
2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541
2542 if (ref $channel) {
2543 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel);
2547 }
2548
2549 $channel = $channel->{id};
2550 }
2551
2552 return unless @extra || length $msg;
2553
2396 if ($self->can_msg) { 2554 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2555 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF;
2558
2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2561 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572
2573 $color &= cf::NDI_COLOR_MASK;
2574
2575 utf8::encode $msg;
2576
2410 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2578 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2579 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2580 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2581 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2582 $self->send_packet ("drawinfo $color $msg")
2415 } 2583 }
2416 } 2584 }
2417 } 2585 }
2418} 2586}
2419 2587
2420=item $client->ext_event ($type, %msg) 2588=item $client->ext_msg ($type, @msg)
2421 2589
2422Sends an ext event to the client. 2590Sends an ext event to the client.
2423 2591
2424=cut 2592=cut
2425 2593
2426sub cf::client::ext_event($$%) { 2594sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2595 my ($self, $type, @msg) = @_;
2428 2596
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2602 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 }
2431} 2605}
2432 2606
2433=item $success = $client->query ($flags, "text", \&cb) 2607=item $success = $client->query ($flags, "text", \&cb)
2434 2608
2435Queues a query to the client, calling the given callback with 2609Queues a query to the client, calling the given callback with
… …
2458 2632
2459 1 2633 1
2460} 2634}
2461 2635
2462cf::client->attach ( 2636cf::client->attach (
2637 on_connect => sub {
2638 my ($ns) = @_;
2639
2640 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2641 },
2463 on_reply => sub { 2642 on_reply => sub {
2464 my ($ns, $msg) = @_; 2643 my ($ns, $msg) = @_;
2465 2644
2466 # this weird shuffling is so that direct followup queries 2645 # this weird shuffling is so that direct followup queries
2467 # get handled first 2646 # get handled first
… …
2482 } 2661 }
2483 }, 2662 },
2484 on_exticmd => sub { 2663 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2664 my ($ns, $buf) = @_;
2486 2665
2487 my $msg = eval { from_json $buf }; 2666 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2667
2489 if (ref $msg) { 2668 if (ref $msg) {
2669 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg
2671 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2674 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2675 my @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid}; 2676
2493 $ns->send ("ext " . cf::to_json \%reply); 2677 $ns->ext_reply ($reply, @reply)
2494 } 2678 if $reply;
2495 } 2679 }
2496 } else { 2680 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2682 }
2499 2683
… …
2547our $safe = new Safe "safe"; 2731our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2732our $safe_hole = new Safe::Hole;
2549 2733
2550$SIG{FPE} = 'IGNORE'; 2734$SIG{FPE} = 'IGNORE';
2551 2735
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2736$safe->permit_only (Opcode::opset qw(
2737 :base_core :base_mem :base_orig :base_math
2738 grepstart grepwhile mapstart mapwhile
2739 sort time
2740));
2553 2741
2554# here we export the classes and methods available to script code 2742# here we export the classes and methods available to script code
2555 2743
2556=pod 2744=pod
2557 2745
2558The following functions and methods are available within a safe environment: 2746The following functions and methods are available within a safe environment:
2559 2747
2560 cf::object contr pay_amount pay_player map 2748 cf::object
2749 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race
2751
2561 cf::object::player player 2752 cf::object::player
2562 cf::player peaceful 2753 player
2563 cf::map trigger 2754
2755 cf::player
2756 peaceful
2757
2758 cf::map
2759 trigger
2564 2760
2565=cut 2761=cut
2566 2762
2567for ( 2763for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)],
2569 ["cf::object::player" => qw(player)], 2766 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2767 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2768 ["cf::map" => qw(trigger)],
2572) { 2769) {
2573 no strict 'refs'; 2770 no strict 'refs';
… …
2665 { 2862 {
2666 my $faces = $facedata->{faceinfo}; 2863 my $faces = $facedata->{faceinfo};
2667 2864
2668 while (my ($face, $info) = each %$faces) { 2865 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2866 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2867 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2673 Coro::cede; 2871
2872 cf::cede_to_tick;
2674 } 2873 }
2675 2874
2676 while (my ($face, $info) = each %$faces) { 2875 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2876 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2877 my $idx = cf::face::find $face
2679 or next; 2878 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2879 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2882 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2883 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2884 }
2685 Coro::cede; 2885
2886 cf::cede_to_tick;
2686 } 2887 }
2687 } 2888 }
2688 2889
2689 { 2890 {
2690 my $anims = $facedata->{animinfo}; 2891 my $anims = $facedata->{animinfo};
2691 2892
2692 while (my ($anim, $info) = each %$anims) { 2893 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2894 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2895 cf::cede_to_tick;
2695 } 2896 }
2696 2897
2697 cf::anim::invalidate_all; # d'oh 2898 cf::anim::invalidate_all; # d'oh
2698 } 2899 }
2699 2900
2901 {
2902 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908
2909 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2916
2917 if ($info->{type} & 1) {
2918 # prepend meta info
2919
2920 my $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2926 }
2927
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick;
2931 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 }
2951
2700 1 2952 1
2701} 2953}
2954
2955register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_;
2957
2958 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v);
2960 }
2961};
2702 2962
2703sub reload_regions { 2963sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2964 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2965 or die "unable to load regions file\n";
2966
2967 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/
2969 if exists $_->{match};
2970 }
2706} 2971}
2707 2972
2708sub reload_facedata { 2973sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2974 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2975 or die "unable to load facedata\n";
2711} 2976}
2712 2977
2713sub reload_archetypes { 2978sub reload_archetypes {
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981 #d# NEED to laod twice to resolve forward references
2982 # this really needs to be done in an extra post-pass
2983 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2984 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2985 or die "unable to load archetypes\n";
2716} 2986}
2717 2987
2718sub reload_treasures { 2988sub reload_treasures {

Diff Legend

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