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.39 by root, Fri Aug 25 13:24:50 2006 UTC vs.
Revision 1.63 by root, Fri Sep 8 17:41:41 2006 UTC

11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16_init_vars;
17
16our %COMMAND = (); 18our %COMMAND = ();
17our @EVENT; 19our @EVENT;
18our @PLUGIN_EVENT;
19our %PROP_TYPE;
20our %PROP_IDX;
21our $LIBDIR = maps_directory "perl"; 20our $LIBDIR = maps_directory "perl";
22 21
23our $TICK = MAX_TIME * 1e-6; 22our $TICK = MAX_TIME * 1e-6;
24our $TICK_WATCHER; 23our $TICK_WATCHER;
25our $NEXT_TICK; 24our $NEXT_TICK;
26 25
27BEGIN { 26BEGIN {
28 @PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
29
30 *CORE::GLOBAL::warn = sub { 27 *CORE::GLOBAL::warn = sub {
31 my $msg = join "", @_; 28 my $msg = join "", @_;
32 $msg .= "\n" 29 $msg .= "\n"
33 unless $msg =~ /\n$/; 30 unless $msg =~ /\n$/;
34 31
35 print STDERR "cfperl: $msg"; 32 print STDERR "cfperl: $msg";
36 LOG llevError, "cfperl: $msg"; 33 LOG llevError, "cfperl: $msg";
37 }; 34 };
38} 35}
39 36
40my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply! 37@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
41 38
42# generate property mutators 39# we bless all objects into (empty) derived classes to force a method lookup
43sub prop_gen { 40# within the Safe compartment.
44 my ($prefix, $class) = @_; 41for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
45
46 no strict 'refs'; 42 no strict 'refs';
47
48 for my $prop (keys %PROP_TYPE) {
49 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
50 my $sub = lc $1;
51
52 my $type = $PROP_TYPE{$prop};
53 my $idx = $PROP_IDX {$prop};
54
55 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
56 $_[0]->get_property ($type, $idx)
57 };
58
59 *{"$class\::set_$sub"} = sub {
60 $_[0]->set_property ($type, $idx, $_[1]);
61 } unless $ignore_set{$prop};
62 }
63}
64
65# auto-generate most of the API
66
67prop_gen OBJECT_PROP => "cf::object";
68# CFAPI_OBJECT_ANIMATION?
69prop_gen PLAYER_PROP => "cf::object::player";
70
71prop_gen MAP_PROP => "cf::map";
72prop_gen ARCH_PROP => "cf::arch";
73
74# guessed hierarchies
75
76@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
77@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
78
79# we bless all objects into derived classes to force a method lookup
80# within the Safe compartment.
81for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
82 no strict 'refs';
83 @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 43 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
84} 44}
85 45
86$Event::DIED = sub { 46$Event::DIED = sub {
87 warn "error in event callback: @_"; 47 warn "error in event callback: @_";
88}; 48};
92my @hook; 52my @hook;
93my %command; 53my %command;
94my %extcmd; 54my %extcmd;
95 55
96############################################################################# 56#############################################################################
57# utility functions
58
59use JSON::Syck (); # TODO# replace by JSON::PC once working
60
61sub from_json($) {
62 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
63 JSON::Syck::Load $_[0]
64}
65
66sub to_json($) {
67 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
68 JSON::Syck::Dump $_[0]
69}
70
71#############################################################################
97# "new" plug-in system 72# "new" plug-in system
98 73
99=item cf::object::attach ... # NYI 74=head3 EVENTS AND OBJECT ATTACHMENTS
100 75
76=over 4
77
78=item $object->attach ($attachment, key => $value...)
79
80=item $object->detach ($attachment)
81
82Attach/detach a pre-registered attachment to an object.
83
84=item $player->attach ($attachment, key => $value...)
85
86=item $player->detach ($attachment)
87
88Attach/detach a pre-registered attachment to a player.
89
90=item $map->attach ($attachment, key => $value...)
91
92=item $map->detach ($attachment)
93
94Attach/detach a pre-registered attachment to a map.
95
96=item $bool = $object->attached ($name)
97
98=item $bool = $player->attached ($name)
99
100=item $bool = $map->attached ($name)
101
102Checks wether the named attachment is currently attached to the object.
103
101=item cf::attach_global ... # NYI 104=item cf::attach_global ...
102 105
103=item cf::attach_to_type ... # NYI 106Attach handlers for global events.
104 107
108This and all following C<attach_*>-functions expect any number of the
109following handler/hook descriptions:
110
111=over 4
112
113=item prio => $number
114
115Set the priority for all following handlers/hooks (unless overwritten
116by another C<prio> setting). Lower priority handlers get executed
117earlier. The default priority is C<0>, and many built-in handlers are
118registered at priority C<-1000>, so lower priorities should not be used
119unless you know what you are doing.
120
121=item on_I<event> => \&cb
122
123Call the given code reference whenever the named event happens (event is
124something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
125handlers are recognised generally depends on the type of object these
126handlers attach to).
127
128See F<include/eventinc.h> for the full list of events supported, and their
129class.
130
131=item package => package::
132
133Look for sub functions of the name C<< on_I<event> >> in the given
134package and register them. Only handlers for eevents supported by the
135object/class are recognised.
136
137=back
138
139=item cf::attach_to_type $object_type, $subtype, ...
140
141Attach handlers for a specific object type (e.g. TRANSPORT) and
142subtype. If C<$subtype> is zero or undef, matches all objects of the given
143type.
144
105=item cf::attach_to_objects ... # NYI 145=item cf::attach_to_objects ...
106 146
147Attach handlers to all objects. Do not use this except for debugging or
148very rare events, as handlers are (obviously) called for I<all> objects in
149the game.
150
107=item cf::attach_to_players ... # NYI 151=item cf::attach_to_players ...
108 152
153Attach handlers to all players.
154
109=item cf::attach_to_maps ... # NYI 155=item cf::attach_to_maps ...
110 156
111 prio => $number, # higehr is earlier 157Attach handlers to all maps.
112 on_xxx => \&cb, 158
113 package => package::, 159=item cf:register_attachment $name, ...
160
161Register an attachment by name through which objects can refer to this
162attachment.
163
164=item cf:register_player_attachment $name, ...
165
166Register an attachment by name through which players can refer to this
167attachment.
168
169=item cf:register_map_attachment $name, ...
170
171Register an attachment by name through which maps can refer to this
172attachment.
114 173
115=cut 174=cut
116 175
117our %CB_CLASS = (); # registry for class-based events 176# the following variables are defined in .xs and must not be re-created
118our @CB_GLOBAL = (); # registry for all global events 177our @CB_GLOBAL = (); # registry for all global events
178our @CB_OBJECT = (); # all objects (should not be used except in emergency)
179our @CB_PLAYER = ();
119our @CB_TYPE = (); # registry for type (cf-object class) based events 180our @CB_TYPE = (); # registry for type (cf-object class) based events
181our @CB_MAP = ();
182
183my %attachment;
120 184
121sub _attach_cb($\%$$$) { 185sub _attach_cb($\%$$$) {
122 my ($registry, $undo, $event, $prio, $cb) = @_; 186 my ($registry, $undo, $event, $prio, $cb) = @_;
123 187
124 use sort 'stable'; 188 use sort 'stable';
133} 197}
134 198
135# attach handles attaching event callbacks 199# attach handles attaching event callbacks
136# the only thing the caller has to do is pass the correct 200# the only thing the caller has to do is pass the correct
137# registry (== where the callback attaches to). 201# registry (== where the callback attaches to).
138sub _attach(\@$\@) { 202sub _attach(\@$@) {
139 my ($registry, $klass, $arg) = @_; 203 my ($registry, $klass, @arg) = @_;
140 204
141 my $prio = 0; 205 my $prio = 0;
142 206
143 my %undo = ( 207 my %undo = (
144 registry => $registry, 208 registry => $registry,
145 cb => [], 209 cb => [],
146 ); 210 );
147 211
148 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT; 212 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
149 213
150 while (@$arg) { 214 while (@arg) {
151 my $type = shift @$arg; 215 my $type = shift @arg;
152 216
153 if ($type eq "prio") { 217 if ($type eq "prio") {
154 $prio = shift @$arg; 218 $prio = shift @arg;
155 219
156 } elsif ($type eq "package") { 220 } elsif ($type eq "package") {
157 my $pkg = shift @$arg; 221 my $pkg = shift @arg;
158 222
159 while (my ($name, $id) = each %cb_id) { 223 while (my ($name, $id) = each %cb_id) {
160 if (my $cb = $pkg->can ($name)) { 224 if (my $cb = $pkg->can ($name)) {
161 _attach_cb $registry, %undo, $id, $prio, $cb; 225 _attach_cb $registry, %undo, $id, $prio, $cb;
162 } 226 }
163 } 227 }
164 228
165 } elsif (exists $cb_id{$type}) { 229 } elsif (exists $cb_id{$type}) {
166 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg; 230 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
167 231
168 } elsif (ref $type) { 232 } elsif (ref $type) {
169 warn "attaching objects not supported, ignoring.\n"; 233 warn "attaching objects not supported, ignoring.\n";
170 234
171 } else { 235 } else {
172 shift @$arg; 236 shift @arg;
173 warn "attach argument '$type' not supported, ignoring.\n"; 237 warn "attach argument '$type' not supported, ignoring.\n";
174 } 238 }
175 } 239 }
176 240
177 \%undo 241 \%undo
178} 242}
179 243
244sub _attach_attachment {
245 my ($obj, $name, %arg) = @_;
246
247 return if exists $obj->{_attachment}{$name};
248
249 my $res;
250
251 if (my $attach = $attachment{$name}) {
252 my $registry = $obj->registry;
253
254 for (@$attach) {
255 my ($klass, @attach) = @$_;
256 $res = _attach @$registry, $klass, @attach;
257 }
258
259 $obj->{$name} = \%arg;
260 } else {
261 warn "object uses attachment '$name' that is not available, postponing.\n";
262 }
263
264 $obj->{_attachment}{$name} = undef;
265
266 $res->{attachment} = $name;
267 $res
268}
269
180sub cf::object::attach { 270*cf::object::attach =
181 die; 271*cf::player::attach =
182} 272*cf::map::attach = sub {
273 my ($obj, $name, %arg) = @_;
274
275 _attach_attachment $obj, $name, %arg;
276};
277
278# all those should be optimised
279*cf::object::detach =
280*cf::player::detach =
281*cf::map::detach = sub {
282 my ($obj, $name) = @_;
283
284 delete $obj->{_attachment}{$name};
285 reattach ($obj);
286};
287
288*cf::object::attached =
289*cf::player::attached =
290*cf::map::attached = sub {
291 my ($obj, $name) = @_;
292
293 exists $obj->{_attachment}{$name}
294};
183 295
184sub attach_global { 296sub attach_global {
185 _attach @CB_GLOBAL, KLASS_GLOBAL, @_ 297 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
186} 298}
187 299
188sub attach_type { 300sub attach_to_type {
189 my $type = shift; 301 my $type = shift;
190 _attach @{$CB_TYPE[$type]}, KLASS_MAP, @_ 302 my $subtype = shift;
303
304 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
191} 305}
192 306
193sub attach_to_objects { 307sub attach_to_objects {
194 _attach @{$CB_CLASS{cf::object::wrap::}}, KLASS_OBJECT, @_ 308 _attach @CB_OBJECT, KLASS_OBJECT, @_
195} 309}
196 310
197sub attach_to_players { 311sub attach_to_players {
198 _attach @{$CB_CLASS{cf::player::wrap::}}, KLASS_PLAYER, @_ 312 _attach @CB_PLAYER, KLASS_PLAYER, @_
199} 313}
200 314
201sub attach_to_maps { 315sub attach_to_maps {
202 _attach @{$CB_CLASS{cf::map::wrap::}}, KLASS_MAP, @_ 316 _attach @CB_MAP, KLASS_MAP, @_
317}
318
319sub register_attachment {
320 my $name = shift;
321
322 $attachment{$name} = [[KLASS_OBJECT, @_]];
323}
324
325sub register_player_attachment {
326 my $name = shift;
327
328 $attachment{$name} = [[KLASS_PLAYER, @_]];
329}
330
331sub register_map_attachment {
332 my $name = shift;
333
334 $attachment{$name} = [[KLASS_MAP, @_]];
203} 335}
204 336
205our $override; 337our $override;
338our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
206 339
207sub override() { 340sub override {
208 $override = 1 341 $override = 1;
342 @invoke_results = ();
209} 343}
210 344
211sub invoke { 345sub do_invoke {
212 my $event = shift; 346 my $event = shift;
347 my $callbacks = shift;
213 348
214 my @cb; 349 @invoke_results = ();
215
216 if (my $ref = ref $_[0]) {
217 # 1. object-specific (NYI)
218 # 2. class-specific
219 push @cb, @{$CB_CLASS{$ref}[$event] || []};
220 }
221
222 # global
223 push @cb, @{$CB_GLOBAL[$event] || []};
224
225# warn "invoke id $EVENT[$event][0], args <@_> <=> @cb\n";#d#
226 350
227 local $override; 351 local $override;
228 352
229 for (@cb) { 353 for (@$callbacks) {
230 eval { &{$_->[1]} }; 354 eval { &{$_->[1]} };
231 355
232 if ($@) { 356 if ($@) {
233 warn "$@"; 357 warn "$@";
234 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 358 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
239 } 363 }
240 364
241 0 365 0
242} 366}
243 367
368=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
369
370=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
371
372=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
373
374=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
375
376Generate a global/object/player/map-specific event with the given arguments.
377
378This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
379removed in future versions), and there is no public API to access override
380results (if you must, access C<@cf::invoke_results> directly).
381
382=back
383
384=head2 methods valid for all pointers
385
386=over 4
387
388=item $object->valid
389
390=item $player->valid
391
392=item $map->valid
393
394Just because you have a perl object does not mean that the corresponding
395C-level object still exists. If you try to access an object that has no
396valid C counterpart anymore you get an exception at runtime. This method
397can be used to test for existence of the C object part without causing an
398exception.
399
400=back
401
402=cut
403
404*cf::object::valid =
405*cf::player::valid =
406*cf::map::valid = \&cf::_valid;
407
408#############################################################################
409# object support
410
411sub instantiate {
412 my ($obj, $data) = @_;
413
414 $data = from_json $data;
415
416 for (@$data) {
417 my ($name, $args) = @$_;
418
419 $obj->attach ($name, %{$args || {} });
420 }
421}
422
423# basically do the same as instantiate, without calling instantiate
424sub reattach {
425 my ($obj) = @_;
426 my $registry = $obj->registry;
427
428 @$registry = ();
429
430 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
431
432 for my $name (keys %{ $obj->{_attachment} || {} }) {
433 if (my $attach = $attachment{$name}) {
434 for (@$attach) {
435 my ($klass, @attach) = @$_;
436 _attach @$registry, $klass, @attach;
437 }
438 } else {
439 warn "object uses attachment '$name' that is not available, postponing.\n";
440 }
441 }
442}
443
444sub object_freezer_save {
445 my ($filename, $rdata, $objs) = @_;
446
447 if (length $$rdata) {
448 warn sprintf "saving %s (%d,%d)\n",
449 $filename, length $$rdata, scalar @$objs;
450
451 if (open my $fh, ">:raw", "$filename~") {
452 chmod SAVE_MODE, $fh;
453 syswrite $fh, $$rdata;
454 close $fh;
455
456 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
457 chmod SAVE_MODE, $fh;
458 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
459 close $fh;
460 rename "$filename.pst~", "$filename.pst";
461 } else {
462 unlink "$filename.pst";
463 }
464
465 rename "$filename~", $filename;
466 } else {
467 warn "FATAL: $filename~: $!\n";
468 }
469 } else {
470 unlink $filename;
471 unlink "$filename.pst";
472 }
473}
474
475sub object_thawer_load {
476 my ($filename) = @_;
477
478 local $/;
479
480 my $av;
481
482 #TODO: use sysread etc.
483 if (open my $data, "<:raw:perlio", $filename) {
484 $data = <$data>;
485 if (open my $pst, "<:raw:perlio", "$filename.pst") {
486 $av = eval { (Storable::thaw <$pst>)->{objs} };
487 }
488 return ($data, $av);
489 }
490
491 ()
492}
493
494attach_to_objects
495 prio => -1000000,
496 on_clone => sub {
497 my ($src, $dst) = @_;
498
499 @{$dst->registry} = @{$src->registry};
500
501 %$dst = %$src;
502
503 %{$dst->{_attachment}} = %{$src->{_attachment}}
504 if exists $src->{_attachment};
505 },
506;
507
244############################################################################# 508#############################################################################
245# old plug-in events 509# old plug-in events
246 510
247sub inject_event { 511sub inject_event {
248 my $extension = shift; 512 my $extension = shift;
293} 557}
294 558
295sub register { 559sub register {
296 my ($base, $pkg) = @_; 560 my ($base, $pkg) = @_;
297 561
298 for my $idx (0 .. $#PLUGIN_EVENT) { 562 #TODO
299 if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
300 #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
301 $hook[$idx]{$base} = $ref;
302 }
303 }
304} 563}
305 564
306sub load_extension { 565sub load_extension {
307 my ($path) = @_; 566 my ($path) = @_;
308 567
309 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 568 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
310 my $base = $1; 569 my $base = $1;
311 my $pkg = $1; 570 my $pkg = $1;
312 $pkg =~ s/[^[:word:]]/_/g; 571 $pkg =~ s/[^[:word:]]/_/g;
313 $pkg = "cf::ext::$pkg"; 572 $pkg = "ext::$pkg";
314 573
315 warn "loading '$path' into '$pkg'\n"; 574 warn "loading '$path' into '$pkg'\n";
316 575
317 open my $fh, "<:utf8", $path 576 open my $fh, "<:utf8", $path
318 or die "$path: $!"; 577 or die "$path: $!";
339 my ($pkg) = @_; 598 my ($pkg) = @_;
340 599
341 warn "removing extension $pkg\n"; 600 warn "removing extension $pkg\n";
342 601
343 # remove hooks 602 # remove hooks
603 #TODO
344 for my $idx (0 .. $#PLUGIN_EVENT) { 604# for my $idx (0 .. $#PLUGIN_EVENT) {
345 delete $hook[$idx]{$pkg}; 605# delete $hook[$idx]{$pkg};
346 } 606# }
347 607
348 # remove commands 608 # remove commands
349 for my $name (keys %command) { 609 for my $name (keys %command) {
350 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 610 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
351 611
361 # remove extcmds 621 # remove extcmds
362 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 622 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
363 delete $extcmd{$name}; 623 delete $extcmd{$name};
364 } 624 }
365 625
366 if (my $cb = $pkg->can ("on_unload")) { 626 if (my $cb = $pkg->can ("unload")) {
367 eval { 627 eval {
368 $cb->($pkg); 628 $cb->($pkg);
369 1 629 1
370 } or warn "$pkg unloaded, but with errors: $@"; 630 } or warn "$pkg unloaded, but with errors: $@";
371 } 631 }
415 } 675 }
416 676
417 Symbol::delete_package $k; 677 Symbol::delete_package $k;
418 } 678 }
419 679
420 # 4. get rid of ext::, as good as possible 680 # 4. get rid of safe::, as good as possible
421 Symbol::delete_package "ext::$_" 681 Symbol::delete_package "safe::$_"
422 for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region); 682 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
423 683
424 # 5. remove register_script_function callbacks 684 # 5. remove register_script_function callbacks
425 # TODO 685 # TODO
426 686
427 # 6. unload cf.pm "a bit" 687 # 6. unload cf.pm "a bit"
428 delete $INC{"cf.pm"}; 688 delete $INC{"cf.pm"};
429 689
430 # don't, removes xs symbols, too 690 # don't, removes xs symbols, too,
691 # and global variables created in xs
431 #Symbol::delete_package __PACKAGE__; 692 #Symbol::delete_package __PACKAGE__;
432 693
433 # 7. reload cf.pm 694 # 7. reload cf.pm
434 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
435 require cf; 696 require cf;
697
698 $msg->("load extensions");
699 cf::load_extensions;
700
701 $msg->("reattach");
702 _global_reattach;
436 }; 703 };
437 $msg->($@) if $@; 704 $msg->($@) if $@;
438 705
439 $msg->("reloaded"); 706 $msg->("reloaded");
440}; 707};
456 }; 723 };
457 } 724 }
458}; 725};
459 726
460############################################################################# 727#############################################################################
461# utility functions
462
463use JSON::Syck (); # TODO# replace by JSON::PC once working
464
465sub from_json($) {
466 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
467 JSON::Syck::Load $_[0]
468}
469
470sub to_json($) {
471 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
472 JSON::Syck::Dump $_[0]
473}
474
475#############################################################################
476# extcmd framework, basically convert ext <msg> 728# extcmd framework, basically convert ext <msg>
477# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 729# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
478 730
479sub on_extcmd { 731attach_to_players
732 on_extcmd => sub {
480 my ($pl, $buf) = @_; 733 my ($pl, $buf) = @_;
481 734
482 my $msg = eval { from_json $buf }; 735 my $msg = eval { from_json $buf };
483 736
484 if (ref $msg) { 737 if (ref $msg) {
485 if (my $cb = $extcmd{$msg->{msgtype}}) { 738 if (my $cb = $extcmd{$msg->{msgtype}}) {
486 if (my %reply = $cb->[0]->($pl, $msg)) { 739 if (my %reply = $cb->[0]->($pl, $msg)) {
487 $pl->ext_reply ($msg->{msgid}, %reply); 740 $pl->ext_reply ($msg->{msgid}, %reply);
741 }
488 } 742 }
489 }
490 } else { 743 } else {
491 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 744 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
745 }
746
747 cf::override;
492 } 748 },
493 749;
494 1
495}
496 750
497############################################################################# 751#############################################################################
498# load/save/clean perl data associated with a map 752# load/save/clean perl data associated with a map
499 753
500*cf::mapsupport::on_clean = sub { 754*cf::mapsupport::on_clean = sub {
501 my ($map) = @_; 755 my ($map) = @_;
502 756
503 my $path = $map->tmpname; 757 my $path = $map->tmpname;
504 defined $path or return; 758 defined $path or return;
505 759
506 unlink "$path.cfperl"; 760 unlink "$path.pst";
507};
508
509*cf::mapsupport::on_swapin =
510*cf::mapsupport::on_load = sub {
511 my ($map) = @_;
512
513 my $path = $map->tmpname;
514 $path = $map->path unless defined $path;
515
516 open my $fh, "<:raw", "$path.cfperl"
517 or return; # no perl data
518
519 my $data = Storable::thaw do { local $/; <$fh> };
520
521 $data->{version} <= 1
522 or return; # too new
523
524 $map->_set_obs ($data->{obs});
525};
526
527*cf::mapsupport::on_swapout = sub {
528 my ($map) = @_;
529
530 my $path = $map->tmpname;
531 $path = $map->path unless defined $path;
532
533 my $obs = $map->_get_obs;
534
535 if (defined $obs) {
536 open my $fh, ">:raw", "$path.cfperl"
537 or die "$path.cfperl: $!";
538
539 stat $path;
540
541 print $fh Storable::nfreeze {
542 size => (stat _)[7],
543 time => (stat _)[9],
544 version => 1,
545 obs => $obs,
546 };
547
548 chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
549 } else {
550 unlink "$path.cfperl";
551 }
552}; 761};
553 762
554attach_to_maps prio => -10000, package => cf::mapsupport::; 763attach_to_maps prio => -10000, package => cf::mapsupport::;
555 764
556############################################################################# 765#############################################################################
558 767
559sub all_objects(@) { 768sub all_objects(@) {
560 @_, map all_objects ($_->inv), @_ 769 @_, map all_objects ($_->inv), @_
561} 770}
562 771
772# TODO: compatibility cruft, remove when no longer needed
563attach_to_players 773attach_to_players
564 on_load => sub { 774 on_load => sub {
565 my ($pl, $path) = @_; 775 my ($pl, $path) = @_;
566 776
567 for my $o (all_objects $pl->ob) { 777 for my $o (all_objects $pl->ob) {
569 $o->set_ob_key_value ("_perl_data"); 779 $o->set_ob_key_value ("_perl_data");
570 780
571 %$o = %{ Storable::thaw pack "H*", $value }; 781 %$o = %{ Storable::thaw pack "H*", $value };
572 } 782 }
573 } 783 }
574 },
575 on_save => sub {
576 my ($pl, $path) = @_;
577
578 $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
579 for grep %$_, all_objects $pl->ob;
580 }, 784 },
581; 785;
582 786
583############################################################################# 787#############################################################################
584# core extensions - in perl 788# core extensions - in perl
632} 836}
633 837
634############################################################################# 838#############################################################################
635# map scripting support 839# map scripting support
636 840
637our $safe = new Safe "ext"; 841our $safe = new Safe "safe";
638our $safe_hole = new Safe::Hole; 842our $safe_hole = new Safe::Hole;
639 843
640$SIG{FPE} = 'IGNORE'; 844$SIG{FPE} = 'IGNORE';
641 845
642$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 846$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
648 ["cf::object::player" => qw(player)], 852 ["cf::object::player" => qw(player)],
649 ["cf::player" => qw(peaceful)], 853 ["cf::player" => qw(peaceful)],
650) { 854) {
651 no strict 'refs'; 855 no strict 'refs';
652 my ($pkg, @funs) = @$_; 856 my ($pkg, @funs) = @$_;
653 *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 857 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
654 for @funs; 858 for @funs;
655} 859}
656 860
657sub safe_eval($;@) { 861sub safe_eval($;@) {
658 my ($code, %vars) = @_; 862 my ($code, %vars) = @_;
660 my $qcode = $code; 864 my $qcode = $code;
661 $qcode =~ s/"/‟/g; # not allowed in #line filenames 865 $qcode =~ s/"/‟/g; # not allowed in #line filenames
662 $qcode =~ s/\n/\\n/g; 866 $qcode =~ s/\n/\\n/g;
663 867
664 local $_; 868 local $_;
665 local @ext::cf::_safe_eval_args = values %vars; 869 local @safe::cf::_safe_eval_args = values %vars;
666 870
667 $code = 871 my $eval =
668 "do {\n" 872 "do {\n"
669 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 873 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
670 . "#line 0 \"{$qcode}\"\n" 874 . "#line 0 \"{$qcode}\"\n"
671 . $code 875 . $code
672 . "\n}" 876 . "\n}"
673 ; 877 ;
674 878
675 sub_generation_inc; 879 sub_generation_inc;
676 my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code); 880 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
677 sub_generation_inc; 881 sub_generation_inc;
882
883 if ($@) {
884 warn "$@";
885 warn "while executing safe code '$code'\n";
886 warn "with arguments " . (join " ", %vars) . "\n";
887 }
678 888
679 wantarray ? @res : $res[0] 889 wantarray ? @res : $res[0]
680} 890}
681 891
682sub register_script_function { 892sub register_script_function {
683 my ($fun, $cb) = @_; 893 my ($fun, $cb) = @_;
684 894
685 no strict 'refs'; 895 no strict 'refs';
686 *{"ext::$fun"} = $safe_hole->wrap ($cb); 896 *{"safe::$fun"} = $safe_hole->wrap ($cb);
687} 897}
688 898
689############################################################################# 899#############################################################################
690# the server's main() 900# the server's main()
691 901
692sub main { 902sub main {
903 load_extensions;
693 Event::loop; 904 Event::loop;
694} 905}
695 906
696############################################################################# 907#############################################################################
697# initialisation 908# initialisation
698 909
699register "<global>", __PACKAGE__; 910register "<global>", __PACKAGE__;
700 911
701unshift @INC, $LIBDIR; 912unshift @INC, $LIBDIR;
702
703load_extensions;
704 913
705$TICK_WATCHER = Event->timer ( 914$TICK_WATCHER = Event->timer (
706 prio => 1, 915 prio => 1,
707 at => $NEXT_TICK || 1, 916 at => $NEXT_TICK || 1,
708 cb => sub { 917 cb => sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines