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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
… …
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
… …
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 247 $d
238 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
239} 249}
240 250
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
250 265
251=item cf::lock_wait $string 266=item cf::lock_wait $string
252 267
253Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
254 269
… …
256 271
257Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
260returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
261 279
262Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
264 282
265=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
… …
306 my $guard = Coro::guard { 324 my $guard = Coro::guard {
307 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
308 }; 326 };
309 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
310 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
311} 385}
312 386
313=item cf::async { BLOCK } 387=item cf::async { BLOCK }
314 388
315Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
405=cut 479=cut
406 480
407sub fork_call(&@) { 481sub fork_call(&@) {
408 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
409 483
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 487
415 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 489 reset_signals;
428 local $SIG{__WARN__}; 490 &$cb
429 local $SIG{__DIE__}; 491 }, @args;
430 eval {
431 close $fh1;
432 492
433 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 494}
441 495
442=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
443 497
444Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
524 if (1) { 578 if (1) {
525 $md5 = 579 $md5 =
526 join "\x00", 580 join "\x00",
527 $processversion, 581 $processversion,
528 map { 582 map {
529 Coro::cede; 583 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 585 } 0.. $#$src;
532 586
533 587
534 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
840 "; 894 ";
841 die if $@; 895 die if $@;
842} 896}
843 897
844our $override; 898our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 900
847sub override { 901sub override {
848 $override = 1; 902 $override = 1;
849 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
850} 904}
851 905
852sub do_invoke { 906sub do_invoke {
853 my $event = shift; 907 my $event = shift;
854 my $callbacks = shift; 908 my $callbacks = shift;
855 909
856 @invoke_results = (); 910 @INVOKE_RESULTS = ();
857 911
858 local $override; 912 local $override;
859 913
860 for (@$callbacks) { 914 for (@$callbacks) {
861 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
878 932
879Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
880 934
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 938
885=back 939=back
886 940
887=cut 941=cut
888 942
889############################################################################# 943#############################################################################
890# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
891 956
892sub reattach { 957sub reattach {
893 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 959 my ($obj) = @_;
895 960
… …
939 }, 1004 },
940); 1005);
941 1006
942sub object_freezer_save { 1007sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
944 1011
945 sync_job { 1012 sync_job {
946 if (length $$rdata) { 1013 if (length $$rdata) {
947 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
972 } 1039 }
973 } else { 1040 } else {
974 aio_unlink $filename; 1041 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
976 } 1043 }
977 } 1044 };
1045
1046 undef $guard;
978} 1047}
979 1048
980sub object_freezer_as_string { 1049sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
982 1051
… …
987 1056
988sub object_thawer_load { 1057sub object_thawer_load {
989 my ($filename) = @_; 1058 my ($filename) = @_;
990 1059
991 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
992 1063
993 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
994 or return; 1065 or return;
995 1066
996 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
998 or return; 1069 or return;
1070
1071 undef $guard;
999 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1000 } 1073 }
1001 1074
1002 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1004 return ($data, $av); 1078 ($data, $av)
1005} 1079}
1006 1080
1007=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1008 1082
1009=over 4 1083=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1104}
1031 1105
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1107
1034Register a callback fro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
1035 1113
1036If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
1037called. 1115called.
1038 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
1039=cut 1128=cut
1040 1129
1041sub register_extcmd { 1130sub register_extcmd {
1042 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
1043 1132
1044 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
1045} 1140}
1046 1141
1047cf::player->attach ( 1142cf::player->attach (
1048 on_command => sub { 1143 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1153 cf::override;
1059 }, 1154 },
1060 on_extcmd => sub { 1155 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1062 1157
1063 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1159
1065 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1071 } else { 1175 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1177 }
1074 1178
1075 cf::override; 1179 cf::override;
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1317
1214 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1217 } 1327 }
1218 } 1328 }
1219} 1329}
1220 1330
… …
1230 1340
1231 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1233 1343
1234 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1235 Coro::cede; 1345 cf::cede_to_tick;
1236} 1346}
1237 1347
1238sub new($) { 1348sub new($) {
1239 my ($login) = @_; 1349 my ($login) = @_;
1240 1350
… …
1244 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1245 1355
1246 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1247 1357
1248 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1249} 1369}
1250 1370
1251=item $pl->quit_character 1371=item $pl->quit_character
1252 1372
1253Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1308 or return []; 1428 or return [];
1309 1429
1310 my @logins; 1430 my @logins;
1311 1431
1312 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1316 1441
1317 utf8::decode $login; 1442 utf8::decode $login;
1318 push @logins, $login; 1443 push @logins, $login;
1319 } 1444 }
1320 1445
… …
1347 } 1472 }
1348 1473
1349 \@paths 1474 \@paths
1350} 1475}
1351 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1352=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1353 1529
1354Sends an ext reply to the player. 1530Sends an ext reply to the player.
1355 1531
1356=cut 1532=cut
1357 1533
1358sub ext_reply($$%) { 1534sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1360 1536
1361 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1538}
1365 1539
1366=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1367 1541
1368Sends an ext event to the client. 1542Sends an ext event to the client.
1369 1543
1370=cut 1544=cut
1371 1545
1372sub ext_event($$%) { 1546sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1374 1548
1375 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1376} 1550}
1377 1551
1378=head3 cf::region 1552=head3 cf::region
1379 1553
1380=over 4 1554=over 4
… …
1393 my ($path) = @_; 1567 my ($path) = @_;
1394 1568
1395 my ($match, $specificity); 1569 my ($match, $specificity);
1396 1570
1397 for my $region (list) { 1571 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1401 } 1575 }
1402 } 1576 }
1403 1577
… …
1523 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1524 return $self; 1698 return $self;
1525 } 1699 }
1526 } 1700 }
1527 1701
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1703 ()
1530} 1704}
1531 1705
1532sub init { 1706sub init {
1533 my ($self) = @_; 1707 my ($self) = @_;
… …
1596 1770
1597sub load_header_from($) { 1771sub load_header_from($) {
1598 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1599 1773
1600 utf8::encode $path; 1774 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1606 1783
1607 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1608 1785
1609 1 1786 1
1610} 1787}
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1700 1877
1701 my $path = $self->{path}; 1878 my $path = $self->{path};
1702 1879
1703 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1704 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1705 1883
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1707 1885
1708 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1709 1887
1710 $self->alloc; 1888 $self->alloc;
1711 1889
1712 $self->pre_load; 1890 $self->pre_load;
1713 Coro::cede; 1891 cf::cede_to_tick;
1714 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1716 or return; 1896 or return;
1717 1897
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1720 1900
1721 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 1902 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 1905 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1726 } 1909 }
1727 } 1910 }
1728 1911
1729 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1730 # now do the right thing for maps 1915 # now do the right thing for maps
1731 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 1918 unless $self->difficulty;
1734 Coro::cede; 1919 cf::cede_to_tick;
1735 1920
1736 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 1922 $self->decay_objects;
1738 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1739 $self->update_buttons; 1924 $self->update_buttons;
1740 Coro::cede; 1925 cf::cede_to_tick;
1741 $self->set_darkness_map; 1926 $self->set_darkness_map;
1742 Coro::cede; 1927 cf::cede_to_tick;
1743 $self->activate; 1928 $self->activate;
1744 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1745 1933
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1935 }
1748 1936
1749 $self->post_load; 1937 $self->post_load;
… …
1760 1948
1761 $self 1949 $self
1762} 1950}
1763 1951
1764# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1953sub load_neighbours {
1766 my ($map) = @_; 1954 my ($map) = @_;
1767 1955
1768 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1769 1957
1770 for (0 .. 3) { 1958 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1772 or next; 1960 or next;
1773 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1774 or next; 1962 or next;
1775 $neigh->load; 1963 $neigh->load;
1776 1964
1965 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 1968 }
1780 1969
1781 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1783 or next; 1973 or next;
1784 $neigh->load; 1974 $neigh->load;
1785 } 1975 }
1786} 1976}
1787 1977
… …
1792} 1982}
1793 1983
1794sub do_load_sync { 1984sub do_load_sync {
1795 my ($map) = @_; 1985 my ($map) = @_;
1796 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1797 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1798} 1991}
1799 1992
1800our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1802 1995
1803sub find_async { 1996sub find_async {
1804 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1805 1998
1806 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1807 2000
1808 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 2003 }
1811 2004
1812 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1813 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2010 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2011 $map->load if $v;
2012 }
1819 2013
1820 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1821 } 2015 }
1822 } 2016 }
1823 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1824 }; 2018 };
1825 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1828} 2022}
1829 2023
1830sub save { 2024sub save {
1831 my ($self) = @_; 2025 my ($self) = @_;
1832 2026
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2028
1835 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1836 2030
1837 return unless $self->dirty; 2031 return unless $self->dirty;
1838 2032
… …
1861 my ($self) = @_; 2055 my ($self) = @_;
1862 2056
1863 # save first because save cedes 2057 # save first because save cedes
1864 $self->save; 2058 $self->save;
1865 2059
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2061
1868 return if $self->players; 2062 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1871 2065
… …
1923my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1924 2118
1925sub nuke { 2119sub nuke {
1926 my ($self) = @_; 2120 my ($self) = @_;
1927 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1928 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1929 2126
1930 $self->unlink_save; 2127 $self->unlink_save;
1931 2128
1932 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2134
1938 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1939 2137
1940 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
1941} 2139}
1942 2140
1943=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2019 2217
2020sub inv_recursive { 2218sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2022} 2220}
2023 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2024package cf; 2253package cf;
2025 2254
2026=back 2255=back
2027 2256
2028=head3 cf::object::player 2257=head3 cf::object::player
… …
2050 2279
2051 } else { 2280 } else {
2052 my $pl = $self->contr; 2281 my $pl = $self->contr;
2053 2282
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2286
2060 } else { 2287 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2063 } 2290 }
2064 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
2065} 2302}
2066 2303
2067=item $player_object->may ("access") 2304=item $player_object->may ("access")
2068 2305
2069Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2151 2388
2152 $map->load; 2389 $map->load;
2153 $map->load_diag; 2390 $map->load_neighbours;
2154 2391
2155 return unless $self->contr->active; 2392 return unless $self->contr->active;
2156 $self->activate_recursive; 2393 $self->activate_recursive;
2157 2394
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2160} 2397}
2161 2398
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2400
2164Moves the player to the given map-path and coordinates by first freezing 2401Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2403that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2404the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process.
2168 2406
2169=cut 2407=cut
2170 2408
2171our $GOTOGEN; 2409our $GOTOGEN;
2172 2410
2173sub cf::object::player::goto { 2411sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2413
2176 # do generation counting so two concurrent goto's will be executed in-order 2414 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2416
2179 $self->enter_link; 2417 $self->enter_link;
… …
2199 2437
2200 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2203 } 2441 }
2442
2443 $done->() if $done;
2204 })->prio (1); 2444 })->prio (1);
2205} 2445}
2206 2446
2207=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2208 2448
… …
2277 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2279 2519
2280 $self->enter_link; 2520 $self->enter_link;
2281 2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2282 (async { 2526 (async {
2283 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2528 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2286 2530
… …
2313 2557
2314 utf8::encode $text; 2558 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2560}
2317 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2318=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2319 2644
2320Sends an exti event to the client. 2645Sends an ext event to the client.
2321 2646
2322=cut 2647=cut
2323 2648
2324sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2326 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2329} 2676}
2330 2677
2331=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2332 2679
2333Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2683
2337Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2685become reliable at some point in the future.
2339 2686
2340=cut 2687=cut
2341 2688
2342sub cf::client::query { 2689sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2698 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2700
2354 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2356} 2705}
2357 2706
2358cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2359 on_reply => sub { 2713 on_reply => sub {
2360 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2361 2715
2362 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2363 # get handled first 2717 # get handled first
… …
2375 } else { 2729 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2731 }
2378 } 2732 }
2379 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2380); 2760);
2381 2761
2382=item $client->async (\&cb) 2762=item $client->async (\&cb)
2383 2763
2384Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2427 2807
2428$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2429 2809
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2431 2815
2432# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2433 2817
2434=pod 2818=pod
2435 2819
2436The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2437 2821
2438 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2439 cf::object::player player 2826 cf::object::player
2440 cf::player peaceful 2827 player
2441 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2442 2834
2443=cut 2835=cut
2444 2836
2445for ( 2837for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2447 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2450) { 2844) {
2451 no strict 'refs'; 2845 no strict 'refs';
… …
2527# the server's init and main functions 2921# the server's init and main functions
2528 2922
2529sub load_facedata($) { 2923sub load_facedata($) {
2530 my ($path) = @_; 2924 my ($path) = @_;
2531 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2532 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2533 2933
2534 my $facedata; 2934 my $facedata;
2535 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 2936 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2539 2939
2540 $facedata->{version} == 2 2940 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2543 { 2950 {
2544 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2545 2952
2546 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 2959
2960 cf::cede_to_tick;
2552 } 2961 }
2553 2962
2554 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2557 or next; 2966 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 2970 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 2972 }
2563 Coro::cede; 2973
2974 cf::cede_to_tick;
2564 } 2975 }
2565 } 2976 }
2566 2977
2567 { 2978 {
2568 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2569 2980
2570 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 2983 cf::cede_to_tick;
2573 } 2984 }
2574 2985
2575 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2576 } 2987 }
2577 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 }
3037
2578 1 3038 1
2579} 3039}
2580 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2581sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2582 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
2584} 3061}
2585 3062
2586sub reload_facedata { 3063sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2589} 3066}
2590 3067
2591sub reload_archetypes { 3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 3074 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 3075 or die "unable to load archetypes\n";
2594} 3076}
2595 3077
2596sub reload_treasures { 3078sub reload_treasures {
… …
2612 3094
2613sub init { 3095sub init {
2614 reload_resources; 3096 reload_resources;
2615} 3097}
2616 3098
2617sub cfg_load { 3099sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3101 or return;
2620 3102
2621 local $/; 3103 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2642 (async { 3124 (async {
2643 Event::one_event; 3125 Event::one_event;
2644 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2645 }; 3127 };
2646 3128
2647 cfg_load; 3129 reload_config;
2648 db_init; 3130 db_init;
2649 load_extensions; 3131 load_extensions;
2650 3132
2651 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2652 Event::loop; 3134 Event::loop;
… …
2790 %EXT_CORO = (); 3272 %EXT_CORO = ();
2791 3273
2792 warn "removing commands"; 3274 warn "removing commands";
2793 %COMMAND = (); 3275 %COMMAND = ();
2794 3276
2795 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2797 3280
2798 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2801 3284
… …
2844 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2845 require cf; 3328 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3330
2848 warn "loading config and database again"; 3331 warn "loading config and database again";
2849 cf::cfg_load; 3332 cf::reload_config;
2850 3333
2851 warn "loading extensions"; 3334 warn "loading extensions";
2852 cf::load_extensions; 3335 cf::load_extensions;
2853 3336
2854 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
2947 or die; 3430 or die;
2948 3431
2949 $map->width (50); 3432 $map->width (50);
2950 $map->height (50); 3433 $map->height (50);
2951 $map->alloc; 3434 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
2953 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
2954 3437
2955 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
2956 if ($t < $min) { 3439 if ($t < $min) {
2957 $min = $t; 3440 $min = $t;

Diff Legend

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