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.223 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.238 by root, Sat Apr 14 07:23:00 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
19 22
20use BDB (); 23use BDB ();
21use Data::Dumper; 24use Data::Dumper;
22use Digest::MD5; 25use Digest::MD5;
23use Fcntl; 26use Fcntl;
27use YAML::Syck ();
24use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 29use Time::HiRes;
27use Compress::LZF; 30use Compress::LZF;
28 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 37
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 39
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
37 42
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 46
40our %COMMAND = (); 47our %COMMAND = ();
41our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
42 49
43our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
… …
203 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
204 $d 211 $d
205 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
206} 213}
207 214
208use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
209 216
210=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
211 218
212Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
213 220
214=cut
215
216sub from_json($) {
217 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
218 JSON::Syck::Load $_[0]
219}
220
221=item $json = cf::to_json $ref 221=item $json = cf::to_json $ref
222 222
223Converts a perl data structure into its JSON representation. 223Converts a perl data structure into its JSON representation.
224
225=cut
226
227sub to_json($) {
228 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
229 JSON::Syck::Dump $_[0]
230}
231 224
232=item cf::lock_wait $string 225=item cf::lock_wait $string
233 226
234Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
235 228
… …
380 373
381 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
382 and return; 375 and return;
383 376
384 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
385} 389}
386 390
387=back 391=back
388 392
389=cut 393=cut
… …
961} 965}
962 966
963sub path($) { 967sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
965 969
966 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
967} 971}
968 972
969sub find_active($) { 973sub find_active($) {
970 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
971 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
984 my $login = $_[0]; 988 my $login = $_[0];
985 989
986 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
987 991
988 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
989 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
990 or return; 1001 or return;
991 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
992 } 1003 }
993 } 1004 }
… …
1122 } 1133 }
1123 1134
1124 \@paths 1135 \@paths
1125} 1136}
1126 1137
1127=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1128 1139
1129Sends an ext reply to the player. 1140Sends an ext reply to the player.
1130 1141
1131=cut 1142=cut
1132 1143
1133sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1134 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1135 1146
1136 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1137 1148
1138 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1139} 1150}
1140 1151
1141package cf; 1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1162}
1163
1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1142 1192
1143=back 1193=back
1144
1145 1194
1146=head3 cf::map 1195=head3 cf::map
1147 1196
1148=over 4 1197=over 4
1149 1198
… …
1380 $self->load_header_orig 1429 $self->load_header_orig
1381 or return; 1430 or return;
1382 $self->prepare_orig; 1431 $self->prepare_orig;
1383 } 1432 }
1384 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1385 1 1437 1
1386} 1438}
1387 1439
1388sub find; 1440sub find;
1389sub find { 1441sub find {
… …
1951 2003
1952 return unless $self->type == cf::PLAYER; 2004 return unless $self->type == cf::PLAYER;
1953 2005
1954 if ($exit->slaying eq "/!") { 2006 if ($exit->slaying eq "/!") {
1955 #TODO: this should de-fi-ni-te-ly not be a sync-job 2007 #TODO: this should de-fi-ni-te-ly not be a sync-job
2008 # the problem is that $exit might not survive long enough
2009 # so it needs to be done right now, right here
1956 cf::sync_job { prepare_random_map $exit }; 2010 cf::sync_job { prepare_random_map $exit };
1957 } 2011 }
1958 2012
1959 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1960 my $hp = $exit->stats->hp; 2014 my $hp = $exit->stats->hp;
… …
1968 $self->goto ($slaying, $hp, $sp); 2022 $self->goto ($slaying, $hp, $sp);
1969 2023
1970 1; 2024 1;
1971 }) { 2025 }) {
1972 $self->message ("Something went wrong deep within the crossfire server. " 2026 $self->message ("Something went wrong deep within the crossfire server. "
1973 . "I'll try to bring you back to the map you were before. " 2027 . "I'll try to bring you back to the map you were before. "
1974 . "Please report this to the dungeon master!", 2028 . "Please report this to the dungeon master!",
1975 cf::NDI_UNIQUE | cf::NDI_RED); 2029 cf::NDI_UNIQUE | cf::NDI_RED);
1976 2030
1977 warn "ERROR in enter_exit: $@"; 2031 warn "ERROR in enter_exit: $@";
1978 $self->leave_link; 2032 $self->leave_link;
1979 } 2033 }
1980 })->prio (1); 2034 })->prio (1);
… …
1993 2047
1994sub cf::client::send_drawinfo { 2048sub cf::client::send_drawinfo {
1995 my ($self, $text, $flags) = @_; 2049 my ($self, $text, $flags) = @_;
1996 2050
1997 utf8::encode $text; 2051 utf8::encode $text;
1998 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2052 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1999} 2053}
2000 2054
2055=item $client->ext_event ($type, %msg)
2056
2057Sends an exti event to the client.
2058
2059=cut
2060
2061sub cf::client::ext_event($$%) {
2062 my ($self, $type, %msg) = @_;
2063
2064 $msg{msgtype} = "event_$type";
2065 $self->send_packet ("ext " . cf::to_json \%msg);
2066}
2001 2067
2002=item $success = $client->query ($flags, "text", \&cb) 2068=item $success = $client->query ($flags, "text", \&cb)
2003 2069
2004Queues a query to the client, calling the given callback with 2070Queues a query to the client, calling the given callback with
2005the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2071the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2102 2168
2103# here we export the classes and methods available to script code 2169# here we export the classes and methods available to script code
2104 2170
2105=pod 2171=pod
2106 2172
2107The following fucntions and emthods are available within a safe environment: 2173The following functions and methods are available within a safe environment:
2108 2174
2109 cf::object contr pay_amount pay_player map 2175 cf::object contr pay_amount pay_player map
2110 cf::object::player player 2176 cf::object::player player
2111 cf::player peaceful 2177 cf::player peaceful
2112 cf::map trigger 2178 cf::map trigger
… …
2267} 2333}
2268 2334
2269############################################################################# 2335#############################################################################
2270# the server's init and main functions 2336# the server's init and main functions
2271 2337
2272sub load_faces { 2338sub load_facedata {
2273 my $path = sprintf "%s/faces", cf::datadir; 2339 my $path = sprintf "%s/facedata", cf::datadir;
2274 2340
2275 warn "loading faces from $path\n"; 2341 warn "loading facedata from $path\n";
2276 2342
2277 my $faces; 2343 my $facedata;
2278 0 < aio_load $path, $faces 2344 0 < aio_load $path, $facedata
2279 or die "$path: $!"; 2345 or die "$path: $!";
2280 2346
2281 Coro::cede;
2282 $faces = Storable::thaw $faces; 2347 $facedata = Coro::Storable::thaw $facedata;
2283 Coro::cede;
2284 2348
2349 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351
2352 {
2353 my $faces = $facedata->{faceinfo};
2354
2285 while (my ($face, $info) = each %$faces) { 2355 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2356 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2289 Coro::cede; 2360 Coro::cede;
2361 }
2362
2363 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth};
2365 my $idx = cf::face::find $face
2366 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) {
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2369 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 }
2372 Coro::cede;
2373 }
2374 }
2375
2376 {
2377 my $anims = $facedata->{animinfo};
2378
2379 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede;
2382 }
2383
2384 cf::anim::invalidate_all; # d'oh
2290 } 2385 }
2291 2386
2292 1 2387 1
2293} 2388}
2294 2389
2295sub reload_resources { 2390sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2297 or die "unable to load regions file\n";#d# 2392 or die "unable to load regions file\n";#d#
2298 load_faces 2393 load_facedata
2299 or die "unable to load faces\n";#d# 2394 or die "unable to load facedata\n";#d#
2300} 2395}
2301 2396
2302sub init { 2397sub init {
2303 reload_resources; 2398 reload_resources;
2304} 2399}

Diff Legend

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