… | |
… | |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
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 | |
24 | |
|
|
25 | use JSON::XS 1.4 (); |
25 | use BDB (); |
26 | use BDB (); |
26 | use Data::Dumper; |
27 | use Data::Dumper; |
27 | use Digest::MD5; |
28 | use Digest::MD5; |
28 | use Fcntl; |
29 | use Fcntl; |
29 | use YAML::Syck (); |
30 | use YAML::Syck (); |
… | |
… | |
49 | our %COMMAND = (); |
50 | our %COMMAND = (); |
50 | our %COMMAND_TIME = (); |
51 | our %COMMAND_TIME = (); |
51 | |
52 | |
52 | our @EXTS = (); # list of extension package names |
53 | our @EXTS = (); # list of extension package names |
53 | our %EXTCMD = (); |
54 | our %EXTCMD = (); |
|
|
55 | our %EXTICMD = (); |
54 | our %EXT_CORO = (); # coroutines bound to extensions |
56 | our %EXT_CORO = (); # coroutines bound to extensions |
55 | our %EXT_MAP = (); # pluggable maps |
57 | our %EXT_MAP = (); # pluggable maps |
56 | |
58 | |
57 | our $RELOAD; # number of reloads so far |
59 | our $RELOAD; # number of reloads so far |
58 | our @EVENT; |
60 | our @EVENT; |
… | |
… | |
236 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
238 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
237 | $d |
239 | $d |
238 | } || "[unable to dump $_[0]: '$@']"; |
240 | } || "[unable to dump $_[0]: '$@']"; |
239 | } |
241 | } |
240 | |
242 | |
241 | use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working |
|
|
242 | |
|
|
243 | =item $ref = cf::from_json $json |
243 | =item $ref = cf::from_json $json |
244 | |
244 | |
245 | Converts a JSON string into the corresponding perl data structure. |
245 | Converts a JSON string into the corresponding perl data structure. |
246 | |
246 | |
247 | =item $json = cf::to_json $ref |
247 | =item $json = cf::to_json $ref |
248 | |
248 | |
249 | Converts a perl data structure into its JSON representation. |
249 | Converts a perl data structure into its JSON representation. |
|
|
250 | |
|
|
251 | =cut |
|
|
252 | |
|
|
253 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
|
|
254 | |
|
|
255 | sub to_json ($) { $json_coder->encode ($_[0]) } |
|
|
256 | sub from_json ($) { $json_coder->decode ($_[0]) } |
250 | |
257 | |
251 | =item cf::lock_wait $string |
258 | =item cf::lock_wait $string |
252 | |
259 | |
253 | Wait until the given lock is available. See cf::lock_acquire. |
260 | Wait until the given lock is available. See cf::lock_acquire. |
254 | |
261 | |
… | |
… | |
414 | |
421 | |
415 | if (my $pid = fork) { |
422 | if (my $pid = fork) { |
416 | close $fh2; |
423 | close $fh2; |
417 | |
424 | |
418 | my $res = (Coro::Handle::unblock $fh1)->readline (undef); |
425 | my $res = (Coro::Handle::unblock $fh1)->readline (undef); |
|
|
426 | warn "pst<$res>" unless $res =~ /^pst/; |
419 | $res = Coro::Storable::thaw $res; |
427 | $res = Coro::Storable::thaw $res; |
420 | |
428 | |
421 | waitpid $pid, 0; # should not block anymore, we expect the child to simply behave |
429 | waitpid $pid, 0; # should not block anymore, we expect the child to simply behave |
422 | |
430 | |
423 | die $$res unless "ARRAY" eq ref $res; |
431 | Carp::confess $$res unless "ARRAY" eq ref $res; |
424 | |
432 | |
425 | return wantarray ? @$res : $res->[-1]; |
433 | return wantarray ? @$res : $res->[-1]; |
426 | } else { |
434 | } else { |
427 | reset_signals; |
435 | reset_signals; |
428 | local $SIG{__WARN__}; |
436 | local $SIG{__WARN__}; |
429 | local $SIG{__DIE__}; |
437 | local $SIG{__DIE__}; |
|
|
438 | local $Coro::idle; |
|
|
439 | $Coro::current->prio (Coro::PRIO_MAX); |
430 | eval { |
440 | eval { |
431 | close $fh1; |
441 | close $fh1; |
432 | |
442 | |
433 | my @res = eval { $cb->(@args) }; |
443 | my @res = eval { $cb->(@args) }; |
434 | syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); |
444 | |
|
|
445 | open my $fh, ">", \my $buf |
|
|
446 | or die "fork_call: cannot open fh-to-buf in child : $!"; |
|
|
447 | Storable::store_fd +($@ ? \"$@" : \@res), $fh; |
|
|
448 | close $fh; |
|
|
449 | |
|
|
450 | warn "writing ", length $buf; |
|
|
451 | my $x; |
|
|
452 | (length $buf) == ($x = syswrite $fh2, $buf) |
|
|
453 | or warn "error writing ".(length $buf)." != $x\n"; |
|
|
454 | close $fh2; |
435 | }; |
455 | }; |
436 | |
456 | |
437 | warn $@ if $@; |
457 | warn $@ if $@; |
438 | _exit 0; |
458 | _exit 0; |
439 | } |
459 | } |
… | |
… | |
1029 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1049 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1030 | } |
1050 | } |
1031 | |
1051 | |
1032 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1052 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1033 | |
1053 | |
1034 | Register a callback fro execution when the client sends an extcmd packet. |
1054 | Register a callback for execution when the client sends an (synchronous) |
|
|
1055 | extcmd packet. Ext commands will be processed in the order they are |
|
|
1056 | received by the server, like other user commands. The first argument is |
|
|
1057 | the logged-in player. Ext commands can only be processed after a player |
|
|
1058 | has logged in successfully. |
1035 | |
1059 | |
1036 | If the callback returns something, it is sent back as if reply was being |
1060 | If the callback returns something, it is sent back as if reply was being |
1037 | called. |
1061 | called. |
1038 | |
1062 | |
|
|
1063 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
|
|
1064 | |
|
|
1065 | Register a callback for execution when the client sends an (asynchronous) |
|
|
1066 | exticmd packet. Exti commands are processed by the server as soon as they |
|
|
1067 | are received, i.e. out of order w.r.t. other commands. The first argument |
|
|
1068 | is a client socket. Exti commands can be received anytime, even before |
|
|
1069 | log-in. |
|
|
1070 | |
|
|
1071 | If the callback returns something, it is sent back as if reply was being |
|
|
1072 | called. |
|
|
1073 | |
1039 | =cut |
1074 | =cut |
1040 | |
1075 | |
1041 | sub register_extcmd { |
1076 | sub register_extcmd { |
1042 | my ($name, $cb) = @_; |
1077 | my ($name, $cb) = @_; |
1043 | |
1078 | |
1044 | $EXTCMD{$name} = $cb; |
1079 | $EXTCMD{$name} = $cb; |
|
|
1080 | } |
|
|
1081 | |
|
|
1082 | sub register_exticmd { |
|
|
1083 | my ($name, $cb) = @_; |
|
|
1084 | |
|
|
1085 | $EXTICMD{$name} = $cb; |
1045 | } |
1086 | } |
1046 | |
1087 | |
1047 | cf::player->attach ( |
1088 | cf::player->attach ( |
1048 | on_command => sub { |
1089 | on_command => sub { |
1049 | my ($pl, $name, $params) = @_; |
1090 | my ($pl, $name, $params) = @_; |
… | |
… | |
1058 | cf::override; |
1099 | cf::override; |
1059 | }, |
1100 | }, |
1060 | on_extcmd => sub { |
1101 | on_extcmd => sub { |
1061 | my ($pl, $buf) = @_; |
1102 | my ($pl, $buf) = @_; |
1062 | |
1103 | |
1063 | my $msg = eval { from_json $buf }; |
1104 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1064 | |
1105 | |
1065 | if (ref $msg) { |
1106 | if (ref $msg) { |
1066 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1107 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1067 | if (my %reply = $cb->($pl, $msg)) { |
1108 | if (my %reply = $cb->($pl, $msg)) { |
1068 | $pl->ext_reply ($msg->{msgid}, %reply); |
1109 | $pl->ext_reply ($msg->{msgid}, %reply); |
… | |
… | |
1372 | # replace G<male|female> tags |
1413 | # replace G<male|female> tags |
1373 | || s{G<([^>|]*)\|([^>]*)>}{ |
1414 | || s{G<([^>|]*)\|([^>]*)>}{ |
1374 | $self->gender ? $2 : $1 |
1415 | $self->gender ? $2 : $1 |
1375 | }ge |
1416 | }ge |
1376 | # replace H<hint text> |
1417 | # replace H<hint text> |
1377 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
1418 | || s{H<([^\>]*)>} |
|
|
1419 | { |
|
|
1420 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
|
|
1421 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
|
|
1422 | "") |
|
|
1423 | [$self->{hintmode}] |
|
|
1424 | }ge; |
1378 | |
1425 | |
1379 | # create single paragraphs (very hackish) |
1426 | # create single paragraphs (very hackish) |
1380 | s/(?<=\S)\n(?=\w)/ /g; |
1427 | s/(?<=\S)\n(?=\w)/ /g; |
1381 | |
1428 | |
|
|
1429 | # compress some whitespace |
|
|
1430 | s/\s+\n/\n/g; # ws line-ends |
|
|
1431 | s/\n\n+/\n/g; # double lines |
|
|
1432 | s/^\n+//; # beginning lines |
|
|
1433 | s/\n+$//; # ending lines |
|
|
1434 | |
1382 | $_ |
1435 | $_ |
|
|
1436 | } |
|
|
1437 | |
|
|
1438 | sub hintmode { |
|
|
1439 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1440 | $_[0]{hintmode} |
1383 | } |
1441 | } |
1384 | |
1442 | |
1385 | =item $player->ext_reply ($msgid, %msg) |
1443 | =item $player->ext_reply ($msgid, %msg) |
1386 | |
1444 | |
1387 | Sends an ext reply to the player. |
1445 | Sends an ext reply to the player. |
… | |
… | |
1390 | |
1448 | |
1391 | sub ext_reply($$%) { |
1449 | sub ext_reply($$%) { |
1392 | my ($self, $id, %msg) = @_; |
1450 | my ($self, $id, %msg) = @_; |
1393 | |
1451 | |
1394 | $msg{msgid} = $id; |
1452 | $msg{msgid} = $id; |
1395 | |
1453 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1396 | $self->send ("ext " . cf::to_json \%msg); |
|
|
1397 | } |
1454 | } |
1398 | |
1455 | |
1399 | =item $player->ext_event ($type, %msg) |
1456 | =item $player->ext_event ($type, %msg) |
1400 | |
1457 | |
1401 | Sends an ext event to the client. |
1458 | Sends an ext event to the client. |
… | |
… | |
2313 | my $hp = $exit->stats->hp; |
2370 | my $hp = $exit->stats->hp; |
2314 | my $sp = $exit->stats->sp; |
2371 | my $sp = $exit->stats->sp; |
2315 | |
2372 | |
2316 | $self->enter_link; |
2373 | $self->enter_link; |
2317 | |
2374 | |
|
|
2375 | # if exit is damned, update players death & WoR home-position |
|
|
2376 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2377 | if $exit->flag (FLAG_DAMNED); |
|
|
2378 | |
2318 | (async { |
2379 | (async { |
2319 | $self->deactivate_recursive; # just to be sure |
2380 | $self->deactivate_recursive; # just to be sure |
2320 | unless (eval { |
2381 | unless (eval { |
2321 | $self->goto ($slaying, $hp, $sp); |
2382 | $self->goto ($slaying, $hp, $sp); |
2322 | |
2383 | |
… | |
… | |
2363 | sub cf::client::send_msg { |
2424 | sub cf::client::send_msg { |
2364 | my ($self, $color, $type, $msg, @extra) = @_; |
2425 | my ($self, $color, $type, $msg, @extra) = @_; |
2365 | |
2426 | |
2366 | $msg = $self->pl->expand_cfpod ($msg); |
2427 | $msg = $self->pl->expand_cfpod ($msg); |
2367 | |
2428 | |
|
|
2429 | return unless @extra || length $msg; |
|
|
2430 | |
2368 | if ($self->can_msg) { |
2431 | if ($self->can_msg) { |
2369 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2432 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); |
2370 | } else { |
2433 | } else { |
2371 | # replace some tags by gcfclient-compatible ones |
2434 | # replace some tags by gcfclient-compatible ones |
2372 | for ($msg) { |
2435 | for ($msg) { |
2373 | 1 while |
2436 | 1 while |
2374 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
2437 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
… | |
… | |
2380 | |
2443 | |
2381 | if ($color >= 0) { |
2444 | if ($color >= 0) { |
2382 | if (0 && $msg =~ /\[/) { |
2445 | if (0 && $msg =~ /\[/) { |
2383 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2446 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2384 | } else { |
2447 | } else { |
2385 | s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2448 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2386 | $self->send_packet ("drawinfo $color $msg") |
2449 | $self->send_packet ("drawinfo $color $msg") |
2387 | } |
2450 | } |
2388 | } |
2451 | } |
2389 | } |
2452 | } |
2390 | } |
2453 | } |
2391 | |
2454 | |
2392 | =item $client->ext_event ($type, %msg) |
2455 | =item $client->ext_event ($type, %msg) |
2393 | |
2456 | |
2394 | Sends an exti event to the client. |
2457 | Sends an ext event to the client. |
2395 | |
2458 | |
2396 | =cut |
2459 | =cut |
2397 | |
2460 | |
2398 | sub cf::client::ext_event($$%) { |
2461 | sub cf::client::ext_event($$%) { |
2399 | my ($self, $type, %msg) = @_; |
2462 | my ($self, $type, %msg) = @_; |
2400 | |
2463 | |
2401 | $msg{msgtype} = "event_$type"; |
2464 | $msg{msgtype} = "event_$type"; |
2402 | $self->send_packet ("ext " . cf::to_json \%msg); |
2465 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2403 | } |
2466 | } |
2404 | |
2467 | |
2405 | =item $success = $client->query ($flags, "text", \&cb) |
2468 | =item $success = $client->query ($flags, "text", \&cb) |
2406 | |
2469 | |
2407 | Queues a query to the client, calling the given callback with |
2470 | Queues a query to the client, calling the given callback with |
2408 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2471 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2409 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2472 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2410 | |
2473 | |
2411 | Queries can fail, so check the return code. Or don't, as queries will become |
2474 | Queries can fail, so check the return code. Or don't, as queries will |
2412 | reliable at some point in the future. |
2475 | become reliable at some point in the future. |
2413 | |
2476 | |
2414 | =cut |
2477 | =cut |
2415 | |
2478 | |
2416 | sub cf::client::query { |
2479 | sub cf::client::query { |
2417 | my ($self, $flags, $text, $cb) = @_; |
2480 | my ($self, $flags, $text, $cb) = @_; |
… | |
… | |
2425 | utf8::encode $text; |
2488 | utf8::encode $text; |
2426 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2489 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2427 | |
2490 | |
2428 | $self->send_packet ($self->{query_queue}[0][0]) |
2491 | $self->send_packet ($self->{query_queue}[0][0]) |
2429 | if @{ $self->{query_queue} } == 1; |
2492 | if @{ $self->{query_queue} } == 1; |
|
|
2493 | |
|
|
2494 | 1 |
2430 | } |
2495 | } |
2431 | |
2496 | |
2432 | cf::client->attach ( |
2497 | cf::client->attach ( |
|
|
2498 | on_connect => sub { |
|
|
2499 | my ($ns) = @_; |
|
|
2500 | |
|
|
2501 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2502 | }, |
2433 | on_reply => sub { |
2503 | on_reply => sub { |
2434 | my ($ns, $msg) = @_; |
2504 | my ($ns, $msg) = @_; |
2435 | |
2505 | |
2436 | # this weird shuffling is so that direct followup queries |
2506 | # this weird shuffling is so that direct followup queries |
2437 | # get handled first |
2507 | # get handled first |
… | |
… | |
2449 | } else { |
2519 | } else { |
2450 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2520 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2451 | } |
2521 | } |
2452 | } |
2522 | } |
2453 | }, |
2523 | }, |
|
|
2524 | on_exticmd => sub { |
|
|
2525 | my ($ns, $buf) = @_; |
|
|
2526 | |
|
|
2527 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
|
|
2528 | |
|
|
2529 | if (ref $msg) { |
|
|
2530 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
|
|
2531 | if (my %reply = $cb->($ns, $msg)) { |
|
|
2532 | $reply{msgid} = $msg->{msgid}; |
|
|
2533 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
|
|
2534 | } |
|
|
2535 | } |
|
|
2536 | } else { |
|
|
2537 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
|
|
2538 | } |
|
|
2539 | |
|
|
2540 | cf::override; |
|
|
2541 | }, |
2454 | ); |
2542 | ); |
2455 | |
2543 | |
2456 | =item $client->async (\&cb) |
2544 | =item $client->async (\&cb) |
2457 | |
2545 | |
2458 | Create a new coroutine, running the specified callback. The coroutine will |
2546 | Create a new coroutine, running the specified callback. The coroutine will |
… | |
… | |
2507 | |
2595 | |
2508 | =pod |
2596 | =pod |
2509 | |
2597 | |
2510 | The following functions and methods are available within a safe environment: |
2598 | The following functions and methods are available within a safe environment: |
2511 | |
2599 | |
2512 | cf::object contr pay_amount pay_player map |
2600 | cf::object |
|
|
2601 | contr pay_amount pay_player map x y force_find force_add |
|
|
2602 | insert remove |
|
|
2603 | |
2513 | cf::object::player player |
2604 | cf::object::player |
2514 | cf::player peaceful |
2605 | player |
2515 | cf::map trigger |
2606 | |
|
|
2607 | cf::player |
|
|
2608 | peaceful |
|
|
2609 | |
|
|
2610 | cf::map |
|
|
2611 | trigger |
2516 | |
2612 | |
2517 | =cut |
2613 | =cut |
2518 | |
2614 | |
2519 | for ( |
2615 | for ( |
2520 | ["cf::object" => qw(contr pay_amount pay_player map)], |
2616 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
|
|
2617 | insert remove)], |
2521 | ["cf::object::player" => qw(player)], |
2618 | ["cf::object::player" => qw(player)], |
2522 | ["cf::player" => qw(peaceful)], |
2619 | ["cf::player" => qw(peaceful)], |
2523 | ["cf::map" => qw(trigger)], |
2620 | ["cf::map" => qw(trigger)], |
2524 | ) { |
2621 | ) { |
2525 | no strict 'refs'; |
2622 | no strict 'refs'; |
… | |
… | |
2661 | load_facedata "$DATADIR/facedata" |
2758 | load_facedata "$DATADIR/facedata" |
2662 | or die "unable to load facedata\n"; |
2759 | or die "unable to load facedata\n"; |
2663 | } |
2760 | } |
2664 | |
2761 | |
2665 | sub reload_archetypes { |
2762 | sub reload_archetypes { |
|
|
2763 | load_resource_file "$DATADIR/archetypes" |
|
|
2764 | or die "unable to load archetypes\n"; |
|
|
2765 | #d# NEED to laod twice to resolve forward references |
|
|
2766 | # this really needs to be done in an extra post-pass |
|
|
2767 | # (which needs to be synchronous, so solve it differently) |
2666 | load_resource_file "$DATADIR/archetypes" |
2768 | load_resource_file "$DATADIR/archetypes" |
2667 | or die "unable to load archetypes\n"; |
2769 | or die "unable to load archetypes\n"; |
2668 | } |
2770 | } |
2669 | |
2771 | |
2670 | sub reload_treasures { |
2772 | sub reload_treasures { |
… | |
… | |
2864 | %EXT_CORO = (); |
2966 | %EXT_CORO = (); |
2865 | |
2967 | |
2866 | warn "removing commands"; |
2968 | warn "removing commands"; |
2867 | %COMMAND = (); |
2969 | %COMMAND = (); |
2868 | |
2970 | |
2869 | warn "removing ext commands"; |
2971 | warn "removing ext/exti commands"; |
2870 | %EXTCMD = (); |
2972 | %EXTCMD = (); |
|
|
2973 | %EXTICMD = (); |
2871 | |
2974 | |
2872 | warn "unloading/nuking all extensions"; |
2975 | warn "unloading/nuking all extensions"; |
2873 | for my $pkg (@EXTS) { |
2976 | for my $pkg (@EXTS) { |
2874 | warn "... unloading $pkg"; |
2977 | warn "... unloading $pkg"; |
2875 | |
2978 | |