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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.315 by root, Mon Jul 23 17:53:55 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
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
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
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# 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,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
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 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1181 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1182 1145
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1147
1185 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
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1188 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1189 } 1158 if $reply;
1190 } 1159 }
1191 } else { 1160 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1162 }
1194 1163
… …
1364 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1365 1334
1366 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1367 1336
1368 $self 1337 $self
1338}
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 (@_);
1369} 1348}
1370 1349
1371=item $pl->quit_character 1350=item $pl->quit_character
1372 1351
1373Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1517sub hintmode { 1496sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1498 $_[0]{hintmode}
1520} 1499}
1521 1500
1522=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1523 1502
1524Sends an ext reply to the player. 1503Sends an ext reply to the player.
1525 1504
1526=cut 1505=cut
1527 1506
1528sub ext_reply($$%) { 1507sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1530 1509
1531 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1533} 1517}
1534 1518
1535=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1536 1520
1537Sends an ext event to the client. 1521Sends an ext event to the client.
1538 1522
1539=cut 1523=cut
1540 1524
1541sub ext_event($$%) { 1525sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1543 1527
1544 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1545} 1529}
1546 1530
1547=head3 cf::region 1531=head3 cf::region
1548 1532
1549=over 4 1533=over 4
… …
1910 $self->set_darkness_map; 1894 $self->set_darkness_map;
1911 Coro::cede; 1895 Coro::cede;
1912 $self->activate; 1896 $self->activate;
1913 } 1897 }
1914 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1903 }
1917 1904
1918 $self->post_load; 1905 $self->post_load;
1919} 1906}
… …
2219 2206
2220 } else { 2207 } else {
2221 my $pl = $self->contr; 2208 my $pl = $self->contr;
2222 2209
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2211 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2213
2232 } else { 2214 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2235 } 2217 }
2236 } 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 (@_);
2237} 2229}
2238 2230
2239=item $player_object->may ("access") 2231=item $player_object->may ("access")
2240 2232
2241Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
… …
2506sub cf::client::send_msg { 2498sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2499 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2500
2509 $msg = $self->pl->expand_cfpod ($msg); 2501 $msg = $self->pl->expand_cfpod ($msg);
2510 2502
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2504
2513 if (ref $channel) { 2505 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2506 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2507 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2508 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2509 $self->ext_msg (channel_info => $channel);
2518 } 2510 }
2519 2511
2520 $channel = $channel->{id}; 2512 $channel = $channel->{id};
2521 } 2513 }
2522 2514
2523 return unless @extra || length $msg; 2515 return unless @extra || length $msg;
2524 2516
2525 if ($self->can_msg) { 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
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2524 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 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
2539 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2543 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2544 } 2546 }
2545 } 2547 }
2546 } 2548 }
2547} 2549}
2548 2550
2549=item $client->ext_event ($type, %msg) 2551=item $client->ext_msg ($type, @msg)
2550 2552
2551Sends an ext event to the client. 2553Sends an ext event to the client.
2552 2554
2553=cut 2555=cut
2554 2556
2555sub cf::client::ext_event($$%) { 2557sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2558 my ($self, $type, @msg) = @_;
2557 2559
2558 return unless $self->extcmd; 2560 my $extcmd = $self->extcmd;
2559 2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2565 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2562} 2568}
2563 2569
2564=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
2565 2571
2566Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2627 my ($ns, $buf) = @_;
2622 2628
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2630
2625 if (ref $msg) { 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
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2637 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2638 my @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid}; 2639
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2640 $ns->ext_reply ($reply, @reply)
2630 } 2641 if $reply;
2631 } 2642 }
2632 } else { 2643 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2645 }
2635 2646
… …
2683our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2685 2696
2686$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2687 2698
2688$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));
2689 2704
2690# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2691 2706
2692=pod 2707=pod
2693 2708
2694The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2695 2710
2696 cf::object 2711 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2712 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2713 insert remove name archname title slaying race
2699 2714
2700 cf::object::player 2715 cf::object::player
2701 player 2716 player
2702 2717
2703 cf::player 2718 cf::player
… …
2708 2723
2709=cut 2724=cut
2710 2725
2711for ( 2726for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 2728 insert remove inv name archname title slaying race)],
2714 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2717) { 2732) {
2718 no strict 'refs'; 2733 no strict 'refs';
… …
2850 # TODO: for gcfclient pleasure, we should give resources 2865 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 2866 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 2867 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2854 2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2855 while (my ($name, $info) = each %$res) { 2872 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 2873 my $meta = $enc->encode ({
2857 name => $name, 2874 name => $name,
2858 type => $info->{type}, 2875 %{ $info->{meta} || {} },
2859 copyright => $info->{copyright}, #TODO#
2860 }); 2876 });
2861 2877
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863 2879
2864 if ($name =~ /\.jpg$/) { 2880 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2881 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2882
2867 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870 2885
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk; 2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2873 } 2889 }
2874 2890
2891 cf::face::set_type $idx, $info->{type};
2892
2875 cf::cede_to_tick; 2893 cf::cede_to_tick;
2876 } 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 }
2877 } 2913 }
2878 2914
2879 1 2915 1
2880} 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};
2881 2925
2882sub reload_regions { 2926sub reload_regions {
2883 load_resource_file "$MAPDIR/regions" 2927 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 2928 or die "unable to load regions file\n";
2885 2929

Diff Legend

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