@yuneta/gobj-js 7.6.6 → 7.7.0

package/dist/gobj-js.umd.js

@@ -389,6 +389,13 @@
 	function tab() {
 		return " ".repeat(Math.max(0, __inside__ * 2 - 1));
 	}
+	var __trace_machine_format__ = 0;
+	function gobj_set_trace_machine_format(format) {
+		__trace_machine_format__ = Number(format) === 1 ? 1 : 0;
+	}
+	function gobj_trace_machine_format() {
+		return __trace_machine_format__;
+	}
 	/************************************************************
 	*
 	************************************************************/
@@ -2121,9 +2128,12 @@
 			return -1;
 		}
 		if (tracea) {
-			let action_name = "";
-			if (event_action.action) action_name = get_function_name(event_action.action);
-			trace_machine(sprintf("🔄 mach(%s%s^%s), st: %s, ev: %s%s%s, ac: %s, from(%s%s^%s)", !dst.running ? "!!" : "", gobj_gclass_name(dst), gobj_name(dst), state.state_name, "", event ? event : "", "", action_name, src && !src.running ? "!!" : "", gobj_gclass_name(src), gobj_name(src)));
+			if (__trace_machine_format__ === 1) trace_machine(sprintf("🔄 %s %s%s %s from %s%s", event ? event : "", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, src && !src.running ? "!!" : "", gobj_short_name(src)));
+			else {
+				let action_name = "";
+				if (event_action.action) action_name = get_function_name(event_action.action);
+				trace_machine(sprintf("🔄 mach(%s%s^%s), st: %s, ev: %s%s%s, ac: %s, from(%s%s^%s)", !dst.running ? "!!" : "", gobj_gclass_name(dst), gobj_name(dst), state.state_name, "", event ? event : "", "", action_name, src && !src.running ? "!!" : "", gobj_gclass_name(src), gobj_name(src)));
+			}
 			if (kw) {
 				if (tracea > 1) {
 					if (json_object_size(kw)) trace_json(kw);
@@ -2135,7 +2145,7 @@
 		try {
 			if (event_action.action) ret = event_action.action(dst, event, kw, src);
 		} finally {}
-		if (tracea && !(dst.obflag & obflag_t.obflag_destroyed)) trace_machine(sprintf("<- mach(%s%s^%s), st: %s, ev: %s, ret: %d", !dst.running ? "!!" : "", gobj_gclass_name(dst), gobj_name(dst), dst.current_state.state_name, event ? event : "", is_number(ret) ? ret : 0));
+		if (tracea && __trace_machine_format__ !== 1 && !(dst.obflag & obflag_t.obflag_destroyed)) trace_machine(sprintf("<- mach(%s%s^%s), st: %s, ev: %s, ret: %d", !dst.running ? "!!" : "", gobj_gclass_name(dst), gobj_name(dst), dst.current_state.state_name, event ? event : "", is_number(ret) ? ret : 0));
 		__inside__--;
 		return ret;
 	}
@@ -2619,6 +2629,15 @@
 	var f_warning = _console.warn;
 	var f_info = _console.info;
 	var f_debug = _console.debug;
+	var __log_callback__ = null;
+	function set_log_callback(fn) {
+		__log_callback__ = typeof fn === "function" ? fn : null;
+	}
+	function emit_log_callback(level, msg, hora) {
+		if (__log_callback__) try {
+			__log_callback__(level, msg, hora);
+		} catch (e) {}
+	}
 	function set_remote_log_functions(remote_log_fn) {
 		if (remote_log_fn) {
 			f_error = remote_log_fn;
@@ -2658,6 +2677,7 @@
 			window.console.error("%c" + hora + " ERROR: " + String(msg), "color:red");
 			f_error(`${hora} ERROR: ${String(msg)}`);
 		}
+		emit_log_callback("error", msg, hora);
 	}
 	function log_warning(format) {
 		let msg = format_log(format);
@@ -2667,25 +2687,30 @@
 			window.console.warn("%c" + hora + " WARNING: " + String(msg), "color:yellow");
 			f_warning(`${hora} WARNING: ${String(msg)}`);
 		}
+		emit_log_callback("warning", msg, hora);
 	}
 	function log_info(format) {
 		let msg = format_log(format);
 		let hora = current_timestamp();
 		if (f_info) f_info("%c" + hora + " INFO: " + String(msg), "color:cyan");
+		emit_log_callback("info", msg, hora);
 	}
 	function log_debug(format) {
 		let msg = format_log(format);
 		let hora = current_timestamp();
 		if (f_debug) f_debug("%c" + hora + " DEBUG: " + String(msg), "color:silver");
+		emit_log_callback("debug", msg, hora);
 	}
 	function trace_msg(format) {
 		let msg = format_log(format);
 		let hora = current_timestamp();
 		if (f_debug) f_debug("%c" + hora + " MSG: " + String(msg), "color:cyan");
+		emit_log_callback("msg", msg, hora);
 	}
 	function trace_json(jn, msg) {
 		if (msg) window.console.warn("=====> " + msg);
 		window.console.dir(jn);
+		emit_log_callback("json", jn, current_timestamp());
 	}
 	/************************************************************
 	*  Duplicate an object (new references)
@@ -5484,13 +5509,7 @@
 		let priv = gobj.priv;
 		clear_timeout(priv.gobj_timer);
 		gobj_stop(priv.gobj_timer);
-		if (priv.websocket) {
-			priv.websocket.onopen = null;
-			priv.websocket.onmessage = null;
-			priv.websocket.onerror = null;
-			priv.websocket.onclose = null;
-			close_websocket(gobj);
-		}
+		if (priv.websocket) close_websocket(gobj);
 		return 0;
 	}
 	/***************************************************************
@@ -5624,6 +5643,7 @@
 			}, gobj);
 		};
 		websocket.onclose = (e) => {
+			if (gobj_is_destroying(gobj)) return;
 			if (!gobj_read_bool_attr(gobj_yuno(), "browser_beforeunload")) gobj_send_event(gobj, "EV_ON_CLOSE", {
 				url,
 				e
@@ -6232,6 +6252,7 @@
 	exports.gobj_send_event = gobj_send_event;
 	exports.gobj_services = gobj_services;
 	exports.gobj_set_bottom_gobj = gobj_set_bottom_gobj;
+	exports.gobj_set_trace_machine_format = gobj_set_trace_machine_format;
 	exports.gobj_short_name = gobj_short_name;
 	exports.gobj_start = gobj_start;
 	exports.gobj_start_children = gobj_start_children;
@@ -6242,6 +6263,7 @@
 	exports.gobj_stop_children = gobj_stop_children;
 	exports.gobj_stop_tree = gobj_stop_tree;
 	exports.gobj_subscribe_event = gobj_subscribe_event;
+	exports.gobj_trace_machine_format = gobj_trace_machine_format;
 	exports.gobj_unsubscribe_event = gobj_unsubscribe_event;
 	exports.gobj_unsubscribe_list = gobj_unsubscribe_list;
 	exports.gobj_walk_gobj_children = gobj_walk_gobj_children;
@@ -6344,6 +6366,7 @@
 	exports.safeSrc = safeSrc;
 	exports.sdata_flag_t = sdata_flag_t;
 	exports.send_http_json_post = send_http_json_post;
+	exports.set_log_callback = set_log_callback;
 	exports.set_remote_log_functions = set_remote_log_functions;
 	exports.set_timeout = set_timeout;
 	exports.set_timeout_periodic = set_timeout_periodic;