@yuneta/gobj-js 7.13.7 → 7.13.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2297,7 +2297,9 @@ function gobj_change_state(gobj, state_name) {
2297
2297
  gobj.current_state = new_state;
2298
2298
  let tracea = is_machine_tracing(gobj, "EV_STATE_CHANGED");
2299
2299
  let tracea_states = __trace_gobj_states__(gobj) ? true : false;
2300
- if (tracea || tracea_states) trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
2300
+ if (tracea || tracea_states) {
2301
+ if (__trace_machine_format__ === 1) {} else trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
2302
+ }
2301
2303
  return true;
2302
2304
  }
2303
2305
  /***************************************************************************
@@ -2490,7 +2492,8 @@ function gobj_send_event(dst, event, kw, src) {
2490
2492
  if (dst.gclass.gmt.mt_inject_event) {
2491
2493
  __inside__--;
2492
2494
  if (tracea) {
2493
- trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
2495
+ if (__trace_machine_format__ === 1) trace_machine(sprintf("🔜 %s %s%s %s", event ? event : "", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name));
2496
+ else trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
2494
2497
  if (kw) {
2495
2498
  if (tracea > 1) {
2496
2499
  if (json_object_size(kw)) trace_json(kw);
@@ -2871,8 +2874,9 @@ function gobj_publish_event(publisher, event, kw) {
2871
2874
  }
2872
2875
  let tracea = __yuno__ && gobj_read_bool_attr(__yuno__, "trace_subscriptions");
2873
2876
  if (tracea) {
2874
- trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
2875
- trace_json(kw);
2877
+ if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔝 %s %s%s %s", event ? event : "", !publisher.running ? "!!" : "", gobj_short_name(publisher), publisher.current_state.state_name));
2878
+ else trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
2879
+ if (json_object_size(kw)) trace_json(kw);
2876
2880
  }
2877
2881
  if (publisher.gclass.gmt.mt_publish_event) {
2878
2882
  let topublish = publisher.gclass.gmt.mt_publish_event(publisher, event, kw);
@@ -2919,8 +2923,9 @@ function gobj_publish_event(publisher, event, kw) {
2919
2923
  if (__config__) {}
2920
2924
  if (__global__) json_object_update(kw2publish, __global__);
2921
2925
  if (tracea) {
2922
- trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
2923
- trace_json(kw2publish);
2926
+ if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔄 %s (%s) %s%s", event ? event : "", event ? event : "", !subscriber.running ? "!!" : "", gobj_short_name(subscriber)));
2927
+ else trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
2928
+ if (json_object_size(kw2publish)) trace_json(kw2publish);
2924
2929
  }
2925
2930
  let ret_ = gobj_send_event(subscriber, event, kw2publish, publisher);
2926
2931
  if (ret_ < 0 && subs_flag & subs_flag_t.__own_event__) {