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.308 by root, Mon Jul 16 14:09:40 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
… …
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 240 $d
239 } || "[unable to dump $_[0]: '$@']"; 241 } || "[unable to dump $_[0]: '$@']";
240} 242}
241 243
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
245 245
246Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
247 247
248=item $json = cf::to_json $ref 248=item $json = cf::to_json $ref
249 249
250Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
251 251
252=cut 252=cut
253 253
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 255
256sub to_json ($) { $json_coder->encode ($_[0]) } 256sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 257sub from_json ($) { $json_coder->decode ($_[0]) }
258 258
259=item cf::lock_wait $string 259=item cf::lock_wait $string
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 410Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 411never block itself or use any form of Event handling.
412 412
413=cut 413=cut
414 414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
415sub fork_call(&@) { 424sub fork_call(&@) {
416 my ($cb, @args) = @_; 425 my ($cb, @args) = @_;
417 426
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
419# or die "socketpair: $!"; 428# or die "socketpair: $!";
… …
422 431
423 if (my $pid = fork) { 432 if (my $pid = fork) {
424 close $fh2; 433 close $fh2;
425 434
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res; 437 $res = Coro::Storable::thaw $res;
428 438
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430 440
431 die $$res unless "ARRAY" eq ref $res; 441 Carp::confess $$res unless "ARRAY" eq ref $res;
432 442
433 return wantarray ? @$res : $res->[-1]; 443 return wantarray ? @$res : $res->[-1];
434 } else { 444 } else {
435 reset_signals; 445 reset_signals;
436 local $SIG{__WARN__}; 446 local $SIG{__WARN__};
437 local $SIG{__DIE__}; 447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
438 eval { 454 eval {
439 close $fh1; 455 close $fh1;
440 456
441 my @res = eval { $cb->(@args) }; 457 my @res = eval { $cb->(@args) };
458
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
443 }; 461 };
444 462
445 warn $@ if $@; 463 warn $@ if $@;
446 _exit 0; 464 _exit 0;
447 } 465 }
… …
1087 cf::override; 1105 cf::override;
1088 }, 1106 },
1089 on_extcmd => sub { 1107 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1108 my ($pl, $buf) = @_;
1091 1109
1092 my $msg = eval { from_json $buf }; 1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1111
1094 if (ref $msg) { 1112 if (ref $msg) {
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1114 if (my %reply = $cb->($pl, $msg)) {
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1115 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1401 # replace G<male|female> tags 1419 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1420 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1421 $self->gender ? $2 : $1
1404 }ge 1422 }ge
1405 # replace H<hint text> 1423 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1407 1431
1408 # create single paragraphs (very hackish) 1432 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1433 s/(?<=\S)\n(?=\w)/ /g;
1410 1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1411 $_ 1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1412} 1447}
1413 1448
1414=item $player->ext_reply ($msgid, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1415 1450
1416Sends an ext reply to the player. 1451Sends an ext reply to the player.
… …
1419 1454
1420sub ext_reply($$%) { 1455sub ext_reply($$%) {
1421 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1422 1457
1423 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1424 $self->send ("ext " . cf::to_json \%msg); 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1425} 1460}
1426 1461
1427=item $player->ext_event ($type, %msg) 1462=item $player->ext_event ($type, %msg)
1428 1463
1429Sends an ext event to the client. 1464Sends an ext event to the client.
… …
1454 my ($path) = @_; 1489 my ($path) = @_;
1455 1490
1456 my ($match, $specificity); 1491 my ($match, $specificity);
1457 1492
1458 for my $region (list) { 1493 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1494 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1495 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1496 if $region->specificity > $specificity;
1462 } 1497 }
1463 } 1498 }
1464 1499
… …
1584 $self->init; # pass $1 etc. 1619 $self->init; # pass $1 etc.
1585 return $self; 1620 return $self;
1586 } 1621 }
1587 } 1622 }
1588 1623
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1624 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1625 ()
1591} 1626}
1592 1627
1593sub init { 1628sub init {
1594 my ($self) = @_; 1629 my ($self) = @_;
… …
1872 1907
1873 undef $MAP_PREFETCH{$path}; 1908 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1909 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1910 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1911 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1912 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1913 $map->load;
1914 }
1880 1915
1881 delete $MAP_PREFETCH{$path}; 1916 delete $MAP_PREFETCH{$path};
1882 } 1917 }
1883 } 1918 }
1884 undef $MAP_PREFETCHER; 1919 undef $MAP_PREFETCHER;
… …
2221 2256
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
2224} 2259}
2225 2260
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2262
2228Moves the player to the given map-path and coordinates by first freezing 2263Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2264her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2265that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2266the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process.
2232 2268
2233=cut 2269=cut
2234 2270
2235our $GOTOGEN; 2271our $GOTOGEN;
2236 2272
2237sub cf::object::player::goto { 2273sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2274 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2275
2240 # do generation counting so two concurrent goto's will be executed in-order 2276 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2278
2243 $self->enter_link; 2279 $self->enter_link;
… …
2263 2299
2264 if ($gen == $self->{_goto_generation}) { 2300 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2301 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2302 $self->leave_link ($map, $x, $y);
2267 } 2303 }
2304
2305 $done->() if $done;
2268 })->prio (1); 2306 })->prio (1);
2269} 2307}
2270 2308
2271=item $player_object->enter_exit ($exit_object) 2309=item $player_object->enter_exit ($exit_object)
2272 2310
… …
2341 my $hp = $exit->stats->hp; 2379 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2380 my $sp = $exit->stats->sp;
2343 2381
2344 $self->enter_link; 2382 $self->enter_link;
2345 2383
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2346 (async { 2388 (async {
2347 $self->deactivate_recursive; # just to be sure 2389 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2390 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2391 $self->goto ($slaying, $hp, $sp);
2350 2392
… …
2391sub cf::client::send_msg { 2433sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2434 my ($self, $color, $type, $msg, @extra) = @_;
2393 2435
2394 $msg = $self->pl->expand_cfpod ($msg); 2436 $msg = $self->pl->expand_cfpod ($msg);
2395 2437
2438 return unless @extra || length $msg;
2439
2396 if ($self->can_msg) { 2440 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2398 } else { 2442 } else {
2399 # replace some tags by gcfclient-compatible ones 2443 # replace some tags by gcfclient-compatible ones
2400 for ($msg) { 2444 for ($msg) {
2401 1 while 2445 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2424=cut 2468=cut
2425 2469
2426sub cf::client::ext_event($$%) { 2470sub cf::client::ext_event($$%) {
2427 my ($self, $type, %msg) = @_; 2471 my ($self, $type, %msg) = @_;
2428 2472
2473 return unless $self->extcmd;
2474
2429 $msg{msgtype} = "event_$type"; 2475 $msg{msgtype} = "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2431} 2477}
2432 2478
2433=item $success = $client->query ($flags, "text", \&cb) 2479=item $success = $client->query ($flags, "text", \&cb)
2434 2480
2435Queues a query to the client, calling the given callback with 2481Queues a query to the client, calling the given callback with
… …
2458 2504
2459 1 2505 1
2460} 2506}
2461 2507
2462cf::client->attach ( 2508cf::client->attach (
2509 on_connect => sub {
2510 my ($ns) = @_;
2511
2512 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2513 },
2463 on_reply => sub { 2514 on_reply => sub {
2464 my ($ns, $msg) = @_; 2515 my ($ns, $msg) = @_;
2465 2516
2466 # this weird shuffling is so that direct followup queries 2517 # this weird shuffling is so that direct followup queries
2467 # get handled first 2518 # get handled first
… …
2482 } 2533 }
2483 }, 2534 },
2484 on_exticmd => sub { 2535 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2536 my ($ns, $buf) = @_;
2486 2537
2487 my $msg = eval { from_json $buf }; 2538 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2539
2489 if (ref $msg) { 2540 if (ref $msg) {
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2542 if (my %reply = $cb->($ns, $msg)) {
2492 $reply{msgid} = $msg->{msgid}; 2543 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply); 2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2494 } 2545 }
2495 } 2546 }
2496 } else { 2547 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2549 }
… …
2555 2606
2556=pod 2607=pod
2557 2608
2558The following functions and methods are available within a safe environment: 2609The following functions and methods are available within a safe environment:
2559 2610
2560 cf::object contr pay_amount pay_player map 2611 cf::object
2612 contr pay_amount pay_player map x y force_find force_add
2613 insert remove
2614
2561 cf::object::player player 2615 cf::object::player
2562 cf::player peaceful 2616 player
2563 cf::map trigger 2617
2618 cf::player
2619 peaceful
2620
2621 cf::map
2622 trigger
2564 2623
2565=cut 2624=cut
2566 2625
2567for ( 2626for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)],
2569 ["cf::object::player" => qw(player)], 2629 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2630 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2631 ["cf::map" => qw(trigger)],
2572) { 2632) {
2573 no strict 'refs'; 2633 no strict 'refs';
… …
2665 { 2725 {
2666 my $faces = $facedata->{faceinfo}; 2726 my $faces = $facedata->{faceinfo};
2667 2727
2668 while (my ($face, $info) = each %$faces) { 2728 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2729 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2730 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2673 Coro::cede; 2734
2735 cf::cede_to_tick;
2674 } 2736 }
2675 2737
2676 while (my ($face, $info) = each %$faces) { 2738 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2739 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2740 my $idx = cf::face::find $face
2679 or next; 2741 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2742 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2745 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2746 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2747 }
2685 Coro::cede; 2748
2749 cf::cede_to_tick;
2686 } 2750 }
2687 } 2751 }
2688 2752
2689 { 2753 {
2690 my $anims = $facedata->{animinfo}; 2754 my $anims = $facedata->{animinfo};
2691 2755
2692 while (my ($anim, $info) = each %$anims) { 2756 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2757 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2758 cf::cede_to_tick;
2695 } 2759 }
2696 2760
2697 cf::anim::invalidate_all; # d'oh 2761 cf::anim::invalidate_all; # d'oh
2762 }
2763
2764 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769
2770 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2782 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 }
2789
2790 cf::cede_to_tick;
2791 }
2698 } 2792 }
2699 2793
2700 1 2794 1
2701} 2795}
2702 2796
2703sub reload_regions { 2797sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2798 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2799 or die "unable to load regions file\n";
2800
2801 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/
2803 if exists $_->{match};
2804 }
2706} 2805}
2707 2806
2708sub reload_facedata { 2807sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2808 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2809 or die "unable to load facedata\n";
2711} 2810}
2712 2811
2713sub reload_archetypes { 2812sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2818 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2819 or die "unable to load archetypes\n";
2716} 2820}
2717 2821
2718sub reload_treasures { 2822sub reload_treasures {

Diff Legend

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