… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1149 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1150 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1151 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1153 | |
|
|
1154 | my @reply; |
|
|
1155 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1156 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1157 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1158 | } |
|
|
1159 | |
|
|
1160 | $pl->ext_reply ($reply, @reply) |
|
|
1161 | if $reply; |
|
|
1162 | |
1160 | } else { |
1163 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1164 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1165 | } |
1163 | |
1166 | |
1164 | cf::override; |
1167 | cf::override; |
… | |
… | |
1505 | =cut |
1508 | =cut |
1506 | |
1509 | |
1507 | sub ext_reply($$@) { |
1510 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1511 | my ($self, $id, @msg) = @_; |
1509 | |
1512 | |
1510 | if ($self->ns->extcmd == 2) { |
1513 | $self->ns->ext_reply ($id, @msg) |
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; |
|
|
1515 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1516 | } |
|
|
1517 | } |
1514 | } |
1518 | |
1515 | |
1519 | =item $player->ext_msg ($type, @msg) |
1516 | =item $player->ext_msg ($type, @msg) |
1520 | |
1517 | |
1521 | Sends an ext event to the client. |
1518 | Sends an ext event to the client. |
… | |
… | |
1950 | } |
1947 | } |
1951 | |
1948 | |
1952 | sub do_load_sync { |
1949 | sub do_load_sync { |
1953 | my ($map) = @_; |
1950 | my ($map) = @_; |
1954 | |
1951 | |
|
|
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1953 | if $Coro::current == $Coro::main; |
|
|
1954 | |
1955 | cf::sync_job { $map->load }; |
1955 | cf::sync_job { $map->load }; |
1956 | } |
1956 | } |
1957 | |
1957 | |
1958 | our %MAP_PREFETCH; |
1958 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1959 | our $MAP_PREFETCHER = undef; |
1960 | |
1960 | |
1961 | sub find_async { |
1961 | sub find_async { |
1962 | my ($path, $origin) = @_; |
1962 | my ($path, $origin, $load) = @_; |
1963 | |
1963 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1965 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1966 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1967 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1968 | } |
1969 | |
1969 | |
1970 | undef $MAP_PREFETCH{$path}; |
1970 | $MAP_PREFETCH{$path} |= $load; |
|
|
1971 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
1972 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
1973 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
1974 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
1975 | if (my $map = find $k) { |
1975 | $map->load; |
1976 | $map->load if $v; |
1976 | } |
1977 | } |
1977 | |
1978 | |
1978 | delete $MAP_PREFETCH{$path}; |
1979 | delete $MAP_PREFETCH{$k}; |
1979 | } |
1980 | } |
1980 | } |
1981 | } |
1981 | undef $MAP_PREFETCHER; |
1982 | undef $MAP_PREFETCHER; |
1982 | }; |
1983 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
1984 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
2557 | =cut |
2558 | =cut |
2558 | |
2559 | |
2559 | sub cf::client::ext_msg($$@) { |
2560 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2561 | my ($self, $type, @msg) = @_; |
2561 | |
2562 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2563 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2564 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2565 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2566 | push @msg, msgtype => "event_$type"; |
|
|
2567 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2568 | } |
|
|
2569 | } |
|
|
2570 | |
|
|
2571 | =item $client->ext_reply ($msgid, @msg) |
|
|
2572 | |
|
|
2573 | Sends an ext reply to the client. |
|
|
2574 | |
|
|
2575 | =cut |
|
|
2576 | |
|
|
2577 | sub cf::client::ext_reply($$@) { |
|
|
2578 | my ($self, $id, @msg) = @_; |
|
|
2579 | |
|
|
2580 | if ($self->extcmd == 2) { |
|
|
2581 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2582 | } elsif ($self->extcmd == 1) { |
|
|
2583 | #TODO: version 1, remove |
|
|
2584 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2586 | } |
2570 | } |
2587 | } |
2571 | |
2588 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2589 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2651 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2652 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2653 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2654 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2655 | |
|
|
2656 | my @reply; |
|
|
2657 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2658 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2659 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2660 | } |
|
|
2661 | |
|
|
2662 | $ns->ext_reply ($reply, @reply) |
|
|
2663 | if $reply; |
|
|
2664 | |
2645 | } else { |
2665 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2666 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2667 | } |
2648 | |
2668 | |
2649 | cf::override; |
2669 | cf::override; |
… | |
… | |
2710 | |
2730 | |
2711 | The following functions and methods are available within a safe environment: |
2731 | The following functions and methods are available within a safe environment: |
2712 | |
2732 | |
2713 | cf::object |
2733 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2734 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2735 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2736 | |
2717 | cf::object::player |
2737 | cf::object::player |
2718 | player |
2738 | player |
2719 | |
2739 | |
2720 | cf::player |
2740 | cf::player |
… | |
… | |
2725 | |
2745 | |
2726 | =cut |
2746 | =cut |
2727 | |
2747 | |
2728 | for ( |
2748 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2749 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2750 | insert remove inv name archname title slaying race |
|
|
2751 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2752 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2753 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2754 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2755 | ) { |
2735 | no strict 'refs'; |
2756 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2832 | # the server's init and main functions |
2812 | |
2833 | |
2813 | sub load_facedata($) { |
2834 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2835 | my ($path) = @_; |
2815 | |
2836 | |
|
|
2837 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2838 | |
2816 | warn "loading facedata from $path\n"; |
2839 | warn "loading facedata from $path\n"; |
2817 | |
2840 | |
2818 | my $facedata; |
2841 | my $facedata; |
2819 | 0 < aio_load $path, $facedata |
2842 | 0 < aio_load $path, $facedata |
2820 | or die "$path: $!"; |
2843 | or die "$path: $!"; |
2821 | |
2844 | |
2822 | $facedata = Coro::Storable::thaw $facedata; |
2845 | $facedata = Coro::Storable::thaw $facedata; |
2823 | |
2846 | |
2824 | $facedata->{version} == 2 |
2847 | $facedata->{version} == 2 |
2825 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2848 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2849 | |
|
|
2850 | # patch in the exptable |
|
|
2851 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2852 | type => FT_RSRC, |
|
|
2853 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2854 | }; |
|
|
2855 | cf::cede_to_tick; |
2826 | |
2856 | |
2827 | { |
2857 | { |
2828 | my $faces = $facedata->{faceinfo}; |
2858 | my $faces = $facedata->{faceinfo}; |
2829 | |
2859 | |
2830 | while (my ($face, $info) = each %$faces) { |
2860 | while (my ($face, $info) = each %$faces) { |
2831 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2861 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2832 | cf::face::set_visibility $idx, $info->{visibility}; |
2862 | cf::face::set_visibility $idx, $info->{visibility}; |
2833 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2863 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2834 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2864 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2835 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2865 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2836 | |
2866 | |
2837 | cf::cede_to_tick; |
2867 | cf::cede_to_tick; |
2838 | } |
2868 | } |
2839 | |
2869 | |
2840 | while (my ($face, $info) = each %$faces) { |
2870 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2865 | |
2895 | |
2866 | { |
2896 | { |
2867 | # TODO: for gcfclient pleasure, we should give resources |
2897 | # TODO: for gcfclient pleasure, we should give resources |
2868 | # that gcfclient doesn't grok a >10000 face index. |
2898 | # that gcfclient doesn't grok a >10000 face index. |
2869 | my $res = $facedata->{resource}; |
2899 | my $res = $facedata->{resource}; |
2870 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2871 | |
2900 | |
2872 | my $soundconf = delete $res->{"res/sound.conf"}; |
2901 | my $soundconf = delete $res->{"res/sound.conf"}; |
2873 | |
2902 | |
2874 | while (my ($name, $info) = each %$res) { |
2903 | while (my ($name, $info) = each %$res) { |
2875 | my $meta = $enc->encode ({ |
|
|
2876 | name => $name, |
|
|
2877 | %{ $info->{meta} || {} }, |
|
|
2878 | }); |
|
|
2879 | |
|
|
2880 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2904 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2905 | my $data; |
2881 | |
2906 | |
2882 | if ($info->{type} & 1) { |
2907 | if ($info->{type} & 1) { |
2883 | # prepend meta info |
2908 | # prepend meta info |
2884 | |
2909 | |
|
|
2910 | my $meta = $enc->encode ({ |
|
|
2911 | name => $name, |
|
|
2912 | %{ $info->{meta} || {} }, |
|
|
2913 | }); |
|
|
2914 | |
2885 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2915 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2886 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2887 | |
|
|
2888 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2889 | } else { |
2916 | } else { |
2890 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
2917 | $data = $info->{data}; |
2891 | } |
2918 | } |
2892 | |
2919 | |
|
|
2920 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2893 | cf::face::set_type $idx, $info->{type}; |
2921 | cf::face::set_type $idx, $info->{type}; |
2894 | |
2922 | |
2895 | cf::cede_to_tick; |
2923 | cf::cede_to_tick; |
2896 | } |
2924 | } |
2897 | |
2925 | |