… | |
… | |
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 | |
… | |
… | |
1029 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1036 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1030 | } |
1037 | } |
1031 | |
1038 | |
1032 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1039 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1033 | |
1040 | |
1034 | Register a callback fro execution when the client sends an extcmd packet. |
1041 | Register a callback for execution when the client sends an (synchronous) |
|
|
1042 | extcmd packet. Ext commands will be processed in the order they are |
|
|
1043 | received by the server, like other user commands. The first argument is |
|
|
1044 | the logged-in player. Ext commands can only be processed after a player |
|
|
1045 | has logged in successfully. |
1035 | |
1046 | |
1036 | If the callback returns something, it is sent back as if reply was being |
1047 | If the callback returns something, it is sent back as if reply was being |
1037 | called. |
1048 | called. |
1038 | |
1049 | |
|
|
1050 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
|
|
1051 | |
|
|
1052 | Register a callback for execution when the client sends an (asynchronous) |
|
|
1053 | exticmd packet. Exti commands are processed by the server as soon as they |
|
|
1054 | are received, i.e. out of order w.r.t. other commands. The first argument |
|
|
1055 | is a client socket. Exti commands can be received anytime, even before |
|
|
1056 | log-in. |
|
|
1057 | |
|
|
1058 | If the callback returns something, it is sent back as if reply was being |
|
|
1059 | called. |
|
|
1060 | |
1039 | =cut |
1061 | =cut |
1040 | |
1062 | |
1041 | sub register_extcmd { |
1063 | sub register_extcmd { |
1042 | my ($name, $cb) = @_; |
1064 | my ($name, $cb) = @_; |
1043 | |
1065 | |
1044 | $EXTCMD{$name} = $cb; |
1066 | $EXTCMD{$name} = $cb; |
|
|
1067 | } |
|
|
1068 | |
|
|
1069 | sub register_exticmd { |
|
|
1070 | my ($name, $cb) = @_; |
|
|
1071 | |
|
|
1072 | $EXTICMD{$name} = $cb; |
1045 | } |
1073 | } |
1046 | |
1074 | |
1047 | cf::player->attach ( |
1075 | cf::player->attach ( |
1048 | on_command => sub { |
1076 | on_command => sub { |
1049 | my ($pl, $name, $params) = @_; |
1077 | my ($pl, $name, $params) = @_; |
… | |
… | |
1058 | cf::override; |
1086 | cf::override; |
1059 | }, |
1087 | }, |
1060 | on_extcmd => sub { |
1088 | on_extcmd => sub { |
1061 | my ($pl, $buf) = @_; |
1089 | my ($pl, $buf) = @_; |
1062 | |
1090 | |
1063 | my $msg = eval { from_json $buf }; |
1091 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1064 | |
1092 | |
1065 | if (ref $msg) { |
1093 | if (ref $msg) { |
1066 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1094 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1067 | if (my %reply = $cb->($pl, $msg)) { |
1095 | if (my %reply = $cb->($pl, $msg)) { |
1068 | $pl->ext_reply ($msg->{msgid}, %reply); |
1096 | $pl->ext_reply ($msg->{msgid}, %reply); |
… | |
… | |
1372 | # replace G<male|female> tags |
1400 | # replace G<male|female> tags |
1373 | || s{G<([^>|]*)\|([^>]*)>}{ |
1401 | || s{G<([^>|]*)\|([^>]*)>}{ |
1374 | $self->gender ? $2 : $1 |
1402 | $self->gender ? $2 : $1 |
1375 | }ge |
1403 | }ge |
1376 | # replace H<hint text> |
1404 | # replace H<hint text> |
1377 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
1405 | || s{H<([^\>]*)>} |
|
|
1406 | { |
|
|
1407 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
|
|
1408 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
|
|
1409 | "") |
|
|
1410 | [$self->{hintmode}] |
|
|
1411 | }ge; |
1378 | |
1412 | |
1379 | # create single paragraphs (very hackish) |
1413 | # create single paragraphs (very hackish) |
1380 | s/(?<=\S)\n(?=\w)/ /g; |
1414 | s/(?<=\S)\n(?=\w)/ /g; |
1381 | |
1415 | |
|
|
1416 | # compress some whitespace |
|
|
1417 | 1 while s/\s*\n\s*\n\s*/\n/; |
|
|
1418 | |
1382 | $_ |
1419 | $_ |
|
|
1420 | } |
|
|
1421 | |
|
|
1422 | sub hintmode { |
|
|
1423 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1424 | $_[0]{hintmode} |
1383 | } |
1425 | } |
1384 | |
1426 | |
1385 | =item $player->ext_reply ($msgid, %msg) |
1427 | =item $player->ext_reply ($msgid, %msg) |
1386 | |
1428 | |
1387 | Sends an ext reply to the player. |
1429 | Sends an ext reply to the player. |
… | |
… | |
1390 | |
1432 | |
1391 | sub ext_reply($$%) { |
1433 | sub ext_reply($$%) { |
1392 | my ($self, $id, %msg) = @_; |
1434 | my ($self, $id, %msg) = @_; |
1393 | |
1435 | |
1394 | $msg{msgid} = $id; |
1436 | $msg{msgid} = $id; |
1395 | |
1437 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1396 | $self->send ("ext " . cf::to_json \%msg); |
|
|
1397 | } |
1438 | } |
1398 | |
1439 | |
1399 | =item $player->ext_event ($type, %msg) |
1440 | =item $player->ext_event ($type, %msg) |
1400 | |
1441 | |
1401 | Sends an ext event to the client. |
1442 | Sends an ext event to the client. |
… | |
… | |
2364 | my ($self, $color, $type, $msg, @extra) = @_; |
2405 | my ($self, $color, $type, $msg, @extra) = @_; |
2365 | |
2406 | |
2366 | $msg = $self->pl->expand_cfpod ($msg); |
2407 | $msg = $self->pl->expand_cfpod ($msg); |
2367 | |
2408 | |
2368 | if ($self->can_msg) { |
2409 | if ($self->can_msg) { |
2369 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2410 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); |
2370 | } else { |
2411 | } else { |
2371 | # replace some tags by gcfclient-compatible ones |
2412 | # replace some tags by gcfclient-compatible ones |
2372 | for ($msg) { |
2413 | for ($msg) { |
2373 | 1 while |
2414 | 1 while |
2374 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
2415 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
… | |
… | |
2389 | } |
2430 | } |
2390 | } |
2431 | } |
2391 | |
2432 | |
2392 | =item $client->ext_event ($type, %msg) |
2433 | =item $client->ext_event ($type, %msg) |
2393 | |
2434 | |
2394 | Sends an exti event to the client. |
2435 | Sends an ext event to the client. |
2395 | |
2436 | |
2396 | =cut |
2437 | =cut |
2397 | |
2438 | |
2398 | sub cf::client::ext_event($$%) { |
2439 | sub cf::client::ext_event($$%) { |
2399 | my ($self, $type, %msg) = @_; |
2440 | my ($self, $type, %msg) = @_; |
2400 | |
2441 | |
2401 | $msg{msgtype} = "event_$type"; |
2442 | $msg{msgtype} = "event_$type"; |
2402 | $self->send_packet ("ext " . cf::to_json \%msg); |
2443 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2403 | } |
2444 | } |
2404 | |
2445 | |
2405 | =item $success = $client->query ($flags, "text", \&cb) |
2446 | =item $success = $client->query ($flags, "text", \&cb) |
2406 | |
2447 | |
2407 | Queues a query to the client, calling the given callback with |
2448 | 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>, |
2449 | 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>. |
2450 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2410 | |
2451 | |
2411 | Queries can fail, so check the return code. Or don't, as queries will become |
2452 | Queries can fail, so check the return code. Or don't, as queries will |
2412 | reliable at some point in the future. |
2453 | become reliable at some point in the future. |
2413 | |
2454 | |
2414 | =cut |
2455 | =cut |
2415 | |
2456 | |
2416 | sub cf::client::query { |
2457 | sub cf::client::query { |
2417 | my ($self, $flags, $text, $cb) = @_; |
2458 | my ($self, $flags, $text, $cb) = @_; |
… | |
… | |
2425 | utf8::encode $text; |
2466 | utf8::encode $text; |
2426 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2467 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2427 | |
2468 | |
2428 | $self->send_packet ($self->{query_queue}[0][0]) |
2469 | $self->send_packet ($self->{query_queue}[0][0]) |
2429 | if @{ $self->{query_queue} } == 1; |
2470 | if @{ $self->{query_queue} } == 1; |
|
|
2471 | |
|
|
2472 | 1 |
2430 | } |
2473 | } |
2431 | |
2474 | |
2432 | cf::client->attach ( |
2475 | cf::client->attach ( |
|
|
2476 | on_connect => sub { |
|
|
2477 | my ($ns) = @_; |
|
|
2478 | |
|
|
2479 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2480 | }, |
2433 | on_reply => sub { |
2481 | on_reply => sub { |
2434 | my ($ns, $msg) = @_; |
2482 | my ($ns, $msg) = @_; |
2435 | |
2483 | |
2436 | # this weird shuffling is so that direct followup queries |
2484 | # this weird shuffling is so that direct followup queries |
2437 | # get handled first |
2485 | # get handled first |
… | |
… | |
2448 | $ns->send_packet ($ns->{query_queue}[0][0]); |
2496 | $ns->send_packet ($ns->{query_queue}[0][0]); |
2449 | } else { |
2497 | } else { |
2450 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2498 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2451 | } |
2499 | } |
2452 | } |
2500 | } |
|
|
2501 | }, |
|
|
2502 | on_exticmd => sub { |
|
|
2503 | my ($ns, $buf) = @_; |
|
|
2504 | |
|
|
2505 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
|
|
2506 | |
|
|
2507 | if (ref $msg) { |
|
|
2508 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
|
|
2509 | if (my %reply = $cb->($ns, $msg)) { |
|
|
2510 | $reply{msgid} = $msg->{msgid}; |
|
|
2511 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
|
|
2512 | } |
|
|
2513 | } |
|
|
2514 | } else { |
|
|
2515 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
|
|
2516 | } |
|
|
2517 | |
|
|
2518 | cf::override; |
2453 | }, |
2519 | }, |
2454 | ); |
2520 | ); |
2455 | |
2521 | |
2456 | =item $client->async (\&cb) |
2522 | =item $client->async (\&cb) |
2457 | |
2523 | |
… | |
… | |
2661 | load_facedata "$DATADIR/facedata" |
2727 | load_facedata "$DATADIR/facedata" |
2662 | or die "unable to load facedata\n"; |
2728 | or die "unable to load facedata\n"; |
2663 | } |
2729 | } |
2664 | |
2730 | |
2665 | sub reload_archetypes { |
2731 | sub reload_archetypes { |
|
|
2732 | load_resource_file "$DATADIR/archetypes" |
|
|
2733 | or die "unable to load archetypes\n"; |
|
|
2734 | #d# NEED to laod twice to resolve forward references |
|
|
2735 | # this really needs to be done in an extra post-pass |
|
|
2736 | # (which needs to be synchronous, so solve it differently) |
2666 | load_resource_file "$DATADIR/archetypes" |
2737 | load_resource_file "$DATADIR/archetypes" |
2667 | or die "unable to load archetypes\n"; |
2738 | or die "unable to load archetypes\n"; |
2668 | } |
2739 | } |
2669 | |
2740 | |
2670 | sub reload_treasures { |
2741 | sub reload_treasures { |
… | |
… | |
2864 | %EXT_CORO = (); |
2935 | %EXT_CORO = (); |
2865 | |
2936 | |
2866 | warn "removing commands"; |
2937 | warn "removing commands"; |
2867 | %COMMAND = (); |
2938 | %COMMAND = (); |
2868 | |
2939 | |
2869 | warn "removing ext commands"; |
2940 | warn "removing ext/exti commands"; |
2870 | %EXTCMD = (); |
2941 | %EXTCMD = (); |
|
|
2942 | %EXTICMD = (); |
2871 | |
2943 | |
2872 | warn "unloading/nuking all extensions"; |
2944 | warn "unloading/nuking all extensions"; |
2873 | for my $pkg (@EXTS) { |
2945 | for my $pkg (@EXTS) { |
2874 | warn "... unloading $pkg"; |
2946 | warn "... unloading $pkg"; |
2875 | |
2947 | |