@yuneta/gobj-js 7.25.9 → 7.26.0

package/dist/gobj-js.cjs.js

@@ -158,7 +158,7 @@ function command_parser(gobj, command, kw, src) {}
 function build_command_response(gobj, result, comment, schema, data) {
 	return {
 		result,
-		comment: comment || {},
+		comment: comment || "",
 		schema: schema || {},
 		data: data || []
 	};
@@ -212,7 +212,7 @@ var __global_command_parser_fn__ = null;
 var __global_stats_parser_fn__ = null;
 var dl_global_event_types = [];
 var _gclass_register = Object.create(null);
-var __jn_services__ = {};
+var __jn_services__ = Object.create(null);
 var __yuno__ = null;
 var __default_service__ = null;
 var __inside__ = 0;
@@ -821,7 +821,8 @@ function set_default(gobj, sdata, it) {
 			if (!is_object(jn_value)) jn_value = {};
 			break;
 		case data_type_t.DTP_JSON:
-			if (is_string(svalue)) try {
+			if (svalue === "" || svalue === void 0) jn_value = null;
+			else if (is_string(svalue)) try {
 				jn_value = JSON.parse(svalue);
 			} catch (error) {
 				log_error(`JSON parse error: ${error.message}`);
@@ -856,11 +857,17 @@ function json2item(gobj, sdata, it, jn_value_) {
 			break;
 		case data_type_t.DTP_INTEGER:
 			jn_value2 = parseInt(jn_value_);
-			if (isNaN(jn_value2)) log_error(`${gobj_short_name(gobj)}: attr NaN: ${it.name}`);
+			if (isNaN(jn_value2)) {
+				log_error(`${gobj_short_name(gobj)}: attr NaN: ${it.name}`);
+				return -1;
+			}
 			break;
 		case data_type_t.DTP_REAL:
 			jn_value2 = Number(jn_value_);
-			if (isNaN(jn_value2)) log_error(`${gobj_short_name(gobj)}: attr NaN: ${it.name}`);
+			if (isNaN(jn_value2)) {
+				log_error(`${gobj_short_name(gobj)}: attr NaN: ${it.name}`);
+				return -1;
+			}
 			break;
 		case data_type_t.DTP_LIST:
 			if (is_string(jn_value_)) try {
@@ -887,15 +894,11 @@ function json2item(gobj, sdata, it, jn_value_) {
 			}
 			break;
 		case data_type_t.DTP_JSON:
+			jn_value2 = jn_value_;
 			if (is_string(jn_value_)) try {
 				jn_value2 = JSON.parse(jn_value_);
 			} catch (error) {
-				log_error(`JSON parse error: ${error.message}`);
-			}
-			else jn_value2 = jn_value_;
-			if (!is_array(jn_value2) && !is_object(jn_value2)) {
-				log_error(`attr must be a json dict/list: ${it.name}`);
-				return -1;
+				jn_value2 = jn_value_;
 			}
 			break;
 		case data_type_t.DTP_POINTER: jn_value2 = jn_value_;
@@ -1200,6 +1203,10 @@ function gobj_default_service() {
 *        find a service
 ************************************************************/
 function gobj_find_service(service_name, verbose) {
+	if (!is_string(service_name)) {
+		log_error(`gobj_find_service(): service name must be a string: ${service_name}`);
+		return null;
+	}
 	service_name = service_name.toLowerCase();
 	let service_gobj = __jn_services__[service_name];
 	if (!service_gobj) {
@@ -1357,9 +1364,10 @@ function gobj_create2(gobj_name, gclass_name, kw, parent, gobj_flag) {
 			return null;
 		}
 		if (is_string(parent)) {
-			parent = gobj_find_service(parent);
+			const parent_name = parent;
+			parent = gobj_find_service(parent_name);
 			if (!parent) {
-				log_warning(`parent service not found: ${parent}`);
+				log_warning(`parent service not found: ${parent_name}`);
 				return null;
 			}
 		}
@@ -1472,6 +1480,7 @@ function gobj_destroy(gobj) {
 		parent.gclass.gmt.mt_child_removed(parent, gobj);
 	}
 	if (gobj.gobj_flag & gobj_flag_t.gobj_flag_service) _deregister_service(gobj);
+	if (gobj === __default_service__) __default_service__ = null;
 	gobj_unsubscribe_list(gobj, gobj.dl_subscriptions, true);
 	gobj_unsubscribe_list(gobj, gobj.dl_subscribings, true);
 	if (parent) {
@@ -1817,7 +1826,7 @@ function gobj_set_bottom_gobj(gobj, bottom_gobj) {
 		log_error(`gobj NULL of bad type`);
 		return null;
 	}
-	if (gobj.bottom_gobj) log_warning(`${gobj_short_name(gobj)}: bottom_gobj already set`);
+	if (gobj.bottom_gobj && bottom_gobj) log_warning(`${gobj_short_name(gobj)}: bottom_gobj already set`);
 	gobj.bottom_gobj = bottom_gobj;
 }
 /***************************************************************************
@@ -2232,7 +2241,7 @@ function gobj_write_attr(gobj, path, value, src) {
 				jn_attrs[key] = value;
 				if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(key)) gobj.priv[key] = value;
 				if (gobj.obflag & obflag_t.obflag_created && !(gobj.obflag & obflag_t.obflag_destroyed)) {
-					if (gobj.mt_writing) gobj.mt_writing(gobj, key);
+					if (gobj.gclass.gmt.mt_writing) gobj.gclass.gmt.mt_writing(gobj, key);
 				}
 				return 0;
 			}
@@ -2256,8 +2265,8 @@ function sdata_write_default_values(gobj, include_flag, exclude_flag) {
 		if (!it.name) continue;
 		if (exclude_flag && it.flag & exclude_flag) continue;
 		if (include_flag === -1 || it.flag & include_flag) {
-			const value = set_default(gobj, gobj.jn_attrs, it);
-			if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(it.name)) gobj.priv[it.name] = value;
+			set_default(gobj, gobj.jn_attrs, it);
+			if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(it.name)) gobj.priv[it.name] = gobj.jn_attrs[it.name];
 			if (gobj.gclass.gmt.mt_writing) gobj.gclass.gmt.mt_writing(gobj, it.name);
 		}
 	}
@@ -2291,7 +2300,7 @@ function gobj_write_bool_attr(gobj, name, value) {
 	let hs = gobj_hsdata2(gobj, name, false);
 	if (hs) {
 		hs[name] = parseBoolean(value);
-		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = value;
+		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = hs[name];
 		if (gobj.obflag & obflag_t.obflag_created && !(gobj.obflag & obflag_t.obflag_destroyed)) {
 			if (gobj.gclass.gmt.mt_writing) gobj.gclass.gmt.mt_writing(gobj, name);
 		}
@@ -2307,7 +2316,7 @@ function gobj_write_integer_attr(gobj, name, value) {
 	let hs = gobj_hsdata2(gobj, name, false);
 	if (hs) {
 		hs[name] = parseInt(value);
-		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = value;
+		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = hs[name];
 		if (gobj.obflag & obflag_t.obflag_created && !(gobj.obflag & obflag_t.obflag_destroyed)) {
 			if (gobj.gclass.gmt.mt_writing) gobj.gclass.gmt.mt_writing(gobj, name);
 		}
@@ -2323,7 +2332,7 @@ function gobj_write_str_attr(gobj, name, value) {
 	let hs = gobj_hsdata2(gobj, name, false);
 	if (hs) {
 		hs[name] = String(value);
-		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = value;
+		if (is_object(gobj.priv) && gobj.priv.hasOwnProperty(name)) gobj.priv[name] = hs[name];
 		if (gobj.obflag & obflag_t.obflag_created && !(gobj.obflag & obflag_t.obflag_destroyed)) {
 			if (gobj.gclass.gmt.mt_writing) gobj.gclass.gmt.mt_writing(gobj, name);
 		}
@@ -2377,15 +2386,15 @@ function gobj_change_parent(gobj, parent) {
 		log_error(`${gobj_short_name(gobj)}: gobj_change_parent() BAD TYPE of parent`);
 		return -1;
 	}
-	if (gobj.parent && gobj.parent.mt_child_removed) gobj.parent.mt_child_removed(gobj.parent, gobj);
+	if (gobj.parent && gobj.parent.gclass.gmt.mt_child_removed) gobj.parent.gclass.gmt.mt_child_removed(gobj.parent, gobj);
 	if (gobj.parent) {
 		_remove_child(gobj.parent, gobj);
 		gobj.parent = null;
 	}
 	_add_child(parent, gobj);
-	if (parent.mt_child_added) {
+	if (parent.gclass.gmt.mt_child_added) {
 		if (__trace_gobj_create_delete__(gobj)) log_debug(sprintf("👦👦🔵 child_added(%s): %s", gobj_full_name(parent), gobj_short_name(gobj)));
-		parent.mt_child_added(parent, gobj);
+		parent.gclass.gmt.mt_child_added(parent, gobj);
 	}
 	return 0;
 }
@@ -2497,9 +2506,19 @@ function gobj_deliver_posted_events() {
 	let snapshot = __dl_posted_events__;
 	__dl_posted_events__ = [];
 	let delivered = 0;
-	for (let msg of snapshot) {
+	for (let i = 0; i < snapshot.length; i++) {
+		const msg = snapshot[i];
 		if (msg.dst.obflag & (obflag_t.obflag_destroyed | obflag_t.obflag_destroying)) continue;
-		gobj_send_event(msg.dst, msg.event, msg.kw, msg.src);
+		try {
+			gobj_send_event(msg.dst, msg.event, msg.kw, msg.src);
+		} catch (e) {
+			__dl_posted_events__ = snapshot.slice(i + 1).concat(__dl_posted_events__);
+			if (__dl_posted_events__.length > 0 && !__posted_events_scheduled__) {
+				__posted_events_scheduled__ = true;
+				setTimeout(gobj_deliver_posted_events, 0);
+			}
+			throw e;
+		}
 		delivered++;
 	}
 	if (__dl_posted_events__.length > 0 && !__posted_events_scheduled__) {
@@ -2577,7 +2596,16 @@ function gobj_send_event(dst, event, kw, src) {
 	let ret = -1;
 	try {
 		if (event_action.action) ret = event_action.action(dst, event, kw, src);
-	} finally {}
+	} catch (e) {
+		__inside__--;
+		if (!(e && e.__gobj_logged__)) {
+			log_error(`${gobj_short_name(dst)}: action of ${event} in ${dst.current_state.state_name} THREW: ${e && e.stack ? e.stack : e}`);
+			try {
+				e.__gobj_logged__ = true;
+			} catch (e2) {}
+		}
+		throw e;
+	}
 	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;
@@ -3248,10 +3276,22 @@ function set_remote_log_functions(remote_log_fn) {
 		f_warning = _console.warn;
 	}
 }
+/************************************************************
+*  JSON.stringify for a log line: a circular object (a gobj,
+*  a DOM node) must not make the log call itself throw.
+************************************************************/
+function log_stringify(v) {
+	try {
+		return JSON.stringify(v);
+	} catch (e) {
+		return String(v);
+	}
+}
 function format_log(format) {
 	const args = Array.prototype.slice.call(arguments);
 	let output = "";
 	if (typeof format === "string") {
+		if (args.length === 1) return format;
 		let i = 1;
 		output = format.replace(/%[sdifoO]/g, (match) => {
 			const val = args[i++];
@@ -3261,17 +3301,17 @@ function format_log(format) {
 				case "%i": return parseInt(val);
 				case "%f": return parseFloat(val);
 				case "%o":
-				case "%O": return typeof val === "object" ? JSON.stringify(val) : String(val);
+				case "%O": return typeof val === "object" ? log_stringify(val) : String(val);
 				default: return match;
 			}
 		});
-		const rest = args.slice(i).map((arg) => typeof arg === "object" ? JSON.stringify(arg) : String(arg));
+		const rest = args.slice(i).map((arg) => typeof arg === "object" ? log_stringify(arg) : String(arg));
 		if (rest.length > 0) output += " " + rest.join(" ");
-	} else output = args.map((arg) => typeof arg === "object" ? JSON.stringify(arg) : String(arg)).join(" ");
+	} else output = args.map((arg) => typeof arg === "object" ? log_stringify(arg) : String(arg)).join(" ");
 	return output;
 }
-function log_error(format) {
-	let msg = format_log(format);
+function log_error(format, ...args) {
+	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_error) {
 		if (f_error === _console.error) {
@@ -3283,8 +3323,8 @@ function log_error(format) {
 	}
 	emit_log_callback("error", msg, hora);
 }
-function log_warning(format) {
-	let msg = format_log(format);
+function log_warning(format, ...args) {
+	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_warning) {
 		if (f_warning === _console.warn) {
@@ -3296,24 +3336,24 @@ function log_warning(format) {
 	}
 	emit_log_callback("warning", msg, hora);
 }
-function log_info(format) {
-	let msg = format_log(format);
+function log_info(format, ...args) {
+	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_info) {
 		if (console_wants("info", msg)) f_info("%c" + hora + " INFO: " + String(msg), "color:cyan");
 	}
 	emit_log_callback("info", msg, hora);
 }
-function log_debug(format) {
-	let msg = format_log(format);
+function log_debug(format, ...args) {
+	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_debug) {
 		if (console_wants("debug", msg)) f_debug("%c" + hora + " DEBUG: " + String(msg), "color:silver");
 	}
 	emit_log_callback("debug", msg, hora);
 }
-function trace_msg(format) {
-	let msg = format_log(format);
+function trace_msg(format, ...args) {
+	let msg = format_log(format, ...args);
 	let hora = current_timestamp();
 	if (f_debug) {
 		if (console_wants("msg", msg)) f_debug("%c" + hora + " MSG: " + String(msg), "color:cyan");
@@ -3862,6 +3902,8 @@ function cmp_two_simple_json(jn_var1, jn_var2) {
 	if (is_number(jn_var1) || is_number(jn_var2)) {
 		let val1 = Number(jn_var1);
 		let val2 = Number(jn_var2);
+		if (Number.isNaN(val1)) val1 = 0;
+		if (Number.isNaN(val2)) val2 = 0;
 		if (val1 > val2) return 1;
 		else if (val1 < val2) return -1;
 		else return 0;
@@ -3929,6 +3971,28 @@ function kw_has_key(kw, key) {
 	return false;
 }
 /************************************************************
+*  A key that reaches the prototype chain instead of the data:
+*  "__proto__", "constructor" or "prototype" when the object
+*  does not hold it as its OWN key. A walk through one of them
+*  read, or WROTE, Object.prototype: the flat id
+*  "__proto__`polluted" set a key on every object of the page.
+*  In C they are keys like any other, so here too: read them
+*  only as own keys, and write "__proto__" as an own key.
+************************************************************/
+function is_prototype_segment(obj, key) {
+	if (key === "__proto__" || key === "constructor" || key === "prototype") return !Object.prototype.hasOwnProperty.call(obj, key);
+	return false;
+}
+function set_own_key(obj, key, value) {
+	if (key === "__proto__") Object.defineProperty(obj, key, {
+		value,
+		writable: true,
+		enumerable: true,
+		configurable: true
+	});
+	else obj[key] = value;
+}
+/************************************************************
 *  The value at `path` (keys joined by a backtick), as the C
 *  kw_find_path() finds it: undefined when it is not there.
 *  A kw that is not a dict or a list is LOGGED ("kw must be list
@@ -3955,7 +4019,12 @@ function kw_find_path(gobj, kw, path, verbose) {
 	}
 	let ss = path.split("`");
 	let len = ss.length;
-	for (let i = 0; i < len - 1; i++) {
+	for (let i = 0; i < len; i++) {
+		if (is_prototype_segment(kw, ss[i])) {
+			if (verbose) log_error(`${prefix}path not found: '${path}'`);
+			return;
+		}
+		if (i === len - 1) break;
 		kw = kw[ss[i]];
 		if (kw === void 0 || kw === null) {
 			if (verbose) log_error(`${prefix}path not found: '${path}'`);
@@ -4338,17 +4407,13 @@ function kw_set_dict_value(gobj, kw, path, value) {
 		return -1;
 	}
 	let ss = path.split("`");
-	if (ss.length <= 1) {
-		kw[path] = value;
-		return 0;
-	}
 	let len = ss.length;
 	for (let i = 0; i < len; i++) {
 		let key = ss[i];
-		if (i === len - 1) kw[key] = value;
+		if (i === len - 1) set_own_key(kw, key, value);
 		else {
-			let seg = kw[key];
-			if (seg === void 0) kw[key] = {};
+			let seg = is_prototype_segment(kw, key) ? void 0 : kw[key];
+			if (seg === void 0) set_own_key(kw, key, {});
 			else if (!is_object(seg) && !is_array(seg)) {
 				log_error(`${gobj ? gobj_short_name(gobj) + ": " : ""}kw_set_dict_value(): segment '${key}' is not a dict or a list: '${path}'`);
 				return -1;
@@ -4403,9 +4468,9 @@ function _kw_match_simple(kw, jn_filter, prefix_path) {
 				if (!matched) break;
 				continue;
 			}
-			let jn_record_value = kw_get_dict_value(0, kw, path, 0, 0);
-			if (!jn_record_value) jn_record_value = json_object_get(kw, path);
-			if (!jn_record_value) {
+			let jn_record_value = kw_get_dict_value(0, kw, path, void 0, 0);
+			if (jn_record_value === void 0) jn_record_value = json_object_get(kw, path);
+			if (jn_record_value === void 0) {
 				matched = false;
 				break;
 			}
@@ -4524,10 +4589,11 @@ If paths are empty return empty
 ***************************************************************************/
 function kw_clone_by_not_keys(gobj, kw, keys, verbose) {
 	let kw_clone = {};
+	if (!is_object(kw)) return kw_clone;
 	json_object_update(kw_clone, kw);
 	if (is_string(keys) && !empty_string(keys)) {
 		let key = keys;
-		if (kw_get_dict_value(gobj, kw, key, 0, 0)) json_object_del(kw_clone, key);
+		if (kw.hasOwnProperty(key)) json_object_del(kw_clone, key);
 		else if (verbose) log_error(`${gobj_short_name(gobj)}: key not found: ${key}`);
 	} else if (is_object(keys) && json_object_size(keys) > 0) {
 		for (let key of Object.keys(keys)) if (kw.hasOwnProperty(key)) json_object_del(kw_clone, key);
@@ -5487,9 +5553,15 @@ parent: document.body
 *                      will be 'data-i18n' attr
 *
 *      content -> string | [createElement2() or parameters of createElement2]
+*                  | HTMLElement | SVGElement | Text
 *                  if string begins with '<' then
 *                      it will be converted to HTMLElement
 *                          content = createOneHtml(string)
+*                  ⚠️ So a string is MARKUP when it starts with '<': never
+*                  pass DATA (a value from a backend, a name a user typed)
+*                  as a bare string, or "<img src=x onerror=...>" runs.
+*                  Pass it as a Text node, which is always text:
+*                      ['span', {}, document.createTextNode(value)]
 *                  if attrs['i18n'] is not empty then (or 'data-i18n' or 'data_i18next')
 *                          it will be overridden with the translation
 *                          content = translate(attrs['i18n']));
@@ -5928,7 +6000,7 @@ function flat2json(flat) {
 					current[seg] = flat[key];
 				} else {
 					if (Object.prototype.hasOwnProperty.call(current, seg)) throw new Error(`flat2json: '${key}' is written twice, or once as a value and once as a container`);
-					current[seg] = flat[key];
+					set_own_key(current, seg, flat[key]);
 				}
 				break;
 			}
@@ -5941,10 +6013,10 @@ function flat2json(flat) {
 					current[seg] = child;
 				}
 			} else {
-				child = current[seg];
+				child = is_prototype_segment(current, seg) ? void 0 : current[seg];
 				if (child === void 0) {
 					child = next_is_index ? [] : {};
-					current[seg] = child;
+					set_own_key(current, seg, child);
 				}
 			}
 			if (child === null || typeof child !== "object") throw new Error(`flat2json: '${key}' walks through a value: the same id is a leaf and a container at once`);
@@ -6707,6 +6779,7 @@ function mt_stop$1(gobj) {
 ***************************************************************/
 function mt_play(gobj) {
 	let default_service = gobj_default_service();
+	if (!default_service) return 0;
 	if (!gobj_is_running(default_service)) gobj_start(default_service);
 	if (!gobj_is_playing(default_service)) gobj_play(default_service);
 	return 0;
@@ -6715,7 +6788,8 @@ function mt_play(gobj) {
 *          Framework Method: Pause
 ***************************************************************/
 function mt_pause(gobj) {
-	gobj_pause(gobj_default_service());
+	let default_service = gobj_default_service();
+	if (default_service && gobj_is_playing(default_service)) gobj_pause(default_service);
 	return 0;
 }
 /***************************************************************
@@ -6971,6 +7045,7 @@ var __gclass__ = null;
 function mt_create(gobj) {
 	let priv = gobj.priv;
 	priv.gobj_timer = gobj_create_pure_child(gobj_name(gobj), "C_TIMER", {}, gobj);
+	priv.ws_seq = 0;
 	priv.url = gobj_read_str_attr(gobj, "url");
 	priv.remote_yuno_name = gobj_read_str_attr(gobj, "remote_yuno_name");
 	priv.remote_yuno_role = gobj_read_str_attr(gobj, "remote_yuno_role");
@@ -7005,6 +7080,16 @@ function mt_writing(gobj, path) {
 function mt_start(gobj) {
 	let priv = gobj.priv;
 	priv.retry_ms = 0;
+	if (gobj_current_state(gobj) !== "ST_DISCONNECTED") {
+		gobj_send_event(gobj, "EV_ON_CLOSE", {
+			url: priv.url,
+			ws_seq: priv.ws_seq,
+			code: 1e3,
+			reason: "restarted",
+			was_clean: true
+		}, gobj);
+		clear_timeout(priv.gobj_timer);
+	}
 	priv.websocket = setup_websocket(gobj);
 	return 0;
 }
@@ -7139,10 +7224,16 @@ function setup_websocket(gobj) {
 		log_error(`${gobj_short_name(gobj)}: Failed to initialize WebSocket.`);
 		return null;
 	}
+	const ws_seq = ++gobj.priv.ws_seq;
 	websocket.onopen = () => {
-		gobj_send_event(gobj, "EV_ON_OPEN", { url }, gobj);
+		if (ws_seq !== gobj.priv.ws_seq || gobj_is_destroying(gobj)) return;
+		gobj_send_event(gobj, "EV_ON_OPEN", {
+			url,
+			ws_seq
+		}, gobj);
 	};
 	websocket.onmessage = (e) => {
+		if (ws_seq !== gobj.priv.ws_seq || gobj_is_destroying(gobj)) return;
 		gobj_send_event(gobj, "EV_ON_MESSAGE", {
 			url,
 			data: e.data
@@ -7150,9 +7241,13 @@ function setup_websocket(gobj) {
 	};
 	websocket.onclose = (e) => {
 		if (gobj_is_destroying(gobj)) return;
+		if (ws_seq !== gobj.priv.ws_seq) return;
 		if (!gobj_read_bool_attr(gobj_yuno(), "browser_beforeunload")) gobj_send_event(gobj, "EV_ON_CLOSE", {
 			url,
-			e
+			ws_seq,
+			code: e.code,
+			reason: e.reason,
+			was_clean: e.wasClean
 		}, gobj);
 		else log_warning("Close websocket by unload page");
 	};
@@ -7173,7 +7268,7 @@ function close_websocket(gobj, code = 1e3, reason = "") {
 	try {
 		websocket.close(code, reason);
 	} catch (e) {
-		log_error("Error closing WebSocket:", e.message);
+		log_error(`${gobj_short_name(gobj)}: Error closing WebSocket: ${e.message}`);
 	}
 }
 /***************************************************************
@@ -7299,29 +7394,29 @@ function iev_create_from_json(gobj, data) {
 	try {
 		x = JSON.parse(data);
 	} catch (e) {
-		log_error("parsing inter_event json: " + e);
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_event json: ${e}`);
 		return null;
 	}
 	if (!(x instanceof Object)) {
-		log_error("parsing inter_event: websocket data not a json object");
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_event: websocket data not a json object`);
 		return null;
 	}
 	let event = x["event"];
 	if (!event) {
-		log_error("parsing inter_event: no event");
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_event: no event`);
 		return null;
 	}
 	if (typeof event !== "string") {
-		log_error("parsing inter_event: event not a string");
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_event: event not a string`);
 		return null;
 	}
 	let kw = x["kw"];
 	if (!kw) {
-		log_error("parsing inter_kw: no kw");
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_kw: no kw`);
 		return null;
 	}
 	if (!(kw instanceof Object)) {
-		log_error("parsing inter_event: kw not a json object");
+		log_warning(`${gobj_short_name(gobj)}: parsing inter_event: kw not a json object`);
 		return null;
 	}
 	return {
@@ -7381,10 +7476,9 @@ function ac_on_open(gobj, event, kw, src) {
 ***************************************************************/
 function ac_on_close(gobj, event, kw, src) {
 	let priv = gobj.priv;
-	let e = kw.e;
 	let url = kw.url;
 	set_remote_log_functions();
-	log_warning(`${gobj_short_name(gobj)}: WebSocket closed ${url} (Code: ${e.code}, Reason: "${e.reason}", Clean: ${e.wasClean})`);
+	log_warning(`${gobj_short_name(gobj)}: WebSocket closed ${url} (Code: ${kw.code}, Reason: "${kw.reason}", Clean: ${kw.was_clean})`);
 	if (priv.websocket) {
 		priv.websocket.onopen = null;
 		priv.websocket.onmessage = null;
@@ -7401,15 +7495,15 @@ function ac_on_close(gobj, event, kw, src) {
 			remote_yuno_service: priv.remote_yuno_service
 		});
 	} else {
-		log_warning(`${gobj_short_name(gobj)}: EV_ON_OPEN_ERROR cannot open ${url} (Code: ${e.code}, Reason: "${e.reason}", Clean: ${e.wasClean})`);
+		log_warning(`${gobj_short_name(gobj)}: EV_ON_OPEN_ERROR cannot open ${url} (Code: ${kw.code}, Reason: "${kw.reason}", Clean: ${kw.was_clean})`);
 		gobj_publish_event(gobj, "EV_ON_OPEN_ERROR", {
 			url,
 			remote_yuno_name: priv.remote_yuno_name,
 			remote_yuno_role: priv.remote_yuno_role,
 			remote_yuno_service: priv.remote_yuno_service,
-			code: e.code,
-			reason: e.reason,
-			was_clean: e.wasClean
+			code: kw.code,
+			reason: kw.reason,
+			was_clean: kw.was_clean
 		});
 	}
 	if (gobj_is_running(gobj)) set_timeout(priv.gobj_timer, next_retry(gobj));
@@ -7507,6 +7601,10 @@ function ac_identity_card_ack(gobj, event, kw, src) {
 function ac_on_message(gobj, event, kw, src) {
 	let url = gobj.priv.url;
 	let iev_msg = iev_create_from_json(gobj, kw.data);
+	if (!iev_msg) {
+		log_warning(`${gobj_short_name(gobj)}: frame dropped from ${url}: ${String(kw.data).substring(0, 256)}`);
+		return -1;
+	}
 	if (is_traffic_tracing(gobj)) {
 		let prefix = gobj_name(gobj_yuno()) + " <== " + url;
 		let size = kw.data.length;
@@ -7532,8 +7630,14 @@ function ac_on_message(gobj, event, kw, src) {
 		return 0;
 	}
 	let iev_dst_service = kw_get_str(gobj, event_id, "dst_service", "");
-	if (msg_type === "__subscribing__") return -1;
-	if (msg_type === "__unsubscribing__") return -1;
+	if (msg_type === "__subscribing__") {
+		log_warning(`${gobj_short_name(gobj)}: subscription event ignored, I'm client (service: ${iev_dst_service}, event: ${iev_event})`);
+		return -1;
+	}
+	if (msg_type === "__unsubscribing__") {
+		log_warning(`${gobj_short_name(gobj)}: unsubscription event ignored, I'm client (service: ${iev_dst_service}, event: ${iev_event})`);
+		return -1;
+	}
 	if (gobj_has_event(gobj, iev_event, event_flag_t.EVF_PUBLIC_EVENT)) {
 		gobj_send_event(gobj, iev_event, iev_kw, gobj);
 		return 0;